Skip to content

Commit 7f23de1

Browse files
boyuan-chenboyuan-chen
authored
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
1 parent 06c9f2c commit 7f23de1

31 files changed

+348
-987
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,6 @@ jobs:
206206
test_folder: "eth-l2"
207207
- report-integration-tests
208208

209-
integration-tests-avalanche:
210-
executor: intergration-tests-executor
211-
parallelism: 4
212-
steps:
213-
- download-solidity-compilers
214-
- run-integration-tests:
215-
docker_compose_file: "docker-compose-avalanche.yml"
216-
docker_compose_side_file: "docker-compose-avalanche-side.yml"
217-
test_folder: "alt-l2"
218-
- report-integration-tests
219-
220209
integration-tests-bnb:
221210
executor: intergration-tests-executor
222211
parallelism: 4
@@ -232,7 +221,6 @@ workflows:
232221
main:
233222
jobs:
234223
- integration-tests
235-
#- integration-tests-avalanche
236224
- integration-tests-bnb
237225
- go-lint-test-build:
238226
name: proxyd-tests

‎.github/labeler.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
---
22
2-reviewers:
3-
- '.github/**/*'
4-
- 'l2geth/**/*'
5-
- 'ops/**/*'
6-
- 'packages/batch-submitter/**/*'
7-
- 'packages/contracts/**/*'
8-
- 'packages/data-transport-layer/**/*'
9-
- 'packages/message-relayer/**/*'
10-
- 'patches/**/*'
3+
- any: ['.github/**/*', 'l2geth/**/*', 'ops/**/*', 'packages/batch-submitter/**/*', 'packages/contracts/**/*', 'packages/data-transport-layer/**/*', 'packages/message-relayer/**/*', 'patches/**/*']
114

125
M-ci:
136
- any: ['.github/**/*']

‎.github/workflows/golangci-lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
- name: golangci-lint gas-oracle
2323
uses: golangci/golangci-lint-action@v3
2424
with:
25-
version: v1.51.0
25+
version: v1.56.1
2626
working-directory: go/gas-oracle
2727
- name: golangci-lint batch-submitter
2828
uses: golangci/golangci-lint-action@v3
2929
with:
30-
version: v1.51.0
30+
version: v1.56.1
3131
working-directory: go/batch-submitter
3232
- name: golangci-lint bss-core
3333
uses: golangci/golangci-lint-action@v3
3434
with:
35-
version: v1.51.0
35+
version: v1.56.1
3636
working-directory: go/bss-core

‎.github/workflows/labeler.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
pr-labeler:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/labeler@main
10+
- uses: actions/labeler@v3
1111
with:
12-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
12+
repo-token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}"
1313
configuration-path: .github/labeler.yml

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ packages/boba/gateway/public/env.js
6969
/packages/boba/subgraph/L2/build
7070
/packages/boba/subgraph/L1/generated
7171
/packages/boba/subgraph/L2/generated
72+
/packages/boba/subgraph/L1/rollup/generated
73+
/packages/boba/subgraph/L1/rollup/subgraph.yaml
74+
/packages/boba/subgraph/L1/rollup/yarn.lock
7275

7376
# api
7477
env-mainnet.yml
@@ -81,3 +84,4 @@ packages/boba/contracts/coverage/
8184

8285
packages/boba/account-abstraction/deployments/hardhat/
8386
packages/boba/bundler_sdk/coverage/
87+

‎go/batch-submitter/drivers/proposer/driver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (d *Driver) CraftBatchTx(
220220
// so in the event their API is unreachable we can fallback to a degraded
221221
// mode of operation. This also applies to our test environments, as hardhat
222222
// doesn't support the query either.
223-
case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
223+
case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
224224
log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
225225
"by current backend, using fallback gasTipCap")
226226
opts.GasTipCap = drivers.FallbackGasTipCap
@@ -265,7 +265,7 @@ func (d *Driver) SubmitBatchTx(
265265
// so in the event their API is unreachable we can fallback to a degraded
266266
// mode of operation. This also applies to our test environments, as hardhat
267267
// doesn't support the query either.
268-
case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
268+
case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
269269
log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
270270
"by current backend, using fallback gasTipCap")
271271
opts.GasTipCap = drivers.FallbackGasTipCap

‎go/batch-submitter/drivers/sequencer/driver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func (d *Driver) CraftBatchTx(
251251
// method, so in the event their API is unreachable we can fallback to a
252252
// degraded mode of operation. This also applies to our test
253253
// environments, as hardhat doesn't support the query either.
254-
case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
254+
case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
255255
log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
256256
"by current backend, using fallback gasTipCap")
257257
opts.GasTipCap = drivers.FallbackGasTipCap
@@ -295,7 +295,7 @@ func (d *Driver) SubmitBatchTx(
295295
// so in the event their API is unreachable we can fallback to a degraded
296296
// mode of operation. This also applies to our test environments, as hardhat
297297
// doesn't support the query either.
298-
case drivers.IsMaxPriorityFeePerGasNotFoundError(err):
298+
case drivers.IsMaxPriorityFeePerGasNotFoundError(err) || drivers.IsMaxPriorityFeePerGasNotSupportedError(err):
299299
log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
300300
"by current backend, using fallback gasTipCap")
301301
opts.GasTipCap = drivers.FallbackGasTipCap

‎go/bss-core/drivers/clear_pending_tx.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func SignClearingTx(
138138

139139
gasTipCap, err := l1Client.SuggestGasTipCap(ctx)
140140
if err != nil {
141-
if !IsMaxPriorityFeePerGasNotFoundError(err) {
141+
if !IsMaxPriorityFeePerGasNotFoundError(err) && !IsMaxPriorityFeePerGasNotSupportedError(err) {
142142
return nil, err
143143
}
144144

‎go/bss-core/drivers/max_priority_fee_fallback.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ var (
1111
"Method eth_maxPriorityFeePerGas not found",
1212
)
1313

14+
errMaxPriorityFeePerGasNotSupported = errors.New(
15+
"Method eth_maxPriorityFeePerGas is not supported",
16+
)
17+
1418
// FallbackGasTipCap is the default fallback gasTipCap used when we are
1519
// unable to query an L1 backend for a suggested gasTipCap.
1620
FallbackGasTipCap = big.NewInt(1500000000)
@@ -24,3 +28,12 @@ func IsMaxPriorityFeePerGasNotFoundError(err error) bool {
2428
err.Error(), errMaxPriorityFeePerGasNotFound.Error(),
2529
)
2630
}
31+
32+
// IsMaxPriorityFeePerGasNotSupportedError returns true if the provided error
33+
// signals that the backend does not support the eth_maxPrirorityFeePerGas
34+
// method. In this case, the caller should fallback to using the constant above.
35+
func IsMaxPriorityFeePerGasNotSupportedError(err error) bool {
36+
return strings.Contains(
37+
err.Error(), errMaxPriorityFeePerGasNotSupported.Error(),
38+
)
39+
}

0 commit comments

Comments
 (0)