-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ZIL-5483: Token bridge implementation (#328)
* Token bridge implementation * Add separate relay with metadata * Add changes in response to feedback
- Loading branch information
Showing
10 changed files
with
459 additions
and
293 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,153 +1,153 @@ | ||
| // SPDX-License-Identifier: UNLICENSED | ||
| pragma solidity ^0.8.20; | ||
|
|
||
| import "@openzeppelin/contracts/proxy/utils/Initializable.sol"; | ||
| import "contracts/periphery/Bridged.sol"; | ||
| import "contracts/core/ChainGateway.sol"; | ||
|
|
||
| contract Twin is Initializable, Bridged, BridgedTwin { | ||
| function initialize( | ||
| ChainGateway _relayer, | ||
| uint _twinChainId | ||
| ) public initializer { | ||
| __Bridged_init(_relayer); | ||
| __BridgedTwin_init(_twinChainId); | ||
| } | ||
|
|
||
| function start(address target, uint num) external { | ||
| uint nonce = relay( | ||
| twinChainId, | ||
| target, | ||
| abi.encodeWithSignature("test(uint256)", num), | ||
| 1_000_000 | ||
| ); | ||
| } | ||
|
|
||
| event Succeeded(uint); | ||
| event Failed(string); | ||
|
|
||
| function finish( | ||
| bool success, | ||
| bytes calldata res, | ||
| uint nonce | ||
| ) external onlyRelayer { | ||
| if (success) { | ||
| uint num = abi.decode(res, (uint)); | ||
| emit Succeeded(num); | ||
| } else { | ||
| bytes4 sig = bytes4(res[:4]); | ||
| bytes memory err = bytes(res[4:]); | ||
| emit Failed(abi.decode(err, (string))); | ||
| } | ||
| } | ||
|
|
||
| function startSum(address target, uint num) external { | ||
| relay( | ||
| twinChainId, | ||
| target, | ||
| abi.encodeWithSignature("testSum(uint256)", num), | ||
| 1_000_000 | ||
| ); | ||
| } | ||
|
|
||
| function finishSum( | ||
| bool success, | ||
| bytes calldata res, | ||
| uint nonce | ||
| ) external onlyRelayer { | ||
| if (success) { | ||
| uint num = abi.decode(res, (uint)); | ||
| emit Succeeded(num); | ||
| } else { | ||
| bytes4(res[:4]); | ||
| bytes memory err = bytes(res[4:]); | ||
| emit Failed(abi.decode(err, (string))); | ||
| } | ||
| } | ||
|
|
||
| function startNoReturn(address target, uint num) external { | ||
| relay( | ||
| twinChainId, | ||
| target, | ||
| abi.encodeWithSignature("testNoReturn(uint256)", num), | ||
| 1_000_000 | ||
| ); | ||
| } | ||
|
|
||
| event SucceededNoReturn(); | ||
|
|
||
| function finishNoReturn( | ||
| bool success, | ||
| bytes calldata res, | ||
| uint nonce | ||
| ) external onlyRelayer { | ||
| if (success) { | ||
| emit SucceededNoReturn(); | ||
| } else { | ||
| bytes4(res[:4]); | ||
| bytes memory err = bytes(res[4:]); | ||
| emit Failed(abi.decode(err, (string))); | ||
| } | ||
| } | ||
|
|
||
| function startMultipleReturn(address target, uint num) external { | ||
| relay( | ||
| twinChainId, | ||
| target, | ||
| abi.encodeWithSignature("testMultipleReturn(uint256)", num), | ||
| 1_000_000 | ||
| ); | ||
| } | ||
|
|
||
| event SucceededMultipleReturn(uint, uint, uint); | ||
|
|
||
| function finishMultipleReturn( | ||
| bool success, | ||
| bytes calldata res, | ||
| uint nonce | ||
| ) external onlyRelayer { | ||
| if (success) { | ||
| (uint num, uint num2, uint num3) = abi.decode( | ||
| res, | ||
| (uint, uint, uint) | ||
| ); | ||
| emit SucceededMultipleReturn(num, num2, num3); | ||
| } else { | ||
| bytes4(res[:4]); | ||
| bytes memory err = bytes(res[4:]); | ||
| emit Failed(abi.decode(err, (string))); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| contract Target { | ||
| uint private _num = 1; | ||
|
|
||
| event TestNoReturn(uint num); | ||
| event TestSum(uint num); | ||
|
|
||
| function test(uint num_) external pure returns (uint) { | ||
| require(num_ < 1000, "Too large"); | ||
| return num_ + 1; | ||
| } | ||
|
|
||
| function testSum(uint num_) external returns (uint) { | ||
| _num += num_; | ||
| emit TestSum(_num); | ||
| return _num; | ||
| } | ||
|
|
||
| function num() external view returns (uint) { | ||
| return _num; | ||
| } | ||
|
|
||
| function testNoReturn(uint num_) external { | ||
| emit TestNoReturn(num_ + 1); | ||
| } | ||
|
|
||
| function testMultipleReturn( | ||
| uint num_ | ||
| ) external pure returns (uint, uint, uint) { | ||
| return (num_ + 1, num_ + 2, num_ + 3); | ||
| } | ||
| } | ||
| // // SPDX-License-Identifier: UNLICENSED | ||
| // pragma solidity ^0.8.20; | ||
|
|
||
| // import "@openzeppelin/contracts/proxy/utils/Initializable.sol"; | ||
| // import "contracts/periphery/Bridged.sol"; | ||
| // import "contracts/core/ChainGateway.sol"; | ||
|
|
||
| // contract Twin is Initializable, Bridged, BridgedTwin { | ||
| // function initialize( | ||
| // ChainGateway _relayer, | ||
| // uint _twinChainId | ||
| // ) public initializer { | ||
| // __Bridged_init(_relayer); | ||
| // __BridgedTwin_init(_twinChainId); | ||
| // } | ||
|
|
||
| // function start(address target, uint num) external { | ||
| // uint nonce = relay( | ||
| // twinChainId, | ||
| // target, | ||
| // abi.encodeWithSignature("test(uint256)", num), | ||
| // 1_000_000 | ||
| // ); | ||
| // } | ||
|
|
||
| // event Succeeded(uint); | ||
| // event Failed(string); | ||
|
|
||
| // function finish( | ||
| // bool success, | ||
| // bytes calldata res, | ||
| // uint nonce | ||
| // ) external onlyRelayer { | ||
| // if (success) { | ||
| // uint num = abi.decode(res, (uint)); | ||
| // emit Succeeded(num); | ||
| // } else { | ||
| // bytes4 sig = bytes4(res[:4]); | ||
| // bytes memory err = bytes(res[4:]); | ||
| // emit Failed(abi.decode(err, (string))); | ||
| // } | ||
| // } | ||
|
|
||
| // function startSum(address target, uint num) external { | ||
| // relay( | ||
| // twinChainId, | ||
| // target, | ||
| // abi.encodeWithSignature("testSum(uint256)", num), | ||
| // 1_000_000 | ||
| // ); | ||
| // } | ||
|
|
||
| // function finishSum( | ||
| // bool success, | ||
| // bytes calldata res, | ||
| // uint nonce | ||
| // ) external onlyRelayer { | ||
| // if (success) { | ||
| // uint num = abi.decode(res, (uint)); | ||
| // emit Succeeded(num); | ||
| // } else { | ||
| // bytes4(res[:4]); | ||
| // bytes memory err = bytes(res[4:]); | ||
| // emit Failed(abi.decode(err, (string))); | ||
| // } | ||
| // } | ||
|
|
||
| // function startNoReturn(address target, uint num) external { | ||
| // relay( | ||
| // twinChainId, | ||
| // target, | ||
| // abi.encodeWithSignature("testNoReturn(uint256)", num), | ||
| // 1_000_000 | ||
| // ); | ||
| // } | ||
|
|
||
| // event SucceededNoReturn(); | ||
|
|
||
| // function finishNoReturn( | ||
| // bool success, | ||
| // bytes calldata res, | ||
| // uint nonce | ||
| // ) external onlyRelayer { | ||
| // if (success) { | ||
| // emit SucceededNoReturn(); | ||
| // } else { | ||
| // bytes4(res[:4]); | ||
| // bytes memory err = bytes(res[4:]); | ||
| // emit Failed(abi.decode(err, (string))); | ||
| // } | ||
| // } | ||
|
|
||
| // function startMultipleReturn(address target, uint num) external { | ||
| // relay( | ||
| // twinChainId, | ||
| // target, | ||
| // abi.encodeWithSignature("testMultipleReturn(uint256)", num), | ||
| // 1_000_000 | ||
| // ); | ||
| // } | ||
|
|
||
| // event SucceededMultipleReturn(uint, uint, uint); | ||
|
|
||
| // function finishMultipleReturn( | ||
| // bool success, | ||
| // bytes calldata res, | ||
| // uint nonce | ||
| // ) external onlyRelayer { | ||
| // if (success) { | ||
| // (uint num, uint num2, uint num3) = abi.decode( | ||
| // res, | ||
| // (uint, uint, uint) | ||
| // ); | ||
| // emit SucceededMultipleReturn(num, num2, num3); | ||
| // } else { | ||
| // bytes4(res[:4]); | ||
| // bytes memory err = bytes(res[4:]); | ||
| // emit Failed(abi.decode(err, (string))); | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| // contract Target { | ||
| // uint private _num = 1; | ||
|
|
||
| // event TestNoReturn(uint num); | ||
| // event TestSum(uint num); | ||
|
|
||
| // function test(uint num_) external pure returns (uint) { | ||
| // require(num_ < 1000, "Too large"); | ||
| // return num_ + 1; | ||
| // } | ||
|
|
||
| // function testSum(uint num_) external returns (uint) { | ||
| // _num += num_; | ||
| // emit TestSum(_num); | ||
| // return _num; | ||
| // } | ||
|
|
||
| // function num() external view returns (uint) { | ||
| // return _num; | ||
| // } | ||
|
|
||
| // function testNoReturn(uint num_) external { | ||
| // emit TestNoReturn(num_ + 1); | ||
| // } | ||
|
|
||
| // function testMultipleReturn( | ||
| // uint num_ | ||
| // ) external pure returns (uint, uint, uint) { | ||
| // return (num_ + 1, num_ + 2, num_ + 3); | ||
| // } | ||
| // } |
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
Oops, something went wrong.