-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
145 additions
and
101 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,107 +1,38 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity 0.8.26; | ||
|
|
||
| import "@openzeppelin/contracts/access/Ownable.sol"; | ||
| import "@zetachain/protocol-contracts/contracts/evm/GatewayEVM.sol"; | ||
| import {RevertContext} from "@zetachain/protocol-contracts/contracts/Revert.sol"; | ||
| import {CallOptions} from "@zetachain/protocol-contracts/contracts/zevm/interfaces/IGatewayZEVM.sol"; | ||
| import "./ConnectedRouter.sol"; | ||
|
|
||
| contract Connected is Ownable { | ||
| GatewayEVM public immutable gateway; | ||
| uint256 private _nextTokenId; | ||
| address public counterparty; | ||
| address public router; | ||
| contract Connected is ConnectedRouter { | ||
| event OnMessageReceiveEvent(); | ||
| event OnMessageRevertEvent(); | ||
|
|
||
| event HelloEvent(string, string); | ||
| event OnCallEvent(string); | ||
| event OnRevertEvent(string, RevertContext); | ||
|
|
||
| error Unauthorized(); | ||
|
|
||
| function setCounterparty(address contractAddress) external onlyOwner { | ||
| counterparty = contractAddress; | ||
| } | ||
|
|
||
| function setRouter(address contractAddress) external onlyOwner { | ||
| router = contractAddress; | ||
| } | ||
| constructor( | ||
| address payable gateway, | ||
| address owner, | ||
| address router | ||
| ) ConnectedRouter(gateway, owner, router) {} | ||
|
|
||
| modifier onlyGateway() { | ||
| if (msg.sender != address(gateway)) revert Unauthorized(); | ||
| _; | ||
| function onMessageReceive( | ||
| bytes memory data, | ||
| address sender | ||
| ) internal override { | ||
| emit OnMessageReceiveEvent(); | ||
| } | ||
|
|
||
| constructor( | ||
| address payable gatewayAddress, | ||
| address initialOwner | ||
| ) Ownable(initialOwner) { | ||
| gateway = GatewayEVM(gatewayAddress); | ||
| function onMessageRevert( | ||
| bytes memory data, | ||
| address sender | ||
| ) internal override { | ||
| emit OnMessageRevertEvent(); | ||
| } | ||
|
|
||
| function transferCrossChain( | ||
| function sendMessage( | ||
| address destination, | ||
| bytes memory data, | ||
| CallOptions memory callOptions, | ||
| RevertOptions memory revertOptions | ||
| ) external payable { | ||
| bytes memory message = abi.encode( | ||
| abi.encodePacked(counterparty), | ||
| destination, | ||
| data, | ||
| callOptions, | ||
| revertOptions | ||
| ); | ||
| gateway.depositAndCall{value: msg.value}( | ||
| router, | ||
| message, | ||
| revertOptions | ||
| ); | ||
| } | ||
|
|
||
| function hello(string memory message) external payable { | ||
| emit HelloEvent("Event from hello()", message); | ||
| } | ||
|
|
||
| function onCall( | ||
| MessageContext calldata context, | ||
| bytes calldata message | ||
| ) external payable onlyGateway returns (bytes4) { | ||
| if (context.sender != router) revert Unauthorized(); | ||
| (bytes memory data, address sender, bool isCall) = abi.decode( | ||
| message, | ||
| (bytes, address, bool) | ||
| ); | ||
|
|
||
| if (sender != counterparty) revert Unauthorized(); | ||
|
|
||
| if (isCall) { | ||
| // Handle a call from another connected chain | ||
| emit OnCallEvent("regular call"); | ||
| } else { | ||
| // Handle revert | ||
| emit OnCallEvent("revert"); | ||
| } | ||
| return ""; | ||
| } | ||
|
|
||
| // onRevert is executed when router's onCall reverts | ||
| function onRevert( | ||
| RevertContext calldata context | ||
| ) external payable onlyGateway { | ||
| if (context.sender != router) revert("Unauthorized"); | ||
| emit OnRevertEvent("Event from onRevert()", context); | ||
| } | ||
|
|
||
| receive() external payable {} | ||
|
|
||
| fallback() external payable {} | ||
|
|
||
| function bytesToAddress( | ||
| bytes memory b | ||
| ) internal pure returns (address addr) { | ||
| require(b.length == 20, "Invalid bytes length for address"); | ||
| assembly { | ||
| addr := mload(add(b, 20)) | ||
| } | ||
| gatewaySendMessage(destination, data, callOptions, revertOptions); | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity 0.8.26; | ||
|
|
||
| import "@openzeppelin/contracts/access/Ownable.sol"; | ||
| import "@zetachain/protocol-contracts/contracts/evm/GatewayEVM.sol"; | ||
| import {RevertContext} from "@zetachain/protocol-contracts/contracts/Revert.sol"; | ||
| import {CallOptions} from "@zetachain/protocol-contracts/contracts/zevm/interfaces/IGatewayZEVM.sol"; | ||
|
|
||
| contract ConnectedRouter is Ownable { | ||
| GatewayEVM public immutable gateway; | ||
| uint256 private _nextTokenId; | ||
| address public counterparty; | ||
| address public router; | ||
|
|
||
| event HelloEvent(string, string); | ||
| event OnCallEvent(string); | ||
| event OnRevertEvent(string, RevertContext); | ||
|
|
||
| error Unauthorized(); | ||
|
|
||
| function setCounterparty(address contractAddress) external onlyOwner { | ||
| counterparty = contractAddress; | ||
| } | ||
|
|
||
| modifier onlyGateway() { | ||
| if (msg.sender != address(gateway)) revert Unauthorized(); | ||
| _; | ||
| } | ||
|
|
||
| constructor( | ||
| address payable gatewayAddress, | ||
| address ownerAddress, | ||
| address routerAddress | ||
| ) Ownable(ownerAddress) { | ||
| gateway = GatewayEVM(gatewayAddress); | ||
| router = routerAddress; | ||
| } | ||
|
|
||
| function gatewaySendMessage( | ||
| address destination, | ||
| bytes memory data, | ||
| CallOptions memory callOptions, | ||
| RevertOptions memory revertOptions | ||
| ) public payable { | ||
| bytes memory message = abi.encode( | ||
| abi.encodePacked(counterparty), | ||
| destination, | ||
| data, | ||
| callOptions, | ||
| revertOptions | ||
| ); | ||
| gateway.depositAndCall{value: msg.value}( | ||
| router, | ||
| message, | ||
| revertOptions | ||
| ); | ||
| } | ||
|
|
||
| function onCall( | ||
| MessageContext calldata context, | ||
| bytes calldata message | ||
| ) external payable onlyGateway returns (bytes4) { | ||
| if (context.sender != router) revert Unauthorized(); | ||
| (bytes memory data, address sender, bool isCall) = abi.decode( | ||
| message, | ||
| (bytes, address, bool) | ||
| ); | ||
|
|
||
| if (sender != counterparty) revert Unauthorized(); | ||
|
|
||
| if (isCall) { | ||
| onMessageReceive(data, sender); | ||
| } else { | ||
| onMessageRevert(data, sender); | ||
| } | ||
| return ""; | ||
| } | ||
|
|
||
| // onRevert is executed when router's onCall reverts | ||
| function onRevert( | ||
| RevertContext calldata context | ||
| ) external payable onlyGateway { | ||
| if (context.sender != router) revert("Unauthorized"); | ||
| emit OnRevertEvent("Event from onRevert()", context); | ||
| } | ||
|
|
||
| function onMessageReceive( | ||
| bytes memory data, | ||
| address sender | ||
| ) internal virtual { | ||
| // To be overridden in the child contract | ||
| } | ||
|
|
||
| function onMessageRevert( | ||
| bytes memory data, | ||
| address sender | ||
| ) internal virtual { | ||
| // To be overridden in the child contract | ||
| } | ||
|
|
||
| receive() external payable {} | ||
|
|
||
| fallback() external payable {} | ||
|
|
||
| function bytesToAddress( | ||
| bytes memory b | ||
| ) internal pure returns (address addr) { | ||
| require(b.length == 20, "Invalid bytes length for address"); | ||
| assembly { | ||
| addr := mload(add(b, 20)) | ||
| } | ||
| } | ||
| } |
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
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