update scroll scripts

zkLinkProtocol · May 27, 2024 · 64d300c · 64d300c
1 parent 00534d2
commit 64d300c
Show file tree

Hide file tree

Showing 13 changed files with 1,324 additions and 253 deletions.
diff --git a/contracts/dev-contracts/DummyArbitrator.sol b/contracts/dev-contracts/DummyArbitrator.sol
@@ -42,7 +42,7 @@ contract DummyArbitrator is IArbitrator, OwnableUpgradeable, UUPSUpgradeable, Re
         bytes calldata _adapterParams
     ) external payable {
         // Forward fee to send message
-        _gateway.sendMessage{value: msg.value + _value}(_value, _callData, _adapterParams);
+        _gateway.sendMessage{value: msg.value}(_value, _callData, _adapterParams);
     }
 
     function claimMessage(

diff --git a/contracts/dev-contracts/DummyZkLink.sol b/contracts/dev-contracts/DummyZkLink.sol
@@ -41,8 +41,7 @@ contract DummyZkLink is IZkLink, OwnableUpgradeable, UUPSUpgradeable, Reentrancy
         return gateway;
     }
 
-    function setGateway(IL2Gateway _gateway) external {
-        require(address(gateway) == address(0), "Duplicate init gateway");
+    function setGateway(IL2Gateway _gateway) external onlyOwner {
         gateway = _gateway;
     }
 
@@ -64,7 +63,7 @@ contract DummyZkLink is IZkLink, OwnableUpgradeable, UUPSUpgradeable, Reentrancy
         uint256 _toBatchNumber,
         bytes32 _rangeBatchRootHash,
         uint256 _forwardEthAmount
-    ) external payable {
+    ) external payable onlyGateway {
         emit ReceiveRangeBatchRoot(_fromBatchNumber, _toBatchNumber, _rangeBatchRootHash, _forwardEthAmount);
     }
 

diff --git a/examples/scroll/hardhat.config.js b/examples/scroll/hardhat.config.js
@@ -3,9 +3,14 @@ require('./scripts/syncL2Requests');
 require('./scripts/syncBatchRoot');
 require('./scripts/setValidator');
 require('./scripts/changeFeeParams');
+require('./scripts/checkTxStatus');
 
 const BaseConfig = require('../../hardhat.base.config');
 
+BigInt.prototype.toJSON = function () {
+  return this.toString();
+};
+
 module.exports = Object.assign({}, BaseConfig, {
   paths: {
     cache: '../../cache',

diff --git a/examples/scroll/package-lock.json b/examples/scroll/package-lock.json
diff --git a/examples/scroll/package.json b/examples/scroll/package.json
@@ -4,7 +4,9 @@
   "version": "1.0.0",
   "scripts": {},
   "devDependencies": {
+    "@eth-optimism/core-utils": "^0.13.2",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
+    "axios": "^1.7.2",
     "ethers": "^6.11.1",
     "hardhat": "^2.19.5"
   },