PR comments

zeta-chain · Jul 19, 2024 · 1cc8ad5 · 1cc8ad5
1 parent 6c50fae
commit 1cc8ad5
Show file tree

Hide file tree

Showing 25 changed files with 800 additions and 585 deletions.
diff --git a/...ts/prototypes/evm/ZetaConnectorNewEth.sol → ...ts/prototypes/evm/ZetaConnectorNative.sol b/...ts/prototypes/evm/ZetaConnectorNewEth.sol → ...ts/prototypes/evm/ZetaConnectorNative.sol
@@ -5,7 +5,7 @@ import "./ZetaConnectorNewBase.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-contract ZetaConnectorNewEth is ZetaConnectorNewBase {
+contract ZetaConnectorNative is ZetaConnectorNewBase {
     using SafeERC20 for IERC20;
 
     constructor(address _gateway, address _zetaToken)

diff --git a/...prototypes/evm/ZetaConnectorNewNonEth.sol → ...prototypes/evm/ZetaConnectorNonNative.sol b/...prototypes/evm/ZetaConnectorNewNonEth.sol → ...prototypes/evm/ZetaConnectorNonNative.sol
@@ -5,7 +5,7 @@ import "./ZetaConnectorNewBase.sol";
 import "./IZetaNonEthNew.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
 
-contract ZetaConnectorNewNonEth is ZetaConnectorNewBase {
+contract ZetaConnectorNonNative is ZetaConnectorNewBase {
     constructor(address _gateway, address _zetaToken)
         ZetaConnectorNewBase(_gateway, _zetaToken)
     {}

diff --git a/contracts/prototypes/zevm/GatewayZEVM.sol b/contracts/prototypes/zevm/GatewayZEVM.sol
@@ -14,6 +14,8 @@ import "../../zevm/interfaces/IWZETA.sol";
 // The GatewayZEVM contract is the endpoint to call smart contracts on omnichain
 // The contract doesn't hold any funds and should never have active allowances
 contract GatewayZEVM is IGatewayZEVMEvents, IGatewayZEVMErrors, Initializable, OwnableUpgradeable, UUPSUpgradeable, ReentrancyGuard {
+    error ZeroAddress();
+
     address public constant FUNGIBLE_MODULE_ADDRESS = 0x735b14BB79463307AAcBED86DAf3322B1e6226aB;
     address public zetaToken;
 
@@ -23,6 +25,10 @@ contract GatewayZEVM is IGatewayZEVMEvents, IGatewayZEVMErrors, Initializable, O
     }
 
     function initialize(address _zetaToken) public initializer {
+        if (_zetaToken == address(0)) {
+            revert ZeroAddress();
+        }
+
         __Ownable_init();
         __UUPSUpgradeable_init();
         zetaToken = _zetaToken;
@@ -46,7 +52,7 @@ contract GatewayZEVM is IGatewayZEVMEvents, IGatewayZEVMErrors, Initializable, O
     }
 
     function _transferZETA(uint256 amount, address to) internal {
-        if (!IWETH9(zetaToken).transferFrom(msg.sender, address(this), amount)) revert ZetaTokenTransferFailed();
+        if (!IWETH9(zetaToken).transferFrom(msg.sender, address(this), amount)) revert FailedZetaSent();
         IWETH9(zetaToken).withdraw(amount);
         (bool sent, ) = to.call{value: amount}("");
         if (!sent) revert FailedZetaSent();

diff --git a/contracts/prototypes/zevm/IGatewayZEVM.sol b/contracts/prototypes/zevm/IGatewayZEVM.sol
@@ -46,6 +46,5 @@ interface IGatewayZEVMErrors {
     error GasFeeTransferFailed();
     error CallerIsNotFungibleModule();
     error InvalidTarget();
-    error ZetaTokenTransferFailed();
     error FailedZetaSent();
 }
diff --git a/...onnectorneweth.sol/zetaconnectorneweth.go → ...onnectornative.sol/zetaconnectornative.go b/...onnectorneweth.sol/zetaconnectorneweth.go → ...onnectornative.sol/zetaconnectornative.go
diff --git a/...ornewnoneth.sol/zetaconnectornewnoneth.go → ...ornonnative.sol/zetaconnectornonnative.go b/...ornewnoneth.sol/zetaconnectornewnoneth.go → ...ornonnative.sol/zetaconnectornonnative.go
diff --git a/pkg/contracts/prototypes/zevm/gatewayzevm.sol/gatewayzevm.go b/pkg/contracts/prototypes/zevm/gatewayzevm.sol/gatewayzevm.go
diff --git a/pkg/contracts/prototypes/zevm/igatewayzevm.sol/igatewayzevmerrors.go b/pkg/contracts/prototypes/zevm/igatewayzevm.sol/igatewayzevmerrors.go
diff --git a/pkg/contracts/prototypes/zevm/senderzevm.sol/senderzevm.go b/pkg/contracts/prototypes/zevm/senderzevm.sol/senderzevm.go
diff --git a/test/prototypes/GatewayEVMUniswap.spec.ts b/test/prototypes/GatewayEVMUniswap.spec.ts
@@ -59,7 +59,7 @@ describe("Uniswap Integration with GatewayEVM", function () {
     // Deploy contracts
     const Gateway = await ethers.getContractFactory("GatewayEVM");
     const ERC20CustodyNew = await ethers.getContractFactory("ERC20CustodyNew");
-    const ZetaConnector = await ethers.getContractFactory("ZetaConnectorNewNonEth");
+    const ZetaConnector = await ethers.getContractFactory("ZetaConnectorNonNative");
     const zeta = await TestERC20.deploy("Zeta", "ZETA");
     gateway = (await upgrades.deployProxy(Gateway, [tssAddress.address, zeta.address], {
       initializer: "initialize",

diff --git a/testFoundry/GatewayEVM.t.sol b/testFoundry/GatewayEVM.t.sol
@@ -7,7 +7,7 @@ import "forge-std/Vm.sol";
 import "contracts/prototypes/evm/GatewayEVM.sol";
 import "contracts/prototypes/evm/ReceiverEVM.sol";
 import "contracts/prototypes/evm/ERC20CustodyNew.sol";
-import "contracts/prototypes/evm/ZetaConnectorNewNonEth.sol";
+import "contracts/prototypes/evm/ZetaConnectorNonNative.sol";
 import "contracts/prototypes/evm/TestERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
@@ -23,7 +23,7 @@ contract GatewayEVMTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiver
     GatewayEVM gateway;
     ReceiverEVM receiver;
     ERC20CustodyNew custody;
-    ZetaConnectorNewNonEth zetaConnector;
+    ZetaConnectorNonNative zetaConnector;
     TestERC20 token;
     TestERC20 zeta;
     address owner;
@@ -47,7 +47,7 @@ contract GatewayEVMTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IReceiver
         ));
         gateway = GatewayEVM(proxy);
         custody = new ERC20CustodyNew(address(gateway));
-        zetaConnector = new ZetaConnectorNewNonEth(address(gateway), address(zeta));
+        zetaConnector = new ZetaConnectorNonNative(address(gateway), address(zeta));
         receiver = new ReceiverEVM();
 
         gateway.setCustody(address(custody));
@@ -181,7 +181,7 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
 
     GatewayEVM gateway;
     ERC20CustodyNew custody;
-    ZetaConnectorNewNonEth zetaConnector;
+    ZetaConnectorNonNative zetaConnector;
     TestERC20 token;
     TestERC20 zeta;
     address owner;
@@ -203,7 +203,7 @@ contract GatewayEVMInboundTest is Test, IGatewayEVMErrors, IGatewayEVMEvents, IR
         ));
         gateway = GatewayEVM(proxy);
         custody = new ERC20CustodyNew(address(gateway));
-        zetaConnector = new ZetaConnectorNewNonEth(address(gateway), address(zeta));
+        zetaConnector = new ZetaConnectorNonNative(address(gateway), address(zeta));
 
         gateway.setCustody(address(custody));
         gateway.setConnector(address(zetaConnector));