@gooddollar/goodprotocol 1.0.13-beta.1 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (129) hide show
  1. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  2. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  3. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  4. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  5. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  7. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  8. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  9. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  10. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  28. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  29. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  30. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  31. package/artifacts/contracts/governance/GovarnanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  32. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  33. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  34. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  35. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  36. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  37. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  38. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  39. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  40. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  41. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  42. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  43. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  44. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  45. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  46. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  47. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  48. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  49. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  50. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  51. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  52. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  53. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  55. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  56. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  57. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  58. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  59. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  60. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  61. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  62. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  63. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  64. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +7 -2
  65. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  66. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  67. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +15 -2
  68. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  69. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  70. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  71. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +6 -6
  72. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  73. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  74. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  75. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  76. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  77. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  78. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  79. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  80. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  81. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  82. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  83. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  84. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  85. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  86. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  87. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  88. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  89. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  90. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +60 -2
  91. package/artifacts/contracts/unaudited-foundation/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  92. package/artifacts/contracts/unaudited-foundation/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  93. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  94. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  95. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  96. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  97. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  98. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  99. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  100. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  101. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  102. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  103. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +4 -0
  104. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +83 -0
  105. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +4 -0
  106. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +121 -0
  107. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  108. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +2 -2
  109. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  110. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json +2 -2
  111. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  112. package/contracts/reserve/GoodMarketMaker.sol +3 -2
  113. package/contracts/reserve/GoodReserveCDai.sol +25 -21
  114. package/contracts/staking/DonationsStaking.sol +1 -0
  115. package/contracts/ubi/UBIScheme.sol +32 -4
  116. package/contracts/utils/ProtocolUpgrade.sol +3 -2
  117. package/contracts/utils/ProtocolUpgradeFuseRecover.sol +116 -0
  118. package/contracts/utils/ProtocolUpgradeRecover.sol +198 -0
  119. package/contracts/utils/ProxyFactory1967.sol +1 -0
  120. package/package.json +1 -1
  121. package/releases/deployment.json +67 -2
  122. package/scripts/deployFullDAO.ts +2 -1
  123. package/scripts/upgradeToV2/upgradeToV2Recover.ts +947 -0
  124. package/test/helpers.ts +1 -1
  125. package/test/reserve/GoodMarketMaker.test.ts +6 -5
  126. package/test/staking/DonationsStaking.test.ts +14 -4
  127. package/test/ubi/UBIScheme.e2e.test.ts +1 -1
  128. package/test/ubi/UBIScheme.test.ts +4 -4
  129. package/test/utils/ProxyFactory.test.ts +31 -0
package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json ADDED
@@ -0,0 +1,83 @@
1
+ {
2
+ "_format": "hh-sol-artifact-1",
3
+ "contractName": "ProtocolUpgradeFuseRecover",
4
+ "sourceName": "contracts/utils/ProtocolUpgradeFuseRecover.sol",
5
+ "abi": [
6
+ {
7
+ "inputs": [
8
+ {
9
+ "internalType": "contract Controller",
10
+ "name": "_controller",
11
+ "type": "address"
12
+ },
13
+ {
14
+ "internalType": "address",
15
+ "name": "_owner",
16
+ "type": "address"
17
+ }
18
+ ],
19
+ "stateMutability": "nonpayable",
20
+ "type": "constructor"
21
+ },
22
+ {
23
+ "inputs": [
24
+ {
25
+ "internalType": "contract INameService",
26
+ "name": "ns",
27
+ "type": "address"
28
+ },
29
+ {
30
+ "internalType": "address",
31
+ "name": "firstClaimPool",
32
+ "type": "address"
33
+ },
34
+ {
35
+ "internalType": "address",
36
+ "name": "ubiScheme",
37
+ "type": "address"
38
+ },
39
+ {
40
+ "internalType": "bytes32[]",
41
+ "name": "nameHash",
42
+ "type": "bytes32[]"
43
+ },
44
+ {
45
+ "internalType": "address[]",
46
+ "name": "nameAddress",
47
+ "type": "address[]"
48
+ }
49
+ ],
50
+ "name": "upgrade",
51
+ "outputs": [],
52
+ "stateMutability": "nonpayable",
53
+ "type": "function"
54
+ },
55
+ {
56
+ "inputs": [
57
+ {
58
+ "internalType": "address",
59
+ "name": "schemeRegistrar",
60
+ "type": "address"
61
+ },
62
+ {
63
+ "internalType": "address",
64
+ "name": "upgradeScheme",
65
+ "type": "address"
66
+ },
67
+ {
68
+ "internalType": "address",
69
+ "name": "compoundVotingMachine",
70
+ "type": "address"
71
+ }
72
+ ],
73
+ "name": "upgradeGovernance",
74
+ "outputs": [],
75
+ "stateMutability": "nonpayable",
76
+ "type": "function"
77
+ }
78
+ ],
79
+ "bytecode": "0x608060405234801561001057600080fd5b50604051610e6c380380610e6c83398101604081905261002f9161010b565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561009357600080fd5b505afa1580156100a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cb9190610145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506101699050565b6001600160a01b038116811461010857600080fd5b50565b6000806040838503121561011e57600080fd5b8251610129816100f3565b602084015190925061013a816100f3565b809150509250929050565b60006020828403121561015757600080fd5b8151610162816100f3565b9392505050565b610cf4806101786000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea26469706673582212208eb40a1aef52b5188e9d9c81dfda8b8e133097830bcf88ae2be0946860258c2264736f6c63430008080033",
80
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea26469706673582212208eb40a1aef52b5188e9d9c81dfda8b8e133097830bcf88ae2be0946860258c2264736f6c63430008080033",
81
+ "linkReferences": {},
82
+ "deployedLinkReferences": {}
83
+ }
package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../build-info/efe5f1414a4ce24bbd970fd2cd01459e.json"
4
+ }
package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json ADDED
@@ -0,0 +1,121 @@
1
+ {
2
+ "_format": "hh-sol-artifact-1",
3
+ "contractName": "ProtocolUpgradeRecover",
4
+ "sourceName": "contracts/utils/ProtocolUpgradeRecover.sol",
5
+ "abi": [
6
+ {
7
+ "inputs": [
8
+ {
9
+ "internalType": "contract Controller",
10
+ "name": "_controller",
11
+ "type": "address"
12
+ },
13
+ {
14
+ "internalType": "address",
15
+ "name": "_owner",
16
+ "type": "address"
17
+ }
18
+ ],
19
+ "stateMutability": "nonpayable",
20
+ "type": "constructor"
21
+ },
22
+ {
23
+ "inputs": [
24
+ {
25
+ "internalType": "contract INameService",
26
+ "name": "ns",
27
+ "type": "address"
28
+ },
29
+ {
30
+ "internalType": "bytes32",
31
+ "name": "airdrop",
32
+ "type": "bytes32"
33
+ }
34
+ ],
35
+ "name": "setReserveGDXAirdrop",
36
+ "outputs": [],
37
+ "stateMutability": "nonpayable",
38
+ "type": "function"
39
+ },
40
+ {
41
+ "inputs": [
42
+ {
43
+ "internalType": "contract INameService",
44
+ "name": "ns",
45
+ "type": "address"
46
+ },
47
+ {
48
+ "internalType": "address[]",
49
+ "name": "contracts",
50
+ "type": "address[]"
51
+ },
52
+ {
53
+ "internalType": "uint256[]",
54
+ "name": "rewards",
55
+ "type": "uint256[]"
56
+ }
57
+ ],
58
+ "name": "setStakingRewards",
59
+ "outputs": [],
60
+ "stateMutability": "nonpayable",
61
+ "type": "function"
62
+ },
63
+ {
64
+ "inputs": [
65
+ {
66
+ "internalType": "contract INameService",
67
+ "name": "ns",
68
+ "type": "address"
69
+ },
70
+ {
71
+ "internalType": "bytes32[]",
72
+ "name": "nameHash",
73
+ "type": "bytes32[]"
74
+ },
75
+ {
76
+ "internalType": "address[]",
77
+ "name": "nameAddress",
78
+ "type": "address[]"
79
+ }
80
+ ],
81
+ "name": "upgradeBasic",
82
+ "outputs": [],
83
+ "stateMutability": "nonpayable",
84
+ "type": "function"
85
+ },
86
+ {
87
+ "inputs": [
88
+ {
89
+ "internalType": "address",
90
+ "name": "compoundVotingMachine",
91
+ "type": "address"
92
+ }
93
+ ],
94
+ "name": "upgradeGovernance",
95
+ "outputs": [],
96
+ "stateMutability": "nonpayable",
97
+ "type": "function"
98
+ },
99
+ {
100
+ "inputs": [
101
+ {
102
+ "internalType": "contract INameService",
103
+ "name": "ns",
104
+ "type": "address"
105
+ }
106
+ ],
107
+ "name": "upgradeReserve",
108
+ "outputs": [],
109
+ "stateMutability": "nonpayable",
110
+ "type": "function"
111
+ },
112
+ {
113
+ "stateMutability": "payable",
114
+ "type": "receive"
115
+ }
116
+ ],
117
+ "bytecode": "0x60806040523480156200001157600080fd5b5060405162001ae138038062001ae1833981016040819052620000349162000116565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200009957600080fd5b505afa158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d4919062000155565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200017c9050565b6001600160a01b03811681146200011357600080fd5b50565b600080604083850312156200012a57600080fd5b82516200013781620000fd565b60208401519092506200014a81620000fd565b809150509250929050565b6000602082840312156200016857600080fd5b81516200017581620000fd565b9392505050565b611955806200018c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220a21b279b283883dd54445ef1b90ca1c3c566c619ccfbff391ee6831d72a3031b64736f6c63430008080033",
118
+ "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220a21b279b283883dd54445ef1b90ca1c3c566c619ccfbff391ee6831d72a3031b64736f6c63430008080033",
119
+ "linkReferences": {},
120
+ "deployedLinkReferences": {}
121
+ }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/d0236d5dba2f03b10edd8f6884e1c171.json"
3
+ "buildInfo": "../../../build-info/ae20d354708cf0adaa862ad0d1462e3a.json"
4
4
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json CHANGED
@@ -75,8 +75,8 @@
75
75
  "type": "receive"
76
76
  }
77
77
  ],
78
- "bytecode": "0x608060405234801561001057600080fd5b50610533806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f610047366004610370565b61005e565b61005c6100576100ea565b610110565b565b61008960017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610400565b6000805160206104b7833981519152146100a5576100a5610425565b6100e58383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509250610134915050565b505050565b600061010b6000805160206104b7833981519152546001600160a01b031690565b905090565b3660008037600080366000845af43d6000803e80801561012f573d6000f35b3d6000fd5b61013d8361015f565b60008251118061014a5750805b156100e557610159838361019f565b50505050565b610168816101cb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606101c483836040518060600160405280602781526020016104d760279139610263565b9392505050565b803b6102345760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084015b60405180910390fd5b6000805160206104b783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6102c25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161022b565b600080856001600160a01b0316856040516102dd9190610467565b600060405180830381855af49150503d8060008114610318576040519150601f19603f3d011682016040523d82523d6000602084013e61031d565b606091505b509150915061032d828286610337565b9695505050505050565b606083156103465750816101c4565b8251156103565782518084602001fd5b8160405162461bcd60e51b815260040161022b9190610483565b60008060006040848603121561038557600080fd5b83356001600160a01b038116811461039c57600080fd5b925060208401356001600160401b03808211156103b857600080fd5b818601915086601f8301126103cc57600080fd5b8135818111156103db57600080fd5b8760208285010111156103ed57600080fd5b6020830194508093505050509250925092565b60008282101561042057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b8381101561045657818101518382015260200161043e565b838111156101595750506000910152565b6000825161047981846020870161043b565b9190910192915050565b60208152600082518060208401526104a281604085016020870161043b565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b419061d888d1255f5923e73eda68322edfb9462ec69404a720a004d31ef160364736f6c63430008080033",
79
- "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f610047366004610370565b61005e565b61005c6100576100ea565b610110565b565b61008960017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610400565b6000805160206104b7833981519152146100a5576100a5610425565b6100e58383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509250610134915050565b505050565b600061010b6000805160206104b7833981519152546001600160a01b031690565b905090565b3660008037600080366000845af43d6000803e80801561012f573d6000f35b3d6000fd5b61013d8361015f565b60008251118061014a5750805b156100e557610159838361019f565b50505050565b610168816101cb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606101c483836040518060600160405280602781526020016104d760279139610263565b9392505050565b803b6102345760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084015b60405180910390fd5b6000805160206104b783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6102c25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161022b565b600080856001600160a01b0316856040516102dd9190610467565b600060405180830381855af49150503d8060008114610318576040519150601f19603f3d011682016040523d82523d6000602084013e61031d565b606091505b509150915061032d828286610337565b9695505050505050565b606083156103465750816101c4565b8251156103565782518084602001fd5b8160405162461bcd60e51b815260040161022b9190610483565b60008060006040848603121561038557600080fd5b83356001600160a01b038116811461039c57600080fd5b925060208401356001600160401b03808211156103b857600080fd5b818601915086601f8301126103cc57600080fd5b8135818111156103db57600080fd5b8760208285010111156103ed57600080fd5b6020830194508093505050509250925092565b60008282101561042057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b8381101561045657818101518382015260200161043e565b838111156101595750506000910152565b6000825161047981846020870161043b565b9190910192915050565b60208152600082518060208401526104a281604085016020870161043b565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b419061d888d1255f5923e73eda68322edfb9462ec69404a720a004d31ef160364736f6c63430008080033",
78
+ "bytecode": "0x608060405234801561001057600080fd5b50610586806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103c3565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610453565b60008051602061050a833981519152146100f8576100f8610478565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061050a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161052a602791396102b6565b9392505050565b803b6102875760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061050a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6103155760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033091906104ba565b600060405180830381855af49150503d806000811461036b576040519150601f19603f3d011682016040523d82523d6000602084013e610370565b606091505b509150915061038082828661038a565b9695505050505050565b6060831561039957508161021c565b8251156103a95782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104d6565b6000806000604084860312156103d857600080fd5b83356001600160a01b03811681146103ef57600080fd5b925060208401356001600160401b038082111561040b57600080fd5b818601915086601f83011261041f57600080fd5b81358181111561042e57600080fd5b87602082850101111561044057600080fd5b6020830194508093505050509250925092565b60008282101561047357634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104a9578181015183820152602001610491565b838111156101b15750506000910152565b600082516104cc81846020870161048e565b9190910192915050565b60208152600082518060208401526104f581604085016020870161048e565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207042cfb19d1fdfc26a8082f087ef0d00316160f896cc3192dcbfda3956ae41c164736f6c63430008080033",
79
+ "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103c3565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610453565b60008051602061050a833981519152146100f8576100f8610478565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061050a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161052a602791396102b6565b9392505050565b803b6102875760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061050a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6103155760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033091906104ba565b600060405180830381855af49150503d806000811461036b576040519150601f19603f3d011682016040523d82523d6000602084013e610370565b606091505b509150915061038082828661038a565b9695505050505050565b6060831561039957508161021c565b8251156103a95782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104d6565b6000806000604084860312156103d857600080fd5b83356001600160a01b03811681146103ef57600080fd5b925060208401356001600160401b038082111561040b57600080fd5b818601915086601f83011261041f57600080fd5b81358181111561042e57600080fd5b87602082850101111561044057600080fd5b6020830194508093505050509250925092565b60008282101561047357634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104a9578181015183820152602001610491565b838111156101b15750506000910152565b600082516104cc81846020870161048e565b9190910192915050565b60208152600082518060208401526104f581604085016020870161048e565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207042cfb19d1fdfc26a8082f087ef0d00316160f896cc3192dcbfda3956ae41c164736f6c63430008080033",
80
80
  "linkReferences": {},
81
81
  "deployedLinkReferences": {}
82
82
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/d0236d5dba2f03b10edd8f6884e1c171.json"
3
+ "buildInfo": "../../../build-info/ae20d354708cf0adaa862ad0d1462e3a.json"
4
4
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json CHANGED
@@ -165,8 +165,8 @@
165
165
  "type": "function"
166
166
  }
167
167
  ],
168
- "bytecode": "0x608060405234801561001057600080fd5b5060405161002060208201610044565b601f1982820381018352601f90910116604052805160209190910120600055610051565b61055380610d1c83390190565b610cbc806100606000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106d5565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106f1565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105538061073483390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b838111156106cf576000848401525b50505050565b600082516106e78184602087016106a5565b9190910192915050565b60018060a01b0383168152604060208201526000825180604084015261071e8160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b50610533806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f610047366004610370565b61005e565b61005c6100576100ea565b610110565b565b61008960017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610400565b6000805160206104b7833981519152146100a5576100a5610425565b6100e58383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509250610134915050565b505050565b600061010b6000805160206104b7833981519152546001600160a01b031690565b905090565b3660008037600080366000845af43d6000803e80801561012f573d6000f35b3d6000fd5b61013d8361015f565b60008251118061014a5750805b156100e557610159838361019f565b50505050565b610168816101cb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606101c483836040518060600160405280602781526020016104d760279139610263565b9392505050565b803b6102345760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084015b60405180910390fd5b6000805160206104b783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6102c25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161022b565b600080856001600160a01b0316856040516102dd9190610467565b600060405180830381855af49150503d8060008114610318576040519150601f19603f3d011682016040523d82523d6000602084013e61031d565b606091505b509150915061032d828286610337565b9695505050505050565b606083156103465750816101c4565b8251156103565782518084602001fd5b8160405162461bcd60e51b815260040161022b9190610483565b60008060006040848603121561038557600080fd5b83356001600160a01b038116811461039c57600080fd5b925060208401356001600160401b03808211156103b857600080fd5b818601915086601f8301126103cc57600080fd5b8135818111156103db57600080fd5b8760208285010111156103ed57600080fd5b6020830194508093505050509250925092565b60008282101561042057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b8381101561045657818101518382015260200161043e565b838111156101595750506000910152565b6000825161047981846020870161043b565b9190910192915050565b60208152600082518060208401526104a281604085016020870161043b565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b419061d888d1255f5923e73eda68322edfb9462ec69404a720a004d31ef160364736f6c63430008080033a26469706673582212205eee3b89200a0074cdf9d14b3a40740e1bfa09965c82cbafe7cd6b8c13a46d2264736f6c63430008080033608060405234801561001057600080fd5b50610533806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f610047366004610370565b61005e565b61005c6100576100ea565b610110565b565b61008960017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610400565b6000805160206104b7833981519152146100a5576100a5610425565b6100e58383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509250610134915050565b505050565b600061010b6000805160206104b7833981519152546001600160a01b031690565b905090565b3660008037600080366000845af43d6000803e80801561012f573d6000f35b3d6000fd5b61013d8361015f565b60008251118061014a5750805b156100e557610159838361019f565b50505050565b610168816101cb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606101c483836040518060600160405280602781526020016104d760279139610263565b9392505050565b803b6102345760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084015b60405180910390fd5b6000805160206104b783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6102c25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161022b565b600080856001600160a01b0316856040516102dd9190610467565b600060405180830381855af49150503d8060008114610318576040519150601f19603f3d011682016040523d82523d6000602084013e61031d565b606091505b509150915061032d828286610337565b9695505050505050565b606083156103465750816101c4565b8251156103565782518084602001fd5b8160405162461bcd60e51b815260040161022b9190610483565b60008060006040848603121561038557600080fd5b83356001600160a01b038116811461039c57600080fd5b925060208401356001600160401b03808211156103b857600080fd5b818601915086601f8301126103cc57600080fd5b8135818111156103db57600080fd5b8760208285010111156103ed57600080fd5b6020830194508093505050509250925092565b60008282101561042057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b8381101561045657818101518382015260200161043e565b838111156101595750506000910152565b6000825161047981846020870161043b565b9190910192915050565b60208152600082518060208401526104a281604085016020870161043b565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b419061d888d1255f5923e73eda68322edfb9462ec69404a720a004d31ef160364736f6c63430008080033",
169
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106d5565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106f1565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105538061073483390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b838111156106cf576000848401525b50505050565b600082516106e78184602087016106a5565b9190910192915050565b60018060a01b0383168152604060208201526000825180604084015261071e8160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b50610533806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f610047366004610370565b61005e565b61005c6100576100ea565b610110565b565b61008960017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610400565b6000805160206104b7833981519152146100a5576100a5610425565b6100e58383838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509250610134915050565b505050565b600061010b6000805160206104b7833981519152546001600160a01b031690565b905090565b3660008037600080366000845af43d6000803e80801561012f573d6000f35b3d6000fd5b61013d8361015f565b60008251118061014a5750805b156100e557610159838361019f565b50505050565b610168816101cb565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606101c483836040518060600160405280602781526020016104d760279139610263565b9392505050565b803b6102345760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084015b60405180910390fd5b6000805160206104b783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6102c25760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161022b565b600080856001600160a01b0316856040516102dd9190610467565b600060405180830381855af49150503d8060008114610318576040519150601f19603f3d011682016040523d82523d6000602084013e61031d565b606091505b509150915061032d828286610337565b9695505050505050565b606083156103465750816101c4565b8251156103565782518084602001fd5b8160405162461bcd60e51b815260040161022b9190610483565b60008060006040848603121561038557600080fd5b83356001600160a01b038116811461039c57600080fd5b925060208401356001600160401b03808211156103b857600080fd5b818601915086601f8301126103cc57600080fd5b8135818111156103db57600080fd5b8760208285010111156103ed57600080fd5b6020830194508093505050509250925092565b60008282101561042057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b8381101561045657818101518382015260200161043e565b838111156101595750506000910152565b6000825161047981846020870161043b565b9190910192915050565b60208152600082518060208401526104a281604085016020870161043b565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b419061d888d1255f5923e73eda68322edfb9462ec69404a720a004d31ef160364736f6c63430008080033a26469706673582212205eee3b89200a0074cdf9d14b3a40740e1bfa09965c82cbafe7cd6b8c13a46d2264736f6c63430008080033",
168
+ "bytecode": "0x608060405234801561001057600080fd5b5060405161002060208201610044565b601f1982820381018352601f90910116604052805160209190910120600055610051565b6105a680610d6f83390190565b610d0f806100606000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106d5565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106f1565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105a68061073483390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b838111156106cf576000848401525b50505050565b600082516106e78184602087016106a5565b9190910192915050565b60018060a01b0383168152604060208201526000825180604084015261071e8160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b50610586806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103c3565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610453565b60008051602061050a833981519152146100f8576100f8610478565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061050a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161052a602791396102b6565b9392505050565b803b6102875760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061050a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6103155760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033091906104ba565b600060405180830381855af49150503d806000811461036b576040519150601f19603f3d011682016040523d82523d6000602084013e610370565b606091505b509150915061038082828661038a565b9695505050505050565b6060831561039957508161021c565b8251156103a95782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104d6565b6000806000604084860312156103d857600080fd5b83356001600160a01b03811681146103ef57600080fd5b925060208401356001600160401b038082111561040b57600080fd5b818601915086601f83011261041f57600080fd5b81358181111561042e57600080fd5b87602082850101111561044057600080fd5b6020830194508093505050509250925092565b60008282101561047357634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104a9578181015183820152602001610491565b838111156101b15750506000910152565b600082516104cc81846020870161048e565b9190910192915050565b60208152600082518060208401526104f581604085016020870161048e565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207042cfb19d1fdfc26a8082f087ef0d00316160f896cc3192dcbfda3956ae41c164736f6c63430008080033a26469706673582212205205993217a9553028a33a3cfd4d212ecac3a1a6b6c69a13bd98e425fcf68bc664736f6c63430008080033608060405234801561001057600080fd5b50610586806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103c3565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610453565b60008051602061050a833981519152146100f8576100f8610478565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061050a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161052a602791396102b6565b9392505050565b803b6102875760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061050a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6103155760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033091906104ba565b600060405180830381855af49150503d806000811461036b576040519150601f19603f3d011682016040523d82523d6000602084013e610370565b606091505b509150915061038082828661038a565b9695505050505050565b6060831561039957508161021c565b8251156103a95782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104d6565b6000806000604084860312156103d857600080fd5b83356001600160a01b03811681146103ef57600080fd5b925060208401356001600160401b038082111561040b57600080fd5b818601915086601f83011261041f57600080fd5b81358181111561042e57600080fd5b87602082850101111561044057600080fd5b6020830194508093505050509250925092565b60008282101561047357634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104a9578181015183820152602001610491565b838111156101b15750506000910152565b600082516104cc81846020870161048e565b9190910192915050565b60208152600082518060208401526104f581604085016020870161048e565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207042cfb19d1fdfc26a8082f087ef0d00316160f896cc3192dcbfda3956ae41c164736f6c63430008080033",
169
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106d5565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106f1565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105a68061073483390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b838111156106cf576000848401525b50505050565b600082516106e78184602087016106a5565b9190910192915050565b60018060a01b0383168152604060208201526000825180604084015261071e8160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b50610586806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103c3565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610453565b60008051602061050a833981519152146100f8576100f8610478565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061050a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161052a602791396102b6565b9392505050565b803b6102875760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061050a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060833b6103155760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033091906104ba565b600060405180830381855af49150503d806000811461036b576040519150601f19603f3d011682016040523d82523d6000602084013e610370565b606091505b509150915061038082828661038a565b9695505050505050565b6060831561039957508161021c565b8251156103a95782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104d6565b6000806000604084860312156103d857600080fd5b83356001600160a01b03811681146103ef57600080fd5b925060208401356001600160401b038082111561040b57600080fd5b818601915086601f83011261041f57600080fd5b81358181111561042e57600080fd5b87602082850101111561044057600080fd5b6020830194508093505050509250925092565b60008282101561047357634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104a9578181015183820152602001610491565b838111156101b15750506000910152565b600082516104cc81846020870161048e565b9190910192915050565b60208152600082518060208401526104f581604085016020870161048e565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212207042cfb19d1fdfc26a8082f087ef0d00316160f896cc3192dcbfda3956ae41c164736f6c63430008080033a26469706673582212205205993217a9553028a33a3cfd4d212ecac3a1a6b6c69a13bd98e425fcf68bc664736f6c63430008080033",
170
170
  "linkReferences": {},
171
171
  "deployedLinkReferences": {}
172
172
  }
package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/78fe23216a2e71b0745d62e12899dde9.json"
3
+ "buildInfo": "../../../build-info/efe5f1414a4ce24bbd970fd2cd01459e.json"
4
4
  }
package/contracts/reserve/GoodMarketMaker.sol CHANGED
@@ -123,14 +123,15 @@ contract GoodMarketMaker is DAOUpgradeableContract, DSMath {
123
123
  ERC20 _token,
124
124
  uint256 _gdSupply,
125
125
  uint256 _tokenSupply,
126
- uint32 _reserveRatio
126
+ uint32 _reserveRatio,
127
+ uint256 _lastExpansion
127
128
  ) public {
128
129
  _onlyReserveOrAvatar();
129
130
  reserveTokens[address(_token)] = ReserveToken({
130
131
  gdSupply: _gdSupply,
131
132
  reserveSupply: _tokenSupply,
132
133
  reserveRatio: _reserveRatio,
133
- lastExpansion: block.timestamp
134
+ lastExpansion: _lastExpansion == 0 ? block.timestamp : _lastExpansion
134
135
  });
135
136
  }
136
137
 
package/contracts/reserve/GoodReserveCDai.sol CHANGED
@@ -134,6 +134,11 @@ contract GoodReserveCDai is
134
134
  gdxAirdrop = _gdxAirdrop;
135
135
  }
136
136
 
137
+ function setGDXAirdrop(bytes32 _airdrop) external {
138
+ _onlyAvatar();
139
+ gdxAirdrop = _airdrop;
140
+ }
141
+
137
142
  /// @dev GDX decimals
138
143
  function decimals() public pure override returns (uint8) {
139
144
  return 2;
@@ -180,14 +185,10 @@ contract GoodReserveCDai is
180
185
  address exchangeHelper = nameService.getAddress("EXCHANGE_HELPER");
181
186
  if (msg.sender != exchangeHelper)
182
187
  require(
183
- buyWith.transferFrom(msg.sender, address(this), _tokenAmount) ==
184
- true,
188
+ buyWith.transferFrom(msg.sender, address(this), _tokenAmount) == true,
185
189
  "transferFrom failed, make sure you approved input token transfer"
186
190
  );
187
- require(
188
- gdReturn >= _minReturn,
189
- "GD return must be above the minReturn"
190
- );
191
+ require(gdReturn >= _minReturn, "GD return must be above the minReturn");
191
192
  _mintGoodDollars(_targetAddress, gdReturn, true);
192
193
  //mint GDX
193
194
  _mintGDX(_targetAddress, gdReturn);
@@ -257,12 +258,12 @@ contract GoodReserveCDai is
257
258
  contributionAmount = ContributionCalc(
258
259
  nameService.getAddress("CONTRIBUTION_CALCULATION")
259
260
  ).calculateContribution(
260
- mm,
261
- this,
262
- _seller,
263
- ERC20(cDaiAddress),
264
- gdAmountTemp - discount
265
- );
261
+ mm,
262
+ this,
263
+ _seller,
264
+ ERC20(cDaiAddress),
265
+ gdAmountTemp - discount
266
+ );
266
267
 
267
268
  uint256 tokenReturn = mm.sellWithContribution(
268
269
  ERC20(cDaiAddress),
@@ -350,9 +351,7 @@ contract GoodReserveCDai is
350
351
  _interestToken,
351
352
  interestInCdai
352
353
  );
353
- uint256 gdExpansionToMint = getMarketMaker().mintExpansion(
354
- _interestToken
355
- );
354
+ uint256 gdExpansionToMint = getMarketMaker().mintExpansion(_interestToken);
356
355
  uint256 gdUBI = gdInterestToMint + gdExpansionToMint;
357
356
  //this enforces who can call the public mintUBI method. only an address with permissions at reserve of RESERVE_MINTER_ROLE
358
357
  _mintGoodDollars(nameService.getAddress("FUND_MANAGER"), gdUBI, false);
@@ -376,9 +375,7 @@ contract GoodReserveCDai is
376
375
  * @param _nom The numerator to calculate the global `reserveRatioDailyExpansion` from
377
376
  * @param _denom The denominator to calculate the global `reserveRatioDailyExpansion` from
378
377
  */
379
- function setReserveRatioDailyExpansion(uint256 _nom, uint256 _denom)
380
- public
381
- {
378
+ function setReserveRatioDailyExpansion(uint256 _nom, uint256 _denom) public {
382
379
  _onlyAvatar();
383
380
  getMarketMaker().setReserveRatioDailyExpansion(_nom, _denom);
384
381
  }
@@ -390,12 +387,19 @@ contract GoodReserveCDai is
390
387
  function end() public {
391
388
  _onlyAvatar();
392
389
  // remaining cDAI tokens in the current reserve contract
393
- recover(ERC20(cDaiAddress));
390
+ if (ERC20(cDaiAddress).balanceOf(address(this)) > 0) {
391
+ require(
392
+ ERC20(cDaiAddress).transfer(
393
+ address(avatar),
394
+ ERC20(cDaiAddress).balanceOf(address(this))
395
+ ),
396
+ "recover transfer failed"
397
+ );
398
+ }
394
399
 
395
400
  //restore minting to avatar, so he can re-delegate it
396
401
  IGoodDollar gd = IGoodDollar(nameService.getAddress("GOODDOLLAR"));
397
- if (gd.isMinter(address(avatar)) == false)
398
- gd.addMinter(address(avatar));
402
+ if (gd.isMinter(address(avatar)) == false) gd.addMinter(address(avatar));
399
403
 
400
404
  IGoodDollar(nameService.getAddress("GOODDOLLAR")).renounceMinter();
401
405
  }
package/contracts/staking/DonationsStaking.sol CHANGED
@@ -150,6 +150,7 @@ contract DonationsStaking is DAOUpgradeableContract, IHasRouter {
150
150
  address _stakingContract,
151
151
  address[] memory _ethToStakingTokenSwapPath
152
152
  ) external {
153
+ _onlyAvatar();
153
154
  require(
154
155
  _ethToStakingTokenSwapPath.length >= 2 &&
155
156
  _ethToStakingTokenSwapPath[0] == address(0x0) &&
package/contracts/ubi/UBIScheme.sol CHANGED
@@ -66,6 +66,11 @@ contract UBIScheme is DAOUpgradeableContract {
66
66
  //should be 0 for starters so distributionFormula detects new cycle on first day claim
67
67
  uint256 public currentCycleLength;
68
68
 
69
+ //dont use first claim, and give ubi as usual
70
+ bool public useFirstClaimPool;
71
+
72
+ uint256 public defaultDailyUbi;
73
+
69
74
  // A pool of GD to give to activated users,
70
75
  // since they will enter the UBI pool
71
76
  // calculations only in the next day,
@@ -148,6 +153,13 @@ contract UBIScheme is DAOUpgradeableContract {
148
153
  iterationGasLimit = 150000;
149
154
  periodStart = (block.timestamp / (1 days)) * 1 days + 12 hours; //set start time to GMT noon
150
155
  startOfCycle = periodStart;
156
+ useFirstClaimPool = true;
157
+ defaultDailyUbi = 5000;
158
+ }
159
+
160
+ function setUseFirstClaimPool(bool _use) public {
161
+ _onlyAvatar();
162
+ useFirstClaimPool = _use;
151
163
  }
152
164
 
153
165
  /**
@@ -270,6 +282,8 @@ contract UBIScheme is DAOUpgradeableContract {
270
282
  funds.openAmount = currentBalance;
271
283
  if (activeUsersCount > 0) {
272
284
  dailyUbi = dailyCyclePool / activeUsersCount;
285
+ } else if (useFirstClaimPool == false) {
286
+ dailyUbi = defaultDailyUbi;
273
287
  }
274
288
  emit UBICalculated(currentDay, dailyUbi, block.number);
275
289
  }
@@ -386,10 +400,16 @@ contract UBIScheme is DAOUpgradeableContract {
386
400
  }
387
401
  if (activeUsersCount > 0) {
388
402
  _dailyUbi = _dailyCyclePool / activeUsersCount;
403
+ } else if (useFirstClaimPool == false) {
404
+ _dailyUbi = defaultDailyUbi;
389
405
  }
390
406
  return _dailyUbi;
391
407
  }
392
408
 
409
+ function checkEntitlement() public view returns (uint256) {
410
+ return checkEntitlement(msg.sender);
411
+ }
412
+
393
413
  /**
394
414
  * @dev Checks the amount which the sender address is eligible to claim for,
395
415
  * regardless if they have been whitelisted or not. In case the user is
@@ -397,16 +417,20 @@ contract UBIScheme is DAOUpgradeableContract {
397
417
  * or fish has already been executed today.
398
418
  * @return The amount of GD tokens the address can claim.
399
419
  */
400
- function checkEntitlement() public view requireStarted returns (uint256) {
420
+ function checkEntitlement(address _member) public view returns (uint256) {
421
+ if (block.timestamp < periodStart) return 0; //not started
401
422
  // new user or inactive should recieve the first claim reward
402
- if (!isNotNewUser(msg.sender) || fishedUsersAddresses[msg.sender]) {
423
+ if (
424
+ useFirstClaimPool &&
425
+ (!isNotNewUser(_member) || fishedUsersAddresses[_member])
426
+ ) {
403
427
  return firstClaimPool.claimAmount();
404
428
  }
405
429
 
406
430
  // current day has already been updated which means
407
431
  // that the dailyUbi has been updated
408
432
  if (currentDay == (block.timestamp - periodStart) / (1 days)) {
409
- return hasClaimed(msg.sender) ? 0 : dailyUbi;
433
+ return hasClaimed(_member) ? 0 : dailyUbi;
410
434
  }
411
435
  return estimateNextDailyUBI();
412
436
  }
@@ -437,7 +461,11 @@ contract UBIScheme is DAOUpgradeableContract {
437
461
  // a unregistered or fished user
438
462
  activeUsersCount += 1;
439
463
  fishedUsersAddresses[_account] = false;
440
- _transferTokens(_account, 0, false, true);
464
+ if (useFirstClaimPool) {
465
+ _transferTokens(_account, 0, false, true);
466
+ } else {
467
+ _transferTokens(_account, 0, true, false);
468
+ }
441
469
  emit ActivatedUser(_account);
442
470
  return true;
443
471
  }