Merge pull request #134 from valory-xyz/polygon_deployment

chore: gnosis multisig implementation polygon deployment
valory-xyz · Oct 24, 2023 · cfa4180 · cfa4180
2 parents eb78c67 + 24620e4
commit cfa4180
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@ coverage
 coverage.json
 typechain
 *.DS_Store
+.idea
+leak_report
 
 # Hardhat files
 cache

diff --git a/.solcover.js b/.solcover.js
@@ -2,11 +2,14 @@ module.exports = {
     skipFiles: ["test/ComponentRegistryTest.sol",
         "test/ERC20Token.sol",
         "test/GnosisSafeABICreator.sol",
+        "test/MockAgentMech.sol",
         "test/MockOperatorContract.sol",
         "test/MockServiceRegistry.sol",
         "test/MockTimelock.sol",
         "test/ReentrancyAttacker.sol",
         "test/ReentrancyTokenAttacker.sol",
+        "test/ReentrancyStakingAttacker.sol",
+        "test/SafeNonceLib.sol",
         "flatten/AgentRegistry-flatten.sol",
         "flatten/ComponentRegistry-flatten.sol",
         "flatten/GenericManager-flatten.sol",

diff --git a/abis/0.8.19/GnosisSafeSameAddressMultisig.json b/abis/0.8.19/GnosisSafeSameAddressMultisig.json
@@ -3,6 +3,17 @@
   "contractName": "GnosisSafeSameAddressMultisig",
   "sourceName": "contracts/multisigs/GnosisSafeSameAddressMultisig.sol",
   "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "_proxyHash",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
     {
       "inputs": [
         {
@@ -30,6 +41,17 @@
       "name": "MultisigExecFailed",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "multisig",
+          "type": "address"
+        }
+      ],
+      "name": "UnauthorizedMultisig",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -73,6 +95,11 @@
       "name": "WrongThreshold",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "ZeroValue",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "DEFAULT_DATA_LENGTH",
@@ -114,10 +141,23 @@
       ],
       "stateMutability": "nonpayable",
       "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "proxyHash",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610772806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063f02fb7741461003b578063f398dba814610056575b600080fd5b610043601481565b6040519081526020015b60405180910390f35b610069610064366004610519565b610081565b6040516001600160a01b03909116815260200161004d565b805160009060148110156100ba578251604051631a64813d60e11b81526014600482015260248101919091526044015b60405180910390fd5b6014830151915060148111156102325760006100d76014836105ff565b905060008167ffffffffffffffff8111156100f4576100f4610426565b6040519080825280601f01601f19166020018201604052801561011e576020820181803683370190505b50905060005b828110156101a45785610138601483610618565b815181106101485761014861062b565b602001015160f81c60f81b8282815181106101655761016561062b565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535061019d81610641565b9050610124565b506000846001600160a01b0316826040516101bf919061065a565b6000604051808303816000865af19150503d80600081146101fc576040519150601f19603f3d011682016040523d82523d6000602084013e610201565b606091505b505090508061022e57604051632aacb4bd60e21b81526001600160a01b03861660048201526024016100b1565b5050505b6000826001600160a01b031663a0e67e2b6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610272573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261029a9190810190610689565b90506000836001600160a01b031663e75235b86040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103009190610723565b905080861461032c57604051635372461560e01b815260048101829052602481018790526044016100b1565b86518251811461035c57825160405163f720290d60e01b81526004810191909152602481018290526044016100b1565b60005b8181101561041a5783600161037483856105ff565b61037e91906105ff565b8151811061038e5761038e61062b565b60200260200101516001600160a01b03168982815181106103b1576103b161062b565b60200260200101516001600160a01b03161461040a578881815181106103d9576103d961062b565b60200260200101516040516374dba67360e01b81526004016100b191906001600160a01b0391909116815260200190565b61041381610641565b905061035f565b50505050509392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561046557610465610426565b604052919050565b600067ffffffffffffffff82111561048757610487610426565b5060051b60200190565b6001600160a01b03811681146104a657600080fd5b50565b600082601f8301126104ba57600080fd5b813567ffffffffffffffff8111156104d4576104d4610426565b6104e7601f8201601f191660200161043c565b8181528460208386010111156104fc57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060006060848603121561052e57600080fd5b833567ffffffffffffffff8082111561054657600080fd5b818601915086601f83011261055a57600080fd5b8135602061056f61056a8361046d565b61043c565b82815260059290921b8401810191818101908a84111561058e57600080fd5b948201945b838610156105b55785356105a681610491565b82529482019490820190610593565b97505087013594505060408601359150808211156105d257600080fd5b506105df868287016104a9565b9150509250925092565b634e487b7160e01b600052601160045260246000fd5b81810381811115610612576106126105e9565b92915050565b80820180821115610612576106126105e9565b634e487b7160e01b600052603260045260246000fd5b600060018201610653576106536105e9565b5060010190565b6000825160005b8181101561067b5760208186018101518583015201610661565b506000920191825250919050565b6000602080838503121561069c57600080fd5b825167ffffffffffffffff8111156106b357600080fd5b8301601f810185136106c457600080fd5b80516106d261056a8261046d565b81815260059190911b820183019083810190878311156106f157600080fd5b928401925b8284101561071857835161070981610491565b825292840192908401906106f6565b979650505050505050565b60006020828403121561073557600080fd5b505191905056fea264697066735822122098ba4f2e0f6f46e71c0608e1fc3642dd707d23b8381ad4dd83923fe990735bbf64736f6c63430008130033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063f02fb7741461003b578063f398dba814610056575b600080fd5b610043601481565b6040519081526020015b60405180910390f35b610069610064366004610519565b610081565b6040516001600160a01b03909116815260200161004d565b805160009060148110156100ba578251604051631a64813d60e11b81526014600482015260248101919091526044015b60405180910390fd5b6014830151915060148111156102325760006100d76014836105ff565b905060008167ffffffffffffffff8111156100f4576100f4610426565b6040519080825280601f01601f19166020018201604052801561011e576020820181803683370190505b50905060005b828110156101a45785610138601483610618565b815181106101485761014861062b565b602001015160f81c60f81b8282815181106101655761016561062b565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535061019d81610641565b9050610124565b506000846001600160a01b0316826040516101bf919061065a565b6000604051808303816000865af19150503d80600081146101fc576040519150601f19603f3d011682016040523d82523d6000602084013e610201565b606091505b505090508061022e57604051632aacb4bd60e21b81526001600160a01b03861660048201526024016100b1565b5050505b6000826001600160a01b031663a0e67e2b6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610272573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261029a9190810190610689565b90506000836001600160a01b031663e75235b86040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103009190610723565b905080861461032c57604051635372461560e01b815260048101829052602481018790526044016100b1565b86518251811461035c57825160405163f720290d60e01b81526004810191909152602481018290526044016100b1565b60005b8181101561041a5783600161037483856105ff565b61037e91906105ff565b8151811061038e5761038e61062b565b60200260200101516001600160a01b03168982815181106103b1576103b161062b565b60200260200101516001600160a01b03161461040a578881815181106103d9576103d961062b565b60200260200101516040516374dba67360e01b81526004016100b191906001600160a01b0391909116815260200190565b61041381610641565b905061035f565b50505050509392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561046557610465610426565b604052919050565b600067ffffffffffffffff82111561048757610487610426565b5060051b60200190565b6001600160a01b03811681146104a657600080fd5b50565b600082601f8301126104ba57600080fd5b813567ffffffffffffffff8111156104d4576104d4610426565b6104e7601f8201601f191660200161043c565b8181528460208386010111156104fc57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060006060848603121561052e57600080fd5b833567ffffffffffffffff8082111561054657600080fd5b818601915086601f83011261055a57600080fd5b8135602061056f61056a8361046d565b61043c565b82815260059290921b8401810191818101908a84111561058e57600080fd5b948201945b838610156105b55785356105a681610491565b82529482019490820190610593565b97505087013594505060408601359150808211156105d257600080fd5b506105df868287016104a9565b9150509250925092565b634e487b7160e01b600052601160045260246000fd5b81810381811115610612576106126105e9565b92915050565b80820180821115610612576106126105e9565b634e487b7160e01b600052603260045260246000fd5b600060018201610653576106536105e9565b5060010190565b6000825160005b8181101561067b5760208186018101518583015201610661565b506000920191825250919050565b6000602080838503121561069c57600080fd5b825167ffffffffffffffff8111156106b357600080fd5b8301601f810185136106c457600080fd5b80516106d261056a8261046d565b81815260059190911b820183019083810190878311156106f157600080fd5b928401925b8284101561071857835161070981610491565b825292840192908401906106f6565b979650505050505050565b60006020828403121561073557600080fd5b505191905056fea264697066735822122098ba4f2e0f6f46e71c0608e1fc3642dd707d23b8381ad4dd83923fe990735bbf64736f6c63430008130033",
+  "bytecode": "0x60a060405234801561001057600080fd5b506040516108af3803806108af83398101604081905261002f91610055565b8061004d57604051637c946ed760e01b815260040160405180910390fd5b60805261006e565b60006020828403121561006757600080fd5b5051919050565b60805161082061008f60003960008181604b015261012701526108206000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063809cee2f14610046578063f02fb77414610080578063f398dba814610088575b600080fd5b61006d7f000000000000000000000000000000000000000000000000000000000000000081565b6040519081526020015b60405180910390f35b61006d601481565b61009b6100963660046105c7565b6100b3565b6040516001600160a01b039091168152602001610077565b805160009060148110156100ec578251604051631a64813d60e11b81526014600482015260248101919091526044015b60405180910390fd5b601483015191506000826001600160a01b0316803b806020016040519081016040528181526000908060200190933c805190602001209050807f00000000000000000000000000000000000000000000000000000000000000001461016e5760405162a2307960e51b81526001600160a01b03841660048201526024016100e3565b60148211156102df5760006101846014846106ad565b905060008167ffffffffffffffff8111156101a1576101a16104d4565b6040519080825280601f01601f1916602001820160405280156101cb576020820181803683370190505b50905060005b8281101561025157866101e56014836106c6565b815181106101f5576101f56106d9565b602001015160f81c60f81b828281518110610212576102126106d9565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535061024a816106ef565b90506101d1565b506000856001600160a01b03168260405161026c9190610708565b6000604051808303816000865af19150503d80600081146102a9576040519150601f19603f3d011682016040523d82523d6000602084013e6102ae565b606091505b50509050806102db57604051632aacb4bd60e21b81526001600160a01b03871660048201526024016100e3565b5050505b6000836001600160a01b031663a0e67e2b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561031f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103479190810190610737565b90506000846001600160a01b031663e75235b86040518163ffffffff1660e01b8152600401602060405180830381865afa158015610389573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ad91906107d1565b90508087146103d957604051635372461560e01b815260048101829052602481018890526044016100e3565b87518251811461040957825160405163f720290d60e01b81526004810191909152602481018290526044016100e3565b60005b818110156104c75783600161042183856106ad565b61042b91906106ad565b8151811061043b5761043b6106d9565b60200260200101516001600160a01b03168a828151811061045e5761045e6106d9565b60200260200101516001600160a01b0316146104b757898181518110610486576104866106d9565b60200260200101516040516374dba67360e01b81526004016100e391906001600160a01b0391909116815260200190565b6104c0816106ef565b905061040c565b5050505050509392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715610513576105136104d4565b604052919050565b600067ffffffffffffffff821115610535576105356104d4565b5060051b60200190565b6001600160a01b038116811461055457600080fd5b50565b600082601f83011261056857600080fd5b813567ffffffffffffffff811115610582576105826104d4565b610595601f8201601f19166020016104ea565b8181528460208386010111156105aa57600080fd5b816020850160208301376000918101602001919091529392505050565b6000806000606084860312156105dc57600080fd5b833567ffffffffffffffff808211156105f457600080fd5b818601915086601f83011261060857600080fd5b8135602061061d6106188361051b565b6104ea565b82815260059290921b8401810191818101908a84111561063c57600080fd5b948201945b838610156106635785356106548161053f565b82529482019490820190610641565b975050870135945050604086013591508082111561068057600080fd5b5061068d86828701610557565b9150509250925092565b634e487b7160e01b600052601160045260246000fd5b818103818111156106c0576106c0610697565b92915050565b808201808211156106c0576106c0610697565b634e487b7160e01b600052603260045260246000fd5b60006001820161070157610701610697565b5060010190565b6000825160005b81811015610729576020818601810151858301520161070f565b506000920191825250919050565b6000602080838503121561074a57600080fd5b825167ffffffffffffffff81111561076157600080fd5b8301601f8101851361077257600080fd5b80516107806106188261051b565b81815260059190911b8201830190838101908783111561079f57600080fd5b928401925b828410156107c65783516107b78161053f565b825292840192908401906107a4565b979650505050505050565b6000602082840312156107e357600080fd5b505191905056fea2646970667358221220e2f0a5775defc46258940a6a1105bbf478e2432aa19826062a42bc0e8567b22a64736f6c63430008130033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c8063809cee2f14610046578063f02fb77414610080578063f398dba814610088575b600080fd5b61006d7f000000000000000000000000000000000000000000000000000000000000000081565b6040519081526020015b60405180910390f35b61006d601481565b61009b6100963660046105c7565b6100b3565b6040516001600160a01b039091168152602001610077565b805160009060148110156100ec578251604051631a64813d60e11b81526014600482015260248101919091526044015b60405180910390fd5b601483015191506000826001600160a01b0316803b806020016040519081016040528181526000908060200190933c805190602001209050807f00000000000000000000000000000000000000000000000000000000000000001461016e5760405162a2307960e51b81526001600160a01b03841660048201526024016100e3565b60148211156102df5760006101846014846106ad565b905060008167ffffffffffffffff8111156101a1576101a16104d4565b6040519080825280601f01601f1916602001820160405280156101cb576020820181803683370190505b50905060005b8281101561025157866101e56014836106c6565b815181106101f5576101f56106d9565b602001015160f81c60f81b828281518110610212576102126106d9565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535061024a816106ef565b90506101d1565b506000856001600160a01b03168260405161026c9190610708565b6000604051808303816000865af19150503d80600081146102a9576040519150601f19603f3d011682016040523d82523d6000602084013e6102ae565b606091505b50509050806102db57604051632aacb4bd60e21b81526001600160a01b03871660048201526024016100e3565b5050505b6000836001600160a01b031663a0e67e2b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561031f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103479190810190610737565b90506000846001600160a01b031663e75235b86040518163ffffffff1660e01b8152600401602060405180830381865afa158015610389573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ad91906107d1565b90508087146103d957604051635372461560e01b815260048101829052602481018890526044016100e3565b87518251811461040957825160405163f720290d60e01b81526004810191909152602481018290526044016100e3565b60005b818110156104c75783600161042183856106ad565b61042b91906106ad565b8151811061043b5761043b6106d9565b60200260200101516001600160a01b03168a828151811061045e5761045e6106d9565b60200260200101516001600160a01b0316146104b757898181518110610486576104866106d9565b60200260200101516040516374dba67360e01b81526004016100e391906001600160a01b0391909116815260200190565b6104c0816106ef565b905061040c565b5050505050509392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715610513576105136104d4565b604052919050565b600067ffffffffffffffff821115610535576105356104d4565b5060051b60200190565b6001600160a01b038116811461055457600080fd5b50565b600082601f83011261056857600080fd5b813567ffffffffffffffff811115610582576105826104d4565b610595601f8201601f19166020016104ea565b8181528460208386010111156105aa57600080fd5b816020850160208301376000918101602001919091529392505050565b6000806000606084860312156105dc57600080fd5b833567ffffffffffffffff808211156105f457600080fd5b818601915086601f83011261060857600080fd5b8135602061061d6106188361051b565b6104ea565b82815260059290921b8401810191818101908a84111561063c57600080fd5b948201945b838610156106635785356106548161053f565b82529482019490820190610641565b975050870135945050604086013591508082111561068057600080fd5b5061068d86828701610557565b9150509250925092565b634e487b7160e01b600052601160045260246000fd5b818103818111156106c0576106c0610697565b92915050565b808201808211156106c0576106c0610697565b634e487b7160e01b600052603260045260246000fd5b60006001820161070157610701610697565b5060010190565b6000825160005b81811015610729576020818601810151858301520161070f565b506000920191825250919050565b6000602080838503121561074a57600080fd5b825167ffffffffffffffff81111561076157600080fd5b8301601f8101851361077257600080fd5b80516107806106188261051b565b81815260059190911b8201830190838101908783111561079f57600080fd5b928401925b828410156107c65783516107b78161053f565b825292840192908401906107a4565b979650505050505050565b6000602082840312156107e357600080fd5b505191905056fea2646970667358221220e2f0a5775defc46258940a6a1105bbf478e2432aa19826062a42bc0e8567b22a64736f6c63430008130033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/docs/configuration.json b/docs/configuration.json
@@ -123,7 +123,7 @@
       {
         "name": "GnosisSafeSameAddressMultisig",
         "artifact": "abis/0.8.19/GnosisSafeSameAddressMultisig.json",
-        "address": "0x34C895f302D0b5cf52ec0Edd3945321EB0f83dd5"
+        "address": "0xd8BCC126ff31d2582018715d5291A508530587b0"
       }
     ]
   },