@gooddollar/goodprotocol 2.0.3 → 2.0.5-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (288) hide show
  1. package/artifacts/abis/IIdentity.min.json +1 -1
  2. package/artifacts/abis/IIdentityV2.min.json +1 -1
  3. package/artifacts/abis/IdentityMock.min.json +1 -1
  4. package/artifacts/abis/OneTimePayments.min.json +1 -0
  5. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  7. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  8. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  9. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  10. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IIdentity.json +19 -0
  23. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/IIdentityV2.json +19 -0
  25. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  34. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  35. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  36. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
  37. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +2 -2
  38. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  39. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +2 -2
  40. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
  41. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +2 -2
  42. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  43. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
  44. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  45. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +2 -2
  46. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  47. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
  48. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  49. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +2 -2
  50. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
  51. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
  52. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  53. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  54. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
  55. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  56. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  57. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  58. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  59. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  60. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
  61. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
  62. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
  63. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +2 -2
  64. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  65. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
  66. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
  67. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +2 -2
  68. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  69. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  70. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  71. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  73. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +2 -2
  75. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  76. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +2 -2
  77. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
  78. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  79. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  80. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  81. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +2 -2
  82. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  83. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  84. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +21 -2
  86. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  87. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  88. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  89. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  90. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  91. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  92. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  93. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  94. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  95. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  96. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  97. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  98. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  99. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  100. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  101. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  102. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
  103. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  104. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
  105. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  106. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
  107. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  108. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
  109. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  110. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  111. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  112. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  113. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  114. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  115. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  116. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  117. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  118. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +2 -2
  119. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  120. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  121. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  122. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
  123. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  124. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  125. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
  126. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  127. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  128. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  129. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  130. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  131. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  132. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  133. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  134. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  135. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  136. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  137. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  138. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  139. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  140. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  141. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  142. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  143. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  144. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  145. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  146. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  147. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  148. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  149. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  150. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  151. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  152. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  153. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  154. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  155. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  156. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
  157. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
  158. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
  159. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +1 -1
  160. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
  161. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +2 -2
  162. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
  163. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
  164. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
  165. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
  166. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
  167. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2 -2
  168. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
  169. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
  170. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
  171. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  172. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  173. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  174. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +2 -2
  175. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
  176. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +2 -2
  177. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  178. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  179. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  180. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
  181. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +2 -2
  182. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  183. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  184. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  185. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  186. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  187. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  188. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  189. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -2
  190. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  191. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  192. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  193. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  194. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  195. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  196. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  197. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +4 -0
  198. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.json +270 -0
  199. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  200. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  201. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  202. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  203. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  204. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  205. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  206. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  207. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  208. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  209. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  210. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  211. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  212. package/contracts/Interfaces.sol +2 -0
  213. package/contracts/identity/IdentityV2.sol +10 -1
  214. package/contracts/mocks/IdentityMock.sol +39 -36
  215. package/contracts/utils/OneTimePayments.sol +135 -0
  216. package/package.json +1 -1
  217. package/releases/deployment.json +6 -3
  218. package/scripts/multichain-deploy/2b_otp-deploy.ts +73 -0
  219. package/scripts/upgrades/celo-defi-ubi-deploy.ts +8 -2
  220. package/types/IIdentity.ts +34 -0
  221. package/types/IIdentityV2.ts +34 -0
  222. package/types/IdentityMock.ts +34 -0
  223. package/types/OneTimePayments.ts +396 -0
  224. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  225. package/types/factories/AdminWalletFuse__factory.ts +1 -1
  226. package/types/factories/AdminWallet__factory.ts +1 -1
  227. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  228. package/types/factories/BaseShareField__factory.ts +1 -1
  229. package/types/factories/BuyAndBridgeHelper__factory.ts +1 -1
  230. package/types/factories/ClaimersDistribution__factory.ts +1 -1
  231. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  232. package/types/factories/CompoundVotingMachine__factory.ts +1 -1
  233. package/types/factories/DAOContract__factory.ts +1 -1
  234. package/types/factories/DAOUpgradeableContract__factory.ts +1 -1
  235. package/types/factories/DistributionBridgeMock__factory.ts +1 -1
  236. package/types/factories/DistributionHelperTestHelper__factory.ts +1 -1
  237. package/types/factories/DistributionHelperTest__factory.ts +1 -1
  238. package/types/factories/DistributionHelper__factory.ts +1 -1
  239. package/types/factories/DonationsStaking__factory.ts +1 -1
  240. package/types/factories/ExchangeHelper__factory.ts +1 -1
  241. package/types/factories/Faucet__factory.ts +1 -1
  242. package/types/factories/FuseFaucetV2__factory.ts +1 -1
  243. package/types/factories/FuseFaucet__factory.ts +1 -1
  244. package/types/factories/FuseStakingV3__factory.ts +1 -1
  245. package/types/factories/GReputation__factory.ts +1 -1
  246. package/types/factories/GoodAaveStakingV2__factory.ts +1 -1
  247. package/types/factories/GoodAaveStaking__factory.ts +1 -1
  248. package/types/factories/GoodCompoundStakingTest__factory.ts +1 -1
  249. package/types/factories/GoodCompoundStakingV2__factory.ts +1 -1
  250. package/types/factories/GoodCompoundStaking__factory.ts +1 -1
  251. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +1 -1
  252. package/types/factories/GoodDollarStakingMock__factory.ts +1 -1
  253. package/types/factories/GoodDollarStaking__factory.ts +1 -1
  254. package/types/factories/GoodDollar__factory.ts +1 -1
  255. package/types/factories/GoodFundManagerTest__factory.ts +1 -1
  256. package/types/factories/GoodFundManager__factory.ts +1 -1
  257. package/types/factories/GoodMarketMaker__factory.ts +1 -1
  258. package/types/factories/GoodReserveCDai__factory.ts +1 -1
  259. package/types/factories/GovernanceStaking__factory.ts +1 -1
  260. package/types/factories/IIdentityV2__factory.ts +19 -0
  261. package/types/factories/IIdentity__factory.ts +19 -0
  262. package/types/factories/IdentityMock__factory.ts +20 -1
  263. package/types/factories/IdentityV2__factory.ts +1 -1
  264. package/types/factories/InvitesFuseV2__factory.ts +1 -1
  265. package/types/factories/InvitesV1__factory.ts +1 -1
  266. package/types/factories/InvitesV2__factory.ts +1 -1
  267. package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
  268. package/types/factories/MultichainRouterMock__factory.ts +1 -1
  269. package/types/factories/OneTimePayments__factory.ts +323 -0
  270. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  271. package/types/factories/OverMintTester__factory.ts +1 -1
  272. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  273. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  274. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  275. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  276. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  277. package/types/factories/Reputation__factory.ts +1 -1
  278. package/types/factories/StakersDistribution__factory.ts +1 -1
  279. package/types/factories/SuperGoodDollar__factory.ts +1 -1
  280. package/types/factories/SwapHelperTest__factory.ts +1 -1
  281. package/types/factories/UBIScheme__factory.ts +1 -1
  282. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  283. package/types/factories/UpgradableMock2__factory.ts +1 -1
  284. package/types/factories/UpgradableMock3__factory.ts +1 -1
  285. package/types/factories/UpgradableMock4__factory.ts +1 -1
  286. package/types/factories/UpgradableMock__factory.ts +1 -1
  287. package/types/hardhat.d.ts +9 -0
  288. package/types/index.ts +2 -0
package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ca5b1cf630571f4204676ecd83da94fb.json"
3
+ "buildInfo": "../../../build-info/44c39c0c101464aff0d0c7767142bfca.json"
4
4
  }
package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json CHANGED
@@ -76,8 +76,8 @@
76
76
  "type": "function"
77
77
  }
78
78
  ],
79
- "bytecode": "0x608060405234801561001057600080fd5b50604051610ddd380380610ddd83398101604081905261002f916100fc565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610098573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100bc9190610136565b600280546001600160a01b0319166001600160a01b03929092169190911790555061015a9050565b6001600160a01b03811681146100f957600080fd5b50565b6000806040838503121561010f57600080fd5b825161011a816100e4565b602084015190925061012b816100e4565b809150509250929050565b60006020828403121561014857600080fd5b8151610153816100e4565b9392505050565b610c74806101696000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e61004936600461088d565b610063565b005b61004e61005e366004610923565b610262565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d906109ca565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af11580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610a03565b6101805760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101b492911690600401610a25565b6020604051808303816000875af11580156101d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f79190610a03565b6102545760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461028c5760405162461bcd60e51b815260040161008d906109ca565b8281146102cd5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b61033b878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061034e92505050565b6103458587610480565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103799087908790602401610a39565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103d49392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af11580156103f3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261041b9190810190610b48565b5090508061047a5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd89160048083019260209291908290030181865afa1580156104ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ee9190610c08565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105269290911690600401610a25565b602060405180830381865afa158015610543573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105679190610c25565b6000805460405192935090916001600160a01b039091169063d1b7089a908690610595908990602401610a25565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b03191681526105f09392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af115801561060f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106379190810190610b48565b5090508061067d5760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a946106ec948c949391169190600401610ae1565b6000604051808303816000875af115801561070b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107339190810190610b48565b509050806107815760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b811561086e5760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd906084016020604051808303816000875af11580156107ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108109190610a03565b90508061086e5760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461088a57600080fd5b50565b6000806000606084860312156108a257600080fd5b83356108ad81610875565b925060208401356108bd81610875565b915060408401356108cd81610875565b809150509250925092565b60008083601f8401126108ea57600080fd5b5081356001600160401b0381111561090157600080fd5b6020830191508360208260051b850101111561091c57600080fd5b9250929050565b600080600080600080600060a0888a03121561093e57600080fd5b873561094981610875565b9650602088013561095981610875565b9550604088013561096981610875565b945060608801356001600160401b038082111561098557600080fd5b6109918b838c016108d8565b909650945060808a01359150808211156109aa57600080fd5b506109b78a828b016108d8565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b805180151581146109fe57600080fd5b919050565b600060208284031215610a1557600080fd5b610a1e826109ee565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610a7257815184529284019290840190600101610a56565b5050508381038285015284518082528583019183019060005b81811015610ab05783516001600160a01b031683529284019291840191600101610a8b565b5090979650505050505050565b60005b83811015610ad8578181015183820152602001610ac0565b50506000910152565b600060018060a01b038087168352608060208401528551806080850152610b0f8160a0860160208a01610abd565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5b57600080fd5b610b64836109ee565b60208401519092506001600160401b0380821115610b8157600080fd5b818501915085601f830112610b9557600080fd5b815181811115610ba757610ba7610b32565b604051601f8201601f19908116603f01168101908382118183101715610bcf57610bcf610b32565b81604052828152886020848701011115610be857600080fd5b610bf9836020830160208801610abd565b80955050505050509250929050565b600060208284031215610c1a57600080fd5b8151610a1e81610875565b600060208284031215610c3757600080fd5b505191905056fea2646970667358221220e7f7e3e41c2c03e2230d7602d3f3f6653fef0e4d4269db4bad2eba7fdbe1701f64736f6c63430008100033",
80
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e61004936600461088d565b610063565b005b61004e61005e366004610923565b610262565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d906109ca565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af11580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610a03565b6101805760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101b492911690600401610a25565b6020604051808303816000875af11580156101d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f79190610a03565b6102545760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461028c5760405162461bcd60e51b815260040161008d906109ca565b8281146102cd5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b61033b878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061034e92505050565b6103458587610480565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103799087908790602401610a39565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103d49392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af11580156103f3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261041b9190810190610b48565b5090508061047a5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd89160048083019260209291908290030181865afa1580156104ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ee9190610c08565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105269290911690600401610a25565b602060405180830381865afa158015610543573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105679190610c25565b6000805460405192935090916001600160a01b039091169063d1b7089a908690610595908990602401610a25565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b03191681526105f09392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af115801561060f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106379190810190610b48565b5090508061067d5760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a946106ec948c949391169190600401610ae1565b6000604051808303816000875af115801561070b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107339190810190610b48565b509050806107815760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b811561086e5760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd906084016020604051808303816000875af11580156107ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108109190610a03565b90508061086e5760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461088a57600080fd5b50565b6000806000606084860312156108a257600080fd5b83356108ad81610875565b925060208401356108bd81610875565b915060408401356108cd81610875565b809150509250925092565b60008083601f8401126108ea57600080fd5b5081356001600160401b0381111561090157600080fd5b6020830191508360208260051b850101111561091c57600080fd5b9250929050565b600080600080600080600060a0888a03121561093e57600080fd5b873561094981610875565b9650602088013561095981610875565b9550604088013561096981610875565b945060608801356001600160401b038082111561098557600080fd5b6109918b838c016108d8565b909650945060808a01359150808211156109aa57600080fd5b506109b78a828b016108d8565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b805180151581146109fe57600080fd5b919050565b600060208284031215610a1557600080fd5b610a1e826109ee565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610a7257815184529284019290840190600101610a56565b5050508381038285015284518082528583019183019060005b81811015610ab05783516001600160a01b031683529284019291840191600101610a8b565b5090979650505050505050565b60005b83811015610ad8578181015183820152602001610ac0565b50506000910152565b600060018060a01b038087168352608060208401528551806080850152610b0f8160a0860160208a01610abd565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5b57600080fd5b610b64836109ee565b60208401519092506001600160401b0380821115610b8157600080fd5b818501915085601f830112610b9557600080fd5b815181811115610ba757610ba7610b32565b604051601f8201601f19908116603f01168101908382118183101715610bcf57610bcf610b32565b81604052828152886020848701011115610be857600080fd5b610bf9836020830160208801610abd565b80955050505050509250929050565b600060208284031215610c1a57600080fd5b8151610a1e81610875565b600060208284031215610c3757600080fd5b505191905056fea2646970667358221220e7f7e3e41c2c03e2230d7602d3f3f6653fef0e4d4269db4bad2eba7fdbe1701f64736f6c63430008100033",
79
+ "bytecode": "0x608060405234801561001057600080fd5b50604051610ddd380380610ddd83398101604081905261002f916100fc565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610098573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100bc9190610136565b600280546001600160a01b0319166001600160a01b03929092169190911790555061015a9050565b6001600160a01b03811681146100f957600080fd5b50565b6000806040838503121561010f57600080fd5b825161011a816100e4565b602084015190925061012b816100e4565b809150509250929050565b60006020828403121561014857600080fd5b8151610153816100e4565b9392505050565b610c74806101696000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e61004936600461088d565b610063565b005b61004e61005e366004610923565b610262565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d906109ca565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af11580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610a03565b6101805760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101b492911690600401610a25565b6020604051808303816000875af11580156101d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f79190610a03565b6102545760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461028c5760405162461bcd60e51b815260040161008d906109ca565b8281146102cd5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b61033b878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061034e92505050565b6103458587610480565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103799087908790602401610a39565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103d49392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af11580156103f3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261041b9190810190610b48565b5090508061047a5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd89160048083019260209291908290030181865afa1580156104ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ee9190610c08565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105269290911690600401610a25565b602060405180830381865afa158015610543573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105679190610c25565b6000805460405192935090916001600160a01b039091169063d1b7089a908690610595908990602401610a25565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b03191681526105f09392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af115801561060f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106379190810190610b48565b5090508061067d5760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a946106ec948c949391169190600401610ae1565b6000604051808303816000875af115801561070b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107339190810190610b48565b509050806107815760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b811561086e5760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd906084016020604051808303816000875af11580156107ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108109190610a03565b90508061086e5760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461088a57600080fd5b50565b6000806000606084860312156108a257600080fd5b83356108ad81610875565b925060208401356108bd81610875565b915060408401356108cd81610875565b809150509250925092565b60008083601f8401126108ea57600080fd5b5081356001600160401b0381111561090157600080fd5b6020830191508360208260051b850101111561091c57600080fd5b9250929050565b600080600080600080600060a0888a03121561093e57600080fd5b873561094981610875565b9650602088013561095981610875565b9550604088013561096981610875565b945060608801356001600160401b038082111561098557600080fd5b6109918b838c016108d8565b909650945060808a01359150808211156109aa57600080fd5b506109b78a828b016108d8565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b805180151581146109fe57600080fd5b919050565b600060208284031215610a1557600080fd5b610a1e826109ee565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610a7257815184529284019290840190600101610a56565b5050508381038285015284518082528583019183019060005b81811015610ab05783516001600160a01b031683529284019291840191600101610a8b565b5090979650505050505050565b60005b83811015610ad8578181015183820152602001610ac0565b50506000910152565b600060018060a01b038087168352608060208401528551806080850152610b0f8160a0860160208a01610abd565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5b57600080fd5b610b64836109ee565b60208401519092506001600160401b0380821115610b8157600080fd5b818501915085601f830112610b9557600080fd5b815181811115610ba757610ba7610b32565b604051601f8201601f19908116603f01168101908382118183101715610bcf57610bcf610b32565b81604052828152886020848701011115610be857600080fd5b610bf9836020830160208801610abd565b80955050505050509250929050565b600060208284031215610c1a57600080fd5b8151610a1e81610875565b600060208284031215610c3757600080fd5b505191905056fea26469706673582212200be3853f9b7e757894e348b1541fadcb1fb3eab1bb5f45b64d731ab6f32d30b864736f6c63430008100033",
80
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635c0d087b1461003b5780639869277b14610050575b600080fd5b61004e61004936600461088d565b610063565b005b61004e61005e366004610923565b610262565b6001546001600160a01b031633146100965760405162461bcd60e51b815260040161008d906109ca565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af11580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610a03565b6101805760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b606482015260840161008d565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926101b492911690600401610a25565b6020604051808303816000875af11580156101d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101f79190610a03565b6102545760405162461bcd60e51b815260206004820152602860248201527f756e7265676973746572696e672050726f746f636f6c55706772616465467573604482015267194819985a5b195960c21b606482015260840161008d565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461028c5760405162461bcd60e51b815260040161008d906109ca565b8281146102cd5760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b604482015260640161008d565b61033b878585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061034e92505050565b6103458587610480565b50505050505050565b600080546040516001600160a01b039091169063d1b7089a9086906103799087908790602401610a39565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526103d49392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af11580156103f3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261041b9190810190610b48565b5090508061047a5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b606482015260840161008d565b50505050565b60025460408051631c2eb17b60e31b815290516000926001600160a01b03169163e1758bd89160048083019260209291908290030181865afa1580156104ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ee9190610c08565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a08231926105269290911690600401610a25565b602060405180830381865afa158015610543573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105679190610c25565b6000805460405192935090916001600160a01b039091169063d1b7089a908690610595908990602401610a25565b60408051601f198184030181529181526020820180516001600160e01b0316631619b41160e11b179052600254905160e085901b6001600160e01b03191681526105f09392916001600160a01b031690600090600401610ae1565b6000604051808303816000875af115801561060f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106379190810190610b48565b5090508061067d5760405162461bcd60e51b81526020600482015260136024820152721cd95d15509254d8da195b594819985a5b1959606a1b604482015260640161008d565b6000805460408051602480820185905282518083039091018152604490910182526020810180516001600160e01b0316631ad53ec360e31b17905260025491516368db844d60e11b81526001600160a01b039384169463d1b7089a946106ec948c949391169190600401610ae1565b6000604051808303816000875af115801561070b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107339190810190610b48565b509050806107815760405162461bcd60e51b815260206004820152601b60248201527a1cd95d155cd9519a5c9cdd10db185a5b541bdbdb0819985a5b1959602a1b604482015260640161008d565b811561086e5760005460025460405163b9a04cdd60e01b81526001600160a01b038681166004830152888116602483015260448201869052918216606482015291169063b9a04cdd906084016020604051808303816000875af11580156107ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108109190610a03565b90508061086e5760405162461bcd60e51b815260206004820152602660248201527f66756e6473207472616e7366657220746f206e657720756269736368656d652060448201526519985a5b195960d21b606482015260840161008d565b5050505050565b6001600160a01b038116811461088a57600080fd5b50565b6000806000606084860312156108a257600080fd5b83356108ad81610875565b925060208401356108bd81610875565b915060408401356108cd81610875565b809150509250925092565b60008083601f8401126108ea57600080fd5b5081356001600160401b0381111561090157600080fd5b6020830191508360208260051b850101111561091c57600080fd5b9250929050565b600080600080600080600060a0888a03121561093e57600080fd5b873561094981610875565b9650602088013561095981610875565b9550604088013561096981610875565b945060608801356001600160401b038082111561098557600080fd5b6109918b838c016108d8565b909650945060808a01359150808211156109aa57600080fd5b506109b78a828b016108d8565b989b979a50959850939692959293505050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b805180151581146109fe57600080fd5b919050565b600060208284031215610a1557600080fd5b610a1e826109ee565b9392505050565b6001600160a01b0391909116815260200190565b604080825283519082018190526000906020906060840190828701845b82811015610a7257815184529284019290840190600101610a56565b5050508381038285015284518082528583019183019060005b81811015610ab05783516001600160a01b031683529284019291840191600101610a8b565b5090979650505050505050565b60005b83811015610ad8578181015183820152602001610ac0565b50506000910152565b600060018060a01b038087168352608060208401528551806080850152610b0f8160a0860160208a01610abd565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5b57600080fd5b610b64836109ee565b60208401519092506001600160401b0380821115610b8157600080fd5b818501915085601f830112610b9557600080fd5b815181811115610ba757610ba7610b32565b604051601f8201601f19908116603f01168101908382118183101715610bcf57610bcf610b32565b81604052828152886020848701011115610be857600080fd5b610bf9836020830160208801610abd565b80955050505050509250929050565b600060208284031215610c1a57600080fd5b8151610a1e81610875565b600060208284031215610c3757600080fd5b505191905056fea26469706673582212200be3853f9b7e757894e348b1541fadcb1fb3eab1bb5f45b64d731ab6f32d30b864736f6c63430008100033",
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/ca5b1cf630571f4204676ecd83da94fb.json"
3
+ "buildInfo": "../../../build-info/44c39c0c101464aff0d0c7767142bfca.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": "0x60806040523480156200001157600080fd5b506040516200199b3803806200199b833981016040819052620000349162000106565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156200009e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000c4919062000145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200016c9050565b6001600160a01b03811681146200010357600080fd5b50565b600080604083850312156200011a57600080fd5b82516200012781620000ed565b60208401519092506200013a81620000ed565b809150509250929050565b6000602082840312156200015857600080fd5b81516200016581620000ed565b9392505050565b61181f806200017c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a610075366004611263565b6100fc565b005b34801561008857600080fd5b5061007a610097366004611287565b6102f6565b3480156100a857600080fd5b5061007a6100b73660046112fe565b6104aa565b3480156100c857600080fd5b5061007a6100d7366004611454565b61058a565b3480156100e857600080fd5b5061007a6100f7366004611263565b610812565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611529565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af1158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc9190611562565b6102195760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261024d9291169060040161157d565b6020604051808303816000875af115801561026c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102909190611562565b6102e85760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b031633146103205760405162461bcd60e51b815260040161012690611529565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac19061035990600401611591565b602060405180830381865afa158015610376573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061039a91906115b2565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b03191681526104029392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610421573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104499190810190611644565b509050806104a55760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146104d45760405162461bcd60e51b815260040161012690611529565b8281146105155760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b610583858585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061085192505050565b5050505050565b6001546001600160a01b031633146105b45760405162461bcd60e51b815260040161012690611529565b80518251146105ff5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b825181101561080c576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa15801561067b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061069f91906115b2565b8585815181106106b1576106b16116eb565b60200260200101518786815181106106cb576106cb6116eb565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107629392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610781573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107a99190810190611644565b509050806107f95760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061080481611701565b915050610602565b50505050565b6001546001600160a01b0316331461083c5760405162461bcd60e51b815260040161012690611529565b6108458161097d565b61084e81610e18565b50565b600080546040516001600160a01b039091169063d1b7089a90869061087c9087908790602401611728565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526108d79392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156108f6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261091e9190810190611644565b5090508061080c5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac1906109b6906004016117ac565b602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906115b2565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a2190600401611591565b602060405180830381865afa158015610a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6291906115b2565b604051602401610a72919061157d565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610acd9392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610aec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b149190810190611644565b50905080610b5f5760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610b97906004016117ac565b602060405180830381865afa158015610bb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd891906115b2565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610c2f94936001600160a01b031691600091016115f3565b6000604051808303816000875af1158015610c4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610c769190810190611644565b50905080610cc65760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610cfe90600401611591565b602060405180830381865afa158015610d1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3f91906115b2565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015610d96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dba9190611562565b905080610e145760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610e5e906020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9f91906115b2565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610ed7929091169060040161157d565b602060405180830381865afa158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1891906117d0565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190610f5590600401611591565b602060405180830381865afa158015610f72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f9691906115b2565b60025460405160e085901b6001600160e01b03191681526001600160a01b0393841660048201529183166024830152604482018690529190911660648201526084016020604051808303816000875af1158015610ff7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101b9190611562565b9250826110765760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac190606401602060405180830381865afa1580156110e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061110991906115b2565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526111a49392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156111c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111eb9190810190611644565b5092508261080c5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b038116811461084e57600080fd5b60006020828403121561127557600080fd5b81356112808161124e565b9392505050565b6000806040838503121561129a57600080fd5b82356112a58161124e565b946020939093013593505050565b60008083601f8401126112c557600080fd5b5081356001600160401b038111156112dc57600080fd5b6020830191508360208260051b85010111156112f757600080fd5b9250929050565b60008060008060006060868803121561131657600080fd5b85356113218161124e565b945060208601356001600160401b038082111561133d57600080fd5b61134989838a016112b3565b9096509450604088013591508082111561136257600080fd5b5061136f888289016112b3565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156113be576113be611380565b604052919050565b60006001600160401b038211156113df576113df611380565b5060051b60200190565b600082601f8301126113fa57600080fd5b8135602061140f61140a836113c6565b611396565b82815260059290921b8401810191818101908684111561142e57600080fd5b8286015b848110156114495780358352918301918301611432565b509695505050505050565b60008060006060848603121561146957600080fd5b83356114748161124e565b92506020848101356001600160401b038082111561149157600080fd5b818701915087601f8301126114a557600080fd5b81356114b361140a826113c6565b81815260059190911b8301840190848101908a8311156114d257600080fd5b938501935b828510156114f95784356114ea8161124e565b825293850193908501906114d7565b96505050604087013592508083111561151157600080fd5b505061151f868287016113e9565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461155d57600080fd5b919050565b60006020828403121561157457600080fd5b6112808261154d565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156115c457600080fd5b81516112808161124e565b60005b838110156115ea5781810151838201526020016115d2565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526116218160a0860160208a016115cf565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561165757600080fd5b6116608361154d565b60208401519092506001600160401b038082111561167d57600080fd5b818501915085601f83011261169157600080fd5b8151818111156116a3576116a3611380565b6116b6601f8201601f1916602001611396565b91508082528660208285010111156116cd57600080fd5b6116de8160208401602086016115cf565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b60006001820161172157634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b8281101561176157815184529284019290840190600101611745565b5050508381038285015284518082528583019183019060005b8181101561179f5783516001600160a01b03168352928401929184019160010161177a565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000602082840312156117e257600080fd5b505191905056fea264697066735822122017d276d65370f8ba8d89474ebc6f7b71268372f3721856947bab1c3f5d78530864736f6c63430008100033",
118
- "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a610075366004611263565b6100fc565b005b34801561008857600080fd5b5061007a610097366004611287565b6102f6565b3480156100a857600080fd5b5061007a6100b73660046112fe565b6104aa565b3480156100c857600080fd5b5061007a6100d7366004611454565b61058a565b3480156100e857600080fd5b5061007a6100f7366004611263565b610812565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611529565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af1158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc9190611562565b6102195760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261024d9291169060040161157d565b6020604051808303816000875af115801561026c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102909190611562565b6102e85760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b031633146103205760405162461bcd60e51b815260040161012690611529565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac19061035990600401611591565b602060405180830381865afa158015610376573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061039a91906115b2565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b03191681526104029392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610421573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104499190810190611644565b509050806104a55760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146104d45760405162461bcd60e51b815260040161012690611529565b8281146105155760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b610583858585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061085192505050565b5050505050565b6001546001600160a01b031633146105b45760405162461bcd60e51b815260040161012690611529565b80518251146105ff5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b825181101561080c576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa15801561067b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061069f91906115b2565b8585815181106106b1576106b16116eb565b60200260200101518786815181106106cb576106cb6116eb565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107629392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610781573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107a99190810190611644565b509050806107f95760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061080481611701565b915050610602565b50505050565b6001546001600160a01b0316331461083c5760405162461bcd60e51b815260040161012690611529565b6108458161097d565b61084e81610e18565b50565b600080546040516001600160a01b039091169063d1b7089a90869061087c9087908790602401611728565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526108d79392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156108f6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261091e9190810190611644565b5090508061080c5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac1906109b6906004016117ac565b602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906115b2565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a2190600401611591565b602060405180830381865afa158015610a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6291906115b2565b604051602401610a72919061157d565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610acd9392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610aec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b149190810190611644565b50905080610b5f5760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610b97906004016117ac565b602060405180830381865afa158015610bb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd891906115b2565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610c2f94936001600160a01b031691600091016115f3565b6000604051808303816000875af1158015610c4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610c769190810190611644565b50905080610cc65760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610cfe90600401611591565b602060405180830381865afa158015610d1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3f91906115b2565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015610d96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dba9190611562565b905080610e145760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610e5e906020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9f91906115b2565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610ed7929091169060040161157d565b602060405180830381865afa158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1891906117d0565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190610f5590600401611591565b602060405180830381865afa158015610f72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f9691906115b2565b60025460405160e085901b6001600160e01b03191681526001600160a01b0393841660048201529183166024830152604482018690529190911660648201526084016020604051808303816000875af1158015610ff7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101b9190611562565b9250826110765760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac190606401602060405180830381865afa1580156110e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061110991906115b2565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526111a49392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156111c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111eb9190810190611644565b5092508261080c5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b038116811461084e57600080fd5b60006020828403121561127557600080fd5b81356112808161124e565b9392505050565b6000806040838503121561129a57600080fd5b82356112a58161124e565b946020939093013593505050565b60008083601f8401126112c557600080fd5b5081356001600160401b038111156112dc57600080fd5b6020830191508360208260051b85010111156112f757600080fd5b9250929050565b60008060008060006060868803121561131657600080fd5b85356113218161124e565b945060208601356001600160401b038082111561133d57600080fd5b61134989838a016112b3565b9096509450604088013591508082111561136257600080fd5b5061136f888289016112b3565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156113be576113be611380565b604052919050565b60006001600160401b038211156113df576113df611380565b5060051b60200190565b600082601f8301126113fa57600080fd5b8135602061140f61140a836113c6565b611396565b82815260059290921b8401810191818101908684111561142e57600080fd5b8286015b848110156114495780358352918301918301611432565b509695505050505050565b60008060006060848603121561146957600080fd5b83356114748161124e565b92506020848101356001600160401b038082111561149157600080fd5b818701915087601f8301126114a557600080fd5b81356114b361140a826113c6565b81815260059190911b8301840190848101908a8311156114d257600080fd5b938501935b828510156114f95784356114ea8161124e565b825293850193908501906114d7565b96505050604087013592508083111561151157600080fd5b505061151f868287016113e9565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461155d57600080fd5b919050565b60006020828403121561157457600080fd5b6112808261154d565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156115c457600080fd5b81516112808161124e565b60005b838110156115ea5781810151838201526020016115d2565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526116218160a0860160208a016115cf565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561165757600080fd5b6116608361154d565b60208401519092506001600160401b038082111561167d57600080fd5b818501915085601f83011261169157600080fd5b8151818111156116a3576116a3611380565b6116b6601f8201601f1916602001611396565b91508082528660208285010111156116cd57600080fd5b6116de8160208401602086016115cf565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b60006001820161172157634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b8281101561176157815184529284019290840190600101611745565b5050508381038285015284518082528583019183019060005b8181101561179f5783516001600160a01b03168352928401929184019160010161177a565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000602082840312156117e257600080fd5b505191905056fea264697066735822122017d276d65370f8ba8d89474ebc6f7b71268372f3721856947bab1c3f5d78530864736f6c63430008100033",
117
+ "bytecode": "0x60806040523480156200001157600080fd5b506040516200199b3803806200199b833981016040819052620000349162000106565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156200009e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000c4919062000145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200016c9050565b6001600160a01b03811681146200010357600080fd5b50565b600080604083850312156200011a57600080fd5b82516200012781620000ed565b60208401519092506200013a81620000ed565b809150509250929050565b6000602082840312156200015857600080fd5b81516200016581620000ed565b9392505050565b61181f806200017c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a610075366004611263565b6100fc565b005b34801561008857600080fd5b5061007a610097366004611287565b6102f6565b3480156100a857600080fd5b5061007a6100b73660046112fe565b6104aa565b3480156100c857600080fd5b5061007a6100d7366004611454565b61058a565b3480156100e857600080fd5b5061007a6100f7366004611263565b610812565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611529565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af1158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc9190611562565b6102195760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261024d9291169060040161157d565b6020604051808303816000875af115801561026c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102909190611562565b6102e85760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b031633146103205760405162461bcd60e51b815260040161012690611529565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac19061035990600401611591565b602060405180830381865afa158015610376573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061039a91906115b2565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b03191681526104029392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610421573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104499190810190611644565b509050806104a55760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146104d45760405162461bcd60e51b815260040161012690611529565b8281146105155760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b610583858585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061085192505050565b5050505050565b6001546001600160a01b031633146105b45760405162461bcd60e51b815260040161012690611529565b80518251146105ff5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b825181101561080c576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa15801561067b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061069f91906115b2565b8585815181106106b1576106b16116eb565b60200260200101518786815181106106cb576106cb6116eb565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107629392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610781573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107a99190810190611644565b509050806107f95760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061080481611701565b915050610602565b50505050565b6001546001600160a01b0316331461083c5760405162461bcd60e51b815260040161012690611529565b6108458161097d565b61084e81610e18565b50565b600080546040516001600160a01b039091169063d1b7089a90869061087c9087908790602401611728565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526108d79392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156108f6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261091e9190810190611644565b5090508061080c5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac1906109b6906004016117ac565b602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906115b2565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a2190600401611591565b602060405180830381865afa158015610a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6291906115b2565b604051602401610a72919061157d565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610acd9392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610aec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b149190810190611644565b50905080610b5f5760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610b97906004016117ac565b602060405180830381865afa158015610bb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd891906115b2565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610c2f94936001600160a01b031691600091016115f3565b6000604051808303816000875af1158015610c4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610c769190810190611644565b50905080610cc65760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610cfe90600401611591565b602060405180830381865afa158015610d1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3f91906115b2565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015610d96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dba9190611562565b905080610e145760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610e5e906020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9f91906115b2565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610ed7929091169060040161157d565b602060405180830381865afa158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1891906117d0565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190610f5590600401611591565b602060405180830381865afa158015610f72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f9691906115b2565b60025460405160e085901b6001600160e01b03191681526001600160a01b0393841660048201529183166024830152604482018690529190911660648201526084016020604051808303816000875af1158015610ff7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101b9190611562565b9250826110765760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac190606401602060405180830381865afa1580156110e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061110991906115b2565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526111a49392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156111c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111eb9190810190611644565b5092508261080c5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b038116811461084e57600080fd5b60006020828403121561127557600080fd5b81356112808161124e565b9392505050565b6000806040838503121561129a57600080fd5b82356112a58161124e565b946020939093013593505050565b60008083601f8401126112c557600080fd5b5081356001600160401b038111156112dc57600080fd5b6020830191508360208260051b85010111156112f757600080fd5b9250929050565b60008060008060006060868803121561131657600080fd5b85356113218161124e565b945060208601356001600160401b038082111561133d57600080fd5b61134989838a016112b3565b9096509450604088013591508082111561136257600080fd5b5061136f888289016112b3565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156113be576113be611380565b604052919050565b60006001600160401b038211156113df576113df611380565b5060051b60200190565b600082601f8301126113fa57600080fd5b8135602061140f61140a836113c6565b611396565b82815260059290921b8401810191818101908684111561142e57600080fd5b8286015b848110156114495780358352918301918301611432565b509695505050505050565b60008060006060848603121561146957600080fd5b83356114748161124e565b92506020848101356001600160401b038082111561149157600080fd5b818701915087601f8301126114a557600080fd5b81356114b361140a826113c6565b81815260059190911b8301840190848101908a8311156114d257600080fd5b938501935b828510156114f95784356114ea8161124e565b825293850193908501906114d7565b96505050604087013592508083111561151157600080fd5b505061151f868287016113e9565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461155d57600080fd5b919050565b60006020828403121561157457600080fd5b6112808261154d565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156115c457600080fd5b81516112808161124e565b60005b838110156115ea5781810151838201526020016115d2565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526116218160a0860160208a016115cf565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561165757600080fd5b6116608361154d565b60208401519092506001600160401b038082111561167d57600080fd5b818501915085601f83011261169157600080fd5b8151818111156116a3576116a3611380565b6116b6601f8201601f1916602001611396565b91508082528660208285010111156116cd57600080fd5b6116de8160208401602086016115cf565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b60006001820161172157634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b8281101561176157815184529284019290840190600101611745565b5050508381038285015284518082528583019183019060005b8181101561179f5783516001600160a01b03168352928401929184019160010161177a565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000602082840312156117e257600080fd5b505191905056fea2646970667358221220f168a363000f0387b211d11d69400e5af4f6d959996cdd56e1fc891bd877347664736f6c63430008100033",
118
+ "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a610075366004611263565b6100fc565b005b34801561008857600080fd5b5061007a610097366004611287565b6102f6565b3480156100a857600080fd5b5061007a6100b73660046112fe565b6104aa565b3480156100c857600080fd5b5061007a6100d7366004611454565b61058a565b3480156100e857600080fd5b5061007a6100f7366004611263565b610812565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611529565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f906084016020604051808303816000875af1158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc9190611562565b6102195760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261024d9291169060040161157d565b6020604051808303816000875af115801561026c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102909190611562565b6102e85760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b031633146103205760405162461bcd60e51b815260040161012690611529565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac19061035990600401611591565b602060405180830381865afa158015610376573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061039a91906115b2565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b03191681526104029392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610421573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104499190810190611644565b509050806104a55760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146104d45760405162461bcd60e51b815260040161012690611529565b8281146105155760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b610583858585808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152505060408051602080890282810182019093528882529093508892508791829185019084908082843760009201919091525061085192505050565b5050505050565b6001546001600160a01b031633146105b45760405162461bcd60e51b815260040161012690611529565b80518251146105ff5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b825181101561080c576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa15801561067b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061069f91906115b2565b8585815181106106b1576106b16116eb565b60200260200101518786815181106106cb576106cb6116eb565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107629392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610781573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526107a99190810190611644565b509050806107f95760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061080481611701565b915050610602565b50505050565b6001546001600160a01b0316331461083c5760405162461bcd60e51b815260040161012690611529565b6108458161097d565b61084e81610e18565b50565b600080546040516001600160a01b039091169063d1b7089a90869061087c9087908790602401611728565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526108d79392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156108f6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261091e9190810190611644565b5090508061080c5760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac1906109b6906004016117ac565b602060405180830381865afa1580156109d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109f791906115b2565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a2190600401611591565b602060405180830381865afa158015610a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6291906115b2565b604051602401610a72919061157d565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610acd9392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af1158015610aec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610b149190810190611644565b50905080610b5f5760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610b97906004016117ac565b602060405180830381865afa158015610bb4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd891906115b2565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610c2f94936001600160a01b031691600091016115f3565b6000604051808303816000875af1158015610c4e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610c769190810190611644565b50905080610cc65760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610cfe90600401611591565b602060405180830381865afa158015610d1b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3f91906115b2565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015610d96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dba9190611562565b905080610e145760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610e5e906020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9f91906115b2565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610ed7929091169060040161157d565b602060405180830381865afa158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1891906117d0565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190610f5590600401611591565b602060405180830381865afa158015610f72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f9691906115b2565b60025460405160e085901b6001600160e01b03191681526001600160a01b0393841660048201529183166024830152604482018690529190911660648201526084016020604051808303816000875af1158015610ff7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101b9190611562565b9250826110765760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac190606401602060405180830381865afa1580156110e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061110991906115b2565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526111a49392916001600160a01b0316906000906004016115f3565b6000604051808303816000875af11580156111c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111eb9190810190611644565b5092508261080c5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b038116811461084e57600080fd5b60006020828403121561127557600080fd5b81356112808161124e565b9392505050565b6000806040838503121561129a57600080fd5b82356112a58161124e565b946020939093013593505050565b60008083601f8401126112c557600080fd5b5081356001600160401b038111156112dc57600080fd5b6020830191508360208260051b85010111156112f757600080fd5b9250929050565b60008060008060006060868803121561131657600080fd5b85356113218161124e565b945060208601356001600160401b038082111561133d57600080fd5b61134989838a016112b3565b9096509450604088013591508082111561136257600080fd5b5061136f888289016112b3565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156113be576113be611380565b604052919050565b60006001600160401b038211156113df576113df611380565b5060051b60200190565b600082601f8301126113fa57600080fd5b8135602061140f61140a836113c6565b611396565b82815260059290921b8401810191818101908684111561142e57600080fd5b8286015b848110156114495780358352918301918301611432565b509695505050505050565b60008060006060848603121561146957600080fd5b83356114748161124e565b92506020848101356001600160401b038082111561149157600080fd5b818701915087601f8301126114a557600080fd5b81356114b361140a826113c6565b81815260059190911b8301840190848101908a8311156114d257600080fd5b938501935b828510156114f95784356114ea8161124e565b825293850193908501906114d7565b96505050604087013592508083111561151157600080fd5b505061151f868287016113e9565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461155d57600080fd5b919050565b60006020828403121561157457600080fd5b6112808261154d565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156115c457600080fd5b81516112808161124e565b60005b838110156115ea5781810151838201526020016115d2565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526116218160a0860160208a016115cf565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561165757600080fd5b6116608361154d565b60208401519092506001600160401b038082111561167d57600080fd5b818501915085601f83011261169157600080fd5b8151818111156116a3576116a3611380565b6116b6601f8201601f1916602001611396565b91508082528660208285010111156116cd57600080fd5b6116de8160208401602086016115cf565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b60006001820161172157634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b8281101561176157815184529284019290840190600101611745565b5050508381038285015284518082528583019183019060005b8181101561179f5783516001600160a01b03168352928401929184019160010161177a565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b6000602082840312156117e257600080fd5b505191905056fea2646970667358221220f168a363000f0387b211d11d69400e5af4f6d959996cdd56e1fc891bd877347664736f6c63430008100033",
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/ca5b1cf630571f4204676ecd83da94fb.json"
3
+ "buildInfo": "../../../build-info/44c39c0c101464aff0d0c7767142bfca.json"
4
4
  }
package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ca5b1cf630571f4204676ecd83da94fb.json"
3
+ "buildInfo": "../../../build-info/44c39c0c101464aff0d0c7767142bfca.json"
4
4
  }
package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ca5b1cf630571f4204676ecd83da94fb.json"
3
+ "buildInfo": "../../../build-info/44c39c0c101464aff0d0c7767142bfca.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": "0x608060405234801561001057600080fd5b5060405161033c38038061033c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102a9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212201919c492695132b9607106ba9a36e16ae4627c9011f98f46aa80ab1e62979e9d64736f6c63430008100033",
78
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212201919c492695132b9607106ba9a36e16ae4627c9011f98f46aa80ab1e62979e9d64736f6c63430008100033",
77
+ "bytecode": "0x608060405234801561001057600080fd5b5060405161033c38038061033c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102a9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220991cc50bfd4afa043c3f835b990e1e7516ce1f40e33547fc4835375457850ac164736f6c63430008100033",
78
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220991cc50bfd4afa043c3f835b990e1e7516ce1f40e33547fc4835375457850ac164736f6c63430008100033",
79
79
  "linkReferences": {},
80
80
  "deployedLinkReferences": {}
81
81
  }
package/contracts/Interfaces.sol CHANGED
@@ -304,6 +304,8 @@ interface IIdentity {
304
304
 
305
305
  function didHashToAddress(bytes32 hash) external view returns (address);
306
306
 
307
+ function lastAuthenticated(address account) external view returns (uint256);
308
+
307
309
  event WhitelistedAdded(address user);
308
310
  }
309
311
 
package/contracts/identity/IdentityV2.sol CHANGED
@@ -211,7 +211,16 @@ contract IdentityV2 is
211
211
  * @return The date the address was added
212
212
  */
213
213
  function lastAuthenticated(address account) external view returns (uint256) {
214
- return identities[account].dateAuthenticated;
214
+ if (identities[account].dateAuthenticated > 0)
215
+ return identities[account].dateAuthenticated;
216
+ if (address(oldIdentity) != address(0)) {
217
+ try oldIdentity.lastAuthenticated(account) returns (uint256 _lastAuth) {
218
+ return _lastAuth;
219
+ } catch {
220
+ return 0;
221
+ }
222
+ }
223
+ return 0;
215
224
  }
216
225
 
217
226
  /**
package/contracts/mocks/IdentityMock.sol CHANGED
@@ -4,55 +4,58 @@ pragma solidity >=0.8;
4
4
  import "../Interfaces.sol";
5
5
 
6
6
  contract IdentityMock is IIdentity {
7
+ address public immutable owner;
8
+ address public immutable daoContract;
7
9
 
8
- address public immutable owner;
9
- address public immutable daoContract;
10
+ constructor(address daoContract_) {
11
+ owner = msg.sender;
12
+ daoContract = daoContract_;
13
+ }
10
14
 
11
- constructor(address daoContract_) {
12
- owner = msg.sender;
13
- daoContract = daoContract_;
14
- }
15
+ function isWhitelisted(address user) external view returns (bool) {
16
+ return true;
17
+ }
15
18
 
16
- function isWhitelisted(address user) external view returns (bool) {
17
- return true;
18
- }
19
+ function addWhitelistedWithDID(address account, string memory did) external {}
19
20
 
20
- function addWhitelistedWithDID(address account, string memory did) external {}
21
+ function removeWhitelisted(address account) external {}
21
22
 
22
- function removeWhitelisted(address account) external {}
23
+ function addBlacklisted(address account) external {}
23
24
 
24
- function addBlacklisted(address account) external {}
25
+ function removeBlacklisted(address account) external {}
25
26
 
26
- function removeBlacklisted(address account) external {}
27
+ function isBlacklisted(address user) external view returns (bool) {
28
+ return true;
29
+ }
27
30
 
28
- function isBlacklisted(address user) external view returns (bool) {
29
- return true;
30
- }
31
+ function addIdentityAdmin(address account) external returns (bool) {
32
+ return true;
33
+ }
31
34
 
32
- function addIdentityAdmin(address account) external returns (bool) {
33
- return true;
34
- }
35
+ function setAvatar(address _avatar) external {}
35
36
 
36
- function setAvatar(address _avatar) external {}
37
+ function isIdentityAdmin(address account) external view returns (bool) {
38
+ return true;
39
+ }
37
40
 
38
- function isIdentityAdmin(address account) external view returns (bool) {
39
- return true;
40
- }
41
+ // provided by the immutable "owner"
42
+ //function owner() external view returns (address);
41
43
 
42
- // provided by the immutable "owner"
43
- //function owner() external view returns (address);
44
+ function removeContract(address account) external {}
44
45
 
45
- function removeContract(address account) external {}
46
+ function isDAOContract(address account) external view returns (bool) {
47
+ return false;
48
+ }
46
49
 
47
- function isDAOContract(address account) external view returns (bool) {
48
- return false;
49
- }
50
+ function addrToDID(address account) external view returns (string memory) {
51
+ return "not implemented";
52
+ }
50
53
 
51
- function addrToDID(address account) external view returns (string memory) {
52
- return "not implemented";
53
- }
54
+ function didHashToAddress(bytes32 hash) external view returns (address) {
55
+ return address(0); // not implemented
56
+ }
54
57
 
55
- function didHashToAddress(bytes32 hash) external view returns (address) {
56
- return address(0); // not implemented
57
- }
58
- }
58
+ function lastAuthenticated(address account) external view returns (uint256) {
59
+ return 0;
60
+ }
61
+ }
package/contracts/utils/OneTimePayments.sol ADDED
@@ -0,0 +1,135 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity >=0.8.0;
3
+
4
+ import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
5
+
6
+ import "../Interfaces.sol";
7
+ import "./DAOContract.sol";
8
+ import "../utils/NameService.sol";
9
+
10
+ /* @title One Time payment scheme
11
+ * Scheme that allows address to deposit tokens for any address to withdraw
12
+ */
13
+ contract OneTimePayments is DAOContract {
14
+ struct Payment {
15
+ bool hasPayment;
16
+ uint256 paymentAmount;
17
+ address paymentSender;
18
+ }
19
+
20
+ mapping(address => Payment) public payments;
21
+
22
+ event PaymentDeposit(address indexed from, address paymentId, uint256 amount);
23
+ event PaymentCancel(address indexed from, address paymentId, uint256 amount);
24
+ event PaymentWithdraw(
25
+ address indexed from,
26
+ address indexed to,
27
+ address indexed paymentId,
28
+ uint256 amount
29
+ );
30
+
31
+ /* @dev Constructor
32
+ * @param _avatar The avatar of the DAO
33
+ * @param _identity The identity contract
34
+ * @param _gasLimit The gas limit
35
+ */
36
+ constructor(INameService _ns) {
37
+ setDAO(_ns);
38
+ }
39
+
40
+ /* @dev ERC677 on token transfer function. When transferAndCall is called on this contract,
41
+ * this function is called, depositing the payment amount under the hash of the given bytes.
42
+ * Reverts if hash is already in use. Can only be called by token contract.
43
+ * @param sender the address of the sender
44
+ * @param value the amount to deposit
45
+ * @param data The given paymentId which should be a fresh address of a wallet
46
+ */
47
+ function onTokenTransfer(
48
+ address sender,
49
+ uint256 value,
50
+ bytes calldata data
51
+ ) external returns (bool) {
52
+ address paymentId = abi.decode(data, (address));
53
+
54
+ require(!payments[paymentId].hasPayment, "paymentId already in use");
55
+ require(msg.sender == address(nativeToken()), "Only callable by this");
56
+
57
+ payments[paymentId] = Payment(true, value, sender);
58
+
59
+ emit PaymentDeposit(sender, paymentId, value);
60
+
61
+ return true;
62
+ }
63
+
64
+ /* @dev Withdrawal function.
65
+ * allows the sender that proves ownership of paymentId to withdraw
66
+ * @param paymentId the address of the public key that the
67
+ * rightful receiver of the payment knows the private key to
68
+ * @param signature the signature of a the message containing the msg.sender address signed
69
+ * with the private key.
70
+ */
71
+ function withdraw(address paymentId, bytes memory signature) public {
72
+ address signer = signerOfAddress(msg.sender, signature);
73
+ require(signer == paymentId, "Signature is not correct");
74
+
75
+ uint256 value = payments[paymentId].paymentAmount;
76
+ address sender = payments[paymentId].paymentSender;
77
+
78
+ _withdraw(paymentId, value);
79
+ emit PaymentWithdraw(sender, msg.sender, paymentId, value);
80
+ }
81
+
82
+ /* @dev Cancel function
83
+ * allows only creator of payment to cancel
84
+ * @param paymentId The paymentId of the payment to cancelæ
85
+ */
86
+ function cancel(address paymentId) public {
87
+ require(
88
+ payments[paymentId].paymentSender == msg.sender,
89
+ "Can only be called by creator"
90
+ );
91
+
92
+ uint256 value = payments[paymentId].paymentAmount;
93
+
94
+ _withdraw(paymentId, value);
95
+ emit PaymentCancel(msg.sender, paymentId, value);
96
+ }
97
+
98
+ /* @dev Internal withdraw function
99
+ * @param paymentId the paymentId of the payment
100
+ * @param value the amopunt in the payment
101
+ */
102
+ function _withdraw(address paymentId, uint256 value) internal {
103
+ require(payments[paymentId].hasPayment, "paymentId not in use");
104
+
105
+ payments[paymentId].hasPayment = false;
106
+
107
+ require(
108
+ nativeToken().transfer(msg.sender, value),
109
+ "withdraw transfer failed"
110
+ );
111
+ }
112
+
113
+ /* @dev function to check if a payment hash is in use
114
+ * @param paymentId the given paymentId
115
+ */
116
+ function hasPayment(address paymentId) public view returns (bool) {
117
+ return payments[paymentId].hasPayment;
118
+ }
119
+
120
+ /* @dev gives the signer address of the signature and the message
121
+ * @param message the plain-text message that is signed by the signature
122
+ * @param signature the signature of the plain-text message
123
+ */
124
+ function signerOfAddress(address message, bytes memory signature)
125
+ internal
126
+ pure
127
+ returns (address)
128
+ {
129
+ bytes32 signedMessage = ECDSA.toEthSignedMessageHash(
130
+ keccak256(abi.encodePacked(message))
131
+ );
132
+ address signer = ECDSA.recover(signedMessage, signature);
133
+ return signer;
134
+ }
135
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gooddollar/goodprotocol",
3
- "version": "2.0.3",
3
+ "version": "2.0.5-beta.0",
4
4
  "description": "GoodDollar Protocol",
5
5
  "scripts": {
6
6
  "prepack": "npm run minimize",
package/releases/deployment.json CHANGED
@@ -474,7 +474,8 @@
474
474
  "AdminWallet": "0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022",
475
475
  "Faucet": "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84",
476
476
  "Invites": "0x36829D1Cda92FFF5782d5d48991620664FC857d3",
477
- "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1"
477
+ "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1",
478
+ "OneTimePayments": "0xB27D247f5C2a61D2Cb6b6E67FEE51d839447e97d"
478
479
  },
479
480
  "gnosis": {
480
481
  "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
@@ -499,7 +500,8 @@
499
500
  "UBIScheme": "0x6B86F82293552C3B9FE380FC038A89e0328C7C5f",
500
501
  "ClaimersDistribution": "0x6e3c0ad79FA7ccDFa27bE14C2630511415A2F635",
501
502
  "CompoundVotingMachine": "0xC2C303131939370ed75c95686F691f290b56Be66",
502
- "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8"
503
+ "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
504
+ "OneTimePayments": "0xB23e54fd8c2f35F9d38884Fc1611F5e9004f10ea"
503
505
  },
504
506
  "staging-celo": {
505
507
  "network": "staging-celo",
@@ -521,6 +523,7 @@
521
523
  "UBIScheme": "0x2881d417dA066600372753E73A3570F0781f18cB",
522
524
  "ClaimersDistribution": "0x671123F1c7a5B5445467Ff765a5E2Bc86878B245",
523
525
  "CompoundVotingMachine": "0xCd25fB84AB22582F1034bcd80c399a3126f2E775",
524
- "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8"
526
+ "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
527
+ "OneTimePayments": "0x514820Af2DaE5F537dE16E576471528176318113"
525
528
  }
526
529
  }
package/scripts/multichain-deploy/2b_otp-deploy.ts ADDED
@@ -0,0 +1,73 @@
1
+ /***
2
+ * Deploy helper contracts
3
+ * AdminWallet, Faucet, Invites
4
+ */
5
+ import { network, ethers, upgrades, run } from "hardhat";
6
+ import { Contract } from "ethers";
7
+ import { defaultsDeep } from "lodash";
8
+ import { getImplementationAddress } from "@openzeppelin/upgrades-core";
9
+ import { deployDeterministic, verifyProductionSigner, verifyContract } from "./helpers";
10
+ import releaser from "../releaser";
11
+ import ProtocolSettings from "../../releases/deploy-settings.json";
12
+ import dao from "../../releases/deployment.json";
13
+ import { TransactionResponse } from "@ethersproject/providers";
14
+
15
+ const { name } = network;
16
+
17
+ const printDeploy = async (c: Contract | TransactionResponse): Promise<Contract | TransactionResponse> => {
18
+ if (c instanceof Contract) {
19
+ await c.deployed();
20
+ console.log("deployed to: ", c.address);
21
+ }
22
+ if (c.wait) {
23
+ await c.wait();
24
+ console.log("tx done:", c.hash);
25
+ }
26
+ return c;
27
+ };
28
+
29
+ export const deployHelpers = async () => {
30
+ let protocolSettings = defaultsDeep({}, ProtocolSettings[network.name], ProtocolSettings["default"]);
31
+
32
+ let release: { [key: string]: any } = dao[network.name];
33
+
34
+ let [root] = await ethers.getSigners();
35
+ const isProduction = network.name.includes("production");
36
+
37
+ if (isProduction) verifyProductionSigner(root);
38
+
39
+ //generic call permissions
40
+ let schemeMock = root;
41
+
42
+ console.log("got signers:", {
43
+ network,
44
+ root: root.address,
45
+ schemeMock: schemeMock.address,
46
+ balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
47
+ });
48
+
49
+ console.log("deploying onetime payments", { gasprice: protocolSettings.gasPrice });
50
+ const OTP = (await deployDeterministic(
51
+ {
52
+ name: "OneTimePayments",
53
+ salt: "OneTimePayments",
54
+ isUpgradeable: false
55
+ },
56
+ [release.NameService]
57
+ ).then(printDeploy)) as Contract;
58
+
59
+ // const OTP = await ethers.getContractAt("OneTimePayments", release.OneTimePayments);
60
+
61
+ const torelease = {
62
+ OneTimePayments: OTP.address
63
+ };
64
+ await releaser(torelease, network.name, "deployment", false);
65
+
66
+ const constructorArgs = ethers.utils.defaultAbiCoder.encode(["address"], [release.NameService]);
67
+ await verifyContract(OTP.address, "OneTimePayments", network.name, undefined, constructorArgs);
68
+ };
69
+
70
+ export const main = async () => {
71
+ await deployHelpers();
72
+ };
73
+ if (process.argv[1].includes("2b_otp-deploy")) main();