Skip to content

Commit b9be2fd

Browse files
authored
Merge pull request #201 from ethereum-optimism/harry/integrate_superchain_erc20_changes
feat: integrate superchainerc20 redesign
2 parents 54e452c + 8debcc6 commit b9be2fd

38 files changed

+2330
-521
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ go.work.sum
2626

2727
.DS_Store
2828

29+
# vendored packages
30+
lib
31+
2932
/main
3033
dist/
34+
cache/

Justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ calculate-artifact-url:
3939
echo "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-$checksum.tar.gz"
4040

4141
generate-monorepo-bindings:
42-
./scripts/generate-bindings.sh -u $(just calculate-artifact-url) -n CrossL2Inbox,L2ToL2CrossDomainMessenger,L1BlockInterop,SuperchainWETH -o ./bindings
42+
./scripts/generate-bindings.sh -u $(just calculate-artifact-url) -n CrossL2Inbox,L2ToL2CrossDomainMessenger,L1BlockInterop,SuperchainWETH,SuperchainERC20,SuperchainTokenBridge -o ./bindings
4343

4444
generate-genesis: build-contracts checkout-optimism-monorepo
4545
go run ./genesis/cmd/main.go --monorepo-artifacts $(just calculate-artifact-url) --periphery-artifacts ./contracts/out --outdir ./genesis/generated

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ cast send 0x420beeF000000000000000000000000000000001 "mint(address _to, uint256
139139
Send the tokens from Chain 901 to Chain 902 using the following command:
140140

141141
```sh
142-
cast send 0x420beeF000000000000000000000000000000001 "sendERC20(address _to, uint256 _amount, uint256 _chainId)" 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 1000 902 --rpc-url http://127.0.0.1:9545 --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
142+
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
143143
```
144144

145145
**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:
148148

149149
```sh
150150
# example
151-
INFO [08-30|14:30:14.698] L2ToL2CrossChainMessenger#RelayedMessage sourceChainID=901 destinationChainID=902 nonce=0 sender=0x420beeF000000000000000000000000000000001 target=0x420beeF000000000000000000000000000000001
151+
INFO [08-30|14:30:14.698] L2ToL2CrossChainMessenger#RelayedMessage sourceChainID=901 destinationChainID=902 nonce=0 sender=0x4200000000000000000000000000000000000028 target=0x4200000000000000000000000000000000000028
152152
```
153153
**5. Check the balance on chain 902**
154154

bindings/crossl2inbox.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/l1blockinterop.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/l2nativesuperchainerc20.go

Lines changed: 142 additions & 161 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/l2tol2crossdomainmessenger.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/parsedabi.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ var CrossL2InboxParsedABI = MustParseABI(CrossL2InboxMetaData.ABI)
2121
var L1BlockInteropParsedABI = MustParseABI(L1BlockInteropMetaData.ABI)
2222
var L2ToL2CrossDomainMessengerParsedABI = MustParseABI(L2ToL2CrossDomainMessengerMetaData.ABI)
2323
var SuperchainWETHParsedABI = MustParseABI(SuperchainWETHMetaData.ABI)
24+
var SuperchainTokenBridgeParsedABI = MustParseABI(SuperchainTokenBridgeMetaData.ABI)

0 commit comments

Comments
 (0)