Merge pull request #110 from zkLinkProtocol/new-zklink

New zklink

contracts/Arbitrator.sol

@@ -185,23 +185,15 @@ contract Arbitrator is IArbitrator, OwnableUpgradeable, UUPSUpgradeable, Reentra
         bytes calldata _adapterParams
     ) external payable nonReentrant onlyRelayer {
         bytes32 _finalizeMessageHash = keccak256(abi.encode(_value, _callData));
-        if (_gateway == primaryChainGateway) {
-            require(_finalizeMessageHash == primaryChainMessageHashQueue.popFront(), "Invalid finalize message hash");
-            // Unpack destination chain and final callData
-            (IL1Gateway secondaryChainGateway, bytes memory finalCallData) = abi.decode(_callData, (IL1Gateway, bytes));
-            require(secondaryChainGateways[secondaryChainGateway], "Invalid secondary chain gateway");
-            // Forward fee to send message
-            secondaryChainGateway.sendMessage{value: msg.value + _value}(_value, finalCallData, _adapterParams);
-        } else {
-            require(secondaryChainGateways[_gateway], "Not secondary chain gateway");
-            require(
-                _finalizeMessageHash == secondaryChainMessageHashQueues[_gateway].popFront(),
-                "Invalid finalize message hash"
-            );
-            // Forward fee to send message
-            primaryChainGateway.sendMessage{value: msg.value + _value}(_value, _callData, _adapterParams);
-        }
-        emit MessageForwarded(_gateway, _value, _callData);
+        require(secondaryChainGateways[_gateway], "Not secondary chain gateway");
+        require(
+            _finalizeMessageHash == secondaryChainMessageHashQueues[_gateway].popFront(),
+            "Invalid finalize message hash"
+        );
+        // Forward fee to send message
+        IL1Gateway targetGateway = primaryChainGateway;
+        targetGateway.sendMessage{value: msg.value + _value}(_value, _callData, _adapterParams);
+        emit MessageForwarded(targetGateway, _value, _callData);
     }
 
     function claimMessage(

examples/optimism/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "scripts": {},
   "devDependencies": {
-    "@eth-optimism/sdk": "0.0.0-sc-sdk-fps-mainnet-20240610215134",
+    "@eth-optimism/sdk": "^3.3.2",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "ethers": "^5.7.2",
     "hardhat": "^2.9.1"

examples/zklinkNova/.env-sample

@@ -2,6 +2,10 @@
 
 # Duplicate this file as .env here
 
+# Your Private key
+
+DEVNET_PRIVKEY="0x your key here"
+
 # This is zkLink Sepolia Testnet
 
 ZKLINK_NOVA_RPC="https://sepolia.rpc.zklink.io"

examples/zklinkNova/hardhat.config.js

@@ -2,6 +2,7 @@ require('@nomicfoundation/hardhat-toolbox');
 require('./scripts/getTxStatus');
 require('./scripts/decodeRawTx');
 require('./scripts/printGovernanceCall');
+require('./scripts/sendRawTx');
 
 const BaseConfig = require('../../hardhat.base.config');
 

examples/zklinkNova/scripts/sendRawTx.js

@@ -0,0 +1,28 @@
+const { ethers } = require('ethers');
+const { task, types } = require('hardhat/config');
+
+require('dotenv').config();
+
+task('sendRawTx', 'Send raw tx to nova')
+  .addParam('to', 'The to address', undefined, types.string)
+  .addParam('data', 'The call data', undefined, types.string)
+  .addOptionalParam('value', 'The call value(unit: ether)', '0', types.string)
+  .addOptionalParam('gasPrice', 'The gas price(unit: gwei)', '0', types.string)
+  .setAction(async taskArgs => {
+    const to = taskArgs.to;
+    const data = taskArgs.data;
+    const value = ethers.parseEther(taskArgs.value);
+    const gasPrice = ethers.parseUnits(taskArgs.gasPrice, 'gwei');
+
+    const provider = new ethers.JsonRpcProvider(process.env.ZKLINK_NOVA_RPC);
+    const wallet = new ethers.Wallet(process.env.DEVNET_PRIVKEY, provider);
+    const tx = await wallet.sendTransaction({
+      to,
+      data,
+      value,
+      gasPrice,
+    });
+    console.log(`The tx hash: ${tx.hash}`);
+    const txReceipt = await tx.wait(1);
+    console.log(`The tx status: ${txReceipt.status}`);
+  });