fix(relayer): use erc20vault not token vault for required end var (#1…

…4519)
taikoxyz · Aug 15, 2023 · a49c65c · a49c65c
1 parent c820166
commit a49c65c
Show file tree

Hide file tree

Showing 9 changed files with 416 additions and 339 deletions.
diff --git a/packages/eventindexer/ProverPool.json b/packages/eventindexer/ProverPool.json
@@ -54,7 +54,7 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": false,
+        "indexed": true,
         "internalType": "address",
         "name": "addressManager",
         "type": "address"
@@ -117,6 +117,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": true,
+        "internalType": "uint64",
+        "name": "blockId",
+        "type": "uint64"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -198,25 +204,25 @@
   },
   {
     "inputs": [],
-    "name": "MAX_CAPACITY_LOWER_BOUND",
+    "name": "MAX_NUM_PROVERS",
     "outputs": [
       {
-        "internalType": "uint32",
+        "internalType": "uint256",
         "name": "",
-        "type": "uint32"
+        "type": "uint256"
       }
     ],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
-    "name": "MAX_NUM_PROVERS",
+    "name": "MIN_CAPACITY",
     "outputs": [
       {
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "",
-        "type": "uint256"
+        "type": "uint32"
       }
     ],
     "stateMutability": "view",
@@ -237,7 +243,7 @@
   },
   {
     "inputs": [],
-    "name": "MIN_SLASH_AMOUNT",
+    "name": "MIN_STAKE_PER_CAPACITY",
     "outputs": [
       {
         "internalType": "uint64",
@@ -250,7 +256,7 @@
   },
   {
     "inputs": [],
-    "name": "MIN_STAKE_PER_CAPACITY",
+    "name": "SLASH_MULTIPLIER",
     "outputs": [
       {
         "internalType": "uint64",
@@ -574,7 +580,7 @@
     "outputs": [
       {
         "internalType": "address payable",
-        "name": "",
+        "name": "addr",
         "type": "address"
       }
     ],
@@ -598,7 +604,7 @@
     "outputs": [
       {
         "internalType": "address payable",
-        "name": "",
+        "name": "addr",
         "type": "address"
       }
     ],
@@ -620,10 +626,20 @@
   },
   {
     "inputs": [
+      {
+        "internalType": "uint64",
+        "name": "blockId",
+        "type": "uint64"
+      },
       {
         "internalType": "address",
         "name": "addr",
         "type": "address"
+      },
+      {
+        "internalType": "uint64",
+        "name": "proofReward",
+        "type": "uint64"
       }
     ],
     "name": "slashProver",

diff --git a/packages/eventindexer/TaikoL1.json b/packages/eventindexer/TaikoL1.json
@@ -143,12 +143,12 @@
   },
   {
     "inputs": [],
-    "name": "L1_INVALID_PROOF",
+    "name": "L1_NOT_BETTER_BID",
     "type": "error"
   },
   {
     "inputs": [],
-    "name": "L1_NOT_BETTER_BID",
+    "name": "L1_NOT_PROVEABLE",
     "type": "error"
   },
   {
@@ -158,12 +158,17 @@
   },
   {
     "inputs": [],
-    "name": "L1_NOT_PROVEABLE",
+    "name": "L1_NOT_SPECIAL_PROVER",
     "type": "error"
   },
   {
     "inputs": [],
-    "name": "L1_NOT_SPECIAL_PROVER",
+    "name": "L1_PERMISSION_DENIED",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "L1_PERMISSION_DENIED",
     "type": "error"
   },
   {
@@ -276,7 +281,7 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": false,
+        "indexed": true,
         "internalType": "address",
         "name": "addressManager",
         "type": "address"
@@ -1041,6 +1046,11 @@
             "name": "proofMaxWindow",
             "type": "uint16"
           },
+          {
+            "internalType": "uint16",
+            "name": "proofWindowMultiplier",
+            "type": "uint16"
+          },
           {
             "internalType": "uint256",
             "name": "ethDepositRingBufferSize",
@@ -1082,9 +1092,14 @@
             "type": "uint8"
           },
           {
-            "internalType": "uint256",
+            "internalType": "uint32",
             "name": "rewardOpenMaxCount",
-            "type": "uint256"
+            "type": "uint32"
+          },
+          {
+            "internalType": "uint32",
+            "name": "rewardMaxDelayPenalty",
+            "type": "uint32"
           }
         ],
         "internalType": "struct TaikoData.Config",
@@ -1473,7 +1488,7 @@
     "outputs": [
       {
         "internalType": "address payable",
-        "name": "",
+        "name": "addr",
         "type": "address"
       }
     ],
@@ -1497,7 +1512,7 @@
     "outputs": [
       {
         "internalType": "address payable",
-        "name": "",
+        "name": "addr",
         "type": "address"
       }
     ],

diff --git a/packages/eventindexer/contracts/bridge/Bridge.go b/packages/eventindexer/contracts/bridge/Bridge.go
diff --git a/packages/eventindexer/contracts/proverpool/ProverPool.go b/packages/eventindexer/contracts/proverpool/ProverPool.go
diff --git a/packages/eventindexer/contracts/taikol1/TaikoL1.go b/packages/eventindexer/contracts/taikol1/TaikoL1.go
diff --git a/packages/eventindexer/indexer/filter.go b/packages/eventindexer/indexer/filter.go
@@ -89,7 +89,7 @@ func L1FilterFunc(
 
 	if svc.proverPool != nil {
 		wg.Go(func() error {
-			slashedEvents, err := svc.proverPool.FilterSlashed(filterOpts, nil)
+			slashedEvents, err := svc.proverPool.FilterSlashed(filterOpts, nil, nil)
 			if err != nil {
 				return errors.Wrap(err, "svc.proverPool.FilterSlashed")
 			}

diff --git a/packages/eventindexer/indexer/save_message_sent_event.go b/packages/eventindexer/indexer/save_message_sent_event.go
@@ -31,7 +31,7 @@ func (svc *Service) saveMessageSentEvents(
 	for {
 		event := events.Event
 
-		slog.Info("new messageSent event", "owner", event.Message.Owner.Hex())
+		slog.Info("new messageSent event", "owner", event.Message.From.Hex())
 
 		if err := svc.saveMessageSentEvent(ctx, chainID, event); err != nil {
 			eventindexer.MessageSentEventsProcessedError.Inc()
@@ -57,10 +57,10 @@ func (svc *Service) saveMessageSentEvent(
 	}
 
 	// amount must be >= 0.15 eth
-	if event.Message.DepositValue.Cmp(minEthAmount) < 0 {
+	if event.Message.Value.Cmp(minEthAmount) < 0 {
 		slog.Info("skipping message sent event",
 			"value",
-			event.Message.DepositValue.String(),
+			event.Message.Value.String(),
 			"requiredValue",
 			minEthAmount.String(),
 		)
@@ -78,7 +78,7 @@ func (svc *Service) saveMessageSentEvent(
 		Data:    string(marshaled),
 		ChainID: chainID,
 		Event:   eventindexer.EventNameMessageSent,
-		Address: event.Message.Owner.Hex(),
+		Address: event.Message.From.Hex(),
 	})
 	if err != nil {
 		return errors.Wrap(err, "svc.eventRepo.Save")

diff --git a/packages/eventindexer/indexer/subscribe.go b/packages/eventindexer/indexer/subscribe.go
@@ -116,7 +116,7 @@ func (svc *Service) subscribeSlashed(
 
 		return svc.proverPool.WatchSlashed(&bind.WatchOpts{
 			Context: ctx,
-		}, sink, nil)
+		}, sink, nil, nil)
 	})
 
 	defer sub.Unsubscribe()
@@ -589,7 +589,7 @@ func (svc *Service) subscribeMessageSent(ctx context.Context, chainID *big.Int,
 			errChan <- errors.Wrap(err, "sub.Err()")
 		case event := <-sink:
 			go func() {
-				slog.Info("messageSentEvent", "owner", event.Message.Owner.Hex())
+				slog.Info("messageSentEvent", "owner", event.Message.From.Hex())
 
 				if err := svc.saveMessageSentEvent(ctx, chainID, event); err != nil {
 					eventindexer.MessageSentEventsProcessedError.Inc()

diff --git a/packages/relayer/cli/cli.go b/packages/relayer/cli/cli.go
@@ -32,8 +32,8 @@ var (
 		"L1_BRIDGE_ADDRESS",
 		"L2_BRIDGE_ADDRESS",
 		"L2_TAIKO_ADDRESS",
-		"L1_TOKEN_VAULT_ADDRESS",
-		"L2_TOKEN_VAULT_ADDRESS",
+		"L1_ERC20_VAULT_ADDRESS",
+		"L2_ERC20_VAULT_ADDRESS",
 		"L1_RPC_URL",
 		"L2_RPC_URL",
 		"MYSQL_USER",