Update subgraph endpoints (#1394)

* Update subgraph endpoints * Disable gas price oracle test * Fix batch_submitter for integration test * Delete labeler * Disable gas-oracle * Update golangci-lint version * Add back labeler * Fix 2-reviewers * Downgrade actions/labeler * Update repo-token * Use ipv4 subnet * Upgrade ubuntu image tag * Replace bnb with geth * Fix bnb local network * Update key and contract addresses * Fix integration test key * Fix sdk addresses and remove bobalink tests * Fix sdk addresses
bobanetwork · May 21, 2024 · 7f23de1 · 7f23de1
1 parent 06c9f2c
commit 7f23de1
Show file tree

Hide file tree

Showing 31 changed files with 348 additions and 987 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -206,17 +206,6 @@ jobs:
           test_folder: "eth-l2"
       - report-integration-tests
 
-  integration-tests-avalanche:
-    executor: intergration-tests-executor
-    parallelism: 4
-    steps:
-      - download-solidity-compilers
-      - run-integration-tests:
-          docker_compose_file: "docker-compose-avalanche.yml"
-          docker_compose_side_file: "docker-compose-avalanche-side.yml"
-          test_folder: "alt-l2"
-      - report-integration-tests
-
   integration-tests-bnb:
     executor: intergration-tests-executor
     parallelism: 4
@@ -232,7 +221,6 @@ workflows:
   main:
     jobs:
       - integration-tests
-      #- integration-tests-avalanche
       - integration-tests-bnb
       - go-lint-test-build:
           name: proxyd-tests

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,13 +1,6 @@
 ---
 2-reviewers:
-  - '.github/**/*'
-  - 'l2geth/**/*'
-  - 'ops/**/*'
-  - 'packages/batch-submitter/**/*'
-  - 'packages/contracts/**/*'
-  - 'packages/data-transport-layer/**/*'
-  - 'packages/message-relayer/**/*'
-  - 'patches/**/*'
+  - any: ['.github/**/*', 'l2geth/**/*', 'ops/**/*', 'packages/batch-submitter/**/*', 'packages/contracts/**/*', 'packages/data-transport-layer/**/*', 'packages/message-relayer/**/*', 'patches/**/*']
 
 M-ci:
   - any: ['.github/**/*']

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -22,15 +22,15 @@ jobs:
       - name: golangci-lint gas-oracle
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.0
+          version: v1.56.1
           working-directory: go/gas-oracle
       - name: golangci-lint batch-submitter
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.0
+          version: v1.56.1
           working-directory: go/batch-submitter
       - name: golangci-lint bss-core
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.0
+          version: v1.56.1
           working-directory: go/bss-core
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -7,7 +7,7 @@ jobs:
   pr-labeler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@main
+      - uses: actions/labeler@v3
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
           configuration-path: .github/labeler.yml
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,9 @@ packages/boba/gateway/public/env.js
 /packages/boba/subgraph/L2/build
 /packages/boba/subgraph/L1/generated
 /packages/boba/subgraph/L2/generated
+/packages/boba/subgraph/L1/rollup/generated
+/packages/boba/subgraph/L1/rollup/subgraph.yaml
+/packages/boba/subgraph/L1/rollup/yarn.lock
 
 # api
 env-mainnet.yml
@@ -81,3 +84,4 @@ packages/boba/contracts/coverage/
 
 packages/boba/account-abstraction/deployments/hardhat/
 packages/boba/bundler_sdk/coverage/
+
diff --git a/go/batch-submitter/drivers/proposer/driver.go b/go/batch-submitter/drivers/proposer/driver.go
@@ -220,7 +220,7 @@ func (d *Driver) CraftBatchTx(
 	// so in the event their API is unreachable we can fallback to a degraded
 	// mode of operation. This also applies to our test environments, as hardhat
 	// doesn't support the query either.
-	case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
+	case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
 		log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
 			"by current backend, using fallback gasTipCap")
 		opts.GasTipCap = drivers.FallbackGasTipCap
@@ -265,7 +265,7 @@ func (d *Driver) SubmitBatchTx(
 	// so in the event their API is unreachable we can fallback to a degraded
 	// mode of operation. This also applies to our test environments, as hardhat
 	// doesn't support the query either.
-	case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
+	case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
 		log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
 			"by current backend, using fallback gasTipCap")
 		opts.GasTipCap = drivers.FallbackGasTipCap

diff --git a/go/batch-submitter/drivers/sequencer/driver.go b/go/batch-submitter/drivers/sequencer/driver.go
@@ -251,7 +251,7 @@ func (d *Driver) CraftBatchTx(
 		// method, so in the event their API is unreachable we can fallback to a
 		// degraded mode of operation. This also applies to our test
 		// environments, as hardhat doesn't support the query either.
-		case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
+		case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
 			log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
 				"by current backend, using fallback gasTipCap")
 			opts.GasTipCap = drivers.FallbackGasTipCap
@@ -295,7 +295,7 @@ func (d *Driver) SubmitBatchTx(
 	// so in the event their API is unreachable we can fallback to a degraded
 	// mode of operation. This also applies to our test environments, as hardhat
 	// doesn't support the query either.
-	case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
+	case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
 		log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
 			"by current backend, using fallback gasTipCap")
 		opts.GasTipCap = drivers.FallbackGasTipCap

diff --git a/go/bss-core/drivers/clear_pending_tx.go b/go/bss-core/drivers/clear_pending_tx.go
@@ -138,7 +138,7 @@ func SignClearingTx(
 
 	gasTipCap, err := l1Client.SuggestGasTipCap(ctx)
 	if err != nil {
-		if !IsMaxPriorityFeePerGasNotFoundError(err) {
+		if !IsMaxPriorityFeePerGasNotFoundError(err) && !IsMaxPriorityFeePerGasNotSupportedError(err) {
 			return nil, err
 		}
 

diff --git a/go/bss-core/drivers/max_priority_fee_fallback.go b/go/bss-core/drivers/max_priority_fee_fallback.go
@@ -11,6 +11,10 @@ var (
 		"Method eth_maxPriorityFeePerGas not found",
 	)
 
+	errMaxPriorityFeePerGasNotSupported = errors.New(
+		"Method eth_maxPriorityFeePerGas is not supported",
+	)
+
 	// FallbackGasTipCap is the default fallback gasTipCap used when we are
 	// unable to query an L1 backend for a suggested gasTipCap.
 	FallbackGasTipCap = big.NewInt(1500000000)
@@ -24,3 +28,12 @@ func IsMaxPriorityFeePerGasNotFoundError(err error) bool {
 		err.Error(), errMaxPriorityFeePerGasNotFound.Error(),
 	)
 }
+
+// IsMaxPriorityFeePerGasNotSupportedError returns true if the provided error
+// signals that the backend does not support the eth_maxPrirorityFeePerGas
+// method. In this case, the caller should fallback to using the constant above.
+func IsMaxPriorityFeePerGasNotSupportedError(err error) bool {
+	return strings.Contains(
+		err.Error(), errMaxPriorityFeePerGasNotSupported.Error(),
+	)
+}