@gooddollar/goodprotocol 2.0.5-beta.0 → 2.0.5-beta.10

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 (334) hide show
  1. package/artifacts/abis/Faucet.min.json +1 -1
  2. package/artifacts/abis/FuseFaucetV2.min.json +1 -1
  3. package/artifacts/abis/IFirstClaimPool.min.json +1 -1
  4. package/artifacts/abis/IdentityFix.min.json +1 -0
  5. package/artifacts/abis/IdentityV2.min.json +1 -1
  6. package/artifacts/abis/InvitesFuseV2.min.json +1 -1
  7. package/artifacts/abis/OneTimePaymentsV2.min.json +1 -0
  8. package/artifacts/abis/UBISchemeV2.min.json +1 -0
  9. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  10. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  11. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  12. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  13. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  14. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.json +7 -0
  23. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  34. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  35. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  36. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  37. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  38. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  39. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
  40. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +29 -10
  41. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  42. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +2 -2
  43. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
  44. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +28 -2
  45. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  46. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
  47. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  48. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +2 -2
  49. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  50. package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
  51. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  52. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +2 -2
  53. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
  54. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
  55. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  56. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  57. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
  58. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  59. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  60. package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
  61. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  62. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
  63. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
  64. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +20 -2
  65. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
  66. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +15 -2
  67. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  68. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
  69. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
  70. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +2 -2
  71. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  73. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  75. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  76. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
  77. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  78. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  79. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
  80. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  81. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +2 -2
  82. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  83. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +2 -2
  84. package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
  86. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  87. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  88. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
  89. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  90. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +2 -2
  91. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  92. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
  93. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
  94. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +2 -2
  95. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  96. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  97. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  98. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  99. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
  100. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  101. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  102. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
  103. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  104. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
  105. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +1 -1
  106. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  107. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  108. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  109. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
  110. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  111. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  112. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
  113. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  114. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
  115. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  116. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
  117. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  118. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
  119. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  120. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  121. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  122. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  123. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  124. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  125. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  126. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  127. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  128. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +2 -2
  129. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  130. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
  131. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  132. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
  133. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  134. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  135. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
  136. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  137. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
  138. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  139. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
  140. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  141. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
  142. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  143. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  144. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  145. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  146. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  147. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
  148. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  149. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  150. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  151. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
  152. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  153. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
  154. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  155. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
  156. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  157. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
  158. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  159. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
  160. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  161. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
  162. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  163. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
  164. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  165. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  166. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
  167. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
  168. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
  169. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +1 -1
  170. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
  171. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +2 -2
  172. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
  173. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
  174. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
  175. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
  176. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
  177. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2 -2
  178. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
  179. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
  180. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
  181. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +1 -1
  182. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +1 -1
  183. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +2 -2
  184. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +1 -1
  185. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.json +2 -2
  186. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  187. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  188. package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.dbg.json +4 -0
  189. package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.json +789 -0
  190. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  191. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +2 -2
  192. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
  193. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +2 -2
  194. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  195. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  196. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
  197. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
  198. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +2 -2
  199. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  200. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
  201. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  202. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
  203. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  204. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  205. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  206. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -2
  207. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  208. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  209. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  210. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  211. package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.dbg.json +4 -0
  212. package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.json +60 -0
  213. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  214. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  215. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
  216. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  217. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +1 -1
  218. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.json +2 -2
  219. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json +4 -0
  220. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.json +316 -0
  221. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  222. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  223. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
  224. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  225. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
  226. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  227. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
  228. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  229. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
  230. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  231. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  232. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  233. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
  234. package/contracts/Interfaces.sol +46 -61
  235. package/contracts/fuseFaucet/Faucet.sol +22 -26
  236. package/contracts/fuseFaucet/FuseFaucetV2.sol +16 -9
  237. package/contracts/identity/IdentityV2.sol +52 -61
  238. package/contracts/invite/InvitesFuseV2.sol +21 -25
  239. package/contracts/invite/InvitesV2.sol +20 -30
  240. package/contracts/token/superfluid/SuperGoodDollar.sol +16 -22
  241. package/contracts/token/superfluid/UUPSProxy.sol +1 -1
  242. package/contracts/ubi/UBISchemeV2.sol +470 -0
  243. package/contracts/utils/IdentityFix.sol +31 -0
  244. package/contracts/utils/OneTimePaymentsV2.sol +172 -0
  245. package/hardhat.config.ts +11 -1
  246. package/package.json +11 -9
  247. package/releases/deploy-settings.json +6 -0
  248. package/releases/deployment.json +22 -4
  249. package/scripts/analytics/activeUsersCount.ts +56 -18
  250. package/scripts/analytics/whitelistsyncIssue.ts +87 -0
  251. package/scripts/multichain-deploy/1_basicdao-deploy.ts +34 -94
  252. package/scripts/multichain-deploy/2b_otp-deploy.ts +4 -4
  253. package/scripts/multichain-deploy/helpers.ts +25 -12
  254. package/scripts/proposals/gip-14_1.ts +251 -0
  255. package/scripts/proposals/gips-14_1.md +29 -0
  256. package/test/faucet/Faucet.test.ts +166 -130
  257. package/truffle-config.js +6 -0
  258. package/types/Faucet.ts +60 -29
  259. package/types/FuseFaucetV2.ts +50 -0
  260. package/types/IFirstClaimPool.ts +21 -0
  261. package/types/IdentityFix.ts +141 -0
  262. package/types/IdentityV2.ts +39 -0
  263. package/types/InvitesFuseV2.ts +28 -0
  264. package/types/OneTimePaymentsV2.ts +456 -0
  265. package/types/UBISchemeV2.ts +1192 -0
  266. package/types/factories/AaveStakingFactory__factory.ts +1 -1
  267. package/types/factories/AdminWalletFuse__factory.ts +1 -1
  268. package/types/factories/AdminWallet__factory.ts +1 -1
  269. package/types/factories/BaseShareFieldV2__factory.ts +1 -1
  270. package/types/factories/BaseShareField__factory.ts +1 -1
  271. package/types/factories/BuyAndBridgeHelper__factory.ts +1 -1
  272. package/types/factories/ClaimersDistribution__factory.ts +1 -1
  273. package/types/factories/CompoundStakingFactory__factory.ts +1 -1
  274. package/types/factories/CompoundVotingMachine__factory.ts +1 -1
  275. package/types/factories/DAOContract__factory.ts +1 -1
  276. package/types/factories/DAOUpgradeableContract__factory.ts +1 -1
  277. package/types/factories/DistributionBridgeMock__factory.ts +1 -1
  278. package/types/factories/DistributionHelperTestHelper__factory.ts +1 -1
  279. package/types/factories/DistributionHelperTest__factory.ts +1 -1
  280. package/types/factories/DistributionHelper__factory.ts +1 -1
  281. package/types/factories/DonationsStaking__factory.ts +1 -1
  282. package/types/factories/ExchangeHelper__factory.ts +1 -1
  283. package/types/factories/Faucet__factory.ts +28 -9
  284. package/types/factories/FuseFaucetV2__factory.ts +27 -1
  285. package/types/factories/FuseFaucet__factory.ts +1 -1
  286. package/types/factories/FuseStakingV3__factory.ts +1 -1
  287. package/types/factories/GReputation__factory.ts +1 -1
  288. package/types/factories/GoodAaveStakingV2__factory.ts +1 -1
  289. package/types/factories/GoodAaveStaking__factory.ts +1 -1
  290. package/types/factories/GoodCompoundStakingTest__factory.ts +1 -1
  291. package/types/factories/GoodCompoundStakingV2__factory.ts +1 -1
  292. package/types/factories/GoodCompoundStaking__factory.ts +1 -1
  293. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +1 -1
  294. package/types/factories/GoodDollarStakingMock__factory.ts +1 -1
  295. package/types/factories/GoodDollarStaking__factory.ts +1 -1
  296. package/types/factories/GoodDollar__factory.ts +1 -1
  297. package/types/factories/GoodFundManagerTest__factory.ts +1 -1
  298. package/types/factories/GoodFundManager__factory.ts +1 -1
  299. package/types/factories/GoodMarketMaker__factory.ts +1 -1
  300. package/types/factories/GoodReserveCDai__factory.ts +1 -1
  301. package/types/factories/GovernanceStaking__factory.ts +1 -1
  302. package/types/factories/IFirstClaimPool__factory.ts +7 -0
  303. package/types/factories/IdentityFix__factory.ts +110 -0
  304. package/types/factories/IdentityMock__factory.ts +1 -1
  305. package/types/factories/IdentityV2__factory.ts +19 -1
  306. package/types/factories/InvitesFuseV2__factory.ts +14 -1
  307. package/types/factories/InvitesV1__factory.ts +1 -1
  308. package/types/factories/InvitesV2__factory.ts +1 -1
  309. package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
  310. package/types/factories/MultichainRouterMock__factory.ts +1 -1
  311. package/types/factories/OneTimePaymentsV2__factory.ts +369 -0
  312. package/types/factories/OneTimePayments__factory.ts +1 -1
  313. package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
  314. package/types/factories/OverMintTester__factory.ts +1 -1
  315. package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
  316. package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
  317. package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
  318. package/types/factories/ProtocolUpgrade__factory.ts +1 -1
  319. package/types/factories/ReputationTestHelper__factory.ts +1 -1
  320. package/types/factories/Reputation__factory.ts +1 -1
  321. package/types/factories/StakersDistribution__factory.ts +1 -1
  322. package/types/factories/SuperGoodDollar__factory.ts +1 -1
  323. package/types/factories/SwapHelperTest__factory.ts +1 -1
  324. package/types/factories/UBISchemeV2__factory.ts +837 -0
  325. package/types/factories/UBIScheme__factory.ts +1 -1
  326. package/types/factories/UUPSProxy__factory.ts +1 -1
  327. package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
  328. package/types/factories/UpgradableMock2__factory.ts +1 -1
  329. package/types/factories/UpgradableMock3__factory.ts +1 -1
  330. package/types/factories/UpgradableMock4__factory.ts +1 -1
  331. package/types/factories/UpgradableMock__factory.ts +1 -1
  332. package/types/hardhat.d.ts +27 -0
  333. package/types/index.ts +6 -0
  334. package/yarn.lock +22499 -20151
package/types/factories/UBIScheme__factory.ts CHANGED
@@ -985,7 +985,7 @@ const _abi = [
985
985
  ];
986
986
 
987
987
  const _bytecode =
988
- "0x60a06040523060805234801561001457600080fd5b50608051612c7661004c60003960008181610d6901528181610da9015281816111dd0152818161121d01526112990152612c766000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631248b101146102d45780631794bb3c1461030b5780631a787f2e1461032b5780631b3c90a81461034b5780631bbc644c146103605780631d8f5ea91461039057806322b45727146103a65780633659cfe6146103bc57806337658574146103dc5780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db57806352d1902d1461050b578063560796d1146105205780635aef7de6146105715780635c9302c9146105915780635c975abb146105a757806373b2e80e146105c1578063741470ac146105e15780638081cbbd146105f75780638fd247d21461061757806398d6621b146106375780639dc2c0331461064c578063a21f698a14610662578063b656223d14610682578063ba07541014610698578063c033abf2146106ae578063c1337508146106c4578063c7713870146106e4578063c7a76adf146106f9578063cc054dfc14610719578063cef6360014610746578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e366004612651565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e36600461267c565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b506102aa6102ef366004612699565b609a602052600090815260409020600181015460029091015482565b34801561031757600080fd5b506102936103263660046126b2565b61088e565b34801561033757600080fd5b50610260610346366004612651565b610a81565b34801561035757600080fd5b50610293610ba9565b34801561036c57600080fd5b5061038061037b366004612651565b610cd0565b604051901515815260200161026a565b34801561039c57600080fd5b50610260609e5481565b3480156103b257600080fd5b5061026060a05481565b3480156103c857600080fd5b506102936103d7366004612651565b610d5f565b3480156103e857600080fd5b5061026060a95481565b3480156103fe57600080fd5b5061029361040d366004612699565b610e27565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a91906126f3565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061038061047a366004612651565b610eca565b34801561048b57600080fd5b5060a3546103809060ff1681565b3480156104a557600080fd5b5060a8546103809060ff1681565b3480156104bf57600080fd5b50610380610f2c565b6102936104d6366004612774565b6111d3565b3480156104e757600080fd5b506103806104f6366004612651565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b5061026061128c565b34801561052c57600080fd5b5061055a61053b366004612699565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561057d57600080fd5b50606654610432906001600160a01b031681565b34801561059d57600080fd5b50610260609c5481565b3480156105b357600080fd5b5060ae546103809060ff1681565b3480156105cd57600080fd5b506103806105dc366004612651565b61133a565b3480156105ed57600080fd5b5061026060a75481565b34801561060357600080fd5b5060aa54610432906001600160a01b031681565b34801561062357600080fd5b50610293610632366004612699565b611366565b34801561064357600080fd5b50610260611373565b34801561065857600080fd5b5061026060a55481565b34801561066e57600080fd5b5061038061067d366004612651565b61137e565b34801561068e57600080fd5b5061026060a25481565b3480156106a457600080fd5b5061026060a65481565b3480156106ba57600080fd5b50610260609f5481565b3480156106d057600080fd5b506102606106df366004612806565b6113a4565b3480156106f057600080fd5b506102606114f3565b34801561070557600080fd5b50610260610714366004612699565b6115d6565b34801561072557600080fd5b50610260610734366004612651565b60ad6020526000908152604090205481565b34801561075257600080fd5b50610260610761366004612699565b6115eb565b34801561077257600080fd5b5061029361078136600461267c565b611600565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b5061029361161b565b3480156107bd57600080fd5b506102936107cc36600461267c565b61167a565b3480156107dd57600080fd5b506104326116c9565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611751565b60ae805460ff1916911515919091179055565b600080600062015180609d544261084491906128cd565b61084e91906128e0565b9050610859816115d6565b610862826115eb565b92509250509091565b60006201518060a6544261087f91906128cd565b61088991906128e0565b905090565b600054610100900460ff16158080156108ae5750600054600160ff909116105b806108cf57506108bd30611816565b1580156108cf575060005460ff166001145b6109375760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801561095a576000805461ff0019166101001790555b600082116109aa5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f604482015260640161092e565b6109b384611825565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055601e60a4556202d2a8609f556109f662015180426128e0565b610a039062015180612902565b610a0f9061a8c0612921565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a9558015610a7b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15b50505050565b6000609d54421015610a9557506000919050565b60a85460ff168015610acf5750610aab8261137e565b1580610acf57506001600160a01b038216600090815260ac602052604090205460ff165b15610b515760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4b9190612934565b92915050565b62015180609d5442610b6391906128cd565b610b6d91906128e0565b609c54148015610b7f57506000609e54115b15610ba157610b8d8261133a565b610b9957609e54610b4b565b600092915050565b610b4b6114f3565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061294d565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610c8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cae919061294d565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610ce857506000609d54115b8015610cf65750609d544210155b610d125760405162461bcd60e51b815260040161092e9061296a565b610d1b82611848565b610d545760405162461bcd60e51b815260206004820152600a6024820152690c6c2dc4ee840ccd2e6d60b31b604482015260640161092e565b610b4b82600161188c565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610da75760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610dd961193a565b6001600160a01b031614610dff5760405162461bcd60e51b815260040161092e906129db565b610e0881611956565b60408051600080825260208201909252610e249183919061195e565b50565b610e2f611751565b60008111610e895760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b606482015260840161092e565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610eec8361137e565b15610f2357600062015180610f0183426128cd565b610f0b91906128e0565b905060a254811015610f21575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610f4457506000609d54115b8015610f525750609d544210155b610f6e5760405162461bcd60e51b815260040161092e9061296a565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610fd0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff4919061294d565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b815260040161101f91906126f3565b602060405180830381865afa15801561103c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611060919061294d565b90506001600160a01b0381166110b55760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b604482015260640161092e565b60006110c18233611ace565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561112d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611151919061294d565b905081801561116857506001600160a01b03811615155b156111cc5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111999086906004016126f3565b600060405180830381600087803b1580156111b357600080fd5b505af11580156111c7573d6000803e3d6000fd5b505050505b5091505090565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361121b5760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661124d61193a565b6001600160a01b0316146112735760405162461bcd60e51b815260040161092e906129db565b61127c82611956565b6112888282600161195e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113275760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161092e565b50600080516020612bfa83398151915290565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b61136e611751565b60a055565b600061088933610a81565b6001600160a01b0381166000908152609b602052604081205415610b9957506001919050565b60ae5460009060ff161580156113bc57506000609d54115b80156113ca5750609d544210155b6113e65760405162461bcd60e51b815260040161092e9061296a565b6000805b83518210156114a557609f545a106114a55761141e84838151811061141157611411612a15565b6020026020010151611848565b156114955761144784838151811061143857611438612a15565b6020026020010151600061188c565b6114855760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b604482015260640161092e565b609e546114929082612921565b90505b61149e82612a2b565b91506113ea565b80156114b9576114b9333383600080611c19565b6040518281527f72b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540f9060200160405180910390a15092915050565b6000806114fe6116c9565b6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161152991906126f3565b602060405180830381865afa158015611546573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156a9190612934565b9050600060a55460a4548361157f91906128e0565b119050600060a5549050600060a75461159661086b565b1015806115a05750825b156115b55760a4546115b290856128e0565b91505b6115c360a05460a954611eb2565b6115cd90836128e0565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b611608611751565b60a8805460ff1916911515919091179055565b600062015180609d544261162f91906128cd565b61163991906128e0565b9050609c54811115610e2457609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ebf565b611682611751565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ebf565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561172d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061294d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561179a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117be919061294d565b6001600160a01b0316146118145760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161092e565b565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610e24610ba9565b60006118538261137e565b8015611865575061186382610eca565b155b8015610b4b5750506001600160a01b0316600090815260ac602052604090205460ff161590565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055806118b8611ecb565b60a054909150156118dc57600160a060008282546118d691906128cd565b90915550505b82156118f0576118f0333383600080611c19565b6040518181526001600160a01b0385169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a35060019392505050565b600080516020612bfa833981519152546001600160a01b031690565b610e24611751565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611996576119918361215d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156119f0575060408051601f3d908101601f191682019092526119ed91810190612934565b60015b611a535760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161092e565b600080516020612bfa8339815191528114611ac25760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161092e565b506119918383836121f7565b600080611ad9611ecb565b9050611ae48461137e565b8015611b0957506001600160a01b038416600090815260ac602052604090205460ff16155b8015611b1b5750611b198461133a565b155b15611b3957611b2f84848360016000611c19565b6001915050610b4b565b611b428461137e565b1580611b6657506001600160a01b038416600090815260ac602052604090205460ff165b15611c0f57600160a06000828254611b7e9190612921565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff1615611bc257611bbd84846000806001611c19565b611bd1565b611bd184848360016000611c19565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610b4b565b5060009392505050565b8180611c225750805b15611cb0576001609a6000609c5481526020019081526020016000206001016000828254611c509190612921565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611caa908490612921565b90915550505b8015611d8b5760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ce79088906004016126f3565b6020604051808303816000875af1158015611d06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d2a9190612934565b905080609a6000609c5481526020019081526020016000206002016000828254611d549190612921565b90915550506040518181526001600160a01b03871690600080516020612bda8339815191529060200160405180910390a250611eab565b8115611de757609c546000908152609a602052604081206002018054859290611db5908490612921565b90915550506040518381526001600160a01b03861690600080516020612bda8339815191529060200160405180910390a25b6000611df16116c9565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e229088908890600401612a44565b6020604051808303816000875af1158015611e41573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e659190612a5d565b611ea95760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b604482015260640161092e565b505b5050505050565b600081831015611ec25781611ec4565b825b9392505050565b6000611ed561161b565b60a154609c54141580611ee85750609e54155b15612156576000611ef76116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f2791906126f3565b602060405180830381865afa158015611f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f689190612934565b9050600060a55460a45483611f7d91906128e0565b11905060a754611f8b61086b565b101580611f955750805b1561209e5760a35460ff161561201d57611fad61221c565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611fd99030906004016126f3565b602060405180830381865afa158015611ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201a9190612934565b91505b60a45461202a90836128e0565b60a55560a45460a75561203f610e10426128e0565b61204b90610e10612902565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a9546120de9190611eb2565b60a5546120eb91906128e0565b609e5560a05461210990612101906002906128e0565b60a954611eb2565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b61216681611816565b6121c85760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161092e565b600080516020612bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612200836124da565b60008251118061220d5750805b1561199157610a7b838361251a565b60006122266116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161225691906126f3565b602060405180830381865afa158015612273573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122979190612934565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926122cf92909116906004016126f3565b602060405180830381865afa1580156122ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123109190612934565b6065546040519192506001600160a01b03169063d1b7089a90859061233b9030908690602401612a44565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526123969392916001600160a01b031690600090600401612aca565b6000604051808303816000875af11580156123b5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123dd9190810190612afe565b50600090506123ec8284612921565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061241b9030906004016126f3565b602060405180830381865afa158015612438573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061245c9190612934565b81146124a45760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b604482015260640161092e565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba9101610a72565b6124e38161215d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061252583611816565b6125805760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161092e565b600080846001600160a01b03168460405161259b9190612b8a565b600060405180830381855af49150503d80600081146125d6576040519150601f19603f3d011682016040523d82523d6000602084013e6125db565b606091505b50915091506115cd8282604051806060016040528060278152602001612c1a602791396060831561260d575081611ec4565b611ec483838151156126225781518083602001fd5b8060405162461bcd60e51b815260040161092e9190612ba6565b6001600160a01b0381168114610e2457600080fd5b60006020828403121561266357600080fd5b8135611ec48161263c565b8015158114610e2457600080fd5b60006020828403121561268e57600080fd5b8135611ec48161266e565b6000602082840312156126ab57600080fd5b5035919050565b6000806000606084860312156126c757600080fd5b83356126d28161263c565b925060208401356126e28161263c565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561274557612745612707565b604052919050565b60006001600160401b0382111561276657612766612707565b50601f01601f191660200190565b6000806040838503121561278757600080fd5b82356127928161263c565b915060208301356001600160401b038111156127ad57600080fd5b8301601f810185136127be57600080fd5b80356127d16127cc8261274d565b61271d565b8181528660208385010111156127e657600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561281957600080fd5b82356001600160401b038082111561283057600080fd5b818501915085601f83011261284457600080fd5b81358181111561285657612856612707565b8060051b915061286784830161271d565b818152918301840191848101908884111561288157600080fd5b938501935b838510156128ab578435925061289b8361263c565b8282529385019390850190612886565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610b4b57610b4b6128b7565b6000826128fd57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561291c5761291c6128b7565b500290565b80820180821115610b4b57610b4b6128b7565b60006020828403121561294657600080fd5b5051919050565b60006020828403121561295f57600080fd5b8151611ec48161263c565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201612a3d57612a3d6128b7565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6f57600080fd5b8151611ec48161266e565b60005b83811015612a95578181015183820152602001612a7d565b50506000910152565b60008151808452612ab6816020860160208601612a7a565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612aec6080840187612a9e565b94166040830152506060015292915050565b60008060408385031215612b1157600080fd5b8251612b1c8161266e565b60208401519092506001600160401b03811115612b3857600080fd5b8301601f81018513612b4957600080fd5b8051612b576127cc8261274d565b818152866020838501011115612b6c57600080fd5b612b7d826020830160208601612a7a565b8093505050509250929050565b60008251612b9c818460208701612a7a565b9190910192915050565b602081526000611ec46020830184612a9e56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122063e7244b7d5607d81e70f53dbb5e20873435c85aa9d11aefabf4a1174757a82a64736f6c63430008100033";
988
+ "0x60a06040523060805234801561001457600080fd5b50608051612c7661004c60003960008181610d6901528181610da9015281816111dd0152818161121d01526112990152612c766000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631248b101146102d45780631794bb3c1461030b5780631a787f2e1461032b5780631b3c90a81461034b5780631bbc644c146103605780631d8f5ea91461039057806322b45727146103a65780633659cfe6146103bc57806337658574146103dc5780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db57806352d1902d1461050b578063560796d1146105205780635aef7de6146105715780635c9302c9146105915780635c975abb146105a757806373b2e80e146105c1578063741470ac146105e15780638081cbbd146105f75780638fd247d21461061757806398d6621b146106375780639dc2c0331461064c578063a21f698a14610662578063b656223d14610682578063ba07541014610698578063c033abf2146106ae578063c1337508146106c4578063c7713870146106e4578063c7a76adf146106f9578063cc054dfc14610719578063cef6360014610746578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e366004612651565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e36600461267c565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b506102aa6102ef366004612699565b609a602052600090815260409020600181015460029091015482565b34801561031757600080fd5b506102936103263660046126b2565b61088e565b34801561033757600080fd5b50610260610346366004612651565b610a81565b34801561035757600080fd5b50610293610ba9565b34801561036c57600080fd5b5061038061037b366004612651565b610cd0565b604051901515815260200161026a565b34801561039c57600080fd5b50610260609e5481565b3480156103b257600080fd5b5061026060a05481565b3480156103c857600080fd5b506102936103d7366004612651565b610d5f565b3480156103e857600080fd5b5061026060a95481565b3480156103fe57600080fd5b5061029361040d366004612699565b610e27565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a91906126f3565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061038061047a366004612651565b610eca565b34801561048b57600080fd5b5060a3546103809060ff1681565b3480156104a557600080fd5b5060a8546103809060ff1681565b3480156104bf57600080fd5b50610380610f2c565b6102936104d6366004612774565b6111d3565b3480156104e757600080fd5b506103806104f6366004612651565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b5061026061128c565b34801561052c57600080fd5b5061055a61053b366004612699565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561057d57600080fd5b50606654610432906001600160a01b031681565b34801561059d57600080fd5b50610260609c5481565b3480156105b357600080fd5b5060ae546103809060ff1681565b3480156105cd57600080fd5b506103806105dc366004612651565b61133a565b3480156105ed57600080fd5b5061026060a75481565b34801561060357600080fd5b5060aa54610432906001600160a01b031681565b34801561062357600080fd5b50610293610632366004612699565b611366565b34801561064357600080fd5b50610260611373565b34801561065857600080fd5b5061026060a55481565b34801561066e57600080fd5b5061038061067d366004612651565b61137e565b34801561068e57600080fd5b5061026060a25481565b3480156106a457600080fd5b5061026060a65481565b3480156106ba57600080fd5b50610260609f5481565b3480156106d057600080fd5b506102606106df366004612806565b6113a4565b3480156106f057600080fd5b506102606114f3565b34801561070557600080fd5b50610260610714366004612699565b6115d6565b34801561072557600080fd5b50610260610734366004612651565b60ad6020526000908152604090205481565b34801561075257600080fd5b50610260610761366004612699565b6115eb565b34801561077257600080fd5b5061029361078136600461267c565b611600565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b5061029361161b565b3480156107bd57600080fd5b506102936107cc36600461267c565b61167a565b3480156107dd57600080fd5b506104326116c9565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611751565b60ae805460ff1916911515919091179055565b600080600062015180609d544261084491906128cd565b61084e91906128e0565b9050610859816115d6565b610862826115eb565b92509250509091565b60006201518060a6544261087f91906128cd565b61088991906128e0565b905090565b600054610100900460ff16158080156108ae5750600054600160ff909116105b806108cf57506108bd30611816565b1580156108cf575060005460ff166001145b6109375760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801561095a576000805461ff0019166101001790555b600082116109aa5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f604482015260640161092e565b6109b384611825565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055601e60a4556202d2a8609f556109f662015180426128e0565b610a039062015180612902565b610a0f9061a8c0612921565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a9558015610a7b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15b50505050565b6000609d54421015610a9557506000919050565b60a85460ff168015610acf5750610aab8261137e565b1580610acf57506001600160a01b038216600090815260ac602052604090205460ff165b15610b515760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4b9190612934565b92915050565b62015180609d5442610b6391906128cd565b610b6d91906128e0565b609c54148015610b7f57506000609e54115b15610ba157610b8d8261133a565b610b9957609e54610b4b565b600092915050565b610b4b6114f3565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061294d565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610c8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cae919061294d565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610ce857506000609d54115b8015610cf65750609d544210155b610d125760405162461bcd60e51b815260040161092e9061296a565b610d1b82611848565b610d545760405162461bcd60e51b815260206004820152600a6024820152690c6c2dc4ee840ccd2e6d60b31b604482015260640161092e565b610b4b82600161188c565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610da75760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610dd961193a565b6001600160a01b031614610dff5760405162461bcd60e51b815260040161092e906129db565b610e0881611956565b60408051600080825260208201909252610e249183919061195e565b50565b610e2f611751565b60008111610e895760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b606482015260840161092e565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610eec8361137e565b15610f2357600062015180610f0183426128cd565b610f0b91906128e0565b905060a254811015610f21575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610f4457506000609d54115b8015610f525750609d544210155b610f6e5760405162461bcd60e51b815260040161092e9061296a565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610fd0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff4919061294d565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b815260040161101f91906126f3565b602060405180830381865afa15801561103c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611060919061294d565b90506001600160a01b0381166110b55760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b604482015260640161092e565b60006110c18233611ace565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561112d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611151919061294d565b905081801561116857506001600160a01b03811615155b156111cc5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111999086906004016126f3565b600060405180830381600087803b1580156111b357600080fd5b505af11580156111c7573d6000803e3d6000fd5b505050505b5091505090565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361121b5760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661124d61193a565b6001600160a01b0316146112735760405162461bcd60e51b815260040161092e906129db565b61127c82611956565b6112888282600161195e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113275760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161092e565b50600080516020612bfa83398151915290565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b61136e611751565b60a055565b600061088933610a81565b6001600160a01b0381166000908152609b602052604081205415610b9957506001919050565b60ae5460009060ff161580156113bc57506000609d54115b80156113ca5750609d544210155b6113e65760405162461bcd60e51b815260040161092e9061296a565b6000805b83518210156114a557609f545a106114a55761141e84838151811061141157611411612a15565b6020026020010151611848565b156114955761144784838151811061143857611438612a15565b6020026020010151600061188c565b6114855760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b604482015260640161092e565b609e546114929082612921565b90505b61149e82612a2b565b91506113ea565b80156114b9576114b9333383600080611c19565b6040518281527f72b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540f9060200160405180910390a15092915050565b6000806114fe6116c9565b6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161152991906126f3565b602060405180830381865afa158015611546573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156a9190612934565b9050600060a55460a4548361157f91906128e0565b119050600060a5549050600060a75461159661086b565b1015806115a05750825b156115b55760a4546115b290856128e0565b91505b6115c360a05460a954611eb2565b6115cd90836128e0565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b611608611751565b60a8805460ff1916911515919091179055565b600062015180609d544261162f91906128cd565b61163991906128e0565b9050609c54811115610e2457609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ebf565b611682611751565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ebf565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561172d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061294d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561179a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117be919061294d565b6001600160a01b0316146118145760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161092e565b565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610e24610ba9565b60006118538261137e565b8015611865575061186382610eca565b155b8015610b4b5750506001600160a01b0316600090815260ac602052604090205460ff161590565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055806118b8611ecb565b60a054909150156118dc57600160a060008282546118d691906128cd565b90915550505b82156118f0576118f0333383600080611c19565b6040518181526001600160a01b0385169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a35060019392505050565b600080516020612bfa833981519152546001600160a01b031690565b610e24611751565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611996576119918361215d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156119f0575060408051601f3d908101601f191682019092526119ed91810190612934565b60015b611a535760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161092e565b600080516020612bfa8339815191528114611ac25760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161092e565b506119918383836121f7565b600080611ad9611ecb565b9050611ae48461137e565b8015611b0957506001600160a01b038416600090815260ac602052604090205460ff16155b8015611b1b5750611b198461133a565b155b15611b3957611b2f84848360016000611c19565b6001915050610b4b565b611b428461137e565b1580611b6657506001600160a01b038416600090815260ac602052604090205460ff165b15611c0f57600160a06000828254611b7e9190612921565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff1615611bc257611bbd84846000806001611c19565b611bd1565b611bd184848360016000611c19565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610b4b565b5060009392505050565b8180611c225750805b15611cb0576001609a6000609c5481526020019081526020016000206001016000828254611c509190612921565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611caa908490612921565b90915550505b8015611d8b5760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ce79088906004016126f3565b6020604051808303816000875af1158015611d06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d2a9190612934565b905080609a6000609c5481526020019081526020016000206002016000828254611d549190612921565b90915550506040518181526001600160a01b03871690600080516020612bda8339815191529060200160405180910390a250611eab565b8115611de757609c546000908152609a602052604081206002018054859290611db5908490612921565b90915550506040518381526001600160a01b03861690600080516020612bda8339815191529060200160405180910390a25b6000611df16116c9565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e229088908890600401612a44565b6020604051808303816000875af1158015611e41573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e659190612a5d565b611ea95760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b604482015260640161092e565b505b5050505050565b600081831015611ec25781611ec4565b825b9392505050565b6000611ed561161b565b60a154609c54141580611ee85750609e54155b15612156576000611ef76116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f2791906126f3565b602060405180830381865afa158015611f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f689190612934565b9050600060a55460a45483611f7d91906128e0565b11905060a754611f8b61086b565b101580611f955750805b1561209e5760a35460ff161561201d57611fad61221c565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611fd99030906004016126f3565b602060405180830381865afa158015611ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201a9190612934565b91505b60a45461202a90836128e0565b60a55560a45460a75561203f610e10426128e0565b61204b90610e10612902565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a9546120de9190611eb2565b60a5546120eb91906128e0565b609e5560a05461210990612101906002906128e0565b60a954611eb2565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b61216681611816565b6121c85760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161092e565b600080516020612bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612200836124da565b60008251118061220d5750805b1561199157610a7b838361251a565b60006122266116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161225691906126f3565b602060405180830381865afa158015612273573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122979190612934565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926122cf92909116906004016126f3565b602060405180830381865afa1580156122ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123109190612934565b6065546040519192506001600160a01b03169063d1b7089a90859061233b9030908690602401612a44565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526123969392916001600160a01b031690600090600401612aca565b6000604051808303816000875af11580156123b5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123dd9190810190612afe565b50600090506123ec8284612921565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061241b9030906004016126f3565b602060405180830381865afa158015612438573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061245c9190612934565b81146124a45760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b604482015260640161092e565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba9101610a72565b6124e38161215d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061252583611816565b6125805760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161092e565b600080846001600160a01b03168460405161259b9190612b8a565b600060405180830381855af49150503d80600081146125d6576040519150601f19603f3d011682016040523d82523d6000602084013e6125db565b606091505b50915091506115cd8282604051806060016040528060278152602001612c1a602791396060831561260d575081611ec4565b611ec483838151156126225781518083602001fd5b8060405162461bcd60e51b815260040161092e9190612ba6565b6001600160a01b0381168114610e2457600080fd5b60006020828403121561266357600080fd5b8135611ec48161263c565b8015158114610e2457600080fd5b60006020828403121561268e57600080fd5b8135611ec48161266e565b6000602082840312156126ab57600080fd5b5035919050565b6000806000606084860312156126c757600080fd5b83356126d28161263c565b925060208401356126e28161263c565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561274557612745612707565b604052919050565b60006001600160401b0382111561276657612766612707565b50601f01601f191660200190565b6000806040838503121561278757600080fd5b82356127928161263c565b915060208301356001600160401b038111156127ad57600080fd5b8301601f810185136127be57600080fd5b80356127d16127cc8261274d565b61271d565b8181528660208385010111156127e657600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561281957600080fd5b82356001600160401b038082111561283057600080fd5b818501915085601f83011261284457600080fd5b81358181111561285657612856612707565b8060051b915061286784830161271d565b818152918301840191848101908884111561288157600080fd5b938501935b838510156128ab578435925061289b8361263c565b8282529385019390850190612886565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610b4b57610b4b6128b7565b6000826128fd57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561291c5761291c6128b7565b500290565b80820180821115610b4b57610b4b6128b7565b60006020828403121561294657600080fd5b5051919050565b60006020828403121561295f57600080fd5b8151611ec48161263c565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201612a3d57612a3d6128b7565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6f57600080fd5b8151611ec48161266e565b60005b83811015612a95578181015183820152602001612a7d565b50506000910152565b60008151808452612ab6816020860160208601612a7a565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612aec6080840187612a9e565b94166040830152506060015292915050565b60008060408385031215612b1157600080fd5b8251612b1c8161266e565b60208401519092506001600160401b03811115612b3857600080fd5b8301601f81018513612b4957600080fd5b8051612b576127cc8261274d565b818152866020838501011115612b6c57600080fd5b612b7d826020830160208601612a7a565b8093505050509250929050565b60008251612b9c818460208701612a7a565b9190910192915050565b602081526000611ec46020830184612a9e56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122015a938857224dd3fcb12c2eb31abce79b863bed2b094b02e86bc452b0c94676f64736f6c63430008100033";
989
989
 
990
990
  type UBISchemeConstructorParams =
991
991
  | [signer?: Signer]
package/types/factories/UUPSProxy__factory.ts CHANGED
@@ -31,7 +31,7 @@ const _abi = [
31
31
  ];
32
32
 
33
33
  const _bytecode =
34
- "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca26469706673582212207c33c3974a940a4eeeb4a7bd07086a7abf0876a8f9ebb856a5a88983d041b07064736f6c63430008100033";
34
+ "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122054303c95e3083467af14f8e45d0e4948671519cda9ee34d9041f82134179ec4464736f6c63430008100033";
35
35
 
36
36
  type UUPSProxyConstructorParams =
37
37
  | [signer?: Signer]
package/types/factories/UniswapV2SwapHelper__factory.ts CHANGED
@@ -52,7 +52,7 @@ const _abi = [
52
52
  ];
53
53
 
54
54
  const _bytecode =
55
- "0x6104ee61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100355760003560e01c8063f10a60ab1461003a575b600080fd5b61004d61004836600461037e565b61005f565b60405190815260200160405180910390f35b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100a0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103d9565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610106573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012a91906103d9565b90506001600160a01b038716156101415786610143565b805b96506001600160a01b0386161561015a578561015c565b805b95506000826001600160a01b031663c45a01556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561019e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c291906103d9565b60405163e6a4390560e01b81526001600160a01b038a811660048301528981166024830152919091169063e6a4390590604401602060405180830381865afa158015610212573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023691906103d9565b9050600080826001600160a01b0316630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610279573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029d9190610419565b50915091506000829050836001600160a01b031663d21220a76040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030991906103d9565b6001600160a01b03168b6001600160a01b0316036103245750805b620186a061033b896001600160701b038416610469565b6103459190610496565b96508887106103545788610356565b865b9c9b505050505050505050505050565b6001600160a01b038116811461037b57600080fd5b50565b600080600080600060a0868803121561039657600080fd5b85356103a181610366565b945060208601356103b181610366565b935060408601356103c181610366565b94979396509394606081013594506080013592915050565b6000602082840312156103eb57600080fd5b81516103f681610366565b9392505050565b80516001600160701b038116811461041457600080fd5b919050565b60008060006060848603121561042e57600080fd5b610437846103fd565b9250610445602085016103fd565b9150604084015163ffffffff8116811461045e57600080fd5b809150509250925092565b600081600019048311821515161561049157634e487b7160e01b600052601160045260246000fd5b500290565b6000826104b357634e487b7160e01b600052601260045260246000fd5b50049056fea26469706673582212205296a87b50fc464dc1f995672d75735ca502ecbf73887917f19eb43618c3b00964736f6c63430008100033";
55
+ "0x6104ee61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100355760003560e01c8063f10a60ab1461003a575b600080fd5b61004d61004836600461037e565b61005f565b60405190815260200160405180910390f35b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100a0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103d9565b90506000816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610106573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012a91906103d9565b90506001600160a01b038716156101415786610143565b805b96506001600160a01b0386161561015a578561015c565b805b95506000826001600160a01b031663c45a01556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561019e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101c291906103d9565b60405163e6a4390560e01b81526001600160a01b038a811660048301528981166024830152919091169063e6a4390590604401602060405180830381865afa158015610212573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023691906103d9565b9050600080826001600160a01b0316630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa158015610279573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029d9190610419565b50915091506000829050836001600160a01b031663d21220a76040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030991906103d9565b6001600160a01b03168b6001600160a01b0316036103245750805b620186a061033b896001600160701b038416610469565b6103459190610496565b96508887106103545788610356565b865b9c9b505050505050505050505050565b6001600160a01b038116811461037b57600080fd5b50565b600080600080600060a0868803121561039657600080fd5b85356103a181610366565b945060208601356103b181610366565b935060408601356103c181610366565b94979396509394606081013594506080013592915050565b6000602082840312156103eb57600080fd5b81516103f681610366565b9392505050565b80516001600160701b038116811461041457600080fd5b919050565b60008060006060848603121561042e57600080fd5b610437846103fd565b9250610445602085016103fd565b9150604084015163ffffffff8116811461045e57600080fd5b809150509250925092565b600081600019048311821515161561049157634e487b7160e01b600052601160045260246000fd5b500290565b6000826104b357634e487b7160e01b600052601260045260246000fd5b50049056fea2646970667358221220f122dd215ecbcb032ad1395958ce0ae95c9754742f2d8a90bd85bf21e1f878b764736f6c63430008100033";
56
56
 
57
57
  type UniswapV2SwapHelperConstructorParams =
58
58
  | [signer?: Signer]
package/types/factories/UpgradableMock2__factory.ts CHANGED
@@ -187,7 +187,7 @@ const _abi = [
187
187
  ];
188
188
 
189
189
  const _bytecode =
190
- "0x60a06040523060805234801561001457600080fd5b50608051610c7661004c600039600081816102bb015281816103040152818161038c015281816103cc01526104480152610c766000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b55780633e6326fc146100d55780634162169f1461010d5780634f1ef2861461012d57806352d1902d146101405780635aef7de614610155578063e1758bd814610175575b600080fd5b34801561008757600080fd5b5061009061018a565b005b34801561009e57600080fd5b5060125b6040519081526020015b60405180910390f35b3480156100c157600080fd5b506100906100d03660046109c6565b6102b1565b3480156100e157600080fd5b506067546100f5906001600160a01b031681565b6040516001600160a01b0390911681526020016100ac565b34801561011957600080fd5b506065546100f5906001600160a01b031681565b61009061013b3660046109f9565b610382565b34801561014c57600080fd5b506100a261043b565b34801561016157600080fd5b506066546100f5906001600160a01b031681565b34801561018157600080fd5b506100f56104e9565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156101ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102119190610abc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa15801561026b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028f9190610abc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103025760405162461bcd60e51b81526004016102f990610ad9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610334610576565b6001600160a01b03161461035a5760405162461bcd60e51b81526004016102f990610b13565b61036381610592565b6040805160008082526020820190925261037f918391906105f1565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103ca5760405162461bcd60e51b81526004016102f990610ad9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103fc610576565b6001600160a01b0316146104225760405162461bcd60e51b81526004016102f990610b13565b61042b82610592565b610437828260016105f1565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146104d65760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016102f9565b50600080516020610bfa83398151915290565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561054d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105719190610abc565b905090565b600080516020610bfa833981519152546001600160a01b031690565b3373f39fd6e51aad88f6f4ce6ab8827279cfffb922661461037f5760405162461bcd60e51b81526020600482015260196024820152786e6f7420617574686f72697a656420746f207570677261646560381b60448201526064016102f9565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156106295761062483610761565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610683575060408051601f3d908101601f1916820190925261068091810190610b4d565b60015b6106e65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016102f9565b600080516020610bfa83398151915281146107555760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016102f9565b506106248383836107fb565b61076a81610826565b6107cc5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016102f9565b600080516020610bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61080483610835565b6000825111806108115750805b15610624576108208383610875565b50505050565b6001600160a01b03163b151590565b61083e81610761565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061088083610826565b6108db5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016102f9565b600080846001600160a01b0316846040516108f69190610b8a565b600060405180830381855af49150503d8060008114610931576040519150601f19603f3d011682016040523d82523d6000602084013e610936565b606091505b509150915061095e8282604051806060016040528060278152602001610c1a60279139610967565b95945050505050565b60608315610976575081610980565b6109808383610987565b9392505050565b8151156109975781518083602001fd5b8060405162461bcd60e51b81526004016102f99190610ba6565b6001600160a01b038116811461037f57600080fd5b6000602082840312156109d857600080fd5b8135610980816109b1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a0c57600080fd5b8235610a17816109b1565b915060208301356001600160401b0380821115610a3357600080fd5b818501915085601f830112610a4757600080fd5b813581811115610a5957610a596109e3565b604051601f8201601f19908116603f01168101908382118183101715610a8157610a816109e3565b81604052828152886020848701011115610a9a57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ace57600080fd5b8151610980816109b1565b6020808252602c90820152600080516020610bda83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610bda83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610b5f57600080fd5b5051919050565b60005b83811015610b81578181015183820152602001610b69565b50506000910152565b60008251610b9c818460208701610b66565b9190910192915050565b6020815260008251806020840152610bc5816040850160208701610b66565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122040c603addf4ae185722be9344437899e78f91b0a101d5573a3f1b40c4a76d9e864736f6c63430008100033";
190
+ "0x60a06040523060805234801561001457600080fd5b50608051610c7661004c600039600081816102bb015281816103040152818161038c015281816103cc01526104480152610c766000f3fe6080604052600436106100765760003560e01c80631b3c90a81461007b578063313ce567146100925780633659cfe6146100b55780633e6326fc146100d55780634162169f1461010d5780634f1ef2861461012d57806352d1902d146101405780635aef7de614610155578063e1758bd814610175575b600080fd5b34801561008757600080fd5b5061009061018a565b005b34801561009e57600080fd5b5060125b6040519081526020015b60405180910390f35b3480156100c157600080fd5b506100906100d03660046109c6565b6102b1565b3480156100e157600080fd5b506067546100f5906001600160a01b031681565b6040516001600160a01b0390911681526020016100ac565b34801561011957600080fd5b506065546100f5906001600160a01b031681565b61009061013b3660046109f9565b610382565b34801561014c57600080fd5b506100a261043b565b34801561016157600080fd5b506066546100f5906001600160a01b031681565b34801561018157600080fd5b506100f56104e9565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156101ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102119190610abc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa15801561026b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028f9190610abc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103025760405162461bcd60e51b81526004016102f990610ad9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610334610576565b6001600160a01b03161461035a5760405162461bcd60e51b81526004016102f990610b13565b61036381610592565b6040805160008082526020820190925261037f918391906105f1565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103ca5760405162461bcd60e51b81526004016102f990610ad9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103fc610576565b6001600160a01b0316146104225760405162461bcd60e51b81526004016102f990610b13565b61042b82610592565b610437828260016105f1565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146104d65760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016102f9565b50600080516020610bfa83398151915290565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561054d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105719190610abc565b905090565b600080516020610bfa833981519152546001600160a01b031690565b3373f39fd6e51aad88f6f4ce6ab8827279cfffb922661461037f5760405162461bcd60e51b81526020600482015260196024820152786e6f7420617574686f72697a656420746f207570677261646560381b60448201526064016102f9565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156106295761062483610761565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610683575060408051601f3d908101601f1916820190925261068091810190610b4d565b60015b6106e65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016102f9565b600080516020610bfa83398151915281146107555760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016102f9565b506106248383836107fb565b61076a81610826565b6107cc5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016102f9565b600080516020610bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61080483610835565b6000825111806108115750805b15610624576108208383610875565b50505050565b6001600160a01b03163b151590565b61083e81610761565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061088083610826565b6108db5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016102f9565b600080846001600160a01b0316846040516108f69190610b8a565b600060405180830381855af49150503d8060008114610931576040519150601f19603f3d011682016040523d82523d6000602084013e610936565b606091505b509150915061095e8282604051806060016040528060278152602001610c1a60279139610967565b95945050505050565b60608315610976575081610980565b6109808383610987565b9392505050565b8151156109975781518083602001fd5b8060405162461bcd60e51b81526004016102f99190610ba6565b6001600160a01b038116811461037f57600080fd5b6000602082840312156109d857600080fd5b8135610980816109b1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a0c57600080fd5b8235610a17816109b1565b915060208301356001600160401b0380821115610a3357600080fd5b818501915085601f830112610a4757600080fd5b813581811115610a5957610a596109e3565b604051601f8201601f19908116603f01168101908382118183101715610a8157610a816109e3565b81604052828152886020848701011115610a9a57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ace57600080fd5b8151610980816109b1565b6020808252602c90820152600080516020610bda83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610bda83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610b5f57600080fd5b5051919050565b60005b83811015610b81578181015183820152602001610b69565b50506000910152565b60008251610b9c818460208701610b66565b9190910192915050565b6020815260008251806020840152610bc5816040850160208701610b66565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220964c38588cc3065f2fa5abe6260bc327762c89e65a982ab8dbfb68f09e9858fd64736f6c63430008100033";
191
191
 
192
192
  type UpgradableMock2ConstructorParams =
193
193
  | [signer?: Signer]
package/types/factories/UpgradableMock3__factory.ts CHANGED
@@ -200,7 +200,7 @@ const _abi = [
200
200
  ];
201
201
 
202
202
  const _bytecode =
203
- "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060035b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220baedd908eb068cbccdcce5146d38a3982f3b35da545f4d85294a5eb8242374f164736f6c63430008100033";
203
+ "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060035b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220eafe23541af66b174fb0c6e3d351ede2198aa059521fded0134efa2f9fc79f3f64736f6c63430008100033";
204
204
 
205
205
  type UpgradableMock3ConstructorParams =
206
206
  | [signer?: Signer]
package/types/factories/UpgradableMock4__factory.ts CHANGED
@@ -200,7 +200,7 @@ const _abi = [
200
200
  ];
201
201
 
202
202
  const _bytecode =
203
- "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060045b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220642e1e6fbeb6031efeb5f16f0c1532a3d15416db5d9bfdd221e222f2ac75c69564736f6c63430008100033";
203
+ "0x60a06040523060805234801561001457600080fd5b50608051610e4b61004c600039600081816102e60152818161032f015281816103b7015281816103f701526104730152610e4b6000f3fe6080604052600436106100815760003560e01c80631b3c90a814610086578063313ce5671461009d5780633659cfe6146100c05780633e6326fc146100e05780634162169f146101185780634f1ef2861461013857806352d1902d1461014b5780635aef7de614610160578063c4d66de814610180578063e1758bd8146101a0575b600080fd5b34801561009257600080fd5b5061009b6101b5565b005b3480156100a957600080fd5b5060045b6040519081526020015b60405180910390f35b3480156100cc57600080fd5b5061009b6100db366004610b9b565b6102dc565b3480156100ec57600080fd5b50606754610100906001600160a01b031681565b6040516001600160a01b0390911681526020016100b7565b34801561012457600080fd5b50606554610100906001600160a01b031681565b61009b610146366004610bce565b6103ad565b34801561015757600080fd5b506100ad610466565b34801561016c57600080fd5b50606654610100906001600160a01b031681565b34801561018c57600080fd5b5061009b61019b366004610b9b565b610514565b3480156101ac57600080fd5b5061010061062d565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610218573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023c9190610c91565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610296573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ba9190610c91565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361032d5760405162461bcd60e51b815260040161032490610cae565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661035f6106ba565b6001600160a01b0316146103855760405162461bcd60e51b815260040161032490610ce8565b61038e816106d6565b604080516000808252602082019092526103aa918391906106de565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103f55760405162461bcd60e51b815260040161032490610cae565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104276106ba565b6001600160a01b03161461044d5760405162461bcd60e51b815260040161032490610ce8565b610456826106d6565b610462828260016106de565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146105015760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610324565b50600080516020610dcf83398151915290565b600054610100900460ff16158080156105345750600054600160ff909116105b8061055557506105433061084e565b158015610555575060005460ff166001145b6105b85760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610324565b6000805460ff1916600117905580156105db576000805461ff0019166101001790555b6105e48261085d565b8015610462576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b59190610c91565b905090565b600080516020610dcf833981519152546001600160a01b031690565b6103aa610880565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107165761071183610945565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610770575060408051601f3d908101601f1916820190925261076d91810190610d22565b60015b6107d35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610324565b600080516020610dcf83398151915281146108425760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610324565b506107118383836109df565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b0383161790556103aa6101b5565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa1580156108c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ed9190610c91565b6001600160a01b0316146109435760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610324565b565b61094e8161084e565b6109b05760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610324565b600080516020610dcf83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6109e883610a0a565b6000825111806109f55750805b1561071157610a048383610a4a565b50505050565b610a1381610945565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b6060610a558361084e565b610ab05760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610324565b600080846001600160a01b031684604051610acb9190610d5f565b600060405180830381855af49150503d8060008114610b06576040519150601f19603f3d011682016040523d82523d6000602084013e610b0b565b606091505b5091509150610b338282604051806060016040528060278152602001610def60279139610b3c565b95945050505050565b60608315610b4b575081610b55565b610b558383610b5c565b9392505050565b815115610b6c5781518083602001fd5b8060405162461bcd60e51b81526004016103249190610d7b565b6001600160a01b03811681146103aa57600080fd5b600060208284031215610bad57600080fd5b8135610b5581610b86565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610be157600080fd5b8235610bec81610b86565b915060208301356001600160401b0380821115610c0857600080fd5b818501915085601f830112610c1c57600080fd5b813581811115610c2e57610c2e610bb8565b604051601f8201601f19908116603f01168101908382118183101715610c5657610c56610bb8565b81604052828152886020848701011115610c6f57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610ca357600080fd5b8151610b5581610b86565b6020808252602c90820152600080516020610daf83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610daf83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610d3457600080fd5b5051919050565b60005b83811015610d56578181015183820152602001610d3e565b50506000910152565b60008251610d71818460208701610d3b565b9190910192915050565b6020815260008251806020840152610d9a816040850160208701610d3b565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212206a092125df57dcc9e29c2da12fa17bc93e5357353bcc27e9471012757aad771964736f6c63430008100033";
204
204
 
205
205
  type UpgradableMock4ConstructorParams =
206
206
  | [signer?: Signer]
package/types/factories/UpgradableMock__factory.ts CHANGED
@@ -213,7 +213,7 @@ const _abi = [
213
213
  ];
214
214
 
215
215
  const _bytecode =
216
- "0x60a06040523060805234801561001457600080fd5b50608051610d8661004c600039600081816103110152818161035a015281816103d901528181610419015261048c0152610d866000f3fe60806040526004361061008c5760003560e01c80631b3c90a814610091578063313ce567146100a85780633659cfe6146100cb5780633e6326fc146100eb5780634162169f146101235780634f1ef2861461014357806352d1902d146101565780635aef7de61461016b5780638da5cb5b1461018b578063c4d66de8146101ab578063e1758bd8146101cb575b600080fd5b34801561009d57600080fd5b506100a66101e0565b005b3480156100b457600080fd5b5060085b6040519081526020015b60405180910390f35b3480156100d757600080fd5b506100a66100e6366004610ad6565b610307565b3480156100f757600080fd5b5060675461010b906001600160a01b031681565b6040516001600160a01b0390911681526020016100c2565b34801561012f57600080fd5b5060655461010b906001600160a01b031681565b6100a6610151366004610b09565b6103cf565b34801561016257600080fd5b506100b861047f565b34801561017757600080fd5b5060665461010b906001600160a01b031681565b34801561019757600080fd5b50609a5461010b906001600160a01b031681565b3480156101b757600080fd5b506100a66101c6366004610ad6565b61052d565b3480156101d757600080fd5b5061010b610658565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610243573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102679190610bcc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102e59190610bcc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103585760405162461bcd60e51b815260040161034f90610be9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661038a6106e5565b6001600160a01b0316146103b05760405162461bcd60e51b815260040161034f90610c23565b604080516000808252602082019092526103cc91839190610701565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104175760405162461bcd60e51b815260040161034f90610be9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104496106e5565b6001600160a01b03161461046f5760405162461bcd60e51b815260040161034f90610c23565b61047b82826001610701565b5050565b6000306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461051a5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161034f565b50600080516020610d0a83398151915290565b600054610100900460ff161580801561054d5750600054600160ff909116105b8061056e575061055c30610871565b15801561056e575060005460ff166001145b6105d15760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161034f565b6000805460ff1916600117905580156105f4576000805461ff0019166101001790555b609a80546001600160a01b0319166001600160a01b038416179055801561047b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610bcc565b905090565b600080516020610d0a833981519152546001600160a01b031690565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107395761073483610880565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610793575060408051601f3d908101601f1916820190925261079091810190610c5d565b60015b6107f65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161034f565b600080516020610d0a83398151915281146108655760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161034f565b5061073483838361091a565b6001600160a01b03163b151590565b61088981610871565b6108eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161034f565b600080516020610d0a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61092383610945565b6000825111806109305750805b156107345761093f8383610985565b50505050565b61094e81610880565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061099083610871565b6109eb5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161034f565b600080846001600160a01b031684604051610a069190610c9a565b600060405180830381855af49150503d8060008114610a41576040519150601f19603f3d011682016040523d82523d6000602084013e610a46565b606091505b5091509150610a6e8282604051806060016040528060278152602001610d2a60279139610a77565b95945050505050565b60608315610a86575081610a90565b610a908383610a97565b9392505050565b815115610aa75781518083602001fd5b8060405162461bcd60e51b815260040161034f9190610cb6565b6001600160a01b03811681146103cc57600080fd5b600060208284031215610ae857600080fd5b8135610a9081610ac1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b1c57600080fd5b8235610b2781610ac1565b915060208301356001600160401b0380821115610b4357600080fd5b818501915085601f830112610b5757600080fd5b813581811115610b6957610b69610af3565b604051601f8201601f19908116603f01168101908382118183101715610b9157610b91610af3565b81604052828152886020848701011115610baa57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610bde57600080fd5b8151610a9081610ac1565b6020808252602c90820152600080516020610cea83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610cea83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610c6f57600080fd5b5051919050565b60005b83811015610c91578181015183820152602001610c79565b50506000910152565b60008251610cac818460208701610c76565b9190910192915050565b6020815260008251806020840152610cd5816040850160208701610c76565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220f52b4537182a3091c158ea304fbc52b549e1b25eaab3003680135bbe08b4d99664736f6c63430008100033";
216
+ "0x60a06040523060805234801561001457600080fd5b50608051610d8661004c600039600081816103110152818161035a015281816103d901528181610419015261048c0152610d866000f3fe60806040526004361061008c5760003560e01c80631b3c90a814610091578063313ce567146100a85780633659cfe6146100cb5780633e6326fc146100eb5780634162169f146101235780634f1ef2861461014357806352d1902d146101565780635aef7de61461016b5780638da5cb5b1461018b578063c4d66de8146101ab578063e1758bd8146101cb575b600080fd5b34801561009d57600080fd5b506100a66101e0565b005b3480156100b457600080fd5b5060085b6040519081526020015b60405180910390f35b3480156100d757600080fd5b506100a66100e6366004610ad6565b610307565b3480156100f757600080fd5b5060675461010b906001600160a01b031681565b6040516001600160a01b0390911681526020016100c2565b34801561012f57600080fd5b5060655461010b906001600160a01b031681565b6100a6610151366004610b09565b6103cf565b34801561016257600080fd5b506100b861047f565b34801561017757600080fd5b5060665461010b906001600160a01b031681565b34801561019757600080fd5b50609a5461010b906001600160a01b031681565b3480156101b757600080fd5b506100a66101c6366004610ad6565b61052d565b3480156101d757600080fd5b5061010b610658565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610243573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102679190610bcc565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102e59190610bcc565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036103585760405162461bcd60e51b815260040161034f90610be9565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661038a6106e5565b6001600160a01b0316146103b05760405162461bcd60e51b815260040161034f90610c23565b604080516000808252602082019092526103cc91839190610701565b50565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036104175760405162461bcd60e51b815260040161034f90610be9565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166104496106e5565b6001600160a01b03161461046f5760405162461bcd60e51b815260040161034f90610c23565b61047b82826001610701565b5050565b6000306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461051a5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161034f565b50600080516020610d0a83398151915290565b600054610100900460ff161580801561054d5750600054600160ff909116105b8061056e575061055c30610871565b15801561056e575060005460ff166001145b6105d15760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161034f565b6000805460ff1916600117905580156105f4576000805461ff0019166101001790555b609a80546001600160a01b0319166001600160a01b038416179055801561047b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610bcc565b905090565b600080516020610d0a833981519152546001600160a01b031690565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156107395761073483610880565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610793575060408051601f3d908101601f1916820190925261079091810190610c5d565b60015b6107f65760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161034f565b600080516020610d0a83398151915281146108655760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161034f565b5061073483838361091a565b6001600160a01b03163b151590565b61088981610871565b6108eb5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161034f565b600080516020610d0a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61092383610945565b6000825111806109305750805b156107345761093f8383610985565b50505050565b61094e81610880565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061099083610871565b6109eb5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161034f565b600080846001600160a01b031684604051610a069190610c9a565b600060405180830381855af49150503d8060008114610a41576040519150601f19603f3d011682016040523d82523d6000602084013e610a46565b606091505b5091509150610a6e8282604051806060016040528060278152602001610d2a60279139610a77565b95945050505050565b60608315610a86575081610a90565b610a908383610a97565b9392505050565b815115610aa75781518083602001fd5b8060405162461bcd60e51b815260040161034f9190610cb6565b6001600160a01b03811681146103cc57600080fd5b600060208284031215610ae857600080fd5b8135610a9081610ac1565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b1c57600080fd5b8235610b2781610ac1565b915060208301356001600160401b0380821115610b4357600080fd5b818501915085601f830112610b5757600080fd5b813581811115610b6957610b69610af3565b604051601f8201601f19908116603f01168101908382118183101715610b9157610b91610af3565b81604052828152886020848701011115610baa57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610bde57600080fd5b8151610a9081610ac1565b6020808252602c90820152600080516020610cea83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020610cea83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b600060208284031215610c6f57600080fd5b5051919050565b60005b83811015610c91578181015183820152602001610c79565b50506000910152565b60008251610cac818460208701610c76565b9190910192915050565b6020815260008251806020840152610cd5816040850160208701610c76565b601f01601f1916919091016040019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220248a2845ee904fc12c37138724b90c5d00911f860e8600349bc7c3c217ab518864736f6c63430008100033";
217
217
 
218
218
  type UpgradableMockConstructorParams =
219
219
  | [signer?: Signer]
package/types/hardhat.d.ts CHANGED
@@ -724,6 +724,10 @@ declare module "hardhat/types/runtime" {
724
724
  name: "UBIScheme",
725
725
  signerOrOptions?: ethers.Signer | FactoryOptions
726
726
  ): Promise<Contracts.UBIScheme__factory>;
727
+ getContractFactory(
728
+ name: "UBISchemeV2",
729
+ signerOrOptions?: ethers.Signer | FactoryOptions
730
+ ): Promise<Contracts.UBISchemeV2__factory>;
727
731
  getContractFactory(
728
732
  name: "AdminWallet",
729
733
  signerOrOptions?: ethers.Signer | FactoryOptions
@@ -760,6 +764,10 @@ declare module "hardhat/types/runtime" {
760
764
  name: "PausableControl",
761
765
  signerOrOptions?: ethers.Signer | FactoryOptions
762
766
  ): Promise<Contracts.PausableControl__factory>;
767
+ getContractFactory(
768
+ name: "IdentityFix",
769
+ signerOrOptions?: ethers.Signer | FactoryOptions
770
+ ): Promise<Contracts.IdentityFix__factory>;
763
771
  getContractFactory(
764
772
  name: "Multicall",
765
773
  signerOrOptions?: ethers.Signer | FactoryOptions
@@ -776,6 +784,10 @@ declare module "hardhat/types/runtime" {
776
784
  name: "OneTimePayments",
777
785
  signerOrOptions?: ethers.Signer | FactoryOptions
778
786
  ): Promise<Contracts.OneTimePayments__factory>;
787
+ getContractFactory(
788
+ name: "OneTimePaymentsV2",
789
+ signerOrOptions?: ethers.Signer | FactoryOptions
790
+ ): Promise<Contracts.OneTimePaymentsV2__factory>;
779
791
  getContractFactory(
780
792
  name: "OldMarketMaker",
781
793
  signerOrOptions?: ethers.Signer | FactoryOptions
@@ -1699,6 +1711,11 @@ declare module "hardhat/types/runtime" {
1699
1711
  address: string,
1700
1712
  signer?: ethers.Signer
1701
1713
  ): Promise<Contracts.UBIScheme>;
1714
+ getContractAt(
1715
+ name: "UBISchemeV2",
1716
+ address: string,
1717
+ signer?: ethers.Signer
1718
+ ): Promise<Contracts.UBISchemeV2>;
1702
1719
  getContractAt(
1703
1720
  name: "AdminWallet",
1704
1721
  address: string,
@@ -1744,6 +1761,11 @@ declare module "hardhat/types/runtime" {
1744
1761
  address: string,
1745
1762
  signer?: ethers.Signer
1746
1763
  ): Promise<Contracts.PausableControl>;
1764
+ getContractAt(
1765
+ name: "IdentityFix",
1766
+ address: string,
1767
+ signer?: ethers.Signer
1768
+ ): Promise<Contracts.IdentityFix>;
1747
1769
  getContractAt(
1748
1770
  name: "Multicall",
1749
1771
  address: string,
@@ -1764,6 +1786,11 @@ declare module "hardhat/types/runtime" {
1764
1786
  address: string,
1765
1787
  signer?: ethers.Signer
1766
1788
  ): Promise<Contracts.OneTimePayments>;
1789
+ getContractAt(
1790
+ name: "OneTimePaymentsV2",
1791
+ address: string,
1792
+ signer?: ethers.Signer
1793
+ ): Promise<Contracts.OneTimePaymentsV2>;
1767
1794
  getContractAt(
1768
1795
  name: "OldMarketMaker",
1769
1796
  address: string,
package/types/index.ts CHANGED
@@ -176,6 +176,7 @@ export type { SuperToken } from "./SuperToken";
176
176
  export type { UUPSProxiable } from "./UUPSProxiable";
177
177
  export type { UUPSProxy } from "./UUPSProxy";
178
178
  export type { UBIScheme } from "./UBIScheme";
179
+ export type { UBISchemeV2 } from "./UBISchemeV2";
179
180
  export type { AdminWallet } from "./AdminWallet";
180
181
  export type { AdminWalletFuse } from "./AdminWalletFuse";
181
182
  export type { BancorFormula } from "./BancorFormula";
@@ -185,10 +186,12 @@ export type { DAOUpgradeableContract } from "./DAOUpgradeableContract";
185
186
  export type { GoodDollarMintBurnWrapper } from "./GoodDollarMintBurnWrapper";
186
187
  export type { IRouter } from "./IRouter";
187
188
  export type { PausableControl } from "./PausableControl";
189
+ export type { IdentityFix } from "./IdentityFix";
188
190
  export type { Multicall } from "./Multicall";
189
191
  export type { MultichainBridgeHelper } from "./MultichainBridgeHelper";
190
192
  export type { NameService } from "./NameService";
191
193
  export type { OneTimePayments } from "./OneTimePayments";
194
+ export type { OneTimePaymentsV2 } from "./OneTimePaymentsV2";
192
195
  export type { OldMarketMaker } from "./OldMarketMaker";
193
196
  export type { ProtocolUpgrade } from "./ProtocolUpgrade";
194
197
  export type { ProtocolUpgradeFuse } from "./ProtocolUpgradeFuse";
@@ -373,6 +376,7 @@ export { SuperToken__factory } from "./factories/SuperToken__factory";
373
376
  export { UUPSProxiable__factory } from "./factories/UUPSProxiable__factory";
374
377
  export { UUPSProxy__factory } from "./factories/UUPSProxy__factory";
375
378
  export { UBIScheme__factory } from "./factories/UBIScheme__factory";
379
+ export { UBISchemeV2__factory } from "./factories/UBISchemeV2__factory";
376
380
  export { AdminWallet__factory } from "./factories/AdminWallet__factory";
377
381
  export { AdminWalletFuse__factory } from "./factories/AdminWalletFuse__factory";
378
382
  export { BancorFormula__factory } from "./factories/BancorFormula__factory";
@@ -382,10 +386,12 @@ export { DAOUpgradeableContract__factory } from "./factories/DAOUpgradeableContr
382
386
  export { GoodDollarMintBurnWrapper__factory } from "./factories/GoodDollarMintBurnWrapper__factory";
383
387
  export { IRouter__factory } from "./factories/IRouter__factory";
384
388
  export { PausableControl__factory } from "./factories/PausableControl__factory";
389
+ export { IdentityFix__factory } from "./factories/IdentityFix__factory";
385
390
  export { Multicall__factory } from "./factories/Multicall__factory";
386
391
  export { MultichainBridgeHelper__factory } from "./factories/MultichainBridgeHelper__factory";
387
392
  export { NameService__factory } from "./factories/NameService__factory";
388
393
  export { OneTimePayments__factory } from "./factories/OneTimePayments__factory";
394
+ export { OneTimePaymentsV2__factory } from "./factories/OneTimePaymentsV2__factory";
389
395
  export { OldMarketMaker__factory } from "./factories/OldMarketMaker__factory";
390
396
  export { ProtocolUpgrade__factory } from "./factories/ProtocolUpgrade__factory";
391
397
  export { ProtocolUpgradeFuse__factory } from "./factories/ProtocolUpgradeFuse__factory";