calldata better

0xPolygonHermez · Jan 24, 2023 · 7fbfcab · 7fbfcab
1 parent 4854cef
commit 7fbfcab
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 31 deletions.
diff --git a/compiled-contracts/PolygonZkEVM.json b/compiled-contracts/PolygonZkEVM.json
diff --git a/compiled-contracts/PolygonZkEVMBridge.json b/compiled-contracts/PolygonZkEVMBridge.json
diff --git a/compiled-contracts/PolygonZkEVMBridgeMock.json b/compiled-contracts/PolygonZkEVMBridgeMock.json
diff --git a/compiled-contracts/PolygonZkEVMMock.json b/compiled-contracts/PolygonZkEVMMock.json
diff --git a/contracts/PolygonZkEVM.sol b/contracts/PolygonZkEVM.sol
@@ -407,7 +407,7 @@ contract PolygonZkEVM is OwnableUpgradeable, EmergencyManager {
      * @param batches Struct array which the necessary data to append new batces ot the sequence
      */
     function sequenceBatches(
-        BatchData[] memory batches
+        BatchData[] calldata batches
     ) external ifNotEmergencyState onlyTrustedSequencer {
         uint256 batchesNum = batches.length;
         require(
@@ -918,7 +918,7 @@ contract PolygonZkEVM is OwnableUpgradeable, EmergencyManager {
      * @param maticAmount Max amount of MATIC tokens that the sender is willing to pay
      */
     function forceBatch(
-        bytes memory transactions,
+        bytes calldata transactions,
         uint256 maticAmount
     ) external ifNotEmergencyState isForceBatchAllowed {
         // Calculate matic collateral
@@ -970,7 +970,7 @@ contract PolygonZkEVM is OwnableUpgradeable, EmergencyManager {
      * @param batches Struct array which the necessary data to append new batces ot the sequence
      */
     function sequenceForceBatches(
-        ForcedBatchData[] memory batches
+        ForcedBatchData[] calldata batches
     ) external ifNotEmergencyState isForceBatchAllowed {
         uint256 batchesNum = batches.length;
 

diff --git a/contracts/PolygonZkEVMBridge.sol b/contracts/PolygonZkEVMBridge.sol
@@ -223,7 +223,7 @@ contract PolygonZkEVMBridge is
     function bridgeMessage(
         uint32 destinationNetwork,
         address destinationAddress,
-        bytes memory metadata
+        bytes calldata metadata
     ) external payable ifNotEmergencyState {
         require(
             destinationNetwork != networkID,
@@ -280,7 +280,7 @@ contract PolygonZkEVMBridge is
         uint32 destinationNetwork,
         address destinationAddress,
         uint256 amount,
-        bytes memory metadata
+        bytes calldata metadata
     ) external ifNotEmergencyState {
         // Verify leaf exist and it does not have been claimed
         _verifyLeaf(
@@ -394,7 +394,7 @@ contract PolygonZkEVMBridge is
         uint32 destinationNetwork,
         address destinationAddress,
         uint256 amount,
-        bytes memory metadata
+        bytes calldata metadata
     ) external ifNotEmergencyState {
         // Verify leaf exist and it does not have been claimed
         _verifyLeaf(
@@ -523,7 +523,7 @@ contract PolygonZkEVMBridge is
         uint32 destinationNetwork,
         address destinationAddress,
         uint256 amount,
-        bytes memory metadata,
+        bytes calldata metadata,
         uint8 leafType
     ) internal {
         // Set and check nullifier

diff --git a/gas_report.md b/gas_report.md
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -104,6 +104,7 @@ module.exports = {
     },
     hardhat: {
       initialDate: '0',
+      allowUnlimitedContractSize: true,
       accounts: {
         mnemonic: process.env.MNEMONIC || DEFAULT_MNEMONIC,
         path: "m/44'/60'/0'/0",

diff --git a/test/contracts/bridge.test.js b/test/contracts/bridge.test.js
@@ -1002,7 +1002,7 @@ describe('PolygonZkEVMBridge Contract', () => {
         const destinationNetwork = networkIDMainnet;
         const destinationAddress = deployer.address;
 
-        const metadata = '0x'; // since is ether does not have metadata
+        const metadata = '0x176923791298713271763697869132'; // since is ether does not have metadata
         const metadataHash = ethers.utils.solidityKeccak256(['bytes'], [metadata]);
 
         const mainnetExitRoot = await polygonZkEVMGlobalExitRoot.lastMainnetExitRoot();