Missing zero address check in (#62)

* Missing zero address check in Signed-off-by: Andres Aiello <[email protected]> * test signed Signed-off-by: Andres Aiello <[email protected]> * test signed Signed-off-by: Andres Aiello <[email protected]> Signed-off-by: Andres Aiello <[email protected]>
zeta-chain · Jan 25, 2023 · cfe525c · cfe525c
1 parent 9336fe2
commit cfe525c
Show file tree

Hide file tree

Showing 64 changed files with 2,905 additions and 146 deletions.
diff --git a/packages/example-contracts/contracts/multi-chain-swap/MultiChainSwapUniV2.strategy.sol b/packages/example-contracts/contracts/multi-chain-swap/MultiChainSwapUniV2.strategy.sol
@@ -19,11 +19,8 @@ contract MultiChainSwapUniV2 is MultiChainSwap, ZetaInteractor, MultiChainSwapEr
 
     IUniswapV2Router02 internal uniswapV2Router;
 
-    constructor(
-        address zetaConnector_,
-        address zetaToken_,
-        address uniswapV2Router_
-    ) ZetaInteractor(zetaConnector_) {
+    constructor(address zetaConnector_, address zetaToken_, address uniswapV2Router_) ZetaInteractor(zetaConnector_) {
+        if (zetaToken_ == address(0) || uniswapV2Router_ == address(0)) revert ZetaCommonErrors.InvalidAddress();
         zetaToken = zetaToken_;
         uniswapV2RouterAddress = uniswapV2Router_;
         uniswapV2Router = IUniswapV2Router02(uniswapV2Router_);
@@ -184,11 +181,9 @@ contract MultiChainSwapUniV2 is MultiChainSwap, ZetaInteractor, MultiChainSwapEr
         );
     }
 
-    function onZetaMessage(ZetaInterfaces.ZetaMessage calldata zetaMessage)
-        external
-        override
-        isValidMessageCall(zetaMessage)
-    {
+    function onZetaMessage(
+        ZetaInterfaces.ZetaMessage calldata zetaMessage
+    ) external override isValidMessageCall(zetaMessage) {
         (
             bytes32 messageType,
             address sourceTxOrigin,
@@ -268,11 +263,9 @@ contract MultiChainSwapUniV2 is MultiChainSwap, ZetaInteractor, MultiChainSwapEr
         );
     }
 
-    function onZetaRevert(ZetaInterfaces.ZetaRevert calldata zetaRevert)
-        external
-        override
-        isValidRevertCall(zetaRevert)
-    {
+    function onZetaRevert(
+        ZetaInterfaces.ZetaRevert calldata zetaRevert
+    ) external override isValidRevertCall(zetaRevert) {
         /**
          * @dev: If something goes wrong we must swap to the source input token
          */

diff --git a/packages/example-contracts/contracts/multi-chain-swap/test/MultiChainSwapZetaConnector.sol b/packages/example-contracts/contracts/multi-chain-swap/test/MultiChainSwapZetaConnector.sol
@@ -7,9 +7,10 @@ import "@zetachain/protocol-contracts/contracts/interfaces/ZetaInterfaces.sol";
 import "../MultiChainSwap.sol";
 
 contract MultiChainSwapZetaConnector is ZetaConnector {
-    address public zetaToken;
+    address public immutable zetaToken;
 
     constructor(address zetaToken_) {
+        if (zetaToken_ == address(0)) revert ZetaCommonErrors.InvalidAddress();
         zetaToken = zetaToken_;
     }
 

diff --git a/packages/example-contracts/contracts/multi-chain-value/MultiChainValue.sol b/packages/example-contracts/contracts/multi-chain-value/MultiChainValue.sol
@@ -21,6 +21,7 @@ contract MultiChainValue is ZetaInteractor, MultiChainValueErrors {
     mapping(uint256 => bool) public availableChainIds;
 
     constructor(address connectorAddress_, address zetaToken_) ZetaInteractor(connectorAddress_) {
+        if (zetaToken_ == address(0)) revert ZetaCommonErrors.InvalidAddress();
         zetaToken = zetaToken_;
     }
 
@@ -36,11 +37,7 @@ contract MultiChainValue is ZetaInteractor, MultiChainValueErrors {
         delete availableChainIds[destinationChainId];
     }
 
-    function send(
-        uint256 destinationChainId,
-        bytes calldata destinationAddress,
-        uint256 zetaValueAndGas
-    ) external {
+    function send(uint256 destinationChainId, bytes calldata destinationAddress, uint256 zetaValueAndGas) external {
         if (!availableChainIds[destinationChainId]) revert InvalidDestinationChainId();
         if (zetaValueAndGas == 0) revert InvalidZetaValueAndGas();
 

diff --git a/packages/example-contracts/lib/shared/network.constants.ts b/packages/example-contracts/lib/shared/network.constants.ts
@@ -10,6 +10,18 @@ export type NetworkVariables = {
 };
 
 export const networkVariables: Record<NetworkName, NetworkVariables> = {
+  athens: {
+    chainId: 0,
+    connectorAddress: "",
+    crossChainId: 0,
+    crossChainName: ""
+  },
+  "bitcoin-test": {
+    chainId: 0,
+    connectorAddress: "",
+    crossChainId: 0,
+    crossChainName: ""
+  },
   "bsc-localnet": {
     chainId: 0,
     connectorAddress: "",

diff --git a/packages/interfaces/abi/json/contracts/ZetaInteractor.sol/ZetaInteractor.json b/packages/interfaces/abi/json/contracts/ZetaInteractor.sol/ZetaInteractor.json
@@ -1,4 +1,9 @@
 [
+  {
+    "inputs": [],
+    "name": "InvalidAddress",
+    "type": "error"
+  },
   {
     "inputs": [
       {

diff --git a/packages/interfaces/abi/json/contracts/ZetaTokenConsumerTrident.strategy.sol/WETH9.json b/packages/interfaces/abi/json/contracts/ZetaTokenConsumerTrident.strategy.sol/WETH9.json
@@ -0,0 +1,53 @@
+[
+  {
+    "inputs": [],
+    "name": "deposit",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      }
+    ],
+    "name": "depositTo",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "withdraw",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "withdrawTo",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]