pr fixes

payamm70 · Jun 27, 2022 · 653ae44 · 653ae44
1 parent f430414
commit 653ae44
Show file tree

Hide file tree

Showing 31 changed files with 155 additions and 202 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -3,7 +3,7 @@
   "rules": {
     "mark-callable-contracts": "off",
     "no-empty-blocks": "off",
-    "compiler-version": ["error", "0.8.9"],
+    "compiler-version": ["error", "0.8.15"],
     "private-vars-leading-underscore": "error",
     "bracket-align": "off",
     "reason-string": "off"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
   "editor.formatOnSave": false,
   "solidity.linter": "solhint",
-  "solidity.compileUsingRemoteVersion": "v0.8.9"
+  "solidity.compileUsingRemoteVersion": "v0.8.15+commit.e14f2714"
 }
diff --git a/compiled-contracts/Bridge.json b/compiled-contracts/Bridge.json
diff --git a/compiled-contracts/BridgeMock.json b/compiled-contracts/BridgeMock.json
diff --git a/compiled-contracts/ERC20PermitMock.json b/compiled-contracts/ERC20PermitMock.json
diff --git a/compiled-contracts/GlobalExitRootManager.json b/compiled-contracts/GlobalExitRootManager.json
@@ -19,25 +19,6 @@
       "stateMutability": "nonpayable",
       "type": "constructor"
     },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
     {
       "anonymous": false,
       "inputs": [
@@ -147,26 +128,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "rollupAddress",
@@ -180,19 +141,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -207,8 +155,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161080438038061080483398101604081905261002f916100d5565b61003833610069565b600680546001600160a01b039384166001600160a01b03199182161790915560058054929093169116179055610108565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80516001600160a01b03811681146100d057600080fd5b919050565b600080604083850312156100e857600080fd5b6100f1836100b9565b91506100ff602084016100b9565b90509250929050565b6106ed806101176000396000f3fe608060405234801561001057600080fd5b50600436106100c95760003560e01c80633ed691ef116100815780638da5cb5b1161005b5780638da5cb5b146101b7578063a3c573eb146101d5578063f2fde38b146101f557600080fd5b80633ed691ef146101315780635ec6a8df1461016a578063715018a6146101af57600080fd5b8063257b3632116100b2578063257b3632146100f3578063319cf7351461011357806333d6247d1461011c57600080fd5b806301fd9044146100ce578063029f2793146100ea575b600080fd5b6100d760015481565b6040519081526020015b60405180910390f35b6100d760045481565b6100d7610101366004610601565b60036020526000908152604090205481565b6100d760025481565b61012f61012a366004610601565b610208565b005b6100d760025460015460408051602081019390935282015260009060600160405160208183030381529060405280519060200120905090565b60065461018a9073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100e1565b61012f6103cf565b60005473ffffffffffffffffffffffffffffffffffffffff1661018a565b60055461018a9073ffffffffffffffffffffffffffffffffffffffff1681565b61012f61020336600461061a565b61045c565b60065473ffffffffffffffffffffffffffffffffffffffff16331480610245575060055473ffffffffffffffffffffffffffffffffffffffff1633145b6102d6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603d60248201527f476c6f62616c45786974526f6f744d616e616765723a3a75706461746545786960448201527f74526f6f743a204f4e4c595f414c4c4f5745445f434f4e54524143545300000060648201526084015b60405180910390fd5b60065473ffffffffffffffffffffffffffffffffffffffff163314156102fc5760018190555b60055473ffffffffffffffffffffffffffffffffffffffff163314156103225760028190555b6004805490600061033283610657565b9091555050600254600154604080516020810193909352820152600090606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152828252805160209182012060045460008281526003909352928220839055600154600254919550939092917fb7c409af8cb511116b88f38824d48a0196194596241fdb2d177210d3d3b89fbf91a45050565b60005473ffffffffffffffffffffffffffffffffffffffff163314610450576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102cd565b61045a600061058c565b565b60005473ffffffffffffffffffffffffffffffffffffffff1633146104dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102cd565b73ffffffffffffffffffffffffffffffffffffffff8116610580576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016102cd565b6105898161058c565b50565b6000805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60006020828403121561061357600080fd5b5035919050565b60006020828403121561062c57600080fd5b813573ffffffffffffffffffffffffffffffffffffffff8116811461065057600080fd5b9392505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8214156106b0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b506001019056fea2646970667358221220d5cf6d292c711ef4787266e44d82b2b4a83cc0dc508874135a1d612d1e806fbd64736f6c63430008090033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100c95760003560e01c80633ed691ef116100815780638da5cb5b1161005b5780638da5cb5b146101b7578063a3c573eb146101d5578063f2fde38b146101f557600080fd5b80633ed691ef146101315780635ec6a8df1461016a578063715018a6146101af57600080fd5b8063257b3632116100b2578063257b3632146100f3578063319cf7351461011357806333d6247d1461011c57600080fd5b806301fd9044146100ce578063029f2793146100ea575b600080fd5b6100d760015481565b6040519081526020015b60405180910390f35b6100d760045481565b6100d7610101366004610601565b60036020526000908152604090205481565b6100d760025481565b61012f61012a366004610601565b610208565b005b6100d760025460015460408051602081019390935282015260009060600160405160208183030381529060405280519060200120905090565b60065461018a9073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100e1565b61012f6103cf565b60005473ffffffffffffffffffffffffffffffffffffffff1661018a565b60055461018a9073ffffffffffffffffffffffffffffffffffffffff1681565b61012f61020336600461061a565b61045c565b60065473ffffffffffffffffffffffffffffffffffffffff16331480610245575060055473ffffffffffffffffffffffffffffffffffffffff1633145b6102d6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603d60248201527f476c6f62616c45786974526f6f744d616e616765723a3a75706461746545786960448201527f74526f6f743a204f4e4c595f414c4c4f5745445f434f4e54524143545300000060648201526084015b60405180910390fd5b60065473ffffffffffffffffffffffffffffffffffffffff163314156102fc5760018190555b60055473ffffffffffffffffffffffffffffffffffffffff163314156103225760028190555b6004805490600061033283610657565b9091555050600254600154604080516020810193909352820152600090606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152828252805160209182012060045460008281526003909352928220839055600154600254919550939092917fb7c409af8cb511116b88f38824d48a0196194596241fdb2d177210d3d3b89fbf91a45050565b60005473ffffffffffffffffffffffffffffffffffffffff163314610450576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102cd565b61045a600061058c565b565b60005473ffffffffffffffffffffffffffffffffffffffff1633146104dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102cd565b73ffffffffffffffffffffffffffffffffffffffff8116610580576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016102cd565b6105898161058c565b50565b6000805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60006020828403121561061357600080fd5b5035919050565b60006020828403121561062c57600080fd5b813573ffffffffffffffffffffffffffffffffffffffff8116811461065057600080fd5b9392505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8214156106b0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b506001019056fea2646970667358221220d5cf6d292c711ef4787266e44d82b2b4a83cc0dc508874135a1d612d1e806fbd64736f6c63430008090033",
+  "bytecode": "0x608060405234801561001057600080fd5b506040516104bb3803806104bb83398101604081905261002f9161007c565b600580546001600160a01b039384166001600160a01b031991821617909155600480549290931691161790556100af565b80516001600160a01b038116811461007757600080fd5b919050565b6000806040838503121561008f57600080fd5b61009883610060565b91506100a660208401610060565b90509250929050565b6103fd806100be6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806333d6247d1161005b57806333d6247d146100db5780633ed691ef146100f05780635ec6a8df14610128578063a3c573eb1461016d57600080fd5b806301fd90441461008d578063029f2793146100a9578063257b3632146100b2578063319cf735146100d2575b600080fd5b61009660005481565b6040519081526020015b60405180910390f35b61009660035481565b6100966100c036600461034f565b60026020526000908152604090205481565b61009660015481565b6100ee6100e936600461034f565b61018d565b005b610096600154600080546040805160208101949094528301529060600160405160208183030381529060405280519060200120905090565b6005546101489073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100a0565b6004546101489073ffffffffffffffffffffffffffffffffffffffff1681565b60055473ffffffffffffffffffffffffffffffffffffffff163314806101ca575060045473ffffffffffffffffffffffffffffffffffffffff1633145b61025a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603d60248201527f476c6f62616c45786974526f6f744d616e616765723a3a75706461746545786960448201527f74526f6f743a204f4e4c595f414c4c4f5745445f434f4e545241435453000000606482015260840160405180910390fd5b60055473ffffffffffffffffffffffffffffffffffffffff16330361027f5760008190555b60045473ffffffffffffffffffffffffffffffffffffffff1633036102a45760018190555b600380549060006102b483610368565b90915550506001546000805460408051602081019490945283015290606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120600354600082815260029093529282208390558154600154919550939092917fb7c409af8cb511116b88f38824d48a0196194596241fdb2d177210d3d3b89fbf91a45050565b60006020828403121561036157600080fd5b5035919050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036103c0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b506001019056fea264697066735822122018d6bd3a95671d8e962409a23b31d176c129d00c5cc01ad2eca93c3faa67555564736f6c634300080f0033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c806333d6247d1161005b57806333d6247d146100db5780633ed691ef146100f05780635ec6a8df14610128578063a3c573eb1461016d57600080fd5b806301fd90441461008d578063029f2793146100a9578063257b3632146100b2578063319cf735146100d2575b600080fd5b61009660005481565b6040519081526020015b60405180910390f35b61009660035481565b6100966100c036600461034f565b60026020526000908152604090205481565b61009660015481565b6100ee6100e936600461034f565b61018d565b005b610096600154600080546040805160208101949094528301529060600160405160208183030381529060405280519060200120905090565b6005546101489073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100a0565b6004546101489073ffffffffffffffffffffffffffffffffffffffff1681565b60055473ffffffffffffffffffffffffffffffffffffffff163314806101ca575060045473ffffffffffffffffffffffffffffffffffffffff1633145b61025a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603d60248201527f476c6f62616c45786974526f6f744d616e616765723a3a75706461746545786960448201527f74526f6f743a204f4e4c595f414c4c4f5745445f434f4e545241435453000000606482015260840160405180910390fd5b60055473ffffffffffffffffffffffffffffffffffffffff16330361027f5760008190555b60045473ffffffffffffffffffffffffffffffffffffffff1633036102a45760018190555b600380549060006102b483610368565b90915550506001546000805460408051602081019490945283015290606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120600354600082815260029093529282208390558154600154919550939092917fb7c409af8cb511116b88f38824d48a0196194596241fdb2d177210d3d3b89fbf91a45050565b60006020828403121561036157600080fd5b5035919050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036103c0577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b506001019056fea264697066735822122018d6bd3a95671d8e962409a23b31d176c129d00c5cc01ad2eca93c3faa67555564736f6c634300080f0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/compiled-contracts/GlobalExitRootManagerL2.json b/compiled-contracts/GlobalExitRootManagerL2.json
@@ -73,8 +73,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161027938038061027983398101604081905261002f91610054565b600280546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6101e6806100936000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806301fd904414610051578063257b36321461006d57806333d6247d1461008d578063a3c573eb146100a2575b600080fd5b61005a60015481565b6040519081526020015b60405180910390f35b61005a61007b366004610197565b60006020819052908152604090205481565b6100a061009b366004610197565b6100e7565b005b6002546100c29073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610064565b60025473ffffffffffffffffffffffffffffffffffffffff163314610192576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603460248201527f476c6f62616c45786974526f6f744d616e616765724c323a3a7570646174654560448201527f786974526f6f743a204f4e4c595f425249444745000000000000000000000000606482015260840160405180910390fd5b600155565b6000602082840312156101a957600080fd5b503591905056fea26469706673582212205e2d4359921bdc32cb742b78a2e05d3862a914568e5db237d2a32af61c5619d664736f6c63430008090033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c806301fd904414610051578063257b36321461006d57806333d6247d1461008d578063a3c573eb146100a2575b600080fd5b61005a60015481565b6040519081526020015b60405180910390f35b61005a61007b366004610197565b60006020819052908152604090205481565b6100a061009b366004610197565b6100e7565b005b6002546100c29073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610064565b60025473ffffffffffffffffffffffffffffffffffffffff163314610192576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603460248201527f476c6f62616c45786974526f6f744d616e616765724c323a3a7570646174654560448201527f786974526f6f743a204f4e4c595f425249444745000000000000000000000000606482015260840160405180910390fd5b600155565b6000602082840312156101a957600080fd5b503591905056fea26469706673582212205e2d4359921bdc32cb742b78a2e05d3862a914568e5db237d2a32af61c5619d664736f6c63430008090033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161027938038061027983398101604081905261002f91610054565b600280546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6101e6806100936000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806301fd904414610051578063257b36321461006d57806333d6247d1461008d578063a3c573eb146100a2575b600080fd5b61005a60015481565b6040519081526020015b60405180910390f35b61005a61007b366004610197565b60006020819052908152604090205481565b6100a061009b366004610197565b6100e7565b005b6002546100c29073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610064565b60025473ffffffffffffffffffffffffffffffffffffffff163314610192576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603460248201527f476c6f62616c45786974526f6f744d616e616765724c323a3a7570646174654560448201527f786974526f6f743a204f4e4c595f425249444745000000000000000000000000606482015260840160405180910390fd5b600155565b6000602082840312156101a957600080fd5b503591905056fea26469706673582212201c123715f25414c3f701b09a70b945916994cfd6fb255b0307e7c20cf428a16d64736f6c634300080f0033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c806301fd904414610051578063257b36321461006d57806333d6247d1461008d578063a3c573eb146100a2575b600080fd5b61005a60015481565b6040519081526020015b60405180910390f35b61005a61007b366004610197565b60006020819052908152604090205481565b6100a061009b366004610197565b6100e7565b005b6002546100c29073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610064565b60025473ffffffffffffffffffffffffffffffffffffffff163314610192576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603460248201527f476c6f62616c45786974526f6f744d616e616765724c323a3a7570646174654560448201527f786974526f6f743a204f4e4c595f425249444745000000000000000000000000606482015260840160405180910390fd5b600155565b6000602082840312156101a957600080fd5b503591905056fea26469706673582212201c123715f25414c3f701b09a70b945916994cfd6fb255b0307e7c20cf428a16d64736f6c634300080f0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }