diff --git a/.circleci/config.yml b/.circleci/config.yml index 0953aceaa0..e31a8c5d4e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -311,17 +311,26 @@ jobs: steps: - restore_cache: keys: - - foundry-bin-${foundry_locked_commit}-12 + - foundry-bin-latest-${foundry_cache_version} - rust/install: {} - - run: | - if [ ! -d ~/.foundry ]; then - curl -O https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup && chmod +x ./foundryup - ./foundryup -C $foundry_locked_commit - fi - rm -rf * - echo 'export PATH="$PATH:$HOME/.foundry/bin"' >> $BASH_ENV + - run: + name: "Install Foundry" + working_directory: ~/ + environment: + SHELL: /bin/bash + command: |- + export PATH="$PATH:$HOME/.foundry/bin" + echo 'export PATH=$PATH:$HOME/.foundry/bin' >> $BASH_ENV + if command -v anvil; then + echo "Anvil already installed" + anvil --version + else + curl -L https://foundry.paradigm.xyz | bash + foundryup + fi + rm -rf * - save_cache: - key: foundry-bin-${foundry_locked_commit}-12 + key: foundry-bin-latest-${foundry_cache_version} paths: - ~/.foundry/bin - checkout diff --git a/.circleci/src/jobs/job-test-deploy-script.yml b/.circleci/src/jobs/job-test-deploy-script.yml index 77b498333d..6b5c3351a0 100644 --- a/.circleci/src/jobs/job-test-deploy-script.yml +++ b/.circleci/src/jobs/job-test-deploy-script.yml @@ -5,18 +5,28 @@ steps: # get foundry - restore_cache: keys: - - foundry-bin-${foundry_locked_commit}-12 + - foundry-bin-latest-${foundry_cache_version} - rust/install: {} - - run: | - if [ ! -d ~/.foundry ]; then - curl -O https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup && chmod +x ./foundryup - ./foundryup -C $foundry_locked_commit - fi - rm -rf * - echo 'export PATH="$PATH:$HOME/.foundry/bin"' >> $BASH_ENV + - run: + name: "Install Foundry" + working_directory: ~/ + environment: + SHELL: /bin/bash + command: |- + export PATH="$PATH:$HOME/.foundry/bin" + echo 'export PATH=$PATH:$HOME/.foundry/bin' >> $BASH_ENV + + if command -v anvil; then + echo "Anvil already installed" + anvil --version + else + curl -L https://foundry.paradigm.xyz | bash + foundryup + fi + rm -rf * - save_cache: - key: foundry-bin-${foundry_locked_commit}-12 + key: foundry-bin-latest-${foundry_cache_version} paths: - ~/.foundry/bin diff --git a/contracts/migrations/Migration_Phecda.sol b/contracts/migrations/Migration_Phecda.sol new file mode 100644 index 0000000000..c126630261 --- /dev/null +++ b/contracts/migrations/Migration_Phecda.sol @@ -0,0 +1,92 @@ +pragma solidity ^0.5.16; + +import "../BaseMigration.sol"; +import "../AddressResolver.sol"; +import "../RewardsDistribution.sol"; + +interface ISynthetixNamedContract { + // solhint-disable func-name-mixedcase + function CONTRACT_NAME() external view returns (bytes32); +} + +// solhint-disable contract-name-camelcase +contract Migration_Phecda is BaseMigration { + // https://etherscan.io/address/0xEb3107117FEAd7de89Cd14D463D340A2E6917769; + address public constant OWNER = 0xEb3107117FEAd7de89Cd14D463D340A2E6917769; + + // ---------------------------- + // EXISTING SYNTHETIX CONTRACTS + // ---------------------------- + + // https://etherscan.io/address/0x823bE81bbF96BEc0e25CA13170F5AaCb5B79ba83 + AddressResolver public constant addressresolver_i = AddressResolver(0x823bE81bbF96BEc0e25CA13170F5AaCb5B79ba83); + // https://etherscan.io/address/0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b + RewardsDistribution public constant rewardsdistribution_i = + RewardsDistribution(0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b); + + // ---------------------------------- + // NEW CONTRACTS DEPLOYED TO BE ADDED + // ---------------------------------- + + // https://etherscan.io/address/0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b + address public constant new_RewardsDistribution_contract = 0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b; + + constructor() public BaseMigration(OWNER) {} + + function contractsRequiringOwnership() public pure returns (address[] memory contracts) { + contracts = new address[](2); + contracts[0] = address(addressresolver_i); + contracts[1] = address(rewardsdistribution_i); + } + + function migrate() external onlyOwner { + // ACCEPT OWNERSHIP for all contracts that require ownership to make changes + acceptAll(); + + // MIGRATION + // Import all new contracts into the address resolver; + addressresolver_importAddresses_0(); + // Rebuild the resolver caches in all MixinResolver contracts - batch 1; + addressresolver_rebuildCaches_1(); + // Ensure the RewardsDistribution has Synthetix set as its authority for distribution; + rewardsdistribution_i.setAuthority(0xd0dA9cBeA9C3852C5d63A95F9ABCC4f6eA0F9032); + // Ensure the RewardsDistribution can find the Synthetix proxy to read and transfer; + rewardsdistribution_i.setSynthetixProxy(0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F); + + // NOMINATE OWNERSHIP back to owner for aforementioned contracts + nominateAll(); + } + + function acceptAll() internal { + address[] memory contracts = contractsRequiringOwnership(); + for (uint i = 0; i < contracts.length; i++) { + Owned(contracts[i]).acceptOwnership(); + } + } + + function nominateAll() internal { + address[] memory contracts = contractsRequiringOwnership(); + for (uint i = 0; i < contracts.length; i++) { + returnOwnership(contracts[i]); + } + } + + function addressresolver_importAddresses_0() internal { + bytes32[] memory addressresolver_importAddresses_names_0_0 = new bytes32[](1); + addressresolver_importAddresses_names_0_0[0] = bytes32("RewardsDistribution"); + address[] memory addressresolver_importAddresses_destinations_0_1 = new address[](1); + addressresolver_importAddresses_destinations_0_1[0] = address(new_RewardsDistribution_contract); + addressresolver_i.importAddresses( + addressresolver_importAddresses_names_0_0, + addressresolver_importAddresses_destinations_0_1 + ); + } + + function addressresolver_rebuildCaches_1() internal { + MixinResolver[] memory addressresolver_rebuildCaches_destinations_1_0 = new MixinResolver[](3); + addressresolver_rebuildCaches_destinations_1_0[0] = MixinResolver(0xd0dA9cBeA9C3852C5d63A95F9ABCC4f6eA0F9032); + addressresolver_rebuildCaches_destinations_1_0[1] = MixinResolver(0x83105D7CDd2fd9b8185BFF1cb56bB1595a618618); + addressresolver_rebuildCaches_destinations_1_0[2] = MixinResolver(0x39Ea01a0298C315d149a490E34B59Dbf2EC7e48F); + addressresolver_i.rebuildCaches(addressresolver_rebuildCaches_destinations_1_0); + } +} diff --git a/package-lock.json b/package-lock.json index 54344acaf0..aac0d2cc48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "synthetix", - "version": "2.94.1", + "version": "2.96.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "synthetix", - "version": "2.94.1", + "version": "2.96.1", "license": "MIT", "dependencies": { "@nomiclabs/hardhat-etherscan": "^3.1.0", diff --git a/package.json b/package.json index 1c976545ac..dfa87b6ae7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "synthetix", - "version": "2.94.1", + "version": "2.96.1", "license": "MIT", "author": "Synthetix", "description": "The smart contracts which make up the Synthetix system. (synthetix.io)", diff --git a/publish/deployed/goerli/deployment.json b/publish/deployed/goerli/deployment.json index 4509225b9b..839e5662c3 100644 --- a/publish/deployed/goerli/deployment.json +++ b/publish/deployed/goerli/deployment.json @@ -306,11 +306,11 @@ }, "RewardsDistribution": { "name": "RewardsDistribution", - "address": "0x882eaF70e172b8543145811c5fE169d03740ba9a", + "address": "0x31E1080E7eb408ff005A9108f515CfcFEa6B7584", "source": "RewardsDistribution", - "link": "https://goerli.etherscan.io/address/0x882eaF70e172b8543145811c5fE169d03740ba9a", - "timestamp": "2022-07-15T01:56:59.239Z", - "txn": "", + "link": "https://goerli.etherscan.io/address/0x31E1080E7eb408ff005A9108f515CfcFEa6B7584", + "timestamp": "2023-10-20T13:59:00.000Z", + "txn": "https://goerli.etherscan.io/tx/0x3abe4199548543328a2d808a2f4f88959b252d51fe8408ab722cbf0f6cb9702b", "network": "goerli", "constructorArgs": [ "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9", @@ -17008,7 +17008,7 @@ } }, "RewardsDistribution": { - "bytecode": "608060405234801561001057600080fd5b5060405161129b38038061129b833981810160405260a081101561003357600080fd5b50805160208201516040830151606084015160809094015192939192909190846001600160a01b0381166100ae576040805162461bcd60e51b815260206004820152601960248201527f4f776e657220616464726573732063616e6e6f74206265203000000000000000604482015290519081900360640190fd5b600080546001600160a01b0319166001600160a01b038316908117825560408051928352602083019190915280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a150600280546001600160a01b039586166001600160a01b031991821617909155600380549486169482169490941790935560048054928516928416929092179091556005805491909316911617905550611136806101656000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063817a6951116100a2578063bdd1248211610071578063bdd12482146102c5578063bf7e214f146102cd578063c9e9cc4d146102d5578063d8297e44146102dd578063e54c16711461030357610116565b8063817a6951146102725780638da5cb5b1461028f57806395896b7614610297578063a430be6c146102bd57610116565b806359974e38116100e957806359974e38146101c15780635de39934146101f257806360eb3ff21461021857806379ba5097146102445780637a9e5e4b1461024c57610116565b8063060ca2501461011b5780631627540c146101355780634487d3df1461015d57806353a47bb71461019d575b600080fd5b610123610335565b60408051918252519081900360200190f35b61015b6004803603602081101561014b57600080fd5b50356001600160a01b031661033c565b005b61017a6004803603602081101561017357600080fd5b5035610398565b604080516001600160a01b03909316835260208301919091528051918290030190f35b6101a56103cd565b604080516001600160a01b039092168252519081900360200190f35b6101de600480360360208110156101d757600080fd5b50356103dc565b604080519115158252519081900360200190f35b61015b6004803603602081101561020857600080fd5b50356001600160a01b0316610a2f565b6101de6004803603604081101561022e57600080fd5b506001600160a01b038135169060200135610a59565b61015b610bfc565b61015b6004803603602081101561026257600080fd5b50356001600160a01b0316610cb8565b61015b6004803603602081101561028857600080fd5b5035610ce2565b6101a5610dcd565b61015b600480360360208110156102ad57600080fd5b50356001600160a01b0316610ddc565b6101a5610e06565b6101a5610e15565b6101a5610e24565b6101a5610e33565b61015b600480360360208110156102f357600080fd5b50356001600160a01b0316610e42565b6101de6004803603606081101561031957600080fd5b508035906001600160a01b036020820135169060400135610e6c565b6006545b90565b610344610f38565b600180546001600160a01b0383166001600160a01b0319909116811790915560408051918252517f906a1c6bd7e3091ea86693dd029a831c19049ce77f1dce2ce0bab1cacbabce229181900360200190a150565b600681815481106103a557fe5b6000918252602090912060029091020180546001909101546001600160a01b03909116915082565b6001546001600160a01b031681565b600080821161042a576040805162461bcd60e51b81526020600482015260156024820152744e6f7468696e6720746f206469737472696275746560581b604482015290519081900360640190fd5b6002546001600160a01b03163314610489576040805162461bcd60e51b815260206004820152601860248201527f43616c6c6572206973206e6f7420617574686f72697365640000000000000000604482015290519081900360640190fd5b6004546001600160a01b03166104e6576040805162461bcd60e51b815260206004820152601760248201527f526577617264457363726f77206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b6003546001600160a01b0316610543576040805162461bcd60e51b815260206004820152601960248201527f53796e74686574697850726f7879206973206e6f742073657400000000000000604482015290519081900360640190fd5b6005546001600160a01b03166105a0576040805162461bcd60e51b815260206004820152601760248201527f466565506f6f6c50726f7879206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b600354604080516370a0823160e01b8152306004820152905184926001600160a01b0316916370a08231916024808301926020929190829003018186803b1580156105ea57600080fd5b505afa1580156105fe573d6000803e3d6000fd5b505050506040513d602081101561061457600080fd5b505110156106535760405162461bcd60e51b815260040180806020018281038252604681526020018061108d6046913960600191505060405180910390fd5b8160005b6006548110156109065760006001600160a01b03166006828154811061067957fe5b60009182526020909120600290910201546001600160a01b03161415806106bf5750600681815481106106a857fe5b906000526020600020906002020160010154600014155b156108fe576106f5600682815481106106d457fe5b90600052602060002090600202016001015483610f8390919063ffffffff16565b600354600680549294506001600160a01b039091169163a9059cbb91908490811061071c57fe5b6000918252602090912060029091020154600680546001600160a01b03909216918590811061074757fe5b9060005260206000209060020201600101546040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b1580156107a857600080fd5b505af11580156107bc573d6000803e3d6000fd5b505050506040513d60208110156107d257600080fd5b50506006805460609190839081106107e657fe5b60009182526020808320600160029093020191909101546040805160248082019390935281518082039093018352604401905290810180516001600160e01b0316633c6b16ab60e01b17905260068054919350908490811061084457fe5b60009182526020918290206002909102015460405184516001600160a01b0390921692859282918401908083835b602083106108915780518252601f199092019160209182019101610872565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146108f3576040519150601f19603f3d011682016040523d82523d6000602084013e6108f8565b606091505b50505050505b600101610657565b50600354600480546040805163a9059cbb60e01b81526001600160a01b0392831693810193909352602483018590525192169163a9059cbb916044808201926020929091908290030181600087803b15801561096157600080fd5b505af1158015610975573d6000803e3d6000fd5b505050506040513d602081101561098b57600080fd5b50506005546040805163fd1f498d60e01b81526004810184905290516001600160a01b039092169163fd1f498d9160248082019260009290919082900301818387803b1580156109da57600080fd5b505af11580156109ee573d6000803e3d6000fd5b50506040805186815290517f6d1c76d614228b523baa4dcd9539e2c713b54ff4ab3ff2d1627e7f6cd32be4429350908190036020019150a150600192915050565b610a37610f38565b600480546001600160a01b0319166001600160a01b0392909216919091179055565b6000610a63610f38565b6001600160a01b038316610abe576040805162461bcd60e51b815260206004820152601760248201527f43616e74206164642061207a65726f2061646472657373000000000000000000604482015290519081900360640190fd5b81610b09576040805162461bcd60e51b815260206004820152601660248201527510d85b9d081859190818481e995c9bc8185b5bdd5b9d60521b604482015290519081900360640190fd5b610b11610fe0565b506040805180820182526001600160a01b03858116808352602080840187815260068054600181018255600082905286517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f600290920291820180546001600160a01b031916919097161790955590517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40909401939093559154845160001991909101815291820152808301859052915190917f08fff3cb767a84a8039ea0f84053799c5cdca0e8efb031eeb6b05b9c174aa208916060918190039190910190a15060019392505050565b6001546001600160a01b03163314610c455760405162461bcd60e51b81526004018080602001828103825260358152602001806110586035913960400191505060405180910390fd5b600054600154604080516001600160a01b03938416815292909116602083015280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b610cc0610f38565b600280546001600160a01b0319166001600160a01b0392909216919091179055565b610cea610f38565b60065460001901811115610d3b576040805162461bcd60e51b8152602060048201526013602482015272696e646578206f7574206f6620626f756e647360681b604482015290519081900360640190fd5b805b60065460001901811015610db55760068160010181548110610d5b57fe5b906000526020600020906002020160068281548110610d7657fe5b60009182526020909120825460029092020180546001600160a01b0319166001600160a01b039092169190911781556001918201549082015501610d3d565b506006805490610dc9906000198301610ff7565b5050565b6000546001600160a01b031681565b610de4610f38565b600380546001600160a01b0319166001600160a01b0392909216919091179055565b6004546001600160a01b031681565b6003546001600160a01b031681565b6002546001600160a01b031681565b6005546001600160a01b031681565b610e4a610f38565b600580546001600160a01b0319166001600160a01b0392909216919091179055565b6000610e76610f38565b60065460001901841115610ec7576040805162461bcd60e51b8152602060048201526013602482015272696e646578206f7574206f6620626f756e647360681b604482015290519081900360640190fd5b8260068581548110610ed557fe5b906000526020600020906002020160000160006101000a8154816001600160a01b0302191690836001600160a01b031602179055508160068581548110610f1857fe5b906000526020600020906002020160010181905550600190509392505050565b6000546001600160a01b03163314610f815760405162461bcd60e51b815260040180806020018281038252602f8152602001806110d3602f913960400191505060405180910390fd5b565b600082821115610fda576040805162461bcd60e51b815260206004820152601e60248201527f536166654d6174683a207375627472616374696f6e206f766572666c6f770000604482015290519081900360640190fd5b50900390565b604080518082019091526000808252602082015290565b815481835581811115611023576002028160020283600052602060002091820191016110239190611028565b505050565b61033991905b808211156110535780546001600160a01b03191681556000600182015560020161102e565b509056fe596f75206d757374206265206e6f6d696e61746564206265666f726520796f752063616e20616363657074206f776e65727368697052657761726473446973747269627574696f6e20636f6e747261637420646f6573206e6f74206861766520656e6f75676820746f6b656e7320746f20646973747269627574654f6e6c792074686520636f6e7472616374206f776e6572206d617920706572666f726d207468697320616374696f6ea265627a7a723158202f1a763a9f11a7edb07008112ffed4dab50ca52a11212d5a052c01645a42fdef64736f6c63430005100032", + "bytecode": "608060405234801561001057600080fd5b506040516112af3803806112af833981810160405260a081101561003357600080fd5b50805160208201516040830151606084015160809094015192939192909190846001600160a01b0381166100ae576040805162461bcd60e51b815260206004820152601960248201527f4f776e657220616464726573732063616e6e6f74206265203000000000000000604482015290519081900360640190fd5b600080546001600160a01b0319166001600160a01b038316908117825560408051928352602083019190915280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a150600280546001600160a01b039586166001600160a01b03199182161790915560038054948616948216949094179093556004805492851692841692909217909155600580549190931691161790555061114a806101656000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063817a6951116100a2578063bdd1248211610071578063bdd12482146102c5578063bf7e214f146102cd578063c9e9cc4d146102d5578063d8297e44146102dd578063e54c16711461030357610116565b8063817a6951146102725780638da5cb5b1461028f57806395896b7614610297578063a430be6c146102bd57610116565b806359974e38116100e957806359974e38146101c15780635de39934146101f257806360eb3ff21461021857806379ba5097146102445780637a9e5e4b1461024c57610116565b8063060ca2501461011b5780631627540c146101355780634487d3df1461015d57806353a47bb71461019d575b600080fd5b610123610335565b60408051918252519081900360200190f35b61015b6004803603602081101561014b57600080fd5b50356001600160a01b031661033c565b005b61017a6004803603602081101561017357600080fd5b5035610398565b604080516001600160a01b03909316835260208301919091528051918290030190f35b6101a56103cd565b604080516001600160a01b039092168252519081900360200190f35b6101de600480360360208110156101d757600080fd5b50356103dc565b604080519115158252519081900360200190f35b61015b6004803603602081101561020857600080fd5b50356001600160a01b0316610a43565b6101de6004803603604081101561022e57600080fd5b506001600160a01b038135169060200135610a6d565b61015b610c10565b61015b6004803603602081101561026257600080fd5b50356001600160a01b0316610ccc565b61015b6004803603602081101561028857600080fd5b5035610cf6565b6101a5610de1565b61015b600480360360208110156102ad57600080fd5b50356001600160a01b0316610df0565b6101a5610e1a565b6101a5610e29565b6101a5610e38565b6101a5610e47565b61015b600480360360208110156102f357600080fd5b50356001600160a01b0316610e56565b6101de6004803603606081101561031957600080fd5b508035906001600160a01b036020820135169060400135610e80565b6006545b90565b610344610f4c565b600180546001600160a01b0383166001600160a01b0319909116811790915560408051918252517f906a1c6bd7e3091ea86693dd029a831c19049ce77f1dce2ce0bab1cacbabce229181900360200190a150565b600681815481106103a557fe5b6000918252602090912060029091020180546001909101546001600160a01b03909116915082565b6001546001600160a01b031681565b600080821161042a576040805162461bcd60e51b81526020600482015260156024820152744e6f7468696e6720746f206469737472696275746560581b604482015290519081900360640190fd5b6002546001600160a01b03163314610489576040805162461bcd60e51b815260206004820152601860248201527f43616c6c6572206973206e6f7420617574686f72697365640000000000000000604482015290519081900360640190fd5b6004546001600160a01b03166104e6576040805162461bcd60e51b815260206004820152601760248201527f526577617264457363726f77206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b6003546001600160a01b0316610543576040805162461bcd60e51b815260206004820152601960248201527f53796e74686574697850726f7879206973206e6f742073657400000000000000604482015290519081900360640190fd5b6005546001600160a01b03166105a0576040805162461bcd60e51b815260206004820152601760248201527f466565506f6f6c50726f7879206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b600354604080516370a0823160e01b8152306004820152905184926001600160a01b0316916370a08231916024808301926020929190829003018186803b1580156105ea57600080fd5b505afa1580156105fe573d6000803e3d6000fd5b505050506040513d602081101561061457600080fd5b505110156106535760405162461bcd60e51b81526004018080602001828103825260468152602001806110a16046913960600191505060405180910390fd5b8160005b60065481101561091a5760006001600160a01b03166006828154811061067957fe5b60009182526020909120600290910201546001600160a01b0316148015906106c05750600681815481106106a957fe5b906000526020600020906002020160010154600014155b15610912576106f6600682815481106106d557fe5b90600052602060002090600202016001015483610f9790919063ffffffff16565b600354600680549294506001600160a01b039091169163a9059cbb91908490811061071d57fe5b6000918252602090912060029091020154600680546001600160a01b03909216918590811061074857fe5b9060005260206000209060020201600101546040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b1580156107a957600080fd5b505af11580156107bd573d6000803e3d6000fd5b505050506040513d60208110156107d357600080fd5b50506006805460609190839081106107e757fe5b60009182526020808320600160029093020191909101546040805160248082019390935281518082039093018352604401905290810180516001600160e01b0316633c6b16ab60e01b179052600680549193506060918590811061084757fe5b60009182526020918290206002909102015460405185516001600160a01b0390921692869282918401908083835b602083106108945780518252601f199092019160209182019101610875565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146108f6576040519150601f19603f3d011682016040523d82523d6000602084013e6108fb565b606091505b50915091508161090e5780518060208301fd5b5050505b600101610657565b50600354600480546040805163a9059cbb60e01b81526001600160a01b0392831693810193909352602483018590525192169163a9059cbb916044808201926020929091908290030181600087803b15801561097557600080fd5b505af1158015610989573d6000803e3d6000fd5b505050506040513d602081101561099f57600080fd5b50506005546040805163fd1f498d60e01b81526004810184905290516001600160a01b039092169163fd1f498d9160248082019260009290919082900301818387803b1580156109ee57600080fd5b505af1158015610a02573d6000803e3d6000fd5b50506040805186815290517f6d1c76d614228b523baa4dcd9539e2c713b54ff4ab3ff2d1627e7f6cd32be4429350908190036020019150a150600192915050565b610a4b610f4c565b600480546001600160a01b0319166001600160a01b0392909216919091179055565b6000610a77610f4c565b6001600160a01b038316610ad2576040805162461bcd60e51b815260206004820152601760248201527f43616e74206164642061207a65726f2061646472657373000000000000000000604482015290519081900360640190fd5b81610b1d576040805162461bcd60e51b815260206004820152601660248201527510d85b9d081859190818481e995c9bc8185b5bdd5b9d60521b604482015290519081900360640190fd5b610b25610ff4565b506040805180820182526001600160a01b03858116808352602080840187815260068054600181018255600082905286517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f600290920291820180546001600160a01b031916919097161790955590517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40909401939093559154845160001991909101815291820152808301859052915190917f08fff3cb767a84a8039ea0f84053799c5cdca0e8efb031eeb6b05b9c174aa208916060918190039190910190a15060019392505050565b6001546001600160a01b03163314610c595760405162461bcd60e51b815260040180806020018281038252603581526020018061106c6035913960400191505060405180910390fd5b600054600154604080516001600160a01b03938416815292909116602083015280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b610cd4610f4c565b600280546001600160a01b0319166001600160a01b0392909216919091179055565b610cfe610f4c565b60065460001901811115610d4f576040805162461bcd60e51b8152602060048201526013602482015272696e646578206f7574206f6620626f756e647360681b604482015290519081900360640190fd5b805b60065460001901811015610dc95760068160010181548110610d6f57fe5b906000526020600020906002020160068281548110610d8a57fe5b60009182526020909120825460029092020180546001600160a01b0319166001600160a01b039092169190911781556001918201549082015501610d51565b506006805490610ddd90600019830161100b565b5050565b6000546001600160a01b031681565b610df8610f4c565b600380546001600160a01b0319166001600160a01b0392909216919091179055565b6004546001600160a01b031681565b6003546001600160a01b031681565b6002546001600160a01b031681565b6005546001600160a01b031681565b610e5e610f4c565b600580546001600160a01b0319166001600160a01b0392909216919091179055565b6000610e8a610f4c565b60065460001901841115610edb576040805162461bcd60e51b8152602060048201526013602482015272696e646578206f7574206f6620626f756e647360681b604482015290519081900360640190fd5b8260068581548110610ee957fe5b906000526020600020906002020160000160006101000a8154816001600160a01b0302191690836001600160a01b031602179055508160068581548110610f2c57fe5b906000526020600020906002020160010181905550600190509392505050565b6000546001600160a01b03163314610f955760405162461bcd60e51b815260040180806020018281038252602f8152602001806110e7602f913960400191505060405180910390fd5b565b600082821115610fee576040805162461bcd60e51b815260206004820152601e60248201527f536166654d6174683a207375627472616374696f6e206f766572666c6f770000604482015290519081900360640190fd5b50900390565b604080518082019091526000808252602082015290565b81548183558181111561103757600202816002028360005260206000209182019101611037919061103c565b505050565b61033991905b808211156110675780546001600160a01b031916815560006001820155600201611042565b509056fe596f75206d757374206265206e6f6d696e61746564206265666f726520796f752063616e20616363657074206f776e65727368697052657761726473446973747269627574696f6e20636f6e747261637420646f6573206e6f74206861766520656e6f75676820746f6b656e7320746f20646973747269627574654f6e6c792074686520636f6e7472616374206f776e6572206d617920706572666f726d207468697320616374696f6ea265627a7a72315820b2185e5d0818c5f13b08ecd03e107749f8fe6a7e3fe2f86098180500dcbc252d64736f6c63430005100032", "abi": [ { "inputs": [ @@ -17422,10 +17422,10 @@ } ], "source": { - "keccak256": "0xc79e92b862775aca623f79001f3de3f19b910d892ac16293fda30c0b5f0e6dbb", + "keccak256": "0x71b5addb5aaa4ce3ff21f68a5795b3ad75d5aa4f549fca5f0ed999a89580af0b", "urls": [ - "bzz-raw://ddce5fa54eb86003886794a7dd0c5e69aa128c52f7e56167e67cfd87a8dbe776", - "dweb:/ipfs/QmNoz2SA9RzUMjQmqzxSFJ3u4dEzbBUB7GSbnmDu8CpWKs" + "bzz-raw://370ffa5626cd06f412882a188502ced2d2282329ef593f4cbea94b1fe3ec4890", + "dweb:/ipfs/QmRrqZKkjFGsvPrXgbyELhk3EtfTkJDveSzSRBuCqtADUx" ] }, "metadata": { @@ -17447,10 +17447,10 @@ }, "sources": { "RewardsDistribution.sol": { - "keccak256": "0xc79e92b862775aca623f79001f3de3f19b910d892ac16293fda30c0b5f0e6dbb", + "keccak256": "0x71b5addb5aaa4ce3ff21f68a5795b3ad75d5aa4f549fca5f0ed999a89580af0b", "urls": [ - "bzz-raw://ddce5fa54eb86003886794a7dd0c5e69aa128c52f7e56167e67cfd87a8dbe776", - "dweb:/ipfs/QmNoz2SA9RzUMjQmqzxSFJ3u4dEzbBUB7GSbnmDu8CpWKs" + "bzz-raw://370ffa5626cd06f412882a188502ced2d2282329ef593f4cbea94b1fe3ec4890", + "dweb:/ipfs/QmRrqZKkjFGsvPrXgbyELhk3EtfTkJDveSzSRBuCqtADUx" ] } }, diff --git a/publish/deployed/goerli/versions.json b/publish/deployed/goerli/versions.json index 6ed8cabc06..35941a206c 100644 --- a/publish/deployed/goerli/versions.json +++ b/publish/deployed/goerli/versions.json @@ -145,8 +145,9 @@ }, "RewardsDistribution": { "address": "0x882eaF70e172b8543145811c5fE169d03740ba9a", - "status": "current", - "keccak256": "0xc79e92b862775aca623f79001f3de3f19b910d892ac16293fda30c0b5f0e6dbb" + "status": "replaced", + "keccak256": "0xc79e92b862775aca623f79001f3de3f19b910d892ac16293fda30c0b5f0e6dbb", + "replaced_in": "v2.96.0-alpha" }, "TokenStateSynthetix": { "address": "0xe842C91A5D2BCE122d89497f171d81067255Ad0d", @@ -724,5 +725,20 @@ "keccak256": "0x0e1391394e3eead86ca2ee2e3ddb46150935bc9c1251cb49f1d9509b825b390f" } } + }, + "v2.96.0-alpha": { + "tag": "v2.96.0-alpha", + "fulltag": "v2.96.0-alpha", + "release": "Phecda", + "network": "goerli", + "date": "2023-10-20T14:10:59-03:00", + "commit": "ef579ea6eb464c2dd9c02300332b8fb10e445ebd", + "contracts": { + "RewardsDistribution": { + "address": "0x31E1080E7eb408ff005A9108f515CfcFEa6B7584", + "status": "current", + "keccak256": "0x71b5addb5aaa4ce3ff21f68a5795b3ad75d5aa4f549fca5f0ed999a89580af0b" + } + } } } diff --git a/publish/deployed/mainnet/deployment.json b/publish/deployed/mainnet/deployment.json index 2d8ae12a24..e2e244302c 100644 --- a/publish/deployed/mainnet/deployment.json +++ b/publish/deployed/mainnet/deployment.json @@ -165,7 +165,7 @@ "0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F", "0x5b1b5fEa1b99D83aD479dF0C222F0492385381dD", "0xEb3107117FEAd7de89Cd14D463D340A2E6917769", - "316338561088773603337882496", + "325914989088773603337882496", "0x4E3b31eB0E5CB73641EE1E65E7dCEFe520bA3ef2" ] }, @@ -491,8 +491,8 @@ "network": "mainnet", "constructorArgs": [ "0xEb3107117FEAd7de89Cd14D463D340A2E6917769", - "1680134400", - "212" + "1697673600", + "241" ] }, "DelegateApprovals": { @@ -532,11 +532,11 @@ }, "RewardsDistribution": { "name": "RewardsDistribution", - "address": "0x29C295B046a73Cde593f21f63091B072d407e3F2", + "address": "0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b", "source": "RewardsDistribution", - "link": "https://etherscan.io/address/0x29C295B046a73Cde593f21f63091B072d407e3F2", - "timestamp": "2020-02-20T09:04:10.195Z", - "txn": "", + "link": "https://etherscan.io/address/0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b", + "timestamp": "2023-10-23T14:21:59.000Z", + "txn": "https://etherscan.io/tx/0xa58a87848bea70940d4ec501ea9548785d4a4b8e930a267e04b8162754bab925", "network": "mainnet", "constructorArgs": [ "0xEb3107117FEAd7de89Cd14D463D340A2E6917769", @@ -17483,404 +17483,454 @@ } }, "RewardsDistribution": { - "bytecode": "608060405234801561001057600080fd5b5060405160a0806115f9833981016040908152815160208301519183015160608401516080909401519193909184600160a060020a03811615156100b557604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f4f776e657220616464726573732063616e6e6f74206265203000000000000000604482015290519081900360640190fd5b60008054600160a060020a031916600160a060020a038316908117825560408051928352602083019190915280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a15060028054600160a060020a03958616600160a060020a03199182161790915560038054948616948216949094179093556004805492851692841692909217909155600580549190931691161790555061148d8061016c6000396000f3006080604052600436106100fb5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663060ca25081146101005780631627540c146101275780634487d3df1461014a57806353a47bb71461018557806359974e38146101b65780635de39934146101e257806360eb3ff21461020357806379ba5097146102275780637a9e5e4b1461023c578063817a69511461025d5780638da5cb5b1461027557806395896b761461028a578063a430be6c146102ab578063bdd12482146102c0578063bf7e214f146102d5578063c9e9cc4d146102ea578063d8297e44146102ff578063e54c167114610320575b600080fd5b34801561010c57600080fd5b50610115610347565b60408051918252519081900360200190f35b34801561013357600080fd5b50610148600160a060020a036004351661034e565b005b34801561015657600080fd5b50610162600435610406565b60408051600160a060020a03909316835260208301919091528051918290030190f35b34801561019157600080fd5b5061019a61043c565b60408051600160a060020a039092168252519081900360200190f35b3480156101c257600080fd5b506101ce60043561044b565b604080519115158252519081900360200190f35b3480156101ee57600080fd5b50610148600160a060020a0360043516610ba1565b34801561020f57600080fd5b506101ce600160a060020a0360043516602435610c27565b34801561023357600080fd5b50610148610e37565b34801561024857600080fd5b50610148600160a060020a0360043516610f32565b34801561026957600080fd5b50610148600435610fb8565b34801561028157600080fd5b5061019a611111565b34801561029657600080fd5b50610148600160a060020a0360043516611120565b3480156102b757600080fd5b5061019a6111a6565b3480156102cc57600080fd5b5061019a6111b5565b3480156102e157600080fd5b5061019a6111c4565b3480156102f657600080fd5b5061019a6111d3565b34801561030b57600080fd5b50610148600160a060020a03600435166111e2565b34801561032c57600080fd5b506101ce600435600160a060020a0360243516604435611268565b6006545b90565b600054600160a060020a031633146103b2576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b60018054600160a060020a038316600160a060020a0319909116811790915560408051918252517f906a1c6bd7e3091ea86693dd029a831c19049ce77f1dce2ce0bab1cacbabce229181900360200190a150565b600680548290811061041457fe5b600091825260209091206002909102018054600190910154600160a060020a03909116915082565b600154600160a060020a031681565b60025460009081908190606090600160a060020a031633146104b7576040805160e560020a62461bcd02815260206004820152601860248201527f43616c6c6572206973206e6f7420617574686f72697365640000000000000000604482015290519081900360640190fd5b600454600160a060020a03161515610519576040805160e560020a62461bcd02815260206004820152601760248201527f526577617264457363726f77206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b600354600160a060020a0316151561057b576040805160e560020a62461bcd02815260206004820152601960248201527f53796e74686574697850726f7879206973206e6f742073657400000000000000604482015290519081900360640190fd5b600554600160a060020a031615156105dd576040805160e560020a62461bcd02815260206004820152601760248201527f466565506f6f6c50726f7879206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b60008511610635576040805160e560020a62461bcd02815260206004820152601560248201527f4e6f7468696e6720746f20646973747269627574650000000000000000000000604482015290519081900360640190fd5b600354604080517f70a0823100000000000000000000000000000000000000000000000000000000815230600482015290518792600160a060020a0316916370a082319160248083019260209291908290030181600087803b15801561069a57600080fd5b505af11580156106ae573d6000803e3d6000fd5b505050506040513d60208110156106c457600080fd5b50511015610768576040805160e560020a62461bcd02815260206004820152604660248201527f52657761726473446973747269627574696f6e20636f6e747261637420646f6560448201527f73206e6f74206861766520656e6f75676820746f6b656e7320746f206469737460648201527f7269627574650000000000000000000000000000000000000000000000000000608482015290519081900360a40190fd5b849250600091505b600654821015610a455760068054600091908490811061078c57fe5b6000918252602090912060029091020154600160a060020a03161415806107d3575060068054839081106107bc57fe5b906000526020600020906002020160010154600014155b15610a3a5761080b6006838154811015156107ea57fe5b906000526020600020906002020160010154846113a090919063ffffffff16565b60035460068054929550600160a060020a039091169163a9059cbb91908590811061083257fe5b600091825260209091206002909102015460068054600160a060020a03909216918690811061085d57fe5b9060005260206000209060020201600101546040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083600160a060020a0316600160a060020a0316815260200182815260200192505050602060405180830381600087803b1580156108da57600080fd5b505af11580156108ee573d6000803e3d6000fd5b505050506040513d602081101561090457600080fd5b5050600680548390811061091457fe5b6000918252602091829020600160029092020101546040805160248082019390935281518082039093018352604401905290810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f3c6b16ab0000000000000000000000000000000000000000000000000000000017905260068054919250908390811061099e57fe5b906000526020600020906002020160000160009054906101000a9004600160a060020a0316600160a060020a03168160405180828051906020019080838360005b838110156109f75781810151838201526020016109df565b50505050905090810190601f168015610a245780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af15050505b600190910190610770565b60035460048054604080517fa9059cbb000000000000000000000000000000000000000000000000000000008152600160a060020a0392831693810193909352602483018790525192169163a9059cbb916044808201926020929091908290030181600087803b158015610ab857600080fd5b505af1158015610acc573d6000803e3d6000fd5b505050506040513d6020811015610ae257600080fd5b5050600554604080517ffd1f498d000000000000000000000000000000000000000000000000000000008152600481018690529051600160a060020a039092169163fd1f498d9160248082019260009290919082900301818387803b158015610b4a57600080fd5b505af1158015610b5e573d6000803e3d6000fd5b50506040805188815290517f6d1c76d614228b523baa4dcd9539e2c713b54ff4ab3ff2d1627e7f6cd32be4429350908190036020019150a1506001949350505050565b600054600160a060020a03163314610c05576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b60048054600160a060020a031916600160a060020a0392909216919091179055565b6000610c316113b7565b600054600160a060020a03163314610c95576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b600160a060020a0384161515610cf5576040805160e560020a62461bcd02815260206004820152601760248201527f43616e74206164642061207a65726f2061646472657373000000000000000000604482015290519081900360640190fd5b821515610d4c576040805160e560020a62461bcd02815260206004820152601660248201527f43616e74206164642061207a65726f20616d6f756e7400000000000000000000604482015290519081900360640190fd5b50604080518082018252600160a060020a03858116808352602080840187815260068054600181018255600082905286517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f60029092029182018054600160a060020a031916919097161790955590517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40909401939093559154845160001991909101815291820152808301859052915190917f08fff3cb767a84a8039ea0f84053799c5cdca0e8efb031eeb6b05b9c174aa208916060918190039190910190a15060019392505050565b600154600160a060020a03163314610ebf576040805160e560020a62461bcd02815260206004820152603560248201527f596f75206d757374206265206e6f6d696e61746564206265666f726520796f7560448201527f2063616e20616363657074206f776e6572736869700000000000000000000000606482015290519081900360840190fd5b60005460015460408051600160a060020a03938416815292909116602083015280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a16001805460008054600160a060020a0319908116600160a060020a03841617909155169055565b600054600160a060020a03163314610f96576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b60028054600160a060020a031916600160a060020a0392909216919091179055565b60008054600160a060020a0316331461101d576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b6006546000190182111561107b576040805160e560020a62461bcd02815260206004820152601360248201527f696e646578206f7574206f6620626f756e647300000000000000000000000000604482015290519081900360640190fd5b50805b600654600019018110156110f957600680546001830190811061109d57fe5b90600052602060002090600202016006828154811015156110ba57fe5b6000918252602090912082546002909202018054600160a060020a031916600160a060020a03909216919091178155600191820154908201550161107e565b600680549061110c9060001983016113ce565b505050565b600054600160a060020a031681565b600054600160a060020a03163314611184576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b60038054600160a060020a031916600160a060020a0392909216919091179055565b600454600160a060020a031681565b600354600160a060020a031681565b600254600160a060020a031681565b600554600160a060020a031681565b600054600160a060020a03163314611246576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b60058054600160a060020a031916600160a060020a0392909216919091179055565b60008054600160a060020a031633146112cd576040805160e560020a62461bcd02815260206004820152602f60248201526000805160206114228339815191526044820152600080516020611442833981519152606482015290519081900360840190fd5b6006546000190184111561132b576040805160e560020a62461bcd02815260206004820152601360248201527f696e646578206f7574206f6620626f756e647300000000000000000000000000604482015290519081900360640190fd5b8260068581548110151561133b57fe5b906000526020600020906002020160000160006101000a815481600160a060020a030219169083600160a060020a031602179055508160068581548110151561138057fe5b906000526020600020906002020160010181905550600190509392505050565b600080838311156113b057600080fd5b5050900390565b604080518082019091526000808252602082015290565b81548183558181111561110c5760008381526020902061110c9161034b9160029182028101918502015b8082111561141d578054600160a060020a0319168155600060018201556002016113f8565b509056004f6e6c792074686520636f6e7472616374206f776e6572206d617920706572666f726d207468697320616374696f6e0000000000000000000000000000000000a165627a7a72305820dfcb1d66956584912ee1e204831a82856f207ae2355d1761b0d9cc0efd6cee370029", + "bytecode": "608060405234801561001057600080fd5b506040516112af3803806112af833981810160405260a081101561003357600080fd5b50805160208201516040830151606084015160809094015192939192909190846001600160a01b0381166100ae576040805162461bcd60e51b815260206004820152601960248201527f4f776e657220616464726573732063616e6e6f74206265203000000000000000604482015290519081900360640190fd5b600080546001600160a01b0319166001600160a01b038316908117825560408051928352602083019190915280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a150600280546001600160a01b039586166001600160a01b03199182161790915560038054948616948216949094179093556004805492851692841692909217909155600580549190931691161790555061114a806101656000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063817a6951116100a2578063bdd1248211610071578063bdd12482146102c5578063bf7e214f146102cd578063c9e9cc4d146102d5578063d8297e44146102dd578063e54c16711461030357610116565b8063817a6951146102725780638da5cb5b1461028f57806395896b7614610297578063a430be6c146102bd57610116565b806359974e38116100e957806359974e38146101c15780635de39934146101f257806360eb3ff21461021857806379ba5097146102445780637a9e5e4b1461024c57610116565b8063060ca2501461011b5780631627540c146101355780634487d3df1461015d57806353a47bb71461019d575b600080fd5b610123610335565b60408051918252519081900360200190f35b61015b6004803603602081101561014b57600080fd5b50356001600160a01b031661033c565b005b61017a6004803603602081101561017357600080fd5b5035610398565b604080516001600160a01b03909316835260208301919091528051918290030190f35b6101a56103cd565b604080516001600160a01b039092168252519081900360200190f35b6101de600480360360208110156101d757600080fd5b50356103dc565b604080519115158252519081900360200190f35b61015b6004803603602081101561020857600080fd5b50356001600160a01b0316610a43565b6101de6004803603604081101561022e57600080fd5b506001600160a01b038135169060200135610a6d565b61015b610c10565b61015b6004803603602081101561026257600080fd5b50356001600160a01b0316610ccc565b61015b6004803603602081101561028857600080fd5b5035610cf6565b6101a5610de1565b61015b600480360360208110156102ad57600080fd5b50356001600160a01b0316610df0565b6101a5610e1a565b6101a5610e29565b6101a5610e38565b6101a5610e47565b61015b600480360360208110156102f357600080fd5b50356001600160a01b0316610e56565b6101de6004803603606081101561031957600080fd5b508035906001600160a01b036020820135169060400135610e80565b6006545b90565b610344610f4c565b600180546001600160a01b0383166001600160a01b0319909116811790915560408051918252517f906a1c6bd7e3091ea86693dd029a831c19049ce77f1dce2ce0bab1cacbabce229181900360200190a150565b600681815481106103a557fe5b6000918252602090912060029091020180546001909101546001600160a01b03909116915082565b6001546001600160a01b031681565b600080821161042a576040805162461bcd60e51b81526020600482015260156024820152744e6f7468696e6720746f206469737472696275746560581b604482015290519081900360640190fd5b6002546001600160a01b03163314610489576040805162461bcd60e51b815260206004820152601860248201527f43616c6c6572206973206e6f7420617574686f72697365640000000000000000604482015290519081900360640190fd5b6004546001600160a01b03166104e6576040805162461bcd60e51b815260206004820152601760248201527f526577617264457363726f77206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b6003546001600160a01b0316610543576040805162461bcd60e51b815260206004820152601960248201527f53796e74686574697850726f7879206973206e6f742073657400000000000000604482015290519081900360640190fd5b6005546001600160a01b03166105a0576040805162461bcd60e51b815260206004820152601760248201527f466565506f6f6c50726f7879206973206e6f7420736574000000000000000000604482015290519081900360640190fd5b600354604080516370a0823160e01b8152306004820152905184926001600160a01b0316916370a08231916024808301926020929190829003018186803b1580156105ea57600080fd5b505afa1580156105fe573d6000803e3d6000fd5b505050506040513d602081101561061457600080fd5b505110156106535760405162461bcd60e51b81526004018080602001828103825260468152602001806110a16046913960600191505060405180910390fd5b8160005b60065481101561091a5760006001600160a01b03166006828154811061067957fe5b60009182526020909120600290910201546001600160a01b0316148015906106c05750600681815481106106a957fe5b906000526020600020906002020160010154600014155b15610912576106f6600682815481106106d557fe5b90600052602060002090600202016001015483610f9790919063ffffffff16565b600354600680549294506001600160a01b039091169163a9059cbb91908490811061071d57fe5b6000918252602090912060029091020154600680546001600160a01b03909216918590811061074857fe5b9060005260206000209060020201600101546040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b1580156107a957600080fd5b505af11580156107bd573d6000803e3d6000fd5b505050506040513d60208110156107d357600080fd5b50506006805460609190839081106107e757fe5b60009182526020808320600160029093020191909101546040805160248082019390935281518082039093018352604401905290810180516001600160e01b0316633c6b16ab60e01b179052600680549193506060918590811061084757fe5b60009182526020918290206002909102015460405185516001600160a01b0390921692869282918401908083835b602083106108945780518252601f199092019160209182019101610875565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146108f6576040519150601f19603f3d011682016040523d82523d6000602084013e6108fb565b606091505b50915091508161090e5780518060208301fd5b5050505b600101610657565b50600354600480546040805163a9059cbb60e01b81526001600160a01b0392831693810193909352602483018590525192169163a9059cbb916044808201926020929091908290030181600087803b15801561097557600080fd5b505af1158015610989573d6000803e3d6000fd5b505050506040513d602081101561099f57600080fd5b50506005546040805163fd1f498d60e01b81526004810184905290516001600160a01b039092169163fd1f498d9160248082019260009290919082900301818387803b1580156109ee57600080fd5b505af1158015610a02573d6000803e3d6000fd5b50506040805186815290517f6d1c76d614228b523baa4dcd9539e2c713b54ff4ab3ff2d1627e7f6cd32be4429350908190036020019150a150600192915050565b610a4b610f4c565b600480546001600160a01b0319166001600160a01b0392909216919091179055565b6000610a77610f4c565b6001600160a01b038316610ad2576040805162461bcd60e51b815260206004820152601760248201527f43616e74206164642061207a65726f2061646472657373000000000000000000604482015290519081900360640190fd5b81610b1d576040805162461bcd60e51b815260206004820152601660248201527510d85b9d081859190818481e995c9bc8185b5bdd5b9d60521b604482015290519081900360640190fd5b610b25610ff4565b506040805180820182526001600160a01b03858116808352602080840187815260068054600181018255600082905286517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f600290920291820180546001600160a01b031916919097161790955590517ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40909401939093559154845160001991909101815291820152808301859052915190917f08fff3cb767a84a8039ea0f84053799c5cdca0e8efb031eeb6b05b9c174aa208916060918190039190910190a15060019392505050565b6001546001600160a01b03163314610c595760405162461bcd60e51b815260040180806020018281038252603581526020018061106c6035913960400191505060405180910390fd5b600054600154604080516001600160a01b03938416815292909116602083015280517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9281900390910190a160018054600080546001600160a01b03199081166001600160a01b03841617909155169055565b610cd4610f4c565b600280546001600160a01b0319166001600160a01b0392909216919091179055565b610cfe610f4c565b60065460001901811115610d4f576040805162461bcd60e51b8152602060048201526013602482015272696e646578206f7574206f6620626f756e647360681b604482015290519081900360640190fd5b805b60065460001901811015610dc95760068160010181548110610d6f57fe5b906000526020600020906002020160068281548110610d8a57fe5b60009182526020909120825460029092020180546001600160a01b0319166001600160a01b039092169190911781556001918201549082015501610d51565b506006805490610ddd90600019830161100b565b5050565b6000546001600160a01b031681565b610df8610f4c565b600380546001600160a01b0319166001600160a01b0392909216919091179055565b6004546001600160a01b031681565b6003546001600160a01b031681565b6002546001600160a01b031681565b6005546001600160a01b031681565b610e5e610f4c565b600580546001600160a01b0319166001600160a01b0392909216919091179055565b6000610e8a610f4c565b60065460001901841115610edb576040805162461bcd60e51b8152602060048201526013602482015272696e646578206f7574206f6620626f756e647360681b604482015290519081900360640190fd5b8260068581548110610ee957fe5b906000526020600020906002020160000160006101000a8154816001600160a01b0302191690836001600160a01b031602179055508160068581548110610f2c57fe5b906000526020600020906002020160010181905550600190509392505050565b6000546001600160a01b03163314610f955760405162461bcd60e51b815260040180806020018281038252602f8152602001806110e7602f913960400191505060405180910390fd5b565b600082821115610fee576040805162461bcd60e51b815260206004820152601e60248201527f536166654d6174683a207375627472616374696f6e206f766572666c6f770000604482015290519081900360640190fd5b50900390565b604080518082019091526000808252602082015290565b81548183558181111561103757600202816002028360005260206000209182019101611037919061103c565b505050565b61033991905b808211156110675780546001600160a01b031916815560006001820155600201611042565b509056fe596f75206d757374206265206e6f6d696e61746564206265666f726520796f752063616e20616363657074206f776e65727368697052657761726473446973747269627574696f6e20636f6e747261637420646f6573206e6f74206861766520656e6f75676820746f6b656e7320746f20646973747269627574654f6e6c792074686520636f6e7472616374206f776e6572206d617920706572666f726d207468697320616374696f6ea265627a7a72315820b2185e5d0818c5f13b08ecd03e107749f8fe6a7e3fe2f86098180500dcbc252d64736f6c63430005100032", "abi": [ { - "constant": true, - "inputs": [], - "name": "distributionsLength", - "outputs": [ + "inputs": [ { - "name": "", - "type": "uint256" + "internalType": "address", + "name": "_owner", + "type": "address" + }, + { + "internalType": "address", + "name": "_authority", + "type": "address" + }, + { + "internalType": "address", + "name": "_synthetixProxy", + "type": "address" + }, + { + "internalType": "address", + "name": "_rewardEscrow", + "type": "address" + }, + { + "internalType": "address", + "name": "_feePoolProxy", + "type": "address" } ], "payable": false, - "stateMutability": "view", - "type": "function", - "signature": "0x060ca250" + "stateMutability": "nonpayable", + "type": "constructor" }, { - "constant": false, + "anonymous": false, "inputs": [ { - "name": "_owner", + "indexed": false, + "internalType": "address", + "name": "oldOwner", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "newOwner", "type": "address" } ], - "name": "nominateNewOwner", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function", - "signature": "0x1627540c" + "name": "OwnerChanged", + "type": "event" }, { - "constant": true, + "anonymous": false, "inputs": [ { - "name": "", - "type": "uint256" + "indexed": false, + "internalType": "address", + "name": "newOwner", + "type": "address" } ], - "name": "distributions", - "outputs": [ + "name": "OwnerNominated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ { + "indexed": false, + "internalType": "uint256", + "name": "index", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", "name": "destination", "type": "address" }, { + "indexed": false, + "internalType": "uint256", "name": "amount", "type": "uint256" } ], - "payable": false, - "stateMutability": "view", - "type": "function", - "signature": "0x4487d3df" + "name": "RewardDistributionAdded", + "type": "event" }, { - "constant": true, - "inputs": [], - "name": "nominatedOwner", - "outputs": [ + "anonymous": false, + "inputs": [ { - "name": "", - "type": "address" + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" } ], + "name": "RewardsDistributed", + "type": "event" + }, + { + "constant": false, + "inputs": [], + "name": "acceptOwnership", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function", - "signature": "0x53a47bb7" + "stateMutability": "nonpayable", + "type": "function" }, { "constant": false, "inputs": [ { + "internalType": "address", + "name": "destination", + "type": "address" + }, + { + "internalType": "uint256", "name": "amount", "type": "uint256" } ], - "name": "distributeRewards", + "name": "addRewardDistribution", "outputs": [ { + "internalType": "bool", "name": "", "type": "bool" } ], "payable": false, "stateMutability": "nonpayable", - "type": "function", - "signature": "0x59974e38" + "type": "function" }, { - "constant": false, - "inputs": [ + "constant": true, + "inputs": [], + "name": "authority", + "outputs": [ { - "name": "_rewardEscrow", + "internalType": "address", + "name": "", "type": "address" } ], - "name": "setRewardEscrow", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", - "type": "function", - "signature": "0x5de39934" + "stateMutability": "view", + "type": "function" }, { "constant": false, "inputs": [ { - "name": "destination", - "type": "address" - }, - { + "internalType": "uint256", "name": "amount", "type": "uint256" } ], - "name": "addRewardDistribution", + "name": "distributeRewards", "outputs": [ { + "internalType": "bool", "name": "", "type": "bool" } ], "payable": false, "stateMutability": "nonpayable", - "type": "function", - "signature": "0x60eb3ff2" - }, - { - "constant": false, - "inputs": [], - "name": "acceptOwnership", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function", - "signature": "0x79ba5097" + "type": "function" }, { - "constant": false, + "constant": true, "inputs": [ { - "name": "_authority", - "type": "address" + "internalType": "uint256", + "name": "", + "type": "uint256" } ], - "name": "setAuthority", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function", - "signature": "0x7a9e5e4b" - }, - { - "constant": false, - "inputs": [ + "name": "distributions", + "outputs": [ { - "name": "index", + "internalType": "address", + "name": "destination", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", "type": "uint256" } ], - "name": "removeRewardDistribution", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", - "type": "function", - "signature": "0x817a6951" + "stateMutability": "view", + "type": "function" }, { "constant": true, "inputs": [], - "name": "owner", + "name": "distributionsLength", "outputs": [ { + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function", - "signature": "0x8da5cb5b" + "type": "function" }, { "constant": false, "inputs": [ { - "name": "_synthetixProxy", + "internalType": "uint256", + "name": "index", + "type": "uint256" + }, + { + "internalType": "address", + "name": "destination", "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "editRewardDistribution", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" } ], - "name": "setSynthetixProxy", - "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function", - "signature": "0x95896b76" + "type": "function" }, { "constant": true, "inputs": [], - "name": "rewardEscrow", + "name": "feePoolProxy", "outputs": [ { + "internalType": "address", "name": "", "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function", - "signature": "0xa430be6c" + "type": "function" }, { - "constant": true, - "inputs": [], - "name": "synthetixProxy", - "outputs": [ + "constant": false, + "inputs": [ { - "name": "", + "internalType": "address", + "name": "_owner", "type": "address" } ], + "name": "nominateNewOwner", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function", - "signature": "0xbdd12482" + "stateMutability": "nonpayable", + "type": "function" }, { "constant": true, "inputs": [], - "name": "authority", + "name": "nominatedOwner", "outputs": [ { + "internalType": "address", "name": "", "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function", - "signature": "0xbf7e214f" + "type": "function" }, { "constant": true, "inputs": [], - "name": "feePoolProxy", + "name": "owner", "outputs": [ { + "internalType": "address", "name": "", "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function", - "signature": "0xc9e9cc4d" + "type": "function" }, { "constant": false, "inputs": [ { - "name": "_feePoolProxy", - "type": "address" + "internalType": "uint256", + "name": "index", + "type": "uint256" } ], - "name": "setFeePoolProxy", + "name": "removeRewardDistribution", "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function", - "signature": "0xd8297e44" + "type": "function" }, { - "constant": false, - "inputs": [ - { - "name": "index", - "type": "uint256" - }, - { - "name": "destination", - "type": "address" - }, - { - "name": "amount", - "type": "uint256" - } - ], - "name": "editRewardDistribution", + "constant": true, + "inputs": [], + "name": "rewardEscrow", "outputs": [ { + "internalType": "address", "name": "", - "type": "bool" + "type": "address" } ], "payable": false, - "stateMutability": "nonpayable", - "type": "function", - "signature": "0xe54c1671" + "stateMutability": "view", + "type": "function" }, { + "constant": false, "inputs": [ { - "name": "_owner", - "type": "address" - }, - { + "internalType": "address", "name": "_authority", "type": "address" - }, - { - "name": "_synthetixProxy", - "type": "address" - }, - { - "name": "_rewardEscrow", - "type": "address" - }, - { - "name": "_feePoolProxy", - "type": "address" } ], + "name": "setAuthority", + "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "function" }, { - "anonymous": false, + "constant": false, "inputs": [ { - "indexed": false, - "name": "index", - "type": "uint256" - }, - { - "indexed": false, - "name": "destination", + "internalType": "address", + "name": "_feePoolProxy", "type": "address" - }, - { - "indexed": false, - "name": "amount", - "type": "uint256" } ], - "name": "RewardDistributionAdded", - "type": "event", - "signature": "0x08fff3cb767a84a8039ea0f84053799c5cdca0e8efb031eeb6b05b9c174aa208" + "name": "setFeePoolProxy", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" }, { - "anonymous": false, + "constant": false, "inputs": [ { - "indexed": false, - "name": "amount", - "type": "uint256" + "internalType": "address", + "name": "_rewardEscrow", + "type": "address" } ], - "name": "RewardsDistributed", - "type": "event", - "signature": "0x6d1c76d614228b523baa4dcd9539e2c713b54ff4ab3ff2d1627e7f6cd32be442" + "name": "setRewardEscrow", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" }, { - "anonymous": false, + "constant": false, "inputs": [ { - "indexed": false, - "name": "newOwner", + "internalType": "address", + "name": "_synthetixProxy", "type": "address" } ], - "name": "OwnerNominated", - "type": "event", - "signature": "0x906a1c6bd7e3091ea86693dd029a831c19049ce77f1dce2ce0bab1cacbabce22" + "name": "setSynthetixProxy", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" }, { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "oldOwner", - "type": "address" - }, + "constant": true, + "inputs": [], + "name": "synthetixProxy", + "outputs": [ { - "indexed": false, - "name": "newOwner", + "internalType": "address", + "name": "", "type": "address" } ], - "name": "OwnerChanged", - "type": "event", - "signature": "0xb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c" + "payable": false, + "stateMutability": "view", + "type": "function" } - ] + ], + "source": { + "keccak256": "0x71b5addb5aaa4ce3ff21f68a5795b3ad75d5aa4f549fca5f0ed999a89580af0b", + "urls": [ + "bzz-raw://370ffa5626cd06f412882a188502ced2d2282329ef593f4cbea94b1fe3ec4890", + "dweb:/ipfs/QmRrqZKkjFGsvPrXgbyELhk3EtfTkJDveSzSRBuCqtADUx" + ] + }, + "metadata": { + "compiler": { + "version": "0.5.16+commit.9c3226ce" + }, + "language": "Solidity", + "settings": { + "compilationTarget": { + "RewardsDistribution.sol": "RewardsDistribution" + }, + "evmVersion": "istanbul", + "libraries": {}, + "optimizer": { + "enabled": true, + "runs": 200 + }, + "remappings": [] + }, + "sources": { + "RewardsDistribution.sol": { + "keccak256": "0x71b5addb5aaa4ce3ff21f68a5795b3ad75d5aa4f549fca5f0ed999a89580af0b", + "urls": [ + "bzz-raw://370ffa5626cd06f412882a188502ced2d2282329ef593f4cbea94b1fe3ec4890", + "dweb:/ipfs/QmRrqZKkjFGsvPrXgbyELhk3EtfTkJDveSzSRBuCqtADUx" + ] + } + }, + "version": 1 + } }, "Math": { "bytecode": "604c602c600b82828239805160001a60731460008114601c57601e565bfe5b5030600052607381538281f30073000000000000000000000000000000000000000030146080604052600080fd00a165627a7a723058202cc46ac22383a5b3f8f2b208cff313c4febc44dab79fcbaa1d7596fd115ac5150029", diff --git a/publish/deployed/mainnet/versions.json b/publish/deployed/mainnet/versions.json index effbf50de3..c0d0f5abbd 100644 --- a/publish/deployed/mainnet/versions.json +++ b/publish/deployed/mainnet/versions.json @@ -4748,5 +4748,20 @@ "keccak256": "0x0e1391394e3eead86ca2ee2e3ddb46150935bc9c1251cb49f1d9509b825b390f" } } + }, + "v2.96.1": { + "tag": "v2.96.1", + "fulltag": "v2.96.1", + "release": "Phecda", + "network": "mainnet", + "date": "2023-10-23T14:33:10-03:00", + "commit": "85d61a215cb6ef04fa04c9e5a0240fb6a6e4d011", + "contracts": { + "RewardsDistribution": { + "address": "0x94433f0DA8B5bfb473Ea8cd7ad10D9c8aef4aB7b", + "status": "current", + "keccak256": "0x71b5addb5aaa4ce3ff21f68a5795b3ad75d5aa4f549fca5f0ed999a89580af0b" + } + } } } diff --git a/publish/releases.json b/publish/releases.json index f3016ac9d8..765399840b 100644 --- a/publish/releases.json +++ b/publish/releases.json @@ -985,6 +985,12 @@ "layer": "ovm", "sources": [], "released": "ovm" + }, + { + "sip": 2036, + "layer": "base", + "sources": ["RewardsDistribution"], + "released": "base" } ], "releases": [ @@ -1861,6 +1867,15 @@ }, "sips": [2029, 2031, 2032, 2033], "released": true + }, + { + "name": "Phecda", + "version": { + "major": 2, + "minor": 96 + }, + "sips": [2036], + "released": true } ] }