fix: fix predicate tests, some more gas opts

ysl33p · Mar 31, 2023 · a263cf3 · a263cf3
1 parent 610e40b
commit a263cf3
Show file tree

Hide file tree

Showing 25 changed files with 162 additions and 134 deletions.
diff --git a/artifacts/ChildChainManager.json b/artifacts/ChildChainManager.json
@@ -1 +1 @@
-{"abi":[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"previousAdminRole","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"newAdminRole","type":"bytes32"}],"name":"RoleAdminChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"RoleGranted","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"RoleRevoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"rootToken","type":"address"},{"indexed":true,"internalType":"address","name":"childToken","type":"address"}],"name":"TokenMapped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"rootToken","type":"address"},{"indexed":true,"internalType":"address","name":"childToken","type":"address"}],"name":"TokenUnmapped","type":"event"},{"inputs":[],"name":"DEFAULT_ADMIN_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"DEPOSIT","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"MAPPER_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"MAP_TOKEN","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"STATE_SYNCER_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"childToRootToken","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"}],"name":"getRoleAdmin","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"uint256","name":"index","type":"uint256"}],"name":"getRoleMember","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"}],"name":"getRoleMemberCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"grantRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"hasRole","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"renounceRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"revokeRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"rootToChildToken","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_owner","type":"address"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"rootToken","type":"address"},{"internalType":"address","name":"childToken","type":"address"}],"name":"mapToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"onStateReceive","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"rootToken","type":"address"},{"internalType":"address","name":"childToken","type":"address"}],"name":"cleanMapToken","outputs":[],"stateMutability":"nonpayable","type":"function"}]}
+{"abi":[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"previousAdminRole","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"newAdminRole","type":"bytes32"}],"name":"RoleAdminChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"RoleGranted","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"RoleRevoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"rootToken","type":"address"},{"indexed":true,"internalType":"address","name":"childToken","type":"address"}],"name":"TokenMapped","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"rootToken","type":"address"},{"indexed":true,"internalType":"address","name":"childToken","type":"address"}],"name":"TokenUnmapped","type":"event"},{"inputs":[],"name":"DEFAULT_ADMIN_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[],"name":"DEPOSIT","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[],"name":"MAPPER_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[],"name":"MAP_TOKEN","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[],"name":"STATE_SYNCER_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"childToRootToken","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"}],"name":"getRoleAdmin","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"uint256","name":"index","type":"uint256"}],"name":"getRoleMember","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"}],"name":"getRoleMemberCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"grantRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"hasRole","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"renounceRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"revokeRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"rootToChildToken","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function","constant":true},{"inputs":[{"internalType":"address","name":"_owner","type":"address"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"rootToken","type":"address"},{"internalType":"address","name":"childToken","type":"address"}],"name":"mapToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"onStateReceive","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"rootToken","type":"address"},{"internalType":"address","name":"childToken","type":"address"}],"name":"cleanMapToken","outputs":[],"stateMutability":"nonpayable","type":"function"}]}
diff --git a/contracts/common/Proxy/UpgradableProxy.sol b/contracts/common/Proxy/UpgradableProxy.sol
@@ -67,15 +67,14 @@ contract UpgradableProxy is Proxy {
     }
 
     function updateImplementation(address _newProxyTo) public onlyProxyOwner {
-        require(_newProxyTo != address(0x0), "INVALID_PROXY_ADDRESS");
         require(isContract(_newProxyTo), "DESTINATION_ADDRESS_IS_NOT_A_CONTRACT");
 
         emit ProxyUpdated(_newProxyTo, loadImplementation());
-        
+
         setImplementation(_newProxyTo);
     }
 
-    function updateAndCall(address _newProxyTo, bytes memory data) payable public onlyProxyOwner {
+    function updateAndCall(address _newProxyTo, bytes calldata data) payable external onlyProxyOwner {
         updateImplementation(_newProxyTo);
 
         (bool success, bytes memory returnData) = address(this).call{value: msg.value}(data);
@@ -88,7 +87,7 @@ contract UpgradableProxy is Proxy {
             sstore(position, _newProxyTo)
         }
     }
-    
+
     function isContract(address _target) internal view returns (bool) {
         if (_target == address(0)) {
             return false;

diff --git a/flat/ChainExitERC1155PredicateProxy.sol b/flat/ChainExitERC1155PredicateProxy.sol
@@ -121,15 +121,14 @@ contract UpgradableProxy is Proxy {
     }
 
     function updateImplementation(address _newProxyTo) public onlyProxyOwner {
-        require(_newProxyTo != address(0x0), "INVALID_PROXY_ADDRESS");
         require(isContract(_newProxyTo), "DESTINATION_ADDRESS_IS_NOT_A_CONTRACT");
 
         emit ProxyUpdated(_newProxyTo, loadImplementation());
-        
+
         setImplementation(_newProxyTo);
     }
 
-    function updateAndCall(address _newProxyTo, bytes memory data) payable public onlyProxyOwner {
+    function updateAndCall(address _newProxyTo, bytes calldata data) payable external onlyProxyOwner {
         updateImplementation(_newProxyTo);
 
         (bool success, bytes memory returnData) = address(this).call{value: msg.value}(data);
@@ -142,7 +141,7 @@ contract UpgradableProxy is Proxy {
             sstore(position, _newProxyTo)
         }
     }
-    
+
     function isContract(address _target) internal view returns (bool) {
         if (_target == address(0)) {
             return false;

diff --git a/flat/ChildChainManagerProxy.sol b/flat/ChildChainManagerProxy.sol
@@ -121,15 +121,14 @@ contract UpgradableProxy is Proxy {
     }
 
     function updateImplementation(address _newProxyTo) public onlyProxyOwner {
-        require(_newProxyTo != address(0x0), "INVALID_PROXY_ADDRESS");
         require(isContract(_newProxyTo), "DESTINATION_ADDRESS_IS_NOT_A_CONTRACT");
 
         emit ProxyUpdated(_newProxyTo, loadImplementation());
-        
+
         setImplementation(_newProxyTo);
     }
 
-    function updateAndCall(address _newProxyTo, bytes memory data) payable public onlyProxyOwner {
+    function updateAndCall(address _newProxyTo, bytes calldata data) payable external onlyProxyOwner {
         updateImplementation(_newProxyTo);
 
         (bool success, bytes memory returnData) = address(this).call{value: msg.value}(data);
@@ -142,7 +141,7 @@ contract UpgradableProxy is Proxy {
             sstore(position, _newProxyTo)
         }
     }
-    
+
     function isContract(address _target) internal view returns (bool) {
         if (_target == address(0)) {
             return false;

diff --git a/flat/ChildERC721.sol b/flat/ChildERC721.sol
@@ -1,3 +1,4 @@
+
 // File: @openzeppelin/contracts/GSN/Context.sol
 
 // SPDX-License-Identifier: MIT
@@ -58,6 +59,7 @@ interface IERC165 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @dev Required interface of an ERC721 compliant contract.
  */
@@ -188,6 +190,7 @@ interface IERC721 is IERC165 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @title ERC-721 Non-Fungible Token Standard, optional metadata extension
  * @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -216,6 +219,7 @@ interface IERC721Metadata is IERC721 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
  * @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -271,6 +275,7 @@ interface IERC721Receiver {
 
 pragma solidity ^0.6.0;
 
+
 /**
  * @dev Implementation of the {IERC165} interface.
  *
@@ -1165,6 +1170,7 @@ pragma solidity ^0.6.0;
 
 
 
+
 /**
  * @title ERC721 Non-Fungible Token Standard basic implementation
  * @dev see https://eips.ethereum.org/EIPS/eip-721
@@ -1631,6 +1637,7 @@ pragma solidity ^0.6.0;
 
 
 
+
 /**
  * @dev Contract module that allows children to implement role-based access
  * control mechanisms.
@@ -1845,6 +1852,7 @@ abstract contract AccessControl is Context {
 
 pragma solidity 0.6.6;
 
+
 contract AccessControlMixin is AccessControl {
     string private _revertMsg;
     function _setupContractId(string memory contractId) internal {
@@ -1886,6 +1894,7 @@ contract Initializable {
 
 pragma solidity 0.6.6;
 
+
 contract EIP712Base is Initializable {
     struct EIP712Domain {
         string name;
@@ -1963,6 +1972,7 @@ contract EIP712Base is Initializable {
 pragma solidity 0.6.6;
 
 
+
 contract NativeMetaTransaction is EIP712Base {
     using SafeMath for uint256;
     bytes32 private constant META_TRANSACTION_TYPEHASH = keccak256(
@@ -2098,6 +2108,7 @@ pragma solidity 0.6.6;
 
 
 
+
 contract ChildERC721 is
     ERC721,
     IChildToken,

diff --git a/flat/DummyERC721.sol b/flat/DummyERC721.sol
@@ -1,3 +1,4 @@
+
 // File: @openzeppelin/contracts/GSN/Context.sol
 
 // SPDX-License-Identifier: MIT
@@ -58,6 +59,7 @@ interface IERC165 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @dev Required interface of an ERC721 compliant contract.
  */
@@ -188,6 +190,7 @@ interface IERC721 is IERC165 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @title ERC-721 Non-Fungible Token Standard, optional metadata extension
  * @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -216,6 +219,7 @@ interface IERC721Metadata is IERC721 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
  * @dev See https://eips.ethereum.org/EIPS/eip-721
@@ -271,6 +275,7 @@ interface IERC721Receiver {
 
 pragma solidity ^0.6.0;
 
+
 /**
  * @dev Implementation of the {IERC165} interface.
  *
@@ -1165,6 +1170,7 @@ pragma solidity ^0.6.0;
 
 
 
+
 /**
  * @title ERC721 Non-Fungible Token Standard basic implementation
  * @dev see https://eips.ethereum.org/EIPS/eip-721
@@ -1631,6 +1637,7 @@ pragma solidity ^0.6.0;
 
 
 
+
 /**
  * @dev Contract module that allows children to implement role-based access
  * control mechanisms.
@@ -1845,6 +1852,7 @@ abstract contract AccessControl is Context {
 
 pragma solidity 0.6.6;
 
+
 contract AccessControlMixin is AccessControl {
     string private _revertMsg;
     function _setupContractId(string memory contractId) internal {
@@ -1878,6 +1886,7 @@ contract Initializable {
 
 pragma solidity 0.6.6;
 
+
 contract EIP712Base is Initializable {
     struct EIP712Domain {
         string name;
@@ -1955,6 +1964,7 @@ contract EIP712Base is Initializable {
 pragma solidity 0.6.6;
 
 
+
 contract NativeMetaTransaction is EIP712Base {
     using SafeMath for uint256;
     bytes32 private constant META_TRANSACTION_TYPEHASH = keccak256(
@@ -2092,6 +2102,7 @@ pragma solidity 0.6.6;
 
 
 
+
 contract DummyERC721 is
     ERC721,
     AccessControlMixin,

diff --git a/flat/ERC1155PredicateProxy.sol b/flat/ERC1155PredicateProxy.sol
@@ -121,15 +121,14 @@ contract UpgradableProxy is Proxy {
     }
 
     function updateImplementation(address _newProxyTo) public onlyProxyOwner {
-        require(_newProxyTo != address(0x0), "INVALID_PROXY_ADDRESS");
         require(isContract(_newProxyTo), "DESTINATION_ADDRESS_IS_NOT_A_CONTRACT");
 
         emit ProxyUpdated(_newProxyTo, loadImplementation());
-        
+
         setImplementation(_newProxyTo);
     }
 
-    function updateAndCall(address _newProxyTo, bytes memory data) payable public onlyProxyOwner {
+    function updateAndCall(address _newProxyTo, bytes calldata data) payable external onlyProxyOwner {
         updateImplementation(_newProxyTo);
 
         (bool success, bytes memory returnData) = address(this).call{value: msg.value}(data);
@@ -142,7 +141,7 @@ contract UpgradableProxy is Proxy {
             sstore(position, _newProxyTo)
         }
     }
-    
+
     function isContract(address _target) internal view returns (bool) {
         if (_target == address(0)) {
             return false;

diff --git a/flat/ERC20PredicateProxy.sol b/flat/ERC20PredicateProxy.sol
@@ -121,15 +121,14 @@ contract UpgradableProxy is Proxy {
     }
 
     function updateImplementation(address _newProxyTo) public onlyProxyOwner {
-        require(_newProxyTo != address(0x0), "INVALID_PROXY_ADDRESS");
         require(isContract(_newProxyTo), "DESTINATION_ADDRESS_IS_NOT_A_CONTRACT");
 
         emit ProxyUpdated(_newProxyTo, loadImplementation());
-        
+
         setImplementation(_newProxyTo);
     }
 
-    function updateAndCall(address _newProxyTo, bytes memory data) payable public onlyProxyOwner {
+    function updateAndCall(address _newProxyTo, bytes calldata data) payable external onlyProxyOwner {
         updateImplementation(_newProxyTo);
 
         (bool success, bytes memory returnData) = address(this).call{value: msg.value}(data);
@@ -142,7 +141,7 @@ contract UpgradableProxy is Proxy {
             sstore(position, _newProxyTo)
         }
     }
-    
+
     function isContract(address _target) internal view returns (bool) {
         if (_target == address(0)) {
             return false;

diff --git a/flat/ERC721Predicate.sol b/flat/ERC721Predicate.sol
@@ -1,3 +1,4 @@
+
 // File: @openzeppelin/contracts/introspection/IERC165.sol
 
 // SPDX-License-Identifier: MIT
@@ -31,6 +32,7 @@ interface IERC165 {
 
 pragma solidity ^0.6.2;
 
+
 /**
  * @dev Required interface of an ERC721 compliant contract.
  */
@@ -545,6 +547,7 @@ library RLPReader {
 
 pragma solidity 0.6.6;
 
+
 /// @title Token predicate interface for all pos portal predicates
 /// @notice Abstract interface that defines methods for custom predicates
 interface ITokenPredicate {
@@ -1016,6 +1019,7 @@ pragma solidity ^0.6.0;
 
 
 
+
 /**
  * @dev Contract module that allows children to implement role-based access
  * control mechanisms.
@@ -1230,6 +1234,7 @@ abstract contract AccessControl is Context {
 
 pragma solidity 0.6.6;
 
+
 contract AccessControlMixin is AccessControl {
     string private _revertMsg;
     function _setupContractId(string memory contractId) internal {
@@ -1254,6 +1259,7 @@ pragma solidity 0.6.6;
 
 
 
+
 contract ERC721Predicate is ITokenPredicate, AccessControlMixin, Initializable, IERC721Receiver {
     using RLPReader for bytes;
     using RLPReader for RLPReader.RLPItem;