Merge branch 'develop' into ctb/bridge-spacer

ethereum-optimism · Sep 14, 2022 · c14a79a · c14a79a
2 parents 2738b39 + df041c0
commit c14a79a
Show file tree

Hide file tree

Showing 40 changed files with 124 additions and 85 deletions.
diff --git a/.changeset/fluffy-jokes-return.md b/.changeset/fluffy-jokes-return.md
diff --git a/.changeset/friendly-beers-explain.md b/.changeset/friendly-beers-explain.md
diff --git a/.changeset/selfish-apes-change.md b/.changeset/selfish-apes-change.md
diff --git a/.changeset/slimy-coins-allow.md b/.changeset/slimy-coins-allow.md
diff --git a/.changeset/strange-sloths-sniff.md b/.changeset/strange-sloths-sniff.md
diff --git a/.changeset/unlucky-moons-search.md b/.changeset/unlucky-moons-search.md
diff --git a/integration-tests/package.json b/integration-tests/package.json
@@ -29,10 +29,10 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.5.4",
-    "@eth-optimism/contracts": "^0.5.34",
+    "@eth-optimism/contracts": "^0.5.35",
     "@eth-optimism/contracts-periphery": "^0.2.3",
     "@eth-optimism/core-utils": "0.10.0",
-    "@eth-optimism/sdk": "1.6.1",
+    "@eth-optimism/sdk": "1.6.2",
     "@ethersproject/abstract-provider": "^5.6.1",
     "@ethersproject/providers": "^5.6.8",
     "@ethersproject/transactions": "^5.6.2",

diff --git a/op-bindings/Makefile b/op-bindings/Makefile
@@ -92,7 +92,7 @@ more:
 	go run ./gen/main.go \
 		-artifacts ../packages/contracts-bedrock/artifacts \
 		-out ./bindings \
-		-contracts OptimismMintableERC20Factory,L2StandardBridge,L1BlockNumber,DeployerWhitelist,Proxy,OptimismPortal,L2ToL1MessagePasser,L2CrossDomainMessenger,GasPriceOracle,SequencerFeeVault,L1Block,LegacyERC20ETH,WETH9,GovernanceToken \
+		-contracts OptimismMintableERC20Factory,L2StandardBridge,L1BlockNumber,DeployerWhitelist,Proxy,OptimismPortal,L2ToL1MessagePasser,L2CrossDomainMessenger,GasPriceOracle,SequencerFeeVault,L1Block,LegacyERC20ETH,WETH9,GovernanceToken,L1CrossDomainMessenger \
 		-package bindings
 
 mkdir:

diff --git a/op-bindings/bindings/deployerwhitelist_more.go b/op-bindings/bindings/deployerwhitelist_more.go
diff --git a/op-bindings/bindings/gaspriceoracle_more.go b/op-bindings/bindings/gaspriceoracle_more.go
diff --git a/op-bindings/bindings/governancetoken_more.go b/op-bindings/bindings/governancetoken_more.go
diff --git a/op-bindings/bindings/l1block_more.go b/op-bindings/bindings/l1block_more.go
diff --git a/op-bindings/bindings/l1crossdomainmessenger_more.go b/op-bindings/bindings/l1crossdomainmessenger_more.go
diff --git a/op-bindings/bindings/l2crossdomainmessenger_more.go b/op-bindings/bindings/l2crossdomainmessenger_more.go
diff --git a/op-bindings/bindings/l2standardbridge_more.go b/op-bindings/bindings/l2standardbridge_more.go