Merge pull request #201 from ethereum-optimism/harry/integrate_superc…

…hain_erc20_changes feat: integrate superchainerc20 redesign
ethereum-optimism · Oct 17, 2024 · b9be2fd · b9be2fd
2 parents 54e452c + 8debcc6
commit b9be2fd
Show file tree

Hide file tree

Showing 38 changed files with 2,330 additions and 521 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,5 +26,9 @@ go.work.sum
 
 .DS_Store
 
+# vendored packages
+lib
+
 /main
 dist/
+cache/
diff --git a/Justfile b/Justfile
@@ -39,7 +39,7 @@ calculate-artifact-url:
     echo "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-$checksum.tar.gz"
 
 generate-monorepo-bindings:
-    ./scripts/generate-bindings.sh -u $(just calculate-artifact-url) -n CrossL2Inbox,L2ToL2CrossDomainMessenger,L1BlockInterop,SuperchainWETH -o ./bindings
+    ./scripts/generate-bindings.sh -u $(just calculate-artifact-url) -n CrossL2Inbox,L2ToL2CrossDomainMessenger,L1BlockInterop,SuperchainWETH,SuperchainERC20,SuperchainTokenBridge -o ./bindings
 
 generate-genesis: build-contracts checkout-optimism-monorepo
     go run ./genesis/cmd/main.go --monorepo-artifacts $(just calculate-artifact-url) --periphery-artifacts ./contracts/out --outdir ./genesis/generated

diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ cast send 0x420beeF000000000000000000000000000000001 "mint(address _to, uint256
 Send the tokens from Chain 901 to Chain 902 using the following command:
 
 ```sh
-cast send 0x420beeF000000000000000000000000000000001 "sendERC20(address _to, uint256 _amount, uint256 _chainId)" 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 1000 902 --rpc-url http://127.0.0.1:9545 --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+cast send 0x4200000000000000000000000000000000000028 "sendERC20(address _token, address _to, uint256 _amount, uint256 _chainId)" 0x420beeF000000000000000000000000000000001 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 1000 902 --rpc-url http://127.0.0.1:9545 --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 ```
 
 **4. Wait for the relayed message to appear on chain 902** 
@@ -148,7 +148,7 @@ In a few seconds, you should see the RelayedMessage on chain 902:
 
 ```sh
 # example
-INFO [08-30|14:30:14.698] L2ToL2CrossChainMessenger#RelayedMessage sourceChainID=901 destinationChainID=902 nonce=0 sender=0x420beeF000000000000000000000000000000001 target=0x420beeF000000000000000000000000000000001
+INFO [08-30|14:30:14.698] L2ToL2CrossChainMessenger#RelayedMessage sourceChainID=901 destinationChainID=902 nonce=0 sender=0x4200000000000000000000000000000000000028 target=0x4200000000000000000000000000000000000028
 ```
 **5. Check the balance on chain 902** 
 

diff --git a/bindings/crossl2inbox.go b/bindings/crossl2inbox.go
diff --git a/bindings/l1blockinterop.go b/bindings/l1blockinterop.go
diff --git a/bindings/l2nativesuperchainerc20.go b/bindings/l2nativesuperchainerc20.go
diff --git a/bindings/l2tol2crossdomainmessenger.go b/bindings/l2tol2crossdomainmessenger.go
diff --git a/bindings/parsedabi.go b/bindings/parsedabi.go
@@ -21,3 +21,4 @@ var CrossL2InboxParsedABI = MustParseABI(CrossL2InboxMetaData.ABI)
 var L1BlockInteropParsedABI = MustParseABI(L1BlockInteropMetaData.ABI)
 var L2ToL2CrossDomainMessengerParsedABI = MustParseABI(L2ToL2CrossDomainMessengerMetaData.ABI)
 var SuperchainWETHParsedABI = MustParseABI(SuperchainWETHMetaData.ABI)
+var SuperchainTokenBridgeParsedABI = MustParseABI(SuperchainTokenBridgeMetaData.ABI)
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,9 @@ go.work.sum @@
     .DS_Store
+    # vendored packages
+    lib
     /main
     dist/
+    cache/