@gooddollar/goodprotocol 1.0.26 → 1.0.29-beta.0

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 (222) hide show
  1. package/artifacts/abis/AdminWallet.min.json +1 -0
  2. package/artifacts/abis/FuseFaucet.min.json +1 -1
  3. package/artifacts/abis/IIdentity.min.json +1 -1
  4. package/artifacts/abis/ProxyAdmin.min.json +1 -1
  5. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  7. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  8. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  9. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  10. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IIdentity.json +45 -0
  23. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.json +23 -0
  28. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  34. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  35. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +4 -4
  36. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  37. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
  38. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  39. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +2 -2
  40. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  41. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
  42. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  43. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
  44. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  45. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  46. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  47. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  48. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  49. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  50. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
  51. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  52. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  53. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  55. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  56. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  57. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  58. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  59. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  60. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  61. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  62. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  63. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  64. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  65. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  66. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  67. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  68. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  69. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  70. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  71. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  73. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  75. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
  76. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  77. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
  78. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  79. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
  80. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  81. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
  82. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  83. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  84. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  86. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  87. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  88. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  89. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  90. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  91. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  92. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  93. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
  94. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  95. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  96. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
  97. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  98. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  99. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  100. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  101. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  102. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  103. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  104. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  105. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  106. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  107. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  108. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  109. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  110. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  111. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  112. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  113. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  114. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  115. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  116. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  117. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  118. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  119. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  120. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  121. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  122. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  123. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  124. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  125. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  126. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  127. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +4 -0
  128. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +732 -0
  129. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  130. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  131. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  132. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  133. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  134. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  135. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  136. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  137. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  138. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  139. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  140. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  141. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  142. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  143. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  144. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  145. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  146. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  147. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  148. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  149. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  150. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  151. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  152. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  153. package/contracts/Interfaces.sol +12 -0
  154. package/contracts/fuseFaucet/FuseFaucet.sol +19 -10
  155. package/contracts/utils/AdminWallet.sol +242 -0
  156. package/hardhat.config.ts +11 -1
  157. package/package.json +8 -8
  158. package/releases/deployment.json +9 -6
  159. package/scripts/bulkProof.ts +0 -5
  160. package/scripts/deployFullDAO.ts +17 -9
  161. package/scripts/multichain-deploy/basicdao-deploy.ts +0 -11
  162. package/scripts/test/localOldDaoDeploy.ts +4 -10
  163. package/scripts/upgradeScheme.ts +7 -12
  164. package/scripts/upgradeToV2/upgradeToV2.ts +0 -8
  165. package/scripts/upgradeToV2/upgradeToV2Recover.ts +0 -8
  166. package/test/FuseFaucet.test.ts +8 -12
  167. package/test/utils/AdminWallet.test.ts +278 -0
  168. package/test/utils/ProtocolUpgrade.test.ts +1 -4
  169. package/types/AdminWallet.ts +1136 -0
  170. package/types/FuseFaucet.ts +3 -3
  171. package/types/IIdentity.ts +87 -0
  172. package/types/ProxyAdmin.ts +44 -0
  173. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  174. package/types/factories/AdminWallet__factory.ts +780 -0
  175. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  176. package/types/factories/BaseShareField__factory.ts +1 -1
  177. package/types/factories/BulkProof__factory.ts +1 -1
  178. package/types/factories/ClaimersDistribution__factory.ts +1 -1
  179. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  180. package/types/factories/CompoundVotingMachine__factory.ts +1 -1
  181. package/types/factories/DAOContract__factory.ts +1 -1
  182. package/types/factories/DAOUpgradeableContract__factory.ts +1 -1
  183. package/types/factories/DonationsStaking__factory.ts +1 -1
  184. package/types/factories/ExchangeHelper__factory.ts +1 -1
  185. package/types/factories/FuseFaucet__factory.ts +3 -3
  186. package/types/factories/FuseStakingV3__factory.ts +1 -1
  187. package/types/factories/GReputation__factory.ts +1 -1
  188. package/types/factories/GoodAaveStakingV2__factory.ts +1 -1
  189. package/types/factories/GoodAaveStaking__factory.ts +1 -1
  190. package/types/factories/GoodCompoundStakingTest__factory.ts +1 -1
  191. package/types/factories/GoodCompoundStakingV2__factory.ts +1 -1
  192. package/types/factories/GoodCompoundStaking__factory.ts +1 -1
  193. package/types/factories/GoodFundManagerTest__factory.ts +1 -1
  194. package/types/factories/GoodFundManager__factory.ts +1 -1
  195. package/types/factories/GoodMarketMaker__factory.ts +1 -1
  196. package/types/factories/GoodReserveCDai__factory.ts +1 -1
  197. package/types/factories/GovernanceStaking__factory.ts +1 -1
  198. package/types/factories/IIdentity__factory.ts +45 -0
  199. package/types/factories/InvitesV1__factory.ts +1 -1
  200. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  201. package/types/factories/OverMintTester__factory.ts +1 -1
  202. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  203. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  204. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  205. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  206. package/types/factories/ProxyAdmin__factory.ts +23 -0
  207. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  208. package/types/factories/Reputation__factory.ts +1 -1
  209. package/types/factories/StakersDistribution__factory.ts +1 -1
  210. package/types/factories/SwapHelperTest__factory.ts +1 -1
  211. package/types/factories/UBIScheme__factory.ts +1 -1
  212. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  213. package/types/factories/UpgradableMock2__factory.ts +1 -1
  214. package/types/factories/UpgradableMock3__factory.ts +1 -1
  215. package/types/factories/UpgradableMock4__factory.ts +1 -1
  216. package/types/factories/UpgradableMock__factory.ts +1 -1
  217. package/types/hardhat.d.ts +9 -0
  218. package/types/index.ts +2 -0
  219. package/yarn.lock +320 -217
  220. package/patches/@nomiclabs+hardhat-etherscan+3.0.3.patch +0 -41
  221. package/patches/@openzeppelin+hardhat-upgrades+1.7.0.patch +0 -67
  222. package/patches/@openzeppelin+upgrades-core+1.4.2.patch +0 -21
package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json CHANGED
@@ -76,8 +76,8 @@
76
76
  "type": "function"
77
77
  }
78
78
  ],
79
- "bytecode": "0x608060405234801561001057600080fd5b50604051610e6c380380610e6c83398101604081905261002f9161010b565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561009357600080fd5b505afa1580156100a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cb9190610145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506101699050565b6001600160a01b038116811461010857600080fd5b50565b6000806040838503121561011e57600080fd5b8251610129816100f3565b602084015190925061013a816100f3565b809150509250929050565b60006020828403121561015757600080fd5b8151610162816100f3565b9392505050565b610cf4806101786000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea26469706673582212208eb40a1aef52b5188e9d9c81dfda8b8e133097830bcf88ae2be0946860258c2264736f6c63430008080033",
80
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea26469706673582212208eb40a1aef52b5188e9d9c81dfda8b8e133097830bcf88ae2be0946860258c2264736f6c63430008080033",
79
+ "bytecode": "0x608060405234801561001057600080fd5b50604051610e6c380380610e6c83398101604081905261002f9161010b565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561009357600080fd5b505afa1580156100a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cb9190610145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506101699050565b6001600160a01b038116811461010857600080fd5b50565b6000806040838503121561011e57600080fd5b8251610129816100f3565b602084015190925061013a816100f3565b809150509250929050565b60006020828403121561015757600080fd5b8151610162816100f3565b9392505050565b610cf4806101786000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea26469706673582212207488665c69380980b10e035f7627cbf20946c3ab117a607727c50929200293ca64736f6c63430008080033",
80
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea26469706673582212207488665c69380980b10e035f7627cbf20946c3ab117a607727c50929200293ca64736f6c63430008080033",
81
81
  "linkReferences": {},
82
82
  "deployedLinkReferences": {}
83
83
  }
package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ee3a10370761932044086496103a962a.json"
3
+ "buildInfo": "../../../build-info/252dd82c79ad9963b2f7d10f9fb343c3.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json CHANGED
@@ -114,8 +114,8 @@
114
114
  "type": "receive"
115
115
  }
116
116
  ],
117
- "bytecode": "0x60806040523480156200001157600080fd5b5060405162001ae138038062001ae1833981016040819052620000349162000116565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200009957600080fd5b505afa158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d4919062000155565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200017c9050565b6001600160a01b03811681146200011357600080fd5b50565b600080604083850312156200012a57600080fd5b82516200013781620000fd565b60208401519092506200014a81620000fd565b809150509250929050565b6000602082840312156200016857600080fd5b81516200017581620000fd565b9392505050565b611955806200018c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220a21b279b283883dd54445ef1b90ca1c3c566c619ccfbff391ee6831d72a3031b64736f6c63430008080033",
118
- "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220a21b279b283883dd54445ef1b90ca1c3c566c619ccfbff391ee6831d72a3031b64736f6c63430008080033",
117
+ "bytecode": "0x60806040523480156200001157600080fd5b5060405162001ae138038062001ae1833981016040819052620000349162000116565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200009957600080fd5b505afa158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d4919062000155565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200017c9050565b6001600160a01b03811681146200011357600080fd5b50565b600080604083850312156200012a57600080fd5b82516200013781620000fd565b60208401519092506200014a81620000fd565b809150509250929050565b6000602082840312156200016857600080fd5b81516200017581620000fd565b9392505050565b611955806200018c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220c236c84fcea1b8376182909bb14fd5589de938f5045f870f14f8abafd637c5d564736f6c63430008080033",
118
+ "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220c236c84fcea1b8376182909bb14fd5589de938f5045f870f14f8abafd637c5d564736f6c63430008080033",
119
119
  "linkReferences": {},
120
120
  "deployedLinkReferences": {}
121
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/4f8206a440cfa6bac16c5683c5407b03.json"
3
+ "buildInfo": "../../../build-info/28efded0f4a09672715b1b4a8245eaa4.json"
4
4
  }
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/4f8206a440cfa6bac16c5683c5407b03.json"
3
+ "buildInfo": "../../../build-info/28efded0f4a09672715b1b4a8245eaa4.json"
4
4
  }
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/ee3a10370761932044086496103a962a.json"
3
+ "buildInfo": "../../../build-info/252dd82c79ad9963b2f7d10f9fb343c3.json"
4
4
  }
package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json CHANGED
@@ -74,8 +74,8 @@
74
74
  "type": "function"
75
75
  }
76
76
  ],
77
- "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fde96c0140534281b2023b496f1ce00db0a20029d246a9149dab11c8062ac9ff64736f6c63430008080033",
78
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fde96c0140534281b2023b496f1ce00db0a20029d246a9149dab11c8062ac9ff64736f6c63430008080033",
77
+ "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212206b26764f052d3a83055597d363ee32cde7f9f3016b65a06063340ae7cea97ead64736f6c63430008080033",
78
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212206b26764f052d3a83055597d363ee32cde7f9f3016b65a06063340ae7cea97ead64736f6c63430008080033",
79
79
  "linkReferences": {},
80
80
  "deployedLinkReferences": {}
81
81
  }
package/contracts/Interfaces.sol CHANGED
@@ -248,6 +248,12 @@ interface IIdentity {
248
248
 
249
249
  function removeWhitelisted(address account) external;
250
250
 
251
+ function addBlacklisted(address account) external;
252
+
253
+ function removeBlacklisted(address account) external;
254
+
255
+ function isBlacklisted(address user) external view returns (bool);
256
+
251
257
  function addIdentityAdmin(address account) external returns (bool);
252
258
 
253
259
  function setAvatar(address _avatar) external;
@@ -286,6 +292,12 @@ interface ProxyAdmin {
286
292
  function owner() external view returns (address);
287
293
 
288
294
  function transferOwnership(address newOwner) external;
295
+
296
+ function upgradeAndCall(
297
+ address proxy,
298
+ address implementation,
299
+ bytes memory data
300
+ ) external;
289
301
  }
290
302
 
291
303
  /**
package/contracts/fuseFaucet/FuseFaucet.sol CHANGED
@@ -31,16 +31,16 @@ contract FuseFaucet is Initializable {
31
31
 
32
32
  mapping(address => Wallet) public wallets;
33
33
  uint32 public maxDailyToppings;
34
- uint32 public gasPrice;
34
+ uint64 public gasPrice;
35
35
  uint32 public maxPerWeekMultiplier;
36
36
  uint32 public maxSwapAmount;
37
37
  address public goodDollar;
38
38
 
39
39
  function initialize(address _identity) public initializer {
40
- toppingAmount = 600000 * 1e9; //0.6M gwei
40
+ gasPrice = 1e10;
41
+ toppingAmount = 600000 * gasPrice; //0.6M gwei
41
42
  perDayRoughLimit = 2 * toppingAmount;
42
43
  maxDailyToppings = 3;
43
- gasPrice = 1e9;
44
44
  startTime = block.timestamp;
45
45
  identity = IIdentity(_identity);
46
46
  maxPerWeekMultiplier = 2;
@@ -55,10 +55,10 @@ contract FuseFaucet is Initializable {
55
55
  }
56
56
 
57
57
  function upgrade1() public {
58
- toppingAmount = 600000 * 1e9; //1M gwei
58
+ gasPrice = 1e10;
59
+ toppingAmount = 600000 * gasPrice; //1M gwei
59
60
  perDayRoughLimit = 2 * toppingAmount;
60
61
  maxDailyToppings = 3;
61
- gasPrice = 1e9;
62
62
  maxPerWeekMultiplier = 2;
63
63
  maxSwapAmount = 1000;
64
64
  goodDollar = address(0x495d133B938596C9984d462F007B676bDc57eCEC);
@@ -110,18 +110,27 @@ contract FuseFaucet is Initializable {
110
110
  currentDay = (block.timestamp - startTime) / 1 days;
111
111
  }
112
112
 
113
- function canTop(address _user) public view returns (bool) {
113
+ function canTop(address _user) external view returns (bool) {
114
114
  uint256 _currentDay = (block.timestamp - startTime) / 1 days;
115
- bool can = (wallets[_user].lastDayTopped != uint128(currentDay) ||
115
+ bool can = (wallets[_user].lastDayTopped != uint128(_currentDay) ||
116
116
  wallets[_user].dailyToppingCount < 3) &&
117
117
  (identity.isWhitelisted(_user) || notFirstTime[_user] == false);
118
118
 
119
+ uint128[7] memory lastWeekToppings = wallets[_user].lastWeekToppings;
120
+ //reset inactive days
121
+ uint256 dayOfWeek = _currentDay % 7;
122
+ uint256 dayDiff = (_currentDay - wallets[_user].lastDayTopped);
123
+ dayDiff = dayDiff > 7 ? 7 : dayDiff;
124
+ dayDiff = dayDiff > dayOfWeek ? dayOfWeek + 1 : dayDiff;
125
+
126
+ for (uint256 day = dayOfWeek + 1 - dayDiff; day <= dayOfWeek; day++) {
127
+ lastWeekToppings[day] = 0;
128
+ }
129
+
119
130
  uint128 weekTotal = 0;
120
- uint256 dayOfWeek = currentDay % 7;
121
131
  for (uint256 i = 0; i <= dayOfWeek; i++) {
122
- weekTotal += wallets[_user].lastWeekToppings[uint256(i)];
132
+ weekTotal += lastWeekToppings[uint256(i)];
123
133
  }
124
-
125
134
  can = can && weekTotal < perDayRoughLimit * maxPerWeekMultiplier;
126
135
  return can;
127
136
  }
package/contracts/utils/AdminWallet.sol ADDED
@@ -0,0 +1,242 @@
1
+ // SPDX-License-Identifier: MIT
2
+
3
+ pragma solidity >=0.8.0;
4
+
5
+ import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
6
+ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
7
+ import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
8
+ import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
9
+
10
+ import "../Interfaces.sol";
11
+
12
+ /* @title Admin wallet contract allowing whitelisting and topping up of
13
+ * addresses
14
+ */
15
+ contract AdminWallet is
16
+ Initializable,
17
+ UUPSUpgradeable,
18
+ OwnableUpgradeable,
19
+ AccessControlUpgradeable
20
+ {
21
+ bytes32 public constant WALLET_ADMIN_ROLE = keccak256("WALLET_ADMIN_ROLE");
22
+
23
+ address payable[] adminlist;
24
+
25
+ uint256 public toppingAmount;
26
+ uint256 public adminToppingAmount;
27
+
28
+ uint256 public toppingTimes;
29
+ uint256 public gasPrice;
30
+
31
+ IIdentity public identity;
32
+
33
+ mapping(uint256 => mapping(address => uint256)) toppings;
34
+
35
+ event AdminsAdded(address payable[] indexed admins);
36
+ event AdminsRemoved(address[] indexed admins);
37
+ event WalletTopped(address indexed user, uint256 amount);
38
+ event GenericCall(
39
+ address indexed _contract,
40
+ bytes _data,
41
+ uint256 _value,
42
+ bool _success
43
+ );
44
+
45
+ /**
46
+ * @dev initialize
47
+ */
48
+ function initialize(
49
+ address payable[] memory _admins,
50
+ address _owner,
51
+ IIdentity _identity
52
+ ) public initializer {
53
+ __AccessControl_init_unchained();
54
+ __Ownable_init_unchained();
55
+ _setupRole(DEFAULT_ADMIN_ROLE, _owner);
56
+ _setDefaults(600000, 9e6, 3, 1e10);
57
+ identity = _identity;
58
+ if (_admins.length > 0) {
59
+ addAdmins(_admins);
60
+ }
61
+ }
62
+
63
+ function setDefaults(
64
+ uint256 _toppingAmount,
65
+ uint256 _adminToppingAmount,
66
+ uint256 _toppingTimes,
67
+ uint256 _gasPrice
68
+ ) external onlyOwner {
69
+ _setDefaults(_toppingAmount, _adminToppingAmount, _toppingTimes, _gasPrice);
70
+ }
71
+
72
+ function _setDefaults(
73
+ uint256 _toppingAmount,
74
+ uint256 _adminToppingAmount,
75
+ uint256 _toppingTimes,
76
+ uint256 _gasPrice
77
+ ) internal {
78
+ gasPrice = _gasPrice;
79
+ toppingAmount = _toppingAmount * _gasPrice;
80
+ adminToppingAmount = _adminToppingAmount * _gasPrice;
81
+ toppingTimes = _toppingTimes;
82
+ }
83
+
84
+ function _authorizeUpgrade(address newImplementation)
85
+ internal
86
+ override
87
+ onlyOwner
88
+ {}
89
+
90
+ /* @dev Modifier that checks if caller is admin of wallet
91
+ */
92
+ modifier onlyAdmin() {
93
+ require(isAdmin(msg.sender), "Caller is not admin");
94
+ _;
95
+ }
96
+
97
+ modifier reimburseGas() {
98
+ _;
99
+ if (msg.sender.balance <= adminToppingAmount / 2 && isAdmin(msg.sender)) {
100
+ _topWallet(payable(msg.sender));
101
+ }
102
+ }
103
+
104
+ receive() external payable {}
105
+
106
+ /* @dev Internal function that sets current day
107
+ */
108
+ function currentDay() internal view returns (uint256) {
109
+ return (block.timestamp / 1 days);
110
+ }
111
+
112
+ /* @dev Function to add list of addresses to admins
113
+ * can only be called by creator of contract
114
+ * @param _admins the list of addresses to add
115
+ */
116
+ function addAdmins(address payable[] memory _admins) public onlyOwner {
117
+ for (uint256 i = 0; i < _admins.length; i++) {
118
+ if (isAdmin(_admins[i]) == false) {
119
+ grantRole(WALLET_ADMIN_ROLE, _admins[i]);
120
+ adminlist.push(_admins[i]);
121
+ }
122
+ }
123
+ emit AdminsAdded(_admins);
124
+ }
125
+
126
+ /* @dev Function to remove list of addresses to admins
127
+ * can only be called by creator of contract
128
+ * @param _admins the list of addresses to remove
129
+ */
130
+ function removeAdmins(address[] memory _admins) public onlyOwner {
131
+ for (uint256 i = 0; i < _admins.length; i++) {
132
+ revokeRole(WALLET_ADMIN_ROLE, _admins[i]);
133
+ }
134
+ emit AdminsRemoved(_admins);
135
+ }
136
+
137
+ /**
138
+ * @dev top admins
139
+ */
140
+ function topAdmins(uint256 startIndex, uint256 endIndex) public reimburseGas {
141
+ require(adminlist.length > startIndex, "Admin list is empty");
142
+ for (uint256 i = startIndex; (i < adminlist.length && i < endIndex); i++) {
143
+ if (
144
+ isAdmin(adminlist[i]) && adminlist[i].balance <= adminToppingAmount / 2
145
+ ) {
146
+ _topWallet(adminlist[i]);
147
+ }
148
+ }
149
+ }
150
+
151
+ /* @dev top the first 50 admins
152
+ */
153
+ function topAdmins(uint256 startIndex) public reimburseGas {
154
+ topAdmins(startIndex, startIndex + 50);
155
+ }
156
+
157
+ /**
158
+ * @dev Function to check if given address is an admin
159
+ * @param _user the address to check
160
+ * @return A bool indicating if user is an admin
161
+ */
162
+ function isAdmin(address _user) public view returns (bool) {
163
+ return hasRole(WALLET_ADMIN_ROLE, _user);
164
+ }
165
+
166
+ /* @dev Function to add given address to whitelist of identity contract
167
+ * can only be done by admins of wallet and if wallet is an IdentityAdmin
168
+ */
169
+ function whitelist(address _user, string memory _did)
170
+ public
171
+ onlyAdmin
172
+ reimburseGas
173
+ {
174
+ identity.addWhitelistedWithDID(_user, _did);
175
+ }
176
+
177
+ /* @dev Function to remove given address from whitelist of identity contract
178
+ * can only be done by admins of wallet and if wallet is an IdentityAdmin
179
+ */
180
+ function removeWhitelist(address _user) public onlyAdmin reimburseGas {
181
+ identity.removeWhitelisted(_user);
182
+ }
183
+
184
+ /* @dev Function to add given address to blacklist of identity contract
185
+ * can only be done by admins of wallet and if wallet is an IdentityAdmin
186
+ */
187
+ function blacklist(address _user) public onlyAdmin reimburseGas {
188
+ identity.addBlacklisted(_user);
189
+ }
190
+
191
+ /* @dev Function to remove given address from blacklist of identity contract
192
+ * can only be done by admins of wallet and if wallet is an IdentityAdmin
193
+ */
194
+ function removeBlacklist(address _user) public onlyAdmin reimburseGas {
195
+ identity.removeBlacklisted(_user);
196
+ }
197
+
198
+ /* @dev Function to top given address with amount of G$ given in constructor
199
+ * can only be done by admin the amount of times specified in constructor per day
200
+ * @param _user The address to transfer to
201
+ */
202
+ function topWallet(address payable _user) public onlyAdmin reimburseGas {
203
+ require(
204
+ toppings[currentDay()][_user] < toppingTimes,
205
+ "User wallet has been topped too many times today"
206
+ );
207
+ if (address(_user).balance >= toppingAmount / 4) return;
208
+
209
+ _topWallet(_user);
210
+ }
211
+
212
+ function _topWallet(address payable _wallet) internal {
213
+ toppings[currentDay()][_wallet] += 1;
214
+ uint256 amount = isAdmin(_wallet) ? adminToppingAmount : toppingAmount;
215
+ uint256 toTop = amount - address(_wallet).balance;
216
+ _wallet.transfer(toTop);
217
+ emit WalletTopped(_wallet, toTop);
218
+ }
219
+
220
+ /**
221
+ * @dev perform a generic call to an arbitrary contract
222
+ * @param _contract the contract's address to call
223
+ * @param _data ABI-encoded contract call to call `_contract` address.
224
+ * @param _value value (ETH) to transfer with the transaction
225
+ * @return success success or fail
226
+ * bytes - the return bytes of the called contract's function.
227
+ */
228
+ function genericCall(
229
+ address _contract,
230
+ bytes memory _data,
231
+ uint256 _value
232
+ )
233
+ public
234
+ onlyAdmin
235
+ reimburseGas
236
+ returns (bool success, bytes memory returnValue)
237
+ {
238
+ // solhint-disable-next-line avoid-call-value
239
+ (success, returnValue) = _contract.call{ value: _value }(_data);
240
+ emit GenericCall(_contract, _data, _value, success);
241
+ }
242
+ }
package/hardhat.config.ts CHANGED
@@ -54,7 +54,17 @@ const hhconfig: HardhatUserConfig = {
54
54
  apiKey: {
55
55
  mainnet: etherscan_key,
56
56
  celo: celoscan_key
57
- }
57
+ },
58
+ customChains: [
59
+ {
60
+ network: "celo",
61
+ chainId: 42220,
62
+ urls: {
63
+ apiURL: "https://api.celoscan.io",
64
+ browserURL: "https://celoscan.io"
65
+ }
66
+ }
67
+ ]
58
68
  },
59
69
  contractSizer: {
60
70
  alphaSort: false,