Merge branch 'main' into guardian-no-contest

taikoxyz · May 14, 2024 · b801d78 · b801d78
2 parents db56fb3 + 6ef421a
commit b801d78
Show file tree

Hide file tree

Showing 20 changed files with 413 additions and 119 deletions.
diff --git a/.github/workflows/eventindexer.yml b/.github/workflows/eventindexer.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   lint-eventindexer:
-    name: lint
+    name: lint-eventindexer
     runs-on: [taiko-runner]
     steps:
       - uses: actions/setup-go@v5
@@ -30,7 +30,7 @@ jobs:
 
   test-eventindexer:
     runs-on: [taiko-runner]
-    needs: lint
+    needs: lint-eventindexer
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]

diff --git a/.github/workflows/guardians-health-check.yaml b/.github/workflows/guardians-health-check.yaml
@@ -10,8 +10,8 @@ on:
       - "packages/guardian-prover-health-check/**"
 
 jobs:
-  lint:
-    name: lint
+  lint-guardian-prover-health-check:
+    name: lint-guardian-prover-health-check
     runs-on: [taiko-runner]
     steps:
       - uses: actions/setup-go@v5
@@ -28,9 +28,9 @@ jobs:
           working-directory: ./packages/guardian-prover-health-check
           args: --config=.golangci.yml --timeout=4m
 
-  test:
+  test-guardian-prover-health-check:
     runs-on: [taiko-runner]
-    needs: lint
+    needs: lint-guardian-prover-health-check
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
@@ -52,7 +52,7 @@ jobs:
           files: ./packages/guardian-prover-health-check/coverage.txt
           flags: guardian-prover-health-check
 
-  push-docker-image:
+  push-guardian-prover-health-check-docker-image:
     # only push docker image on PR merge to main
     if: ${{ github.event }} == 'push'
     name: Build and push docker image

diff --git a/.github/workflows/relayer.yml b/.github/workflows/relayer.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   lint-relayer:
-    name: lint
+    name: lint-relayer
     runs-on: [taiko-runner]
     steps:
       - uses: actions/setup-go@v5
@@ -30,7 +30,7 @@ jobs:
 
   test-relayer:
     runs-on: [taiko-runner]
-    needs: lint
+    needs: lint-relayer
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]

diff --git a/packages/guardian-prover-health-check/http/get_signed_blocks.go b/packages/guardian-prover-health-check/http/get_signed_blocks.go
@@ -46,6 +46,7 @@ func (srv *Server) GetSignedBlocks(c echo.Context) error {
 
 		start, err = strconv.ParseUint(c.QueryParam("start"), 10, 64)
 		if err != nil {
+			log.Error("Failed to parse start", "error", err)
 			return echo.NewHTTPError(http.StatusBadRequest, err)
 		}
 	}

diff --git a/packages/relayer/ERC1155Vault.json b/packages/relayer/ERC1155Vault.json
@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "MAX_TOKEN_PER_TXN",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "acceptOwnership",
@@ -90,6 +77,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "impl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "inNonReentrant",
@@ -1003,11 +1003,6 @@
     "name": "VAULT_INVALID_TO_ADDR",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "VAULT_MAX_TOKEN_PER_TXN_EXCEEDED",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "VAULT_PERMISSION_DENIED",

diff --git a/packages/relayer/ERC20Vault.json b/packages/relayer/ERC20Vault.json
@@ -165,6 +165,19 @@
     ],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "impl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "inNonReentrant",

diff --git a/packages/relayer/ERC721Vault.json b/packages/relayer/ERC721Vault.json
@@ -1,17 +1,4 @@
 [
-  {
-    "type": "function",
-    "name": "MAX_TOKEN_PER_TXN",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "acceptOwnership",
@@ -90,6 +77,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "impl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "inNonReentrant",
@@ -959,11 +959,6 @@
     "name": "VAULT_INVALID_TO_ADDR",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "VAULT_MAX_TOKEN_PER_TXN_EXCEEDED",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "VAULT_PERMISSION_DENIED",

diff --git a/packages/relayer/QuotaManager.json b/packages/relayer/QuotaManager.json
@@ -61,6 +61,19 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "impl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "inNonReentrant",

diff --git a/packages/relayer/SignalService.json b/packages/relayer/SignalService.json
@@ -100,6 +100,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "impl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "inNonReentrant",

diff --git a/packages/relayer/TaikoL1.json b/packages/relayer/TaikoL1.json
@@ -363,6 +363,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "impl",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "inNonReentrant",
@@ -639,6 +652,19 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "resetGenesisHash",
+    "inputs": [
+      {
+        "name": "_genesisBlockHash",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
   {
     "type": "function",
     "name": "resolve",
@@ -1943,6 +1969,16 @@
     "name": "L1_RECEIVE_DISABLED",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "L1_TOO_LATE",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "L1_TOO_LATE",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "L1_TOO_MANY_BLOCKS",

diff --git a/packages/relayer/bindings/bridge/Bridge.go b/packages/relayer/bindings/bridge/Bridge.go