@gooddollar/goodprotocol 1.0.31-beta.0 → 2.0.1

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 (738) hide show
  1. package/README.md +25 -0
  2. package/artifacts/abis/AaveMock.min.json +1 -1
  3. package/artifacts/abis/AaveStakingFactory.min.json +1 -1
  4. package/artifacts/abis/AdminWallet.min.json +1 -1
  5. package/artifacts/abis/AdminWalletFuse.min.json +1 -0
  6. package/artifacts/abis/BuyAndBridgeHelper.min.json +1 -0
  7. package/artifacts/abis/ClaimersDistribution.min.json +1 -1
  8. package/artifacts/abis/CompoundStakingFactory.min.json +1 -1
  9. package/artifacts/abis/CompoundVotingMachine.min.json +1 -1
  10. package/artifacts/abis/DAIMock.min.json +1 -1
  11. package/artifacts/abis/DAOUpgradeableContract.min.json +1 -1
  12. package/artifacts/abis/DecimalsMock.min.json +1 -1
  13. package/artifacts/abis/DistributionHelper.min.json +1 -1
  14. package/artifacts/abis/DistributionHelperTest.min.json +1 -1
  15. package/artifacts/abis/DistributionHelperTestHelper.min.json +1 -1
  16. package/artifacts/abis/DonationsStaking.min.json +1 -1
  17. package/artifacts/abis/ERC20Permit.min.json +1 -0
  18. package/artifacts/abis/ERC20PresetMinterPauserUpgradeable.min.json +1 -0
  19. package/artifacts/abis/ERC677.min.json +1 -0
  20. package/artifacts/abis/ERC677Receiver.min.json +1 -0
  21. package/artifacts/abis/ExchangeHelper.min.json +1 -1
  22. package/artifacts/abis/Faucet.min.json +1 -0
  23. package/artifacts/abis/FeesFormulaMock.min.json +1 -0
  24. package/artifacts/abis/FuseFaucet.min.json +1 -1
  25. package/artifacts/abis/FuseFaucetV2.min.json +1 -0
  26. package/artifacts/abis/FuseStakingV3.min.json +1 -1
  27. package/artifacts/abis/GReputation.min.json +1 -1
  28. package/artifacts/abis/GoodAaveStaking.min.json +1 -1
  29. package/artifacts/abis/GoodAaveStakingV2.min.json +1 -1
  30. package/artifacts/abis/GoodCompoundStaking.min.json +1 -1
  31. package/artifacts/abis/GoodCompoundStakingTest.min.json +1 -1
  32. package/artifacts/abis/GoodCompoundStakingV2.min.json +1 -1
  33. package/artifacts/abis/GoodDollar.min.json +1 -0
  34. package/artifacts/abis/GoodDollarMintBurnWrapper.min.json +1 -1
  35. package/artifacts/abis/GoodDollarStaking.min.json +1 -1
  36. package/artifacts/abis/GoodDollarStakingMock.min.json +1 -1
  37. package/artifacts/abis/GoodFundManager.min.json +1 -1
  38. package/artifacts/abis/GoodFundManagerTest.min.json +1 -1
  39. package/artifacts/abis/GoodMarketMaker.min.json +1 -1
  40. package/artifacts/abis/GoodReserveCDai.min.json +1 -1
  41. package/artifacts/abis/GovernanceStaking.min.json +1 -1
  42. package/artifacts/abis/IFeesFormula.min.json +1 -0
  43. package/artifacts/abis/IGoodDollar.min.json +1 -1
  44. package/artifacts/abis/IGoodDollarCustom.min.json +1 -0
  45. package/artifacts/abis/IGovernanceStaking.min.json +1 -0
  46. package/artifacts/abis/IIdentity.min.json +1 -1
  47. package/artifacts/abis/IIdentityV2.min.json +1 -0
  48. package/artifacts/abis/IStakingUpgrade.min.json +1 -0
  49. package/artifacts/abis/ISuperGoodDollar.min.json +1 -0
  50. package/artifacts/abis/IdentityMock.min.json +1 -0
  51. package/artifacts/abis/IdentityV2.min.json +1 -0
  52. package/artifacts/abis/InvitesFuseV2.min.json +1 -0
  53. package/artifacts/abis/InvitesV1.min.json +1 -1
  54. package/artifacts/abis/InvitesV2.min.json +1 -0
  55. package/artifacts/abis/LendingPoolMock.min.json +1 -1
  56. package/artifacts/abis/NameService.min.json +1 -1
  57. package/artifacts/abis/PayableMock.min.json +1 -0
  58. package/artifacts/abis/Proxy.min.json +1 -0
  59. package/artifacts/abis/Reputation.min.json +1 -1
  60. package/artifacts/abis/SelfApprove.min.json +1 -0
  61. package/artifacts/abis/SimpleStaking.min.json +1 -1
  62. package/artifacts/abis/SimpleStakingV2.min.json +1 -1
  63. package/artifacts/abis/SixteenDecimalsTokenMock.min.json +1 -1
  64. package/artifacts/abis/StakersDistribution.min.json +1 -1
  65. package/artifacts/abis/SuperGoodDollar.min.json +1 -0
  66. package/artifacts/abis/SuperToken.min.json +1 -0
  67. package/artifacts/abis/SuperfluidToken.min.json +1 -0
  68. package/artifacts/abis/TwentyDecimalsTokenMock.min.json +1 -1
  69. package/artifacts/abis/UBIScheme.min.json +1 -1
  70. package/artifacts/abis/USDCMock.min.json +1 -1
  71. package/artifacts/abis/UUPSProxiable.min.json +1 -0
  72. package/artifacts/abis/UUPSProxy.min.json +1 -0
  73. package/artifacts/abis/UUPSUtils.min.json +1 -0
  74. package/artifacts/abis/UpgradableMock.min.json +1 -1
  75. package/artifacts/abis/UpgradableMock2.min.json +1 -1
  76. package/artifacts/abis/UpgradableMock3.min.json +1 -1
  77. package/artifacts/abis/UpgradableMock4.min.json +1 -1
  78. package/artifacts/abis/cBATMock.min.json +1 -1
  79. package/artifacts/abis/cDAILowWorthMock.min.json +1 -1
  80. package/artifacts/abis/cDAIMock.min.json +1 -1
  81. package/artifacts/abis/cDAINonMintableMock.min.json +1 -1
  82. package/artifacts/abis/cDecimalsMock.min.json +1 -1
  83. package/artifacts/abis/cSDTMock.min.json +1 -1
  84. package/artifacts/abis/cUSDCMock.min.json +1 -1
  85. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  86. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  87. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  88. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  89. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  90. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  91. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  92. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  93. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  94. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  95. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  96. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  97. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  98. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  99. package/artifacts/contracts/Interfaces.sol/IGoodDollar.json +184 -0
  100. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  101. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  102. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  103. package/artifacts/contracts/Interfaces.sol/IIdentity.json +70 -0
  104. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +4 -0
  105. package/artifacts/contracts/Interfaces.sol/IIdentityV2.json +300 -0
  106. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  107. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  108. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  109. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  110. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  111. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  112. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  113. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  114. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  115. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  116. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  117. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +4 -0
  118. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +736 -0
  119. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  120. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +15 -2
  121. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +4 -0
  122. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +480 -0
  123. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  124. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +28 -2
  125. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  126. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +28 -2
  127. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  128. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +78 -3
  129. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  130. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +71 -2
  131. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +4 -0
  132. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.json +24 -0
  133. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +4 -0
  134. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.json +35 -0
  135. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  136. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  137. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +31 -5
  138. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  139. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  140. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +28 -2
  141. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  142. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +28 -2
  143. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +4 -0
  144. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +1081 -0
  145. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +4 -0
  146. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +505 -0
  147. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  148. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +15 -2
  149. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +4 -0
  150. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +635 -0
  151. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  152. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.json +18 -5
  153. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  154. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.json +2 -2
  155. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  156. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.json +2 -2
  157. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  158. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.json +2 -2
  159. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  160. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.json +18 -5
  161. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  162. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.json +2 -2
  163. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  164. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.json +18 -5
  165. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  166. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  167. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  168. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +28 -2
  169. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  170. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +28 -2
  171. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  172. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.json +2 -2
  173. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +4 -0
  174. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.json +69 -0
  175. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  176. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.json +2 -2
  177. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  178. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +22 -9
  179. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  180. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +95 -2
  181. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  182. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +28 -2
  183. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +4 -0
  184. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +277 -0
  185. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  186. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.json +2 -2
  187. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  188. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.json +18 -5
  189. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  190. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  191. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  192. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  193. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  194. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  195. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  196. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  197. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +4 -0
  198. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.json +18 -0
  199. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  200. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.json +18 -5
  201. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  202. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.json +2 -2
  203. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  204. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  205. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  206. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.json +18 -5
  207. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  208. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +28 -2
  209. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  210. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +28 -2
  211. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  212. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +28 -2
  213. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  214. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +28 -2
  215. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  216. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.json +18 -5
  217. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  218. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.json +18 -5
  219. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  220. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.json +18 -5
  221. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  222. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.json +18 -5
  223. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  224. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.json +18 -5
  225. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  226. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.json +18 -5
  227. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  228. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.json +18 -5
  229. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  230. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.json +18 -5
  231. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  232. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +28 -2
  233. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  234. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +28 -2
  235. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  236. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +28 -2
  237. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  238. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  239. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +31 -5
  240. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  241. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  242. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  243. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  244. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  245. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +32 -6
  246. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  247. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +15 -2
  248. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  249. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  250. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  251. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +28 -2
  252. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  253. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.json +16 -3
  254. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  255. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.json +16 -3
  256. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  257. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  258. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  259. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +3 -3
  260. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  261. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +20 -7
  262. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  263. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +20 -7
  264. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  265. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +4 -4
  266. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  267. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +22 -9
  268. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  269. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +22 -9
  270. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  271. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.json +2 -2
  272. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  273. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +4 -0
  274. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.json +768 -0
  275. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +4 -0
  276. package/artifacts/contracts/token/ERC677.sol/ERC677.json +66 -0
  277. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +4 -0
  278. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.json +40 -0
  279. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +4 -0
  280. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.json +45 -0
  281. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +4 -0
  282. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +1206 -0
  283. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +4 -0
  284. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.json +99 -0
  285. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +4 -0
  286. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.json +34 -0
  287. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +4 -0
  288. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.json +355 -0
  289. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +4 -0
  290. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.json +2132 -0
  291. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +4 -0
  292. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2627 -0
  293. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +4 -0
  294. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.json +1759 -0
  295. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +4 -0
  296. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.json +682 -0
  297. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +4 -0
  298. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.json +89 -0
  299. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +4 -0
  300. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.json +19 -0
  301. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +4 -0
  302. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +32 -0
  303. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +4 -0
  304. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.json +10 -0
  305. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  306. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +41 -22
  307. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  308. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +94 -48
  309. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +4 -0
  310. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +830 -0
  311. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  312. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.json +2 -2
  313. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  314. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  315. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +4 -0
  316. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +184 -0
  317. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  318. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  319. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  320. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +28 -2
  321. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  322. package/artifacts/contracts/utils/DSMath.sol/DSMath.json +2 -2
  323. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  324. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.json +2 -2
  325. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  326. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +35 -2
  327. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  328. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  329. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  330. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  331. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  332. package/artifacts/contracts/utils/MultiCall.sol/Multicall.json +2 -2
  333. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  334. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  335. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  336. package/artifacts/contracts/utils/NameService.sol/NameService.json +28 -2
  337. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  338. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  339. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  340. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  341. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  342. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  343. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  344. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  345. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  346. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  347. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +2 -2
  348. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  349. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json +2 -2
  350. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  351. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  352. package/contracts/Interfaces.sol +57 -3
  353. package/contracts/fuseFaucet/Faucet.sol +258 -0
  354. package/contracts/fuseFaucet/FuseFaucet.sol +1 -2
  355. package/contracts/fuseFaucet/FuseFaucetV2.sol +256 -0
  356. package/contracts/governance/GReputation.sol +104 -16
  357. package/contracts/governance/GoodDollarStaking.sol +139 -53
  358. package/contracts/governance/GovernanceStaking.sol +2 -2
  359. package/contracts/identity/IdentityV2.sol +559 -0
  360. package/contracts/invite/InvitesFuseV2.sol +337 -0
  361. package/contracts/invite/InvitesV1.sol +6 -24
  362. package/contracts/invite/InvitesV2.sol +345 -0
  363. package/contracts/mocks/AaveMock.sol +1 -1
  364. package/contracts/mocks/DAIMock.sol +1 -1
  365. package/contracts/mocks/DecimalsMock.sol +1 -1
  366. package/contracts/mocks/FeesFormularMock.sol +21 -0
  367. package/contracts/mocks/GoodDollarStakingMock.sol +16 -0
  368. package/contracts/mocks/GoodFundManagerTest.sol +1 -1
  369. package/contracts/mocks/IdentityMock.sol +58 -0
  370. package/contracts/mocks/LendingPoolMock.sol +1 -1
  371. package/contracts/mocks/PayableMock.sol +3 -0
  372. package/contracts/mocks/SixteenDecimalsTokenMock.sol +1 -6
  373. package/contracts/mocks/TwentyDecimalsTokenMock.sol +1 -6
  374. package/contracts/mocks/UpgradableMocks.sol +5 -3
  375. package/contracts/mocks/UsdcMock.sol +1 -6
  376. package/contracts/mocks/cBATMock.sol +7 -12
  377. package/contracts/mocks/cDAILowWorthMock.sol +8 -12
  378. package/contracts/mocks/cDAIMock.sol +1 -1
  379. package/contracts/mocks/cDAINonMintableMock.sol +7 -12
  380. package/contracts/mocks/cDecimalsMock.sol +1 -1
  381. package/contracts/mocks/cSDTMock.sol +3 -3
  382. package/contracts/mocks/cUSDCMock.sol +5 -5
  383. package/contracts/reserve/DistributionHelper.sol +1 -1
  384. package/contracts/reserve/GoodReserveCDai.sol +1 -1
  385. package/contracts/token/ERC20PresetMinterPauserUpgradeable.sol +140 -0
  386. package/contracts/token/ERC677.sol +74 -0
  387. package/contracts/token/FeesFormula.sol +10 -0
  388. package/contracts/token/GoodDollar.sol +243 -0
  389. package/contracts/token/superfluid/ERC20Permit.sol +101 -0
  390. package/contracts/token/superfluid/ISuperGoodDollar.sol +84 -0
  391. package/contracts/token/superfluid/SuperGoodDollar.sol +401 -0
  392. package/contracts/token/superfluid/SuperToken.sol +714 -0
  393. package/contracts/token/superfluid/SuperfluidToken.sol +403 -0
  394. package/contracts/token/superfluid/UUPSProxiable.sol +55 -0
  395. package/contracts/token/superfluid/UUPSProxy.sol +153 -0
  396. package/contracts/ubi/UBIScheme.sol +88 -68
  397. package/contracts/utils/AdminWallet.sol +42 -11
  398. package/contracts/utils/AdminWalletFuse.sol +271 -0
  399. package/contracts/utils/BuyAndBridgeHelper.sol +108 -0
  400. package/contracts/utils/GoodDollarMintBurnWrapper.sol +19 -1
  401. package/contracts/utils/ProxyFactory1967.sol +1 -1
  402. package/hardhat.config.ts +29 -6
  403. package/package.json +11 -7
  404. package/releases/deploy-settings.json +58 -4
  405. package/releases/deployment.json +65 -231
  406. package/scripts/deployFullDAO.ts +39 -19
  407. package/scripts/gdx/gdxAirdropCalculation.ts +10 -11
  408. package/scripts/governance/airdropCalculationRecover.ts +43 -33
  409. package/scripts/governance/airdropCalculationSorted.ts +438 -0
  410. package/scripts/governance/goodCheckpointSorted.ts +377 -0
  411. package/scripts/multichain-deploy/0_proxyFactory-deploy.ts +100 -0
  412. package/scripts/multichain-deploy/{basicdao-deploy.ts → 1_basicdao-deploy.ts} +123 -93
  413. package/scripts/multichain-deploy/2_helpers-deploy.ts +151 -0
  414. package/scripts/multichain-deploy/{gdSavings-deploy.ts → 3_gdSavings-deploy.ts} +106 -76
  415. package/scripts/multichain-deploy/4_ubi-deploy.ts +147 -0
  416. package/scripts/multichain-deploy/5_gov-deploy.ts +147 -0
  417. package/scripts/multichain-deploy/fulldeploy.sh +26 -0
  418. package/scripts/multichain-deploy/helpers.ts +149 -111
  419. package/scripts/multichain-deploy/verifyEtherscan.ts +197 -0
  420. package/scripts/test/localOldDaoDeploy.ts +10 -3
  421. package/scripts/upgradeToV3/v3-fix.ts +120 -0
  422. package/scripts/upgradeToV3/v3-upgrade.ts +219 -0
  423. package/scripts/upgrades/celo-defi-ubi-deploy.ts +165 -0
  424. package/scripts/upgrades/identity-upgrade.ts +109 -0
  425. package/scripts/upgrades/transferDaoToGuardians.ts +80 -0
  426. package/test/faucet/Faucet.test.ts +157 -0
  427. package/test/{FuseFaucet.test.ts → faucet/FuseFaucet.test.ts} +26 -31
  428. package/test/governance/ClaimersDistribution.test.ts +58 -6
  429. package/test/governance/CompoundVotingMachine.castvote.test.ts +3 -3
  430. package/test/governance/CompoundVotingMachine.crossblockchain.ts +3 -2
  431. package/test/governance/CompoundVotingMachine.daoscheme.ts +8 -10
  432. package/test/governance/CompoundVotingMachine.delegate.test.ts +4 -5
  433. package/test/governance/CompoundVotingMachine.guardian.test.ts +5 -11
  434. package/test/governance/CompoundVotingMachine.propose.test.ts +3 -2
  435. package/test/governance/CompoundVotingMachine.state.test.ts +3 -2
  436. package/test/governance/GReputation.test.ts +78 -32
  437. package/test/governance/GReputation.v2merkle.test.ts +186 -0
  438. package/test/governance/GoodDollarStaking.gd.test.ts +83 -1
  439. package/test/governance/GoodDollarStaking.good.test.ts +2 -1
  440. package/test/governance/GovernanceStaking.test.ts +4 -4
  441. package/test/governance/Reputation.test.ts +2 -1
  442. package/test/governance/StakersDistribution.test.ts +26 -13
  443. package/test/helpers.ts +145 -52
  444. package/test/identity/IdentityV2.test.ts +539 -0
  445. package/test/{InvitesV1.test.ts → invite/InvitesV1.test.ts} +10 -5
  446. package/test/invite/InvitesV2.test.ts +328 -0
  447. package/test/reserve/DistributionHelper.test.ts +2 -1
  448. package/test/reserve/GoodMarketMaker.test.ts +20 -19
  449. package/test/reserve/GoodReserveCDai.cap.test.ts +8 -1
  450. package/test/reserve/GoodReserveCDai.distribution.test.ts +2 -1
  451. package/test/reserve/GoodReserveCDai.gdx.test.ts +2 -2
  452. package/test/reserve/GoodReserveCDai.pause.test.ts +2 -1
  453. package/test/reserve/GoodReserveCDai.test.ts +14 -38
  454. package/test/reserve/GoodReserveCDai.uniswap.test.ts +21 -19
  455. package/test/staking/CompoundStakingFactory.test.ts +8 -5
  456. package/test/staking/DifferentStakingTokens.test.ts +3 -2
  457. package/test/staking/DonationsStaking.test.ts +33 -24
  458. package/test/staking/FuseStaking.test.ts +9 -9
  459. package/test/staking/GoodAaveStakingFactory.test.ts +36 -31
  460. package/test/staking/SimpleDAIStaking.test.ts +13 -19
  461. package/test/staking/StakingRewards.test.ts +19 -16
  462. package/test/staking/StakingRewardsFixedAPY.test.ts +2 -1
  463. package/test/staking/SwapHelper.test.ts +20 -17
  464. package/test/staking/UsdcAaveStaking.test.ts +36 -33
  465. package/test/token/GoodDollar.test.ts +445 -0
  466. package/test/token/SuperGoodDollar.test.ts +422 -0
  467. package/test/ubi/UBIScheme.e2e.test.ts +6 -5
  468. package/test/ubi/UBIScheme.test.ts +37 -36
  469. package/test/ubi/UBISchemeCycle.test.ts +11 -8
  470. package/test/utils/AdminWallet.test.ts +34 -11
  471. package/test/utils/BuyAndBridgeHelper.test.ts +249 -0
  472. package/test/utils/DAOUpgradeableContract.test.ts +3 -2
  473. package/test/utils/GoodDollarMintBurnWrapper.test.ts +3 -2
  474. package/test/utils/NameService.test.ts +37 -21
  475. package/test/utils/ProtocolUpgrade.test.ts +1 -1
  476. package/test/utils/ProxyFactory.test.ts +12 -10
  477. package/truffle-config.js +18 -18
  478. package/types/AaveMock.ts +24 -15
  479. package/types/AccessControlEnumerableUpgradeable.ts +9 -0
  480. package/types/AccessControlUpgradeable.ts +9 -0
  481. package/types/AdminWallet.ts +149 -110
  482. package/types/AdminWalletFuse.ts +1268 -0
  483. package/types/BuyAndBridgeHelper.ts +279 -0
  484. package/types/CBATMock.ts +24 -15
  485. package/types/CDAILowWorthMock.ts +24 -15
  486. package/types/CDAIMock.ts +24 -15
  487. package/types/CDAINonMintableMock.ts +24 -15
  488. package/types/CDecimalsMock.ts +24 -15
  489. package/types/CSDTMock.ts +24 -15
  490. package/types/CUSDCMock.ts +24 -15
  491. package/types/ClaimersDistribution.ts +28 -0
  492. package/types/CompoundVotingMachine.ts +28 -0
  493. package/types/ContextUpgradeable.ts +77 -0
  494. package/types/DAIMock.ts +24 -15
  495. package/types/DAOUpgradeableContract.ts +28 -0
  496. package/types/DecimalsMock.ts +24 -15
  497. package/types/DistributionHelper.ts +28 -0
  498. package/types/DistributionHelperTest.ts +28 -0
  499. package/types/DistributionHelperTestHelper.ts +28 -0
  500. package/types/DonationsStaking.ts +28 -0
  501. package/types/EIP712Upgradeable.ts +77 -0
  502. package/types/ERC165Upgradeable.ts +13 -2
  503. package/types/ERC1967UpgradeUpgradeable.ts +9 -0
  504. package/types/ERC20BurnableUpgradeable.ts +24 -15
  505. package/types/ERC20PausableUpgradeable.ts +24 -15
  506. package/types/ERC20Permit.ts +186 -0
  507. package/types/ERC20PermitUpgradeable.ts +531 -0
  508. package/types/ERC20PresetMinterPauserUpgradeable.ts +129 -16
  509. package/types/ERC20Upgradeable.ts +24 -15
  510. package/types/ERC20WithTokenInfo.ts +339 -0
  511. package/types/ERC677.ts +131 -0
  512. package/types/ERC677Receiver.ts +115 -0
  513. package/types/EventsEmitter.ts +88 -0
  514. package/types/ExchangeHelper.ts +28 -0
  515. package/types/Faucet.ts +1107 -0
  516. package/types/FeesFormulaMock.ts +130 -0
  517. package/types/FuseFaucet.ts +9 -0
  518. package/types/FuseFaucetV2.ts +729 -0
  519. package/types/FuseStakingV3.ts +9 -0
  520. package/types/GReputation.ts +103 -4
  521. package/types/GoodAaveStaking.ts +24 -15
  522. package/types/GoodAaveStakingV2.ts +24 -15
  523. package/types/GoodCompoundStaking.ts +24 -15
  524. package/types/GoodCompoundStakingTest.ts +24 -15
  525. package/types/GoodCompoundStakingV2.ts +24 -15
  526. package/types/GoodDollar.ts +1733 -0
  527. package/types/GoodDollarMintBurnWrapper.ts +55 -0
  528. package/types/GoodDollarStaking.ts +92 -0
  529. package/types/GoodDollarStakingMock.ts +131 -0
  530. package/types/GoodFundManager.ts +28 -0
  531. package/types/GoodFundManagerTest.ts +28 -0
  532. package/types/GoodMarketMaker.ts +28 -0
  533. package/types/GoodReserveCDai.ts +43 -15
  534. package/types/GovernanceStaking.ts +43 -15
  535. package/types/IERC1271Upgradeable.ts +109 -0
  536. package/types/IERC1820Registry.ts +398 -0
  537. package/types/IERC1822ProxiableUpgradeable.ts +90 -0
  538. package/types/IERC20MetadataUpgradeable.ts +15 -15
  539. package/types/IERC20Permit.ts +175 -0
  540. package/types/IERC20PermitUpgradeable.ts +176 -0
  541. package/types/IERC20Upgradeable.ts +15 -15
  542. package/types/IERC777.ts +586 -0
  543. package/types/IERC777Recipient.ts +130 -0
  544. package/types/IERC777Sender.ts +130 -0
  545. package/types/IFeesFormula.ts +111 -0
  546. package/types/IGoodDollar.ts +304 -7
  547. package/types/IGoodDollarCustom.ts +618 -0
  548. package/types/IGovernanceStaking.ts +98 -0
  549. package/types/IIdentity.ts +106 -0
  550. package/types/IIdentityV2.ts +557 -0
  551. package/types/IStakingUpgrade.ts +110 -0
  552. package/types/ISuperAgreement.ts +151 -0
  553. package/types/ISuperApp.ts +410 -0
  554. package/types/ISuperGoodDollar.ts +3029 -0
  555. package/types/ISuperToken.ts +2326 -0
  556. package/types/ISuperTokenFactory.ts +415 -0
  557. package/types/ISuperfluid.ts +1565 -0
  558. package/types/ISuperfluidGovernance.ts +455 -0
  559. package/types/ISuperfluidToken.ts +951 -0
  560. package/types/IdentityMock.ts +493 -0
  561. package/types/IdentityV2.ts +1743 -0
  562. package/types/Initializable.ts +77 -0
  563. package/types/InvitesFuseV2.ts +806 -0
  564. package/types/InvitesV1.ts +9 -0
  565. package/types/InvitesV2.ts +1010 -0
  566. package/types/LendingPoolMock.ts +24 -15
  567. package/types/NameService.ts +28 -0
  568. package/types/OwnableUpgradeable.ts +9 -0
  569. package/types/PausableUpgradeable.ts +9 -0
  570. package/types/PayableMock.ts +92 -0
  571. package/types/ReentrancyGuardUpgradeable.ts +78 -0
  572. package/types/Reputation.ts +28 -0
  573. package/types/SelfApprove.ts +115 -0
  574. package/types/SimpleStaking.ts +24 -15
  575. package/types/SimpleStakingV2.ts +24 -15
  576. package/types/SixteenDecimalsTokenMock.ts +24 -15
  577. package/types/StakersDistribution.ts +28 -0
  578. package/types/SuperGoodDollar.ts +3662 -0
  579. package/types/SuperToken.ts +2434 -0
  580. package/types/SuperfluidToken.ts +951 -0
  581. package/types/TokenInfo.ts +109 -0
  582. package/types/TwentyDecimalsTokenMock.ts +24 -15
  583. package/types/UBIScheme.ts +47 -40
  584. package/types/USDCMock.ts +24 -15
  585. package/types/UUPSProxiable.ts +183 -0
  586. package/types/UUPSProxy.ts +105 -0
  587. package/types/UUPSUpgradeable.ts +28 -0
  588. package/types/UpgradableMock.ts +28 -0
  589. package/types/UpgradableMock2.ts +28 -0
  590. package/types/UpgradableMock3.ts +28 -0
  591. package/types/UpgradableMock4.ts +28 -0
  592. package/types/factories/AaveMock__factory.ts +17 -4
  593. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  594. package/types/factories/AaveUSDMockOracle__factory.ts +1 -1
  595. package/types/factories/AccessControlEnumerableUpgradeable__factory.ts +13 -0
  596. package/types/factories/AccessControlUpgradeable__factory.ts +13 -0
  597. package/types/factories/AdminWalletFuse__factory.ts +881 -0
  598. package/types/factories/AdminWallet__factory.ts +93 -47
  599. package/types/factories/BancorFormula__factory.ts +1 -1
  600. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  601. package/types/factories/BaseShareField__factory.ts +1 -1
  602. package/types/factories/BatUSDMockOracle__factory.ts +1 -1
  603. package/types/factories/BuyAndBridgeHelper__factory.ts +237 -0
  604. package/types/factories/CBATMock__factory.ts +17 -4
  605. package/types/factories/CDAILowWorthMock__factory.ts +17 -4
  606. package/types/factories/CDAIMock__factory.ts +17 -4
  607. package/types/factories/CDAINonMintableMock__factory.ts +17 -4
  608. package/types/factories/CDecimalsMock__factory.ts +17 -4
  609. package/types/factories/CSDTMock__factory.ts +17 -4
  610. package/types/factories/CUSDCMock__factory.ts +17 -4
  611. package/types/factories/ClaimersDistribution__factory.ts +27 -1
  612. package/types/factories/CompUSDMockOracle__factory.ts +1 -1
  613. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  614. package/types/factories/CompoundVotingMachine__factory.ts +27 -1
  615. package/types/factories/ContextUpgradeable__factory.ts +39 -0
  616. package/types/factories/DAIMock__factory.ts +17 -4
  617. package/types/factories/DAOContract__factory.ts +1 -1
  618. package/types/factories/DAOUpgradeableContract__factory.ts +27 -1
  619. package/types/factories/DaiEthPriceMockOracle__factory.ts +1 -1
  620. package/types/factories/DecimalsMock__factory.ts +17 -4
  621. package/types/factories/DistributionBridgeMock__factory.ts +1 -1
  622. package/types/factories/DistributionHelperTestHelper__factory.ts +27 -1
  623. package/types/factories/DistributionHelperTest__factory.ts +27 -1
  624. package/types/factories/DistributionHelper__factory.ts +27 -1
  625. package/types/factories/DonationsStaking__factory.ts +27 -1
  626. package/types/factories/EIP712Upgradeable__factory.ts +39 -0
  627. package/types/factories/ERC165Upgradeable__factory.ts +13 -0
  628. package/types/factories/ERC1967Proxy__factory.ts +1 -1
  629. package/types/factories/ERC1967UpgradeUpgradeable__factory.ts +13 -0
  630. package/types/factories/ERC20BurnableUpgradeable__factory.ts +16 -3
  631. package/types/factories/ERC20PausableUpgradeable__factory.ts +16 -3
  632. package/types/factories/ERC20PermitUpgradeable__factory.ts +388 -0
  633. package/types/factories/ERC20Permit__factory.ts +111 -0
  634. package/types/factories/ERC20PresetMinterPauserUpgradeable__factory.ts +99 -5
  635. package/types/factories/ERC20Upgradeable__factory.ts +17 -4
  636. package/types/factories/ERC20WithTokenInfo__factory.ts +248 -0
  637. package/types/factories/ERC677Receiver__factory.ts +55 -0
  638. package/types/factories/ERC677__factory.ts +75 -0
  639. package/types/factories/EthUSDMockOracle__factory.ts +1 -1
  640. package/types/factories/EventsEmitter__factory.ts +84 -0
  641. package/types/factories/ExchangeHelper__factory.ts +27 -1
  642. package/types/factories/Faucet__factory.ts +781 -0
  643. package/types/factories/FeesFormulaMock__factory.ts +132 -0
  644. package/types/factories/FuseFaucetV2__factory.ts +528 -0
  645. package/types/factories/FuseFaucet__factory.ts +14 -1
  646. package/types/factories/FuseStakingV3__factory.ts +14 -1
  647. package/types/factories/GReputation__factory.ts +77 -2
  648. package/types/factories/GasPriceMockOracle__factory.ts +1 -1
  649. package/types/factories/GoodAaveStakingV2__factory.ts +17 -4
  650. package/types/factories/GoodAaveStaking__factory.ts +17 -4
  651. package/types/factories/GoodCompoundStakingTest__factory.ts +17 -4
  652. package/types/factories/GoodCompoundStakingV2__factory.ts +17 -4
  653. package/types/factories/GoodCompoundStaking__factory.ts +17 -4
  654. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +34 -1
  655. package/types/factories/GoodDollarStakingMock__factory.ts +94 -1
  656. package/types/factories/GoodDollarStaking__factory.ts +70 -1
  657. package/types/factories/GoodDollar__factory.ts +1254 -0
  658. package/types/factories/GoodFundManagerTest__factory.ts +27 -1
  659. package/types/factories/GoodFundManager__factory.ts +27 -1
  660. package/types/factories/GoodMarketMaker__factory.ts +27 -1
  661. package/types/factories/GoodReserveCDai__factory.ts +30 -4
  662. package/types/factories/GovernanceStaking__factory.ts +30 -4
  663. package/types/factories/IERC1271Upgradeable__factory.ts +50 -0
  664. package/types/factories/IERC1820Registry__factory.ts +239 -0
  665. package/types/factories/IERC1822ProxiableUpgradeable__factory.ts +43 -0
  666. package/types/factories/IERC20MetadataUpgradeable__factory.ts +3 -3
  667. package/types/factories/IERC20PermitUpgradeable__factory.ts +105 -0
  668. package/types/factories/IERC20Permit__factory.ts +98 -0
  669. package/types/factories/IERC20Upgradeable__factory.ts +3 -3
  670. package/types/factories/IERC777Recipient__factory.ts +64 -0
  671. package/types/factories/IERC777Sender__factory.ts +61 -0
  672. package/types/factories/IERC777__factory.ts +414 -0
  673. package/types/factories/IFeesFormula__factory.ts +57 -0
  674. package/types/factories/IGoodDollarCustom__factory.ts +370 -0
  675. package/types/factories/IGoodDollar__factory.ts +184 -0
  676. package/types/factories/IGovernanceStaking__factory.ts +39 -0
  677. package/types/factories/IIdentityV2__factory.ts +312 -0
  678. package/types/factories/IIdentity__factory.ts +70 -0
  679. package/types/factories/IStakingUpgrade__factory.ts +50 -0
  680. package/types/factories/ISuperAgreement__factory.ts +78 -0
  681. package/types/factories/ISuperApp__factory.ts +272 -0
  682. package/types/factories/ISuperGoodDollar__factory.ts +2147 -0
  683. package/types/factories/ISuperTokenFactory__factory.ts +271 -0
  684. package/types/factories/ISuperToken__factory.ts +1682 -0
  685. package/types/factories/ISuperfluidGovernance__factory.ts +264 -0
  686. package/types/factories/ISuperfluidToken__factory.ts +697 -0
  687. package/types/factories/ISuperfluid__factory.ts +1143 -0
  688. package/types/factories/IdentityMock__factory.ts +327 -0
  689. package/types/factories/IdentityV2__factory.ts +1129 -0
  690. package/types/factories/IncentiveControllerMock__factory.ts +1 -1
  691. package/types/factories/Initializable__factory.ts +36 -0
  692. package/types/factories/InvitesFuseV2__factory.ts +553 -0
  693. package/types/factories/InvitesV1__factory.ts +14 -1
  694. package/types/factories/InvitesV2__factory.ts +683 -0
  695. package/types/factories/LendingPoolMock__factory.ts +17 -4
  696. package/types/factories/Multicall__factory.ts +1 -1
  697. package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
  698. package/types/factories/MultichainRouterMock__factory.ts +1 -1
  699. package/types/factories/NameService__factory.ts +27 -1
  700. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  701. package/types/factories/OverMintTester__factory.ts +1 -1
  702. package/types/factories/OwnableUpgradeable__factory.ts +13 -0
  703. package/types/factories/PausableUpgradeable__factory.ts +13 -0
  704. package/types/factories/PayableMock__factory.ts +66 -0
  705. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  706. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  707. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  708. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  709. package/types/factories/ProxyFactory1967__factory.ts +1 -1
  710. package/types/factories/ReentrancyGuardUpgradeable__factory.ts +43 -0
  711. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  712. package/types/factories/Reputation__factory.ts +27 -1
  713. package/types/factories/SelfApprove__factory.ts +46 -0
  714. package/types/factories/SimpleStakingV2__factory.ts +16 -3
  715. package/types/factories/SimpleStaking__factory.ts +16 -3
  716. package/types/factories/SixteenDecimalsTokenMock__factory.ts +17 -4
  717. package/types/factories/StakersDistribution__factory.ts +27 -1
  718. package/types/factories/StakingMockFixedAPY__factory.ts +1 -1
  719. package/types/factories/SuperGoodDollar__factory.ts +2680 -0
  720. package/types/factories/SuperToken__factory.ts +1809 -0
  721. package/types/factories/SuperfluidToken__factory.ts +697 -0
  722. package/types/factories/SwapHelperTest__factory.ts +1 -1
  723. package/types/factories/TokenInfo__factory.ts +62 -0
  724. package/types/factories/TwentyDecimalsTokenMock__factory.ts +17 -4
  725. package/types/factories/UBIScheme__factory.ts +40 -21
  726. package/types/factories/USDCMock__factory.ts +17 -4
  727. package/types/factories/UUPSProxiable__factory.ts +101 -0
  728. package/types/factories/UUPSProxy__factory.ts +80 -0
  729. package/types/factories/UUPSUpgradeable__factory.ts +26 -0
  730. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  731. package/types/factories/UpgradableMock2__factory.ts +27 -1
  732. package/types/factories/UpgradableMock3__factory.ts +27 -1
  733. package/types/factories/UpgradableMock4__factory.ts +27 -1
  734. package/types/factories/UpgradableMock__factory.ts +27 -1
  735. package/types/hardhat.d.ts +459 -0
  736. package/types/index.ts +98 -0
  737. package/yarn.lock +1251 -306
  738. package/scripts/multichain-deploy/nonubiDistribution-deploy.ts +0 -170
package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json CHANGED
@@ -76,8 +76,8 @@
76
76
  "type": "function"
77
77
  }
78
78
  ],
79
- "bytecode": "0x608060405234801561001057600080fd5b50604051610e6c380380610e6c83398101604081905261002f9161010b565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b15801561009357600080fd5b505afa1580156100a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cb9190610145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506101699050565b6001600160a01b038116811461010857600080fd5b50565b6000806040838503121561011e57600080fd5b8251610129816100f3565b602084015190925061013a816100f3565b809150509250929050565b60006020828403121561015757600080fd5b8151610162816100f3565b9392505050565b610cf4806101786000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea2646970667358221220782f6e3dfd6b22518cbdf3520e73fd9cb9b4e91b2fe557fa1ba830a1ad1a95f864736f6c63430008080033",
80
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e610049366004610905565b610063565b005b61004e61005e36600461099b565b610280565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d90610a42565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b1580156100fa57600080fd5b505af115801561010e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101329190610a7b565b61018f5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101c392911690600401610a9d565b602060405180830381600087803b1580156101dd57600080fd5b505af11580156101f1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102159190610a7b565b6102725760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b031633146102aa5760405162461bcd60e51b815260040161008d90610a42565b8281146102eb5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b610359878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061036c92505050565b61036385876104ad565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103979087908790602401610ab1565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103f29392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561040c57600080fd5b505af1158015610420573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104489190810190610bc8565b509050806104a75760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd8916004808301926020929190829003018186803b1580156104f257600080fd5b505afa158015610506573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052a9190610c88565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105629290911690600401610a9d565b60206040518083038186803b15801561057a57600080fd5b505afa15801561058e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105b29190610ca5565b6000805460405192935090916001600160a01b039091169063d1b7089a9086906105e0908990602401610a9d565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b031916815261063b9392916001600160a01b031690600090600401610b61565b600060405180830381600087803b15801561065557600080fd5b505af1158015610669573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106919190810190610bc8565b509050806106d75760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a94610746948c949391169190600401610b61565b600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079c9190810190610bc8565b509050806107ea5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b81156108e65760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd90608401602060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108889190610a7b565b9050806108e65760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461090257600080fd5b50565b60008060006060848603121561091a57600080fd5b8335610925816108ed565b92506020840135610935816108ed565b91506040840135610945816108ed565b809150509250925092565b60008083601f84011261096257600080fd5b5081356001600160401b0381111561097957600080fd5b6020830191508360208260051b850101111561099457600080fd5b9250929050565b600080600080600080600060a0888a0312156109b657600080fd5b87356109c1816108ed565b965060208801356109d1816108ed565b955060408801356109e1816108ed565b945060608801356001600160401b03808211156109fd57600080fd5b610a098b838c01610950565b909650945060808a0135915080821115610a2257600080fd5b50610a2f8a828b01610950565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b80518015158114610a7657600080fd5b919050565b600060208284031215610a8d57600080fd5b610a9682610a66565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610aea57815184529284019290840190600101610ace565b5050508381038285015284518082528583019183019060005b81811015610b285783516001600160a01b031683529284019291840191600101610b03565b5090979650505050505050565b60005b83811015610b50578181015183820152602001610b38565b838111156104a75750506000910152565b600060018060a01b038087168352608060208401528551806080850152610b8f8160a0860160208a01610b35565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610bdb57600080fd5b610be483610a66565b60208401519092506001600160401b0380821115610c0157600080fd5b818501915085601f830112610c1557600080fd5b815181811115610c2757610c27610bb2565b604051601f8201601f19908116603f01168101908382118183101715610c4f57610c4f610bb2565b81604052828152886020848701011115610c6857600080fd5b610c79836020830160208801610b35565b80955050505050509250929050565b600060208284031215610c9a57600080fd5b8151610a96816108ed565b600060208284031215610cb757600080fd5b505191905056fea2646970667358221220782f6e3dfd6b22518cbdf3520e73fd9cb9b4e91b2fe557fa1ba830a1ad1a95f864736f6c63430008080033",
79
+ "bytecode": "0x608060405234801561001057600080fd5b50604051610ddd380380610ddd83398101604081905261002f916100fc565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610098573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100bc9190610136565b600280546001600160a01b0319166001600160a01b03929092169190911790555061015a9050565b6001600160a01b03811681146100f957600080fd5b50565b6000806040838503121561010f57600080fd5b825161011a816100e4565b602084015190925061012b816100e4565b809150509250929050565b60006020828403121561014857600080fd5b8151610153816100e4565b9392505050565b610c74806101696000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e61004936600461088d565b610063565b005b61004e61005e366004610923565b610262565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d906109ca565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af11580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610a03565b6101805760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101b492911690600401610a25565b6020604051808303816000875af11580156101d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f79190610a03565b6102545760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461028c5760405162461bcd60e51b815260040161008d906109ca565b8281146102cd5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b61033b878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061034e92505050565b6103458587610480565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103799087908790602401610a39565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103d49392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af11580156103f3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261041b9190810190610b48565b5090508061047a5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd89160048083019260209291908290030181865afa1580156104ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ee9190610c08565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105269290911690600401610a25565b602060405180830381865afa158015610543573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105679190610c25565b6000805460405192935090916001600160a01b039091169063d1b7089a908690610595908990602401610a25565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b03191681526105f09392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af115801561060f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106379190810190610b48565b5090508061067d5760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a946106ec948c949391169190600401610ae1565b6000604051808303816000875af115801561070b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107339190810190610b48565b509050806107815760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b811561086e5760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd906084016020604051808303816000875af11580156107ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108109190610a03565b90508061086e5760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461088a57600080fd5b50565b6000806000606084860312156108a257600080fd5b83356108ad81610875565b925060208401356108bd81610875565b915060408401356108cd81610875565b809150509250925092565b60008083601f8401126108ea57600080fd5b5081356001600160401b0381111561090157600080fd5b6020830191508360208260051b850101111561091c57600080fd5b9250929050565b600080600080600080600060a0888a03121561093e57600080fd5b873561094981610875565b9650602088013561095981610875565b9550604088013561096981610875565b945060608801356001600160401b038082111561098557600080fd5b6109918b838c016108d8565b909650945060808a01359150808211156109aa57600080fd5b506109b78a828b016108d8565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b805180151581146109fe57600080fd5b919050565b600060208284031215610a1557600080fd5b610a1e826109ee565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610a7257815184529284019290840190600101610a56565b5050508381038285015284518082528583019183019060005b81811015610ab05783516001600160a01b031683529284019291840191600101610a8b565b5090979650505050505050565b60005b83811015610ad8578181015183820152602001610ac0565b50506000910152565b600060018060a01b038087168352608060208401528551806080850152610b0f8160a0860160208a01610abd565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5b57600080fd5b610b64836109ee565b60208401519092506001600160401b0380821115610b8157600080fd5b818501915085601f830112610b9557600080fd5b815181811115610ba757610ba7610b32565b604051601f8201601f19908116603f01168101908382118183101715610bcf57610bcf610b32565b81604052828152886020848701011115610be857600080fd5b610bf9836020830160208801610abd565b80955050505050509250929050565b600060208284031215610c1a57600080fd5b8151610a1e81610875565b600060208284031215610c3757600080fd5b505191905056fea2646970667358221220e7f7e3e41c2c03e2230d7602d3f3f6653fef0e4d4269db4bad2eba7fdbe1701f64736f6c63430008100033",
80
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e61004936600461088d565b610063565b005b61004e61005e366004610923565b610262565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d906109ca565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af11580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610a03565b6101805760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101b492911690600401610a25565b6020604051808303816000875af11580156101d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f79190610a03565b6102545760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461028c5760405162461bcd60e51b815260040161008d906109ca565b8281146102cd5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b61033b878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061034e92505050565b6103458587610480565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103799087908790602401610a39565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103d49392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af11580156103f3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261041b9190810190610b48565b5090508061047a5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd89160048083019260209291908290030181865afa1580156104ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ee9190610c08565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105269290911690600401610a25565b602060405180830381865afa158015610543573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105679190610c25565b6000805460405192935090916001600160a01b039091169063d1b7089a908690610595908990602401610a25565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b03191681526105f09392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af115801561060f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106379190810190610b48565b5090508061067d5760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a946106ec948c949391169190600401610ae1565b6000604051808303816000875af115801561070b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107339190810190610b48565b509050806107815760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b811561086e5760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd906084016020604051808303816000875af11580156107ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108109190610a03565b90508061086e5760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461088a57600080fd5b50565b6000806000606084860312156108a257600080fd5b83356108ad81610875565b925060208401356108bd81610875565b915060408401356108cd81610875565b809150509250925092565b60008083601f8401126108ea57600080fd5b5081356001600160401b0381111561090157600080fd5b6020830191508360208260051b850101111561091c57600080fd5b9250929050565b600080600080600080600060a0888a03121561093e57600080fd5b873561094981610875565b9650602088013561095981610875565b9550604088013561096981610875565b945060608801356001600160401b038082111561098557600080fd5b6109918b838c016108d8565b909650945060808a01359150808211156109aa57600080fd5b506109b78a828b016108d8565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b805180151581146109fe57600080fd5b919050565b600060208284031215610a1557600080fd5b610a1e826109ee565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610a7257815184529284019290840190600101610a56565b5050508381038285015284518082528583019183019060005b81811015610ab05783516001600160a01b031683529284019291840191600101610a8b565b5090979650505050505050565b60005b83811015610ad8578181015183820152602001610ac0565b50506000910152565b600060018060a01b038087168352608060208401528551806080850152610b0f8160a0860160208a01610abd565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5b57600080fd5b610b64836109ee565b60208401519092506001600160401b0380821115610b8157600080fd5b818501915085601f830112610b9557600080fd5b815181811115610ba757610ba7610b32565b604051601f8201601f19908116603f01168101908382118183101715610bcf57610bcf610b32565b81604052828152886020848701011115610be857600080fd5b610bf9836020830160208801610abd565b80955050505050509250929050565b600060208284031215610c1a57600080fd5b8151610a1e81610875565b600060208284031215610c3757600080fd5b505191905056fea2646970667358221220e7f7e3e41c2c03e2230d7602d3f3f6653fef0e4d4269db4bad2eba7fdbe1701f64736f6c63430008100033",
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/82edabb017e079b951c9a9557f562e2a.json"
3
+ "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.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": "0x60806040523480156200001157600080fd5b5060405162001ae138038062001ae1833981016040819052620000349162000116565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200009957600080fd5b505afa158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d4919062000155565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200017c9050565b6001600160a01b03811681146200011357600080fd5b50565b600080604083850312156200012a57600080fd5b82516200013781620000fd565b60208401519092506200014a81620000fd565b809150509250929050565b6000602082840312156200016857600080fd5b81516200017581620000fd565b9392505050565b611955806200018c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea26469706673582212204acc2c5303fd8e7c55615a6750f96436bd49699432c5db263015c49a538c442764736f6c63430008080033",
118
- "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea26469706673582212204acc2c5303fd8e7c55615a6750f96436bd49699432c5db263015c49a538c442764736f6c63430008080033",
117
+ "bytecode": "0x60806040523480156200001157600080fd5b506040516200199b3803806200199b833981016040819052620000349162000106565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156200009e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000c4919062000145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200016c9050565b6001600160a01b03811681146200010357600080fd5b50565b600080604083850312156200011a57600080fd5b82516200012781620000ed565b60208401519092506200013a81620000ed565b809150509250929050565b6000602082840312156200015857600080fd5b81516200016581620000ed565b9392505050565b61181f806200017c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a610075366004611263565b6100fc565b005b34801561008857600080fd5b5061007a610097366004611287565b6102f6565b3480156100a857600080fd5b5061007a6100b73660046112fe565b6104aa565b3480156100c857600080fd5b5061007a6100d7366004611454565b61058a565b3480156100e857600080fd5b5061007a6100f7366004611263565b610812565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611529565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af1158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc9190611562565b6102195760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261024d9291169060040161157d565b6020604051808303816000875af115801561026c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102909190611562565b6102e85760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b031633146103205760405162461bcd60e51b815260040161012690611529565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac19061035990600401611591565b602060405180830381865afa158015610376573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061039a91906115b2565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b03191681526104029392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610421573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104499190810190611644565b509050806104a55760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146104d45760405162461bcd60e51b815260040161012690611529565b8281146105155760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b610583858585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061085192505050565b5050505050565b6001546001600160a01b031633146105b45760405162461bcd60e51b815260040161012690611529565b80518251146105ff5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b825181101561080c576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa15801561067b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061069f91906115b2565b8585815181106106b1576106b16116eb565b60200260200101518786815181106106cb576106cb6116eb565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107629392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610781573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107a99190810190611644565b509050806107f95760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061080481611701565b915050610602565b50505050565b6001546001600160a01b0316331461083c5760405162461bcd60e51b815260040161012690611529565b6108458161097d565b61084e81610e18565b50565b600080546040516001600160a01b039091169063d1b7089a90869061087c9087908790602401611728565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526108d79392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156108f6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261091e9190810190611644565b5090508061080c5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac1906109b6906004016117ac565b602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906115b2565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a2190600401611591565b602060405180830381865afa158015610a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6291906115b2565b604051602401610a72919061157d565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610acd9392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610aec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b149190810190611644565b50905080610b5f5760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610b97906004016117ac565b602060405180830381865afa158015610bb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd891906115b2565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610c2f94936001600160a01b031691600091016115f3565b6000604051808303816000875af1158015610c4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610c769190810190611644565b50905080610cc65760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610cfe90600401611591565b602060405180830381865afa158015610d1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3f91906115b2565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015610d96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dba9190611562565b905080610e145760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610e5e906020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9f91906115b2565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610ed7929091169060040161157d565b602060405180830381865afa158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1891906117d0565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190610f5590600401611591565b602060405180830381865afa158015610f72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f9691906115b2565b60025460405160e085901b6001600160e01b03191681526001600160a01b0393841660048201529183166024830152604482018690529190911660648201526084016020604051808303816000875af1158015610ff7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101b9190611562565b9250826110765760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac190606401602060405180830381865afa1580156110e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061110991906115b2565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526111a49392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156111c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111eb9190810190611644565b5092508261080c5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b038116811461084e57600080fd5b60006020828403121561127557600080fd5b81356112808161124e565b9392505050565b6000806040838503121561129a57600080fd5b82356112a58161124e565b946020939093013593505050565b60008083601f8401126112c557600080fd5b5081356001600160401b038111156112dc57600080fd5b6020830191508360208260051b85010111156112f757600080fd5b9250929050565b60008060008060006060868803121561131657600080fd5b85356113218161124e565b945060208601356001600160401b038082111561133d57600080fd5b61134989838a016112b3565b9096509450604088013591508082111561136257600080fd5b5061136f888289016112b3565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156113be576113be611380565b604052919050565b60006001600160401b038211156113df576113df611380565b5060051b60200190565b600082601f8301126113fa57600080fd5b8135602061140f61140a836113c6565b611396565b82815260059290921b8401810191818101908684111561142e57600080fd5b8286015b848110156114495780358352918301918301611432565b509695505050505050565b60008060006060848603121561146957600080fd5b83356114748161124e565b92506020848101356001600160401b038082111561149157600080fd5b818701915087601f8301126114a557600080fd5b81356114b361140a826113c6565b81815260059190911b8301840190848101908a8311156114d257600080fd5b938501935b828510156114f95784356114ea8161124e565b825293850193908501906114d7565b96505050604087013592508083111561151157600080fd5b505061151f868287016113e9565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461155d57600080fd5b919050565b60006020828403121561157457600080fd5b6112808261154d565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156115c457600080fd5b81516112808161124e565b60005b838110156115ea5781810151838201526020016115d2565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526116218160a0860160208a016115cf565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561165757600080fd5b6116608361154d565b60208401519092506001600160401b038082111561167d57600080fd5b818501915085601f83011261169157600080fd5b8151818111156116a3576116a3611380565b6116b6601f8201601f1916602001611396565b91508082528660208285010111156116cd57600080fd5b6116de8160208401602086016115cf565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b60006001820161172157634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b8281101561176157815184529284019290840190600101611745565b5050508381038285015284518082528583019183019060005b8181101561179f5783516001600160a01b03168352928401929184019160010161177a565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000602082840312156117e257600080fd5b505191905056fea264697066735822122017d276d65370f8ba8d89474ebc6f7b71268372f3721856947bab1c3f5d78530864736f6c63430008100033",
118
+ "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a610075366004611263565b6100fc565b005b34801561008857600080fd5b5061007a610097366004611287565b6102f6565b3480156100a857600080fd5b5061007a6100b73660046112fe565b6104aa565b3480156100c857600080fd5b5061007a6100d7366004611454565b61058a565b3480156100e857600080fd5b5061007a6100f7366004611263565b610812565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611529565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af1158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc9190611562565b6102195760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261024d9291169060040161157d565b6020604051808303816000875af115801561026c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102909190611562565b6102e85760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b031633146103205760405162461bcd60e51b815260040161012690611529565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac19061035990600401611591565b602060405180830381865afa158015610376573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061039a91906115b2565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b03191681526104029392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610421573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104499190810190611644565b509050806104a55760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146104d45760405162461bcd60e51b815260040161012690611529565b8281146105155760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b610583858585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061085192505050565b5050505050565b6001546001600160a01b031633146105b45760405162461bcd60e51b815260040161012690611529565b80518251146105ff5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b825181101561080c576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa15801561067b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061069f91906115b2565b8585815181106106b1576106b16116eb565b60200260200101518786815181106106cb576106cb6116eb565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107629392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610781573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107a99190810190611644565b509050806107f95760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061080481611701565b915050610602565b50505050565b6001546001600160a01b0316331461083c5760405162461bcd60e51b815260040161012690611529565b6108458161097d565b61084e81610e18565b50565b600080546040516001600160a01b039091169063d1b7089a90869061087c9087908790602401611728565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526108d79392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156108f6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261091e9190810190611644565b5090508061080c5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac1906109b6906004016117ac565b602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906115b2565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a2190600401611591565b602060405180830381865afa158015610a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6291906115b2565b604051602401610a72919061157d565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610acd9392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610aec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b149190810190611644565b50905080610b5f5760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610b97906004016117ac565b602060405180830381865afa158015610bb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd891906115b2565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610c2f94936001600160a01b031691600091016115f3565b6000604051808303816000875af1158015610c4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610c769190810190611644565b50905080610cc65760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610cfe90600401611591565b602060405180830381865afa158015610d1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3f91906115b2565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015610d96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dba9190611562565b905080610e145760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610e5e906020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9f91906115b2565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610ed7929091169060040161157d565b602060405180830381865afa158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1891906117d0565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190610f5590600401611591565b602060405180830381865afa158015610f72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f9691906115b2565b60025460405160e085901b6001600160e01b03191681526001600160a01b0393841660048201529183166024830152604482018690529190911660648201526084016020604051808303816000875af1158015610ff7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101b9190611562565b9250826110765760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac190606401602060405180830381865afa1580156110e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061110991906115b2565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526111a49392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156111c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111eb9190810190611644565b5092508261080c5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b038116811461084e57600080fd5b60006020828403121561127557600080fd5b81356112808161124e565b9392505050565b6000806040838503121561129a57600080fd5b82356112a58161124e565b946020939093013593505050565b60008083601f8401126112c557600080fd5b5081356001600160401b038111156112dc57600080fd5b6020830191508360208260051b85010111156112f757600080fd5b9250929050565b60008060008060006060868803121561131657600080fd5b85356113218161124e565b945060208601356001600160401b038082111561133d57600080fd5b61134989838a016112b3565b9096509450604088013591508082111561136257600080fd5b5061136f888289016112b3565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156113be576113be611380565b604052919050565b60006001600160401b038211156113df576113df611380565b5060051b60200190565b600082601f8301126113fa57600080fd5b8135602061140f61140a836113c6565b611396565b82815260059290921b8401810191818101908684111561142e57600080fd5b8286015b848110156114495780358352918301918301611432565b509695505050505050565b60008060006060848603121561146957600080fd5b83356114748161124e565b92506020848101356001600160401b038082111561149157600080fd5b818701915087601f8301126114a557600080fd5b81356114b361140a826113c6565b81815260059190911b8301840190848101908a8311156114d257600080fd5b938501935b828510156114f95784356114ea8161124e565b825293850193908501906114d7565b96505050604087013592508083111561151157600080fd5b505061151f868287016113e9565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461155d57600080fd5b919050565b60006020828403121561157457600080fd5b6112808261154d565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156115c457600080fd5b81516112808161124e565b60005b838110156115ea5781810151838201526020016115d2565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526116218160a0860160208a016115cf565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561165757600080fd5b6116608361154d565b60208401519092506001600160401b038082111561167d57600080fd5b818501915085601f83011261169157600080fd5b8151818111156116a3576116a3611380565b6116b6601f8201601f1916602001611396565b91508082528660208285010111156116cd57600080fd5b6116de8160208401602086016115cf565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b60006001820161172157634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b8281101561176157815184529284019290840190600101611745565b5050508381038285015284518082528583019183019060005b8181101561179f5783516001600160a01b03168352928401929184019160010161177a565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000602082840312156117e257600080fd5b505191905056fea264697066735822122017d276d65370f8ba8d89474ebc6f7b71268372f3721856947bab1c3f5d78530864736f6c63430008100033",
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/82edabb017e079b951c9a9557f562e2a.json"
3
+ "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
4
4
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json CHANGED
@@ -75,8 +75,8 @@
75
75
  "type": "receive"
76
76
  }
77
77
  ],
78
- "bytecode": "0x608060405234801561001057600080fd5b506105a3806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103e0565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610470565b600080516020610527833981519152146100f8576100f8610495565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b600080516020610527833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c8383604051806060016040528060278152602001610547602791396102bd565b9392505050565b61022c81610398565b61028e5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b60606102c884610398565b6103235760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033e91906104d7565b600060405180830381855af49150503d8060008114610379576040519150601f19603f3d011682016040523d82523d6000602084013e61037e565b606091505b509150915061038e8282866103a7565b9695505050505050565b6001600160a01b03163b151590565b606083156103b657508161021c565b8251156103c65782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104f3565b6000806000604084860312156103f557600080fd5b83356001600160a01b038116811461040c57600080fd5b925060208401356001600160401b038082111561042857600080fd5b818601915086601f83011261043c57600080fd5b81358181111561044b57600080fd5b87602082850101111561045d57600080fd5b6020830194508093505050509250925092565b60008282101561049057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104c65781810151838201526020016104ae565b838111156101b15750506000910152565b600082516104e98184602087016104ab565b9190910192915050565b60208152600082518060208401526105128160408501602087016104ab565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220859dac0560f70effb099541786da94ecb702f189a8b02ff16bfd17936e03c51a64736f6c63430008080033",
79
- "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103e0565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610470565b600080516020610527833981519152146100f8576100f8610495565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b600080516020610527833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c8383604051806060016040528060278152602001610547602791396102bd565b9392505050565b61022c81610398565b61028e5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b60606102c884610398565b6103235760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033e91906104d7565b600060405180830381855af49150503d8060008114610379576040519150601f19603f3d011682016040523d82523d6000602084013e61037e565b606091505b509150915061038e8282866103a7565b9695505050505050565b6001600160a01b03163b151590565b606083156103b657508161021c565b8251156103c65782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104f3565b6000806000604084860312156103f557600080fd5b83356001600160a01b038116811461040c57600080fd5b925060208401356001600160401b038082111561042857600080fd5b818601915086601f83011261043c57600080fd5b81358181111561044b57600080fd5b87602082850101111561045d57600080fd5b6020830194508093505050509250925092565b60008282101561049057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104c65781810151838201526020016104ae565b838111156101b15750506000910152565b600082516104e98184602087016104ab565b9190910192915050565b60208152600082518060208401526105128160408501602087016104ab565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220859dac0560f70effb099541786da94ecb702f189a8b02ff16bfd17936e03c51a64736f6c63430008080033",
78
+ "bytecode": "0x608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
79
+ "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
80
80
  "linkReferences": {},
81
81
  "deployedLinkReferences": {}
82
82
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/82edabb017e079b951c9a9557f562e2a.json"
3
+ "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
4
4
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json CHANGED
@@ -165,8 +165,8 @@
165
165
  "type": "function"
166
166
  }
167
167
  ],
168
- "bytecode": "0x608060405234801561001057600080fd5b5060405161002060208201610044565b601f1982820381018352601f90910116604052805160209190910120600055610051565b6105c380610d8c83390190565b610d2c806100606000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106d5565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106f1565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c38061073483390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b838111156106cf576000848401525b50505050565b600082516106e78184602087016106a5565b9190910192915050565b60018060a01b0383168152604060208201526000825180604084015261071e8160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a3806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103e0565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610470565b600080516020610527833981519152146100f8576100f8610495565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b600080516020610527833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c8383604051806060016040528060278152602001610547602791396102bd565b9392505050565b61022c81610398565b61028e5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b60606102c884610398565b6103235760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033e91906104d7565b600060405180830381855af49150503d8060008114610379576040519150601f19603f3d011682016040523d82523d6000602084013e61037e565b606091505b509150915061038e8282866103a7565b9695505050505050565b6001600160a01b03163b151590565b606083156103b657508161021c565b8251156103c65782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104f3565b6000806000604084860312156103f557600080fd5b83356001600160a01b038116811461040c57600080fd5b925060208401356001600160401b038082111561042857600080fd5b818601915086601f83011261043c57600080fd5b81358181111561044b57600080fd5b87602082850101111561045d57600080fd5b6020830194508093505050509250925092565b60008282101561049057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104c65781810151838201526020016104ae565b838111156101b15750506000910152565b600082516104e98184602087016104ab565b9190910192915050565b60208152600082518060208401526105128160408501602087016104ab565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220859dac0560f70effb099541786da94ecb702f189a8b02ff16bfd17936e03c51a64736f6c63430008080033a264697066735822122003ecc01549cdfba7e6f15aec9431b3cc40978f4e0546cb6b37c0418c0cbb8cd964736f6c63430008080033608060405234801561001057600080fd5b506105a3806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103e0565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610470565b600080516020610527833981519152146100f8576100f8610495565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b600080516020610527833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c8383604051806060016040528060278152602001610547602791396102bd565b9392505050565b61022c81610398565b61028e5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b60606102c884610398565b6103235760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033e91906104d7565b600060405180830381855af49150503d8060008114610379576040519150601f19603f3d011682016040523d82523d6000602084013e61037e565b606091505b509150915061038e8282866103a7565b9695505050505050565b6001600160a01b03163b151590565b606083156103b657508161021c565b8251156103c65782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104f3565b6000806000604084860312156103f557600080fd5b83356001600160a01b038116811461040c57600080fd5b925060208401356001600160401b038082111561042857600080fd5b818601915086601f83011261043c57600080fd5b81358181111561044b57600080fd5b87602082850101111561045d57600080fd5b6020830194508093505050509250925092565b60008282101561049057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104c65781810151838201526020016104ae565b838111156101b15750506000910152565b600082516104e98184602087016104ab565b9190910192915050565b60208152600082518060208401526105128160408501602087016104ab565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220859dac0560f70effb099541786da94ecb702f189a8b02ff16bfd17936e03c51a64736f6c63430008080033",
169
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106d5565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106f1565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c38061073483390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b838111156106cf576000848401525b50505050565b600082516106e78184602087016106a5565b9190910192915050565b60018060a01b0383168152604060208201526000825180604084015261071e8160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a3806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103e0565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd610470565b600080516020610527833981519152146100f8576100f8610495565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b600080516020610527833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610223565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c8383604051806060016040528060278152602001610547602791396102bd565b9392505050565b61022c81610398565b61028e5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052783398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b60606102c884610398565b6103235760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016100a8565b600080856001600160a01b03168560405161033e91906104d7565b600060405180830381855af49150503d8060008114610379576040519150601f19603f3d011682016040523d82523d6000602084013e61037e565b606091505b509150915061038e8282866103a7565b9695505050505050565b6001600160a01b03163b151590565b606083156103b657508161021c565b8251156103c65782518084602001fd5b8160405162461bcd60e51b81526004016100a891906104f3565b6000806000604084860312156103f557600080fd5b83356001600160a01b038116811461040c57600080fd5b925060208401356001600160401b038082111561042857600080fd5b818601915086601f83011261043c57600080fd5b81358181111561044b57600080fd5b87602082850101111561045d57600080fd5b6020830194508093505050509250925092565b60008282101561049057634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052600160045260246000fd5b60005b838110156104c65781810151838201526020016104ae565b838111156101b15750506000910152565b600082516104e98184602087016104ab565b9190910192915050565b60208152600082518060208401526105128160408501602087016104ab565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220859dac0560f70effb099541786da94ecb702f189a8b02ff16bfd17936e03c51a64736f6c63430008080033a264697066735822122003ecc01549cdfba7e6f15aec9431b3cc40978f4e0546cb6b37c0418c0cbb8cd964736f6c63430008080033",
168
+ "bytecode": "0x608060405234801561001057600080fd5b5060405161002060208201610044565b601f1982820381018352601f90910116604052805160209190910120600055610051565b6105c680610d8383390190565b610d23806100606000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106c9565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106e5565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c68061072883390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b50506000910152565b600082516106db8184602087016106a5565b9190910192915050565b60018060a01b038316815260406020820152600082518060408401526107128160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033a2646970667358221220e1cadb092ace03aa7309f0b5b35fc651e5acead4dd69707836e8fba02be8e87b64736f6c63430008100033608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
169
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106c9565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106e5565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c68061072883390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b50506000910152565b600082516106db8184602087016106a5565b9190910192915050565b60018060a01b038316815260406020820152600082518060408401526107128160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033a2646970667358221220e1cadb092ace03aa7309f0b5b35fc651e5acead4dd69707836e8fba02be8e87b64736f6c63430008100033",
170
170
  "linkReferences": {},
171
171
  "deployedLinkReferences": {}
172
172
  }
package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/82edabb017e079b951c9a9557f562e2a.json"
3
+ "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.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": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220a9e79a4dd3fd1fa013d0a2232cbff569221ba33b84f992e39b9a89213eb5edac64736f6c63430008080033",
78
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220a9e79a4dd3fd1fa013d0a2232cbff569221ba33b84f992e39b9a89213eb5edac64736f6c63430008080033",
77
+ "bytecode": "0x608060405234801561001057600080fd5b5060405161033c38038061033c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102a9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212201919c492695132b9607106ba9a36e16ae4627c9011f98f46aa80ab1e62979e9d64736f6c63430008100033",
78
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212201919c492695132b9607106ba9a36e16ae4627c9011f98f46aa80ab1e62979e9d64736f6c63430008100033",
79
79
  "linkReferences": {},
80
80
  "deployedLinkReferences": {}
81
81
  }
package/contracts/Interfaces.sol CHANGED
@@ -58,8 +58,42 @@ interface cERC20 is ERC20 {
58
58
  }
59
59
 
60
60
  interface IGoodDollar is ERC20 {
61
+ // view functions
62
+ function feeRecipient() external view returns (address);
63
+
64
+ function getFees(
65
+ uint256 value,
66
+ address sender,
67
+ address recipient
68
+ ) external view returns (uint256 fee, bool senderPays);
69
+
70
+ function cap() external view returns (uint256);
71
+
72
+ function isPauser(address _pauser) external view returns (bool);
73
+
61
74
  function getFees(uint256 value) external view returns (uint256, bool);
62
75
 
76
+ function isMinter(address minter) external view returns (bool);
77
+
78
+ function formula() external view returns (address);
79
+
80
+ function identity() external view returns (address);
81
+
82
+ function owner() external view returns (address);
83
+
84
+ // state changing functions
85
+ function setFeeRecipient(address _feeRecipient) external;
86
+
87
+ function setFormula(address _formula) external;
88
+
89
+ function transferOwnership(address _owner) external;
90
+
91
+ function addPauser(address _pauser) external;
92
+
93
+ function pause() external;
94
+
95
+ function unpause() external;
96
+
63
97
  function burn(uint256 amount) external;
64
98
 
65
99
  function burnFrom(address account, uint256 amount) external;
@@ -68,15 +102,13 @@ interface IGoodDollar is ERC20 {
68
102
 
69
103
  function addMinter(address minter) external;
70
104
 
71
- function isMinter(address minter) external view returns (bool);
72
-
73
105
  function transferAndCall(
74
106
  address to,
75
107
  uint256 value,
76
108
  bytes calldata data
77
109
  ) external returns (bool);
78
110
 
79
- function formula() external view returns (address);
111
+ function setIdentity(address identity) external;
80
112
  }
81
113
 
82
114
  interface IERC2917 is ERC20 {
@@ -264,9 +296,31 @@ interface IIdentity {
264
296
 
265
297
  function owner() external view returns (address);
266
298
 
299
+ function removeContract(address account) external;
300
+
301
+ function isDAOContract(address account) external view returns (bool);
302
+
303
+ function addrToDID(address account) external view returns (string memory);
304
+
305
+ function didHashToAddress(bytes32 hash) external view returns (address);
306
+
267
307
  event WhitelistedAdded(address user);
268
308
  }
269
309
 
310
+ interface IIdentityV2 is IIdentity {
311
+ function addWhitelistedWithDIDAndChain(
312
+ address account,
313
+ string memory did,
314
+ uint256 orgChainId,
315
+ uint256 dateAuthenticated
316
+ ) external;
317
+
318
+ function getWhitelistedRoot(address account)
319
+ external
320
+ view
321
+ returns (address root);
322
+ }
323
+
270
324
  interface IUBIScheme {
271
325
  function currentDay() external view returns (uint256);
272
326