Smr 1935 erc20 withdraw l1 #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to smr-1935-erc20-withdraw-L1
…vm-bridge-contracts into smr-1914-data-length-32
ermyas
reviewed
Nov 6, 2023
Comment on lines
64
to
82
| function test_RevertsIf_WithdrawWithInvalidSourceAddress() public { | ||
| bytes memory data = abi.encode(WITHDRAW_SIG, address(token), address(this), address(this), withdrawAmount); | ||
|
|
||
| bytes32 commandId = bytes32("testCommandId"); | ||
| string memory sourceAddress = rootBridge.childBridgeAdaptor(); | ||
|
|
||
| vm.expectRevert(InvalidSourceChain.selector); | ||
| axelarAdaptor.execute(commandId, "INVALID", sourceAddress, data); | ||
| } | ||
|
|
||
| function test_RevertsIf_WithdrawWithInvalidSourceChain() public { | ||
| bytes memory data = abi.encode(WITHDRAW_SIG, address(token), address(this), address(this), withdrawAmount); | ||
|
|
||
| bytes32 commandId = bytes32("testCommandId"); | ||
| string memory sourceAddress = Strings.toHexString(address(123)); | ||
|
|
||
| vm.expectRevert(InvalidSourceAddress.selector); | ||
| axelarAdaptor.execute(commandId, CHILD_CHAIN_NAME, sourceAddress, data); | ||
| } |
There was a problem hiding this comment.
are these two tests, swapped? the test...InvalidSourceAddress test seems to test for invalid source chain id, and the test...InvalidSourceChain test for invalid source address
There was a problem hiding this comment.
yes they are. Good catch thanks
ermyas
reviewed
Nov 6, 2023
ermyas
reviewed
Nov 6, 2023
src/root/RootAxelarBridgeAdaptor.sol
Outdated
| @@ -79,7 +77,17 @@ contract RootAxelarBridgeAdaptor is | |||
| address(this), _childChain, _childBridgeAdaptor, payload, refundRecipient | |||
| ); | |||
|
|
|||
| axelarGateway.callContract(_childChain, _childBridgeAdaptor, payload); | |||
| gateway.callContract(_childChain, _childBridgeAdaptor, payload); | |||
| emit AxelarMessage(_childChain, _childBridgeAdaptor, payload); | |||
There was a problem hiding this comment.
nit:
- for better observability, should we have a corresponding event when a message is received (in
_execute())? - suggest we rename
AxelarMessagetoAxelarMessageSentso its a bit more descriptive
[SMR-1914] data length must be greater than 32
Co-authored-by: Ermyas Abebe <[email protected]>
…vm-bridge-contracts into smr-1935-erc20-withdraw-L1
ermyas
approved these changes
Nov 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The L1 side of ERC20 Withdrawals.
Blocked by #16