@gooddollar/goodprotocol 2.0.3-beta.0 → 2.0.4

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 (186) hide show
  1. package/artifacts/abis/Faucet.min.json +1 -1
  2. package/artifacts/abis/FuseFaucetV2.min.json +1 -1
  3. package/artifacts/abis/GoodDollarMintBurnWrapper.min.json +1 -1
  4. package/artifacts/abis/OneTimePayments.min.json +1 -0
  5. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  7. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  8. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  9. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  10. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  30. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  31. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  32. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  33. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  34. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
  35. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +43 -17
  36. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  37. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
  38. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +37 -17
  39. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  40. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  41. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  42. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  43. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
  44. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
  45. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  46. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  47. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  48. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  49. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  50. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
  51. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
  52. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  53. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  55. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  56. package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
  57. package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
  58. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
  59. package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
  60. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
  61. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  62. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  63. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  64. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
  65. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  66. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  67. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  68. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  69. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  70. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  71. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  73. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  75. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  76. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  77. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  78. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  79. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  80. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  81. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  82. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  83. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  84. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  86. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  87. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  88. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  89. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  90. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  91. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  92. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  93. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  94. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  95. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  96. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  97. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
  98. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  99. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  100. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  101. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  102. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  103. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  104. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  105. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  106. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  107. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  108. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  109. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  110. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  111. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  112. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
  113. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
  114. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
  115. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +1 -1
  116. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
  117. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
  118. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
  119. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
  120. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
  121. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
  122. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
  123. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
  124. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
  125. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  126. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
  127. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  128. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
  129. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  130. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  131. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
  132. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  133. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  134. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  135. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  136. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  137. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -9
  138. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  139. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  140. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  141. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
  142. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  143. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  144. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +4 -0
  145. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.json +270 -0
  146. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  147. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  148. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  149. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  150. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  151. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  152. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  153. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  154. package/contracts/fuseFaucet/Faucet.sol +19 -10
  155. package/contracts/fuseFaucet/FuseFaucetV2.sol +28 -16
  156. package/contracts/ubi/UBIScheme.sol +1 -1
  157. package/contracts/utils/GoodDollarMintBurnWrapper.sol +1 -19
  158. package/contracts/utils/OneTimePayments.sol +135 -0
  159. package/package.json +1 -1
  160. package/releases/deployment.json +16 -5
  161. package/scripts/multichain-deploy/2_helpers-deploy.ts +46 -21
  162. package/scripts/multichain-deploy/2b_otp-deploy.ts +73 -0
  163. package/scripts/multichain-deploy/4_ubi-deploy.ts +19 -35
  164. package/scripts/multichain-deploy/helpers.ts +2 -2
  165. package/scripts/multichain-deploy/multichainWrapper-deploy.ts +7 -4
  166. package/scripts/upgradeToV3/v3-fuse-multichain.ts +117 -0
  167. package/scripts/upgrades/celo-defi-ubi-deploy.ts +9 -3
  168. package/scripts/upgrades/identity-upgrade.ts +20 -12
  169. package/test/faucet/Faucet.test.ts +4 -3
  170. package/test/faucet/FuseFaucet.test.ts +1 -1
  171. package/test/ubi/UBISchemeCycle.test.ts +20 -58
  172. package/test/utils/GoodDollarMintBurnWrapper.test.ts +66 -224
  173. package/types/Faucet.ts +61 -32
  174. package/types/FuseFaucetV2.ts +69 -32
  175. package/types/GoodDollarMintBurnWrapper.ts +0 -27
  176. package/types/OneTimePayments.ts +396 -0
  177. package/types/factories/Faucet__factory.ts +42 -16
  178. package/types/factories/FuseFaucetV2__factory.ts +36 -16
  179. package/types/factories/FuseStakingV3__factory.ts +1 -1
  180. package/types/factories/GoodDollarMintBurnWrapper__factory.ts +1 -8
  181. package/types/factories/OneTimePayments__factory.ts +323 -0
  182. package/types/factories/UBIScheme__factory.ts +1 -1
  183. package/types/hardhat.d.ts +9 -0
  184. package/types/index.ts +2 -0
  185. package/scripts/multichain-deploy/v3-fix.ts +0 -120
  186. package/scripts/multichain-deploy/v3-upgrade.ts +0 -219
@@ -78,7 +78,6 @@ export interface GoodDollarMintBurnWrapperInterface
78
78
  "unpause(bytes32)": FunctionFragment;
79
79
  "updateAvatar()": FunctionFragment;
80
80
  "updateFrequency()": FunctionFragment;
81
- "upgradeSuperGoodDollar()": FunctionFragment;
82
81
  "upgradeTo(address)": FunctionFragment;
83
82
  "upgradeToAndCall(address,bytes)": FunctionFragment;
84
83
  };
@@ -267,10 +266,6 @@ export interface GoodDollarMintBurnWrapperInterface
267
266
  functionFragment: "updateFrequency",
268
267
  values?: undefined
269
268
  ): string;
270
- encodeFunctionData(
271
- functionFragment: "upgradeSuperGoodDollar",
272
- values?: undefined
273
- ): string;
274
269
  encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
275
270
  encodeFunctionData(
276
271
  functionFragment: "upgradeToAndCall",
@@ -417,10 +412,6 @@ export interface GoodDollarMintBurnWrapperInterface
417
412
  functionFragment: "updateFrequency",
418
413
  data: BytesLike
419
414
  ): Result;
420
- decodeFunctionResult(
421
- functionFragment: "upgradeSuperGoodDollar",
422
- data: BytesLike
423
- ): Result;
424
415
  decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
425
416
  decodeFunctionResult(
426
417
  functionFragment: "upgradeToAndCall",
@@ -816,10 +807,6 @@ export interface GoodDollarMintBurnWrapper extends BaseContract {
816
807
 
817
808
  updateFrequency(overrides?: CallOverrides): Promise<[BigNumber]>;
818
809
 
819
- upgradeSuperGoodDollar(
820
- overrides?: Overrides & { from?: string | Promise<string> }
821
- ): Promise<ContractTransaction>;
822
-
823
810
  upgradeTo(
824
811
  newImplementation: string,
825
812
  overrides?: Overrides & { from?: string | Promise<string> }
@@ -1046,10 +1033,6 @@ export interface GoodDollarMintBurnWrapper extends BaseContract {
1046
1033
 
1047
1034
  updateFrequency(overrides?: CallOverrides): Promise<BigNumber>;
1048
1035
 
1049
- upgradeSuperGoodDollar(
1050
- overrides?: Overrides & { from?: string | Promise<string> }
1051
- ): Promise<ContractTransaction>;
1052
-
1053
1036
  upgradeTo(
1054
1037
  newImplementation: string,
1055
1038
  overrides?: Overrides & { from?: string | Promise<string> }
@@ -1268,8 +1251,6 @@ export interface GoodDollarMintBurnWrapper extends BaseContract {
1268
1251
 
1269
1252
  updateFrequency(overrides?: CallOverrides): Promise<BigNumber>;
1270
1253
 
1271
- upgradeSuperGoodDollar(overrides?: CallOverrides): Promise<void>;
1272
-
1273
1254
  upgradeTo(
1274
1255
  newImplementation: string,
1275
1256
  overrides?: CallOverrides
@@ -1586,10 +1567,6 @@ export interface GoodDollarMintBurnWrapper extends BaseContract {
1586
1567
 
1587
1568
  updateFrequency(overrides?: CallOverrides): Promise<BigNumber>;
1588
1569
 
1589
- upgradeSuperGoodDollar(
1590
- overrides?: Overrides & { from?: string | Promise<string> }
1591
- ): Promise<BigNumber>;
1592
-
1593
1570
  upgradeTo(
1594
1571
  newImplementation: string,
1595
1572
  overrides?: Overrides & { from?: string | Promise<string> }
@@ -1801,10 +1778,6 @@ export interface GoodDollarMintBurnWrapper extends BaseContract {
1801
1778
 
1802
1779
  updateFrequency(overrides?: CallOverrides): Promise<PopulatedTransaction>;
1803
1780
 
1804
- upgradeSuperGoodDollar(
1805
- overrides?: Overrides & { from?: string | Promise<string> }
1806
- ): Promise<PopulatedTransaction>;
1807
-
1808
1781
  upgradeTo(
1809
1782
  newImplementation: string,
1810
1783
  overrides?: Overrides & { from?: string | Promise<string> }
@@ -0,0 +1,396 @@
1
+ /* Autogenerated file. Do not edit manually. */
2
+ /* tslint:disable */
3
+ /* eslint-disable */
4
+
5
+ import {
6
+ ethers,
7
+ EventFilter,
8
+ Signer,
9
+ BigNumber,
10
+ BigNumberish,
11
+ PopulatedTransaction,
12
+ BaseContract,
13
+ ContractTransaction,
14
+ Overrides,
15
+ CallOverrides,
16
+ } from "ethers";
17
+ import { BytesLike } from "@ethersproject/bytes";
18
+ import { Listener, Provider } from "@ethersproject/providers";
19
+ import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
20
+ import type {
21
+ TypedEventFilter,
22
+ TypedEvent,
23
+ TypedListener,
24
+ OnEvent,
25
+ } from "./common";
26
+
27
+ export interface OneTimePaymentsInterface extends ethers.utils.Interface {
28
+ functions: {
29
+ "avatar()": FunctionFragment;
30
+ "cancel(address)": FunctionFragment;
31
+ "dao()": FunctionFragment;
32
+ "hasPayment(address)": FunctionFragment;
33
+ "nameService()": FunctionFragment;
34
+ "nativeToken()": FunctionFragment;
35
+ "onTokenTransfer(address,uint256,bytes)": FunctionFragment;
36
+ "payments(address)": FunctionFragment;
37
+ "updateAvatar()": FunctionFragment;
38
+ "withdraw(address,bytes)": FunctionFragment;
39
+ };
40
+
41
+ encodeFunctionData(functionFragment: "avatar", values?: undefined): string;
42
+ encodeFunctionData(functionFragment: "cancel", values: [string]): string;
43
+ encodeFunctionData(functionFragment: "dao", values?: undefined): string;
44
+ encodeFunctionData(functionFragment: "hasPayment", values: [string]): string;
45
+ encodeFunctionData(
46
+ functionFragment: "nameService",
47
+ values?: undefined
48
+ ): string;
49
+ encodeFunctionData(
50
+ functionFragment: "nativeToken",
51
+ values?: undefined
52
+ ): string;
53
+ encodeFunctionData(
54
+ functionFragment: "onTokenTransfer",
55
+ values: [string, BigNumberish, BytesLike]
56
+ ): string;
57
+ encodeFunctionData(functionFragment: "payments", values: [string]): string;
58
+ encodeFunctionData(
59
+ functionFragment: "updateAvatar",
60
+ values?: undefined
61
+ ): string;
62
+ encodeFunctionData(
63
+ functionFragment: "withdraw",
64
+ values: [string, BytesLike]
65
+ ): string;
66
+
67
+ decodeFunctionResult(functionFragment: "avatar", data: BytesLike): Result;
68
+ decodeFunctionResult(functionFragment: "cancel", data: BytesLike): Result;
69
+ decodeFunctionResult(functionFragment: "dao", data: BytesLike): Result;
70
+ decodeFunctionResult(functionFragment: "hasPayment", data: BytesLike): Result;
71
+ decodeFunctionResult(
72
+ functionFragment: "nameService",
73
+ data: BytesLike
74
+ ): Result;
75
+ decodeFunctionResult(
76
+ functionFragment: "nativeToken",
77
+ data: BytesLike
78
+ ): Result;
79
+ decodeFunctionResult(
80
+ functionFragment: "onTokenTransfer",
81
+ data: BytesLike
82
+ ): Result;
83
+ decodeFunctionResult(functionFragment: "payments", data: BytesLike): Result;
84
+ decodeFunctionResult(
85
+ functionFragment: "updateAvatar",
86
+ data: BytesLike
87
+ ): Result;
88
+ decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
89
+
90
+ events: {
91
+ "PaymentCancel(address,address,uint256)": EventFragment;
92
+ "PaymentDeposit(address,address,uint256)": EventFragment;
93
+ "PaymentWithdraw(address,address,address,uint256)": EventFragment;
94
+ };
95
+
96
+ getEvent(nameOrSignatureOrTopic: "PaymentCancel"): EventFragment;
97
+ getEvent(nameOrSignatureOrTopic: "PaymentDeposit"): EventFragment;
98
+ getEvent(nameOrSignatureOrTopic: "PaymentWithdraw"): EventFragment;
99
+ }
100
+
101
+ export type PaymentCancelEvent = TypedEvent<
102
+ [string, string, BigNumber],
103
+ { from: string; paymentId: string; amount: BigNumber }
104
+ >;
105
+
106
+ export type PaymentCancelEventFilter = TypedEventFilter<PaymentCancelEvent>;
107
+
108
+ export type PaymentDepositEvent = TypedEvent<
109
+ [string, string, BigNumber],
110
+ { from: string; paymentId: string; amount: BigNumber }
111
+ >;
112
+
113
+ export type PaymentDepositEventFilter = TypedEventFilter<PaymentDepositEvent>;
114
+
115
+ export type PaymentWithdrawEvent = TypedEvent<
116
+ [string, string, string, BigNumber],
117
+ { from: string; to: string; paymentId: string; amount: BigNumber }
118
+ >;
119
+
120
+ export type PaymentWithdrawEventFilter = TypedEventFilter<PaymentWithdrawEvent>;
121
+
122
+ export interface OneTimePayments extends BaseContract {
123
+ connect(signerOrProvider: Signer | Provider | string): this;
124
+ attach(addressOrName: string): this;
125
+ deployed(): Promise<this>;
126
+
127
+ interface: OneTimePaymentsInterface;
128
+
129
+ queryFilter<TEvent extends TypedEvent>(
130
+ event: TypedEventFilter<TEvent>,
131
+ fromBlockOrBlockhash?: string | number | undefined,
132
+ toBlock?: string | number | undefined
133
+ ): Promise<Array<TEvent>>;
134
+
135
+ listeners<TEvent extends TypedEvent>(
136
+ eventFilter?: TypedEventFilter<TEvent>
137
+ ): Array<TypedListener<TEvent>>;
138
+ listeners(eventName?: string): Array<Listener>;
139
+ removeAllListeners<TEvent extends TypedEvent>(
140
+ eventFilter: TypedEventFilter<TEvent>
141
+ ): this;
142
+ removeAllListeners(eventName?: string): this;
143
+ off: OnEvent<this>;
144
+ on: OnEvent<this>;
145
+ once: OnEvent<this>;
146
+ removeListener: OnEvent<this>;
147
+
148
+ functions: {
149
+ avatar(overrides?: CallOverrides): Promise<[string]>;
150
+
151
+ cancel(
152
+ paymentId: string,
153
+ overrides?: Overrides & { from?: string | Promise<string> }
154
+ ): Promise<ContractTransaction>;
155
+
156
+ dao(overrides?: CallOverrides): Promise<[string]>;
157
+
158
+ hasPayment(
159
+ paymentId: string,
160
+ overrides?: CallOverrides
161
+ ): Promise<[boolean]>;
162
+
163
+ nameService(overrides?: CallOverrides): Promise<[string]>;
164
+
165
+ nativeToken(overrides?: CallOverrides): Promise<[string]>;
166
+
167
+ onTokenTransfer(
168
+ sender: string,
169
+ value: BigNumberish,
170
+ data: BytesLike,
171
+ overrides?: Overrides & { from?: string | Promise<string> }
172
+ ): Promise<ContractTransaction>;
173
+
174
+ payments(
175
+ arg0: string,
176
+ overrides?: CallOverrides
177
+ ): Promise<
178
+ [boolean, BigNumber, string] & {
179
+ hasPayment: boolean;
180
+ paymentAmount: BigNumber;
181
+ paymentSender: string;
182
+ }
183
+ >;
184
+
185
+ updateAvatar(
186
+ overrides?: Overrides & { from?: string | Promise<string> }
187
+ ): Promise<ContractTransaction>;
188
+
189
+ withdraw(
190
+ paymentId: string,
191
+ signature: BytesLike,
192
+ overrides?: Overrides & { from?: string | Promise<string> }
193
+ ): Promise<ContractTransaction>;
194
+ };
195
+
196
+ avatar(overrides?: CallOverrides): Promise<string>;
197
+
198
+ cancel(
199
+ paymentId: string,
200
+ overrides?: Overrides & { from?: string | Promise<string> }
201
+ ): Promise<ContractTransaction>;
202
+
203
+ dao(overrides?: CallOverrides): Promise<string>;
204
+
205
+ hasPayment(paymentId: string, overrides?: CallOverrides): Promise<boolean>;
206
+
207
+ nameService(overrides?: CallOverrides): Promise<string>;
208
+
209
+ nativeToken(overrides?: CallOverrides): Promise<string>;
210
+
211
+ onTokenTransfer(
212
+ sender: string,
213
+ value: BigNumberish,
214
+ data: BytesLike,
215
+ overrides?: Overrides & { from?: string | Promise<string> }
216
+ ): Promise<ContractTransaction>;
217
+
218
+ payments(
219
+ arg0: string,
220
+ overrides?: CallOverrides
221
+ ): Promise<
222
+ [boolean, BigNumber, string] & {
223
+ hasPayment: boolean;
224
+ paymentAmount: BigNumber;
225
+ paymentSender: string;
226
+ }
227
+ >;
228
+
229
+ updateAvatar(
230
+ overrides?: Overrides & { from?: string | Promise<string> }
231
+ ): Promise<ContractTransaction>;
232
+
233
+ withdraw(
234
+ paymentId: string,
235
+ signature: BytesLike,
236
+ overrides?: Overrides & { from?: string | Promise<string> }
237
+ ): Promise<ContractTransaction>;
238
+
239
+ callStatic: {
240
+ avatar(overrides?: CallOverrides): Promise<string>;
241
+
242
+ cancel(paymentId: string, overrides?: CallOverrides): Promise<void>;
243
+
244
+ dao(overrides?: CallOverrides): Promise<string>;
245
+
246
+ hasPayment(paymentId: string, overrides?: CallOverrides): Promise<boolean>;
247
+
248
+ nameService(overrides?: CallOverrides): Promise<string>;
249
+
250
+ nativeToken(overrides?: CallOverrides): Promise<string>;
251
+
252
+ onTokenTransfer(
253
+ sender: string,
254
+ value: BigNumberish,
255
+ data: BytesLike,
256
+ overrides?: CallOverrides
257
+ ): Promise<boolean>;
258
+
259
+ payments(
260
+ arg0: string,
261
+ overrides?: CallOverrides
262
+ ): Promise<
263
+ [boolean, BigNumber, string] & {
264
+ hasPayment: boolean;
265
+ paymentAmount: BigNumber;
266
+ paymentSender: string;
267
+ }
268
+ >;
269
+
270
+ updateAvatar(overrides?: CallOverrides): Promise<void>;
271
+
272
+ withdraw(
273
+ paymentId: string,
274
+ signature: BytesLike,
275
+ overrides?: CallOverrides
276
+ ): Promise<void>;
277
+ };
278
+
279
+ filters: {
280
+ "PaymentCancel(address,address,uint256)"(
281
+ from?: string | null,
282
+ paymentId?: null,
283
+ amount?: null
284
+ ): PaymentCancelEventFilter;
285
+ PaymentCancel(
286
+ from?: string | null,
287
+ paymentId?: null,
288
+ amount?: null
289
+ ): PaymentCancelEventFilter;
290
+
291
+ "PaymentDeposit(address,address,uint256)"(
292
+ from?: string | null,
293
+ paymentId?: null,
294
+ amount?: null
295
+ ): PaymentDepositEventFilter;
296
+ PaymentDeposit(
297
+ from?: string | null,
298
+ paymentId?: null,
299
+ amount?: null
300
+ ): PaymentDepositEventFilter;
301
+
302
+ "PaymentWithdraw(address,address,address,uint256)"(
303
+ from?: string | null,
304
+ to?: string | null,
305
+ paymentId?: string | null,
306
+ amount?: null
307
+ ): PaymentWithdrawEventFilter;
308
+ PaymentWithdraw(
309
+ from?: string | null,
310
+ to?: string | null,
311
+ paymentId?: string | null,
312
+ amount?: null
313
+ ): PaymentWithdrawEventFilter;
314
+ };
315
+
316
+ estimateGas: {
317
+ avatar(overrides?: CallOverrides): Promise<BigNumber>;
318
+
319
+ cancel(
320
+ paymentId: string,
321
+ overrides?: Overrides & { from?: string | Promise<string> }
322
+ ): Promise<BigNumber>;
323
+
324
+ dao(overrides?: CallOverrides): Promise<BigNumber>;
325
+
326
+ hasPayment(
327
+ paymentId: string,
328
+ overrides?: CallOverrides
329
+ ): Promise<BigNumber>;
330
+
331
+ nameService(overrides?: CallOverrides): Promise<BigNumber>;
332
+
333
+ nativeToken(overrides?: CallOverrides): Promise<BigNumber>;
334
+
335
+ onTokenTransfer(
336
+ sender: string,
337
+ value: BigNumberish,
338
+ data: BytesLike,
339
+ overrides?: Overrides & { from?: string | Promise<string> }
340
+ ): Promise<BigNumber>;
341
+
342
+ payments(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
343
+
344
+ updateAvatar(
345
+ overrides?: Overrides & { from?: string | Promise<string> }
346
+ ): Promise<BigNumber>;
347
+
348
+ withdraw(
349
+ paymentId: string,
350
+ signature: BytesLike,
351
+ overrides?: Overrides & { from?: string | Promise<string> }
352
+ ): Promise<BigNumber>;
353
+ };
354
+
355
+ populateTransaction: {
356
+ avatar(overrides?: CallOverrides): Promise<PopulatedTransaction>;
357
+
358
+ cancel(
359
+ paymentId: string,
360
+ overrides?: Overrides & { from?: string | Promise<string> }
361
+ ): Promise<PopulatedTransaction>;
362
+
363
+ dao(overrides?: CallOverrides): Promise<PopulatedTransaction>;
364
+
365
+ hasPayment(
366
+ paymentId: string,
367
+ overrides?: CallOverrides
368
+ ): Promise<PopulatedTransaction>;
369
+
370
+ nameService(overrides?: CallOverrides): Promise<PopulatedTransaction>;
371
+
372
+ nativeToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
373
+
374
+ onTokenTransfer(
375
+ sender: string,
376
+ value: BigNumberish,
377
+ data: BytesLike,
378
+ overrides?: Overrides & { from?: string | Promise<string> }
379
+ ): Promise<PopulatedTransaction>;
380
+
381
+ payments(
382
+ arg0: string,
383
+ overrides?: CallOverrides
384
+ ): Promise<PopulatedTransaction>;
385
+
386
+ updateAvatar(
387
+ overrides?: Overrides & { from?: string | Promise<string> }
388
+ ): Promise<PopulatedTransaction>;
389
+
390
+ withdraw(
391
+ paymentId: string,
392
+ signature: BytesLike,
393
+ overrides?: Overrides & { from?: string | Promise<string> }
394
+ ): Promise<PopulatedTransaction>;
395
+ };
396
+ }
@@ -268,6 +268,19 @@ const _abi = [
268
268
  stateMutability: "view",
269
269
  type: "function",
270
270
  },
271
+ {
272
+ inputs: [],
273
+ name: "gasTopping",
274
+ outputs: [
275
+ {
276
+ internalType: "uint256",
277
+ name: "",
278
+ type: "uint256",
279
+ },
280
+ ],
281
+ stateMutability: "view",
282
+ type: "function",
283
+ },
271
284
  {
272
285
  inputs: [],
273
286
  name: "getIdentity",
@@ -300,6 +313,19 @@ const _abi = [
300
313
  stateMutability: "view",
301
314
  type: "function",
302
315
  },
316
+ {
317
+ inputs: [],
318
+ name: "getToppingAmount",
319
+ outputs: [
320
+ {
321
+ internalType: "uint256",
322
+ name: "",
323
+ type: "uint256",
324
+ },
325
+ ],
326
+ stateMutability: "view",
327
+ type: "function",
328
+ },
303
329
  {
304
330
  inputs: [],
305
331
  name: "goodDollar_unused",
@@ -575,11 +601,11 @@ const _abi = [
575
601
  inputs: [
576
602
  {
577
603
  internalType: "uint256",
578
- name: "_amount",
604
+ name: "_gasUnits",
579
605
  type: "uint256",
580
606
  },
581
607
  ],
582
- name: "setToppingAmount",
608
+ name: "setGasTopping",
583
609
  outputs: [],
584
610
  stateMutability: "nonpayable",
585
611
  type: "function",
@@ -629,19 +655,6 @@ const _abi = [
629
655
  stateMutability: "nonpayable",
630
656
  type: "function",
631
657
  },
632
- {
633
- inputs: [],
634
- name: "toppingAmount",
635
- outputs: [
636
- {
637
- internalType: "uint256",
638
- name: "",
639
- type: "uint256",
640
- },
641
- ],
642
- stateMutability: "view",
643
- type: "function",
644
- },
645
658
  {
646
659
  inputs: [
647
660
  {
@@ -704,6 +717,19 @@ const _abi = [
704
717
  stateMutability: "payable",
705
718
  type: "function",
706
719
  },
720
+ {
721
+ inputs: [],
722
+ name: "version",
723
+ outputs: [
724
+ {
725
+ internalType: "uint32",
726
+ name: "",
727
+ type: "uint32",
728
+ },
729
+ ],
730
+ stateMutability: "view",
731
+ type: "function",
732
+ },
707
733
  {
708
734
  inputs: [
709
735
  {
@@ -735,7 +761,7 @@ const _abi = [
735
761
  ];
736
762
 
737
763
  const _bytecode =
738
- "0x60a06040523060805234801561001457600080fd5b50608051612b0f61004c600039600081816107a5015281816107e501528181610ef901528181610f390152610fb10152612b0f6000f3fe6080604052600436106101985760003560e01c806301ffc9a7146101a45780630f79c070146101d95780631ece9b12146101fb578063248a9ca3146102295780632f2ff15d1461025757806336568abe146102775780633659cfe61461029757806336afc6fa146102b75780633771dcf8146102cc5780633e6326fc146102ec5780634f1ef2861461030d57806352d1902d146103205780635b61e2c1146103355780635bc758e2146103755780635c9302c91461038b5780636294c311146103a15780636bdd7242146103c157806378e97925146103e15780637befab10146103f757806389b08f111461043157806391d148541461049b578063926d7d7f146104bb57806393a08de4146104dd578063a217fddf146104fb578063a4c0ed3614610510578063aa31e45914610530578063c573cb4014610561578063c5da103314610582578063cce987d4146105bb578063d547741f146105e0578063d55ec69714610600578063e6ea393914610615578063e97eefd21461062b578063f84b40f51461064b578063fe173b971461066157600080fd5b3661019f57005b600080fd5b3480156101b057600080fd5b506101c46101bf36600461234f565b610689565b60405190151581526020015b60405180910390f35b3480156101e557600080fd5b506101f96101f4366004612379565b6106c0565b005b34801561020757600080fd5b506101055461021c906001600160a01b031681565b6040516101d09190612392565b34801561023557600080fd5b50610249610244366004612379565b6106e2565b6040519081526020016101d0565b34801561026357600080fd5b506101f96102723660046123bb565b6106f7565b34801561028357600080fd5b506101f96102923660046123bb565b610718565b3480156102a357600080fd5b506101f96102b23660046123eb565b61079b565b3480156102c357600080fd5b5061021c610863565b3480156102d857600080fd5b506101f96102e73660046123eb565b6108ef565b3480156102f857600080fd5b506101005461021c906001600160a01b031681565b6101f961031b36600461244e565b610eef565b34801561032c57600080fd5b50610249610fa4565b34801561034157600080fd5b506101055461035d90600160a01b90046001600160401b031681565b6040516001600160401b0390911681526020016101d0565b34801561038157600080fd5b5061024960fd5481565b34801561039757600080fd5b5061024960ff5481565b3480156103ad57600080fd5b506101f96103bc366004612511565b611052565b3480156103cd57600080fd5b506101f96103dc36600461256b565b611252565b3480156103ed57600080fd5b5061024960fe5481565b34801561040357600080fd5b506101045461041c90600160601b900463ffffffff1681565b60405163ffffffff90911681526020016101d0565b34801561043d57600080fd5b5061047761044c3660046123eb565b610103602052600090815260409020546001600160801b03811690600160801b900463ffffffff1682565b604080516001600160801b03909316835263ffffffff9091166020830152016101d0565b3480156104a757600080fd5b506101c46104b63660046123bb565b61128b565b3480156104c757600080fd5b50610249600080516020612a9383398151915281565b3480156104e957600080fd5b506101045461041c9063ffffffff1681565b34801561050757600080fd5b50610249600081565b34801561051c57600080fd5b506101c461052b366004612586565b6112b6565b34801561053c57600080fd5b506101c461054b3660046123eb565b6101026020526000908152604090205460ff1681565b34801561056d57600080fd5b506101065461035d906001600160401b031681565b34801561058e57600080fd5b5061024961059d3660046123bb565b61010160209081526000928352604080842090915290825290205481565b3480156105c757600080fd5b506101045461041c90600160801b900463ffffffff1681565b3480156105ec57600080fd5b506101f96105fb3660046123bb565b6114ee565b34801561060c57600080fd5b506101f961150a565b34801561062157600080fd5b5061024960fc5481565b34801561063757600080fd5b506101c46106463660046123eb565b611543565b34801561065757600080fd5b5061024960fb5481565b34801561066d57600080fd5b506101045461035d90600160201b90046001600160401b031681565b60006001600160e01b03198216637965db0b60e01b14806106ba57506301ffc9a760e01b6001600160e01b03198316145b92915050565b60006106cb81611895565b60fc8290556106db826002612624565b60fb555050565b600090815260c9602052604090206001015490565b610700826106e2565b61070981611895565b610713838361189f565b505050565b6001600160a01b038116331461078d5760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6107978282611925565b5050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036107e35760405162461bcd60e51b815260040161078490612643565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661081561198c565b6001600160a01b03161461083b5760405162461bcd60e51b81526004016107849061267d565b610844816119a8565b60408051600080825260208201909252610860918391906119b3565b50565b6101005460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156108c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ea91906126b7565b905090565b60005a90508160006108ff610863565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b815260040161092a9190612392565b602060405180830381865afa158015610947573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061096b91906126b7565b90506001600160a01b038116156109825780610984565b815b60ff54909250610992611b1e565b8060ff54146109ad5761010680546001600160401b03191690555b60ff546001600160a01b038416600090815261010360205260409020546001600160801b039081169116141580610a125750610104546001600160a01b0384166000908152610103602052604090205463ffffffff918216600160801b909104909116105b610a535760405162461bcd60e51b81526020600482015260126024820152716d6178206461696c7920746f7070696e677360701b6044820152606401610784565b6001600160a01b0383166000908152610102602052604090205460ff16158015610a96575061010554610106546001600160401b03600160a01b90920482169116105b80610aa957506001600160a01b03821615155b610b045760405162461bcd60e51b815260206004820152602660248201527f55736572206e6f742077686974656c6973746564206f72206e6f742066697273604482015265742074696d6560d01b6064820152608401610784565b6000600760ff54610b1591906126ea565b6001600160a01b0385166000908152610103602052604081205460ff549293509091610b4a916001600160801b0316906126fe565b905060078111610b5a5780610b5d565b60075b9050818111610b6c5780610b77565b610b77826001612711565b9050600081610b87846001612711565b610b9191906126fe565b90505b828111610c0a576001600160a01b0386166000908152610103602052604081206001018260078110610bc857610bc8612724565b600291828204019190066010026101000a8154816001600160801b0302191690836001600160801b031602179055508080610c029061273a565b915050610b94565b506000805b838111610c81576001600160a01b0387166000908152610103602052604090206001018160078110610c4357610c43612724565b600291828204019190066010029054906101000a90046001600160801b031682610c6d9190612753565b915080610c798161273a565b915050610c0f565b506101045460fb54610ca091600160601b900463ffffffff1690612624565b816001600160801b031610610d145760405162461bcd60e51b815260206004820152603460248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f206044820152736d616e792074696d65732074686973207765656b60601b6064820152608401610784565b876000610d1f610863565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b8152600401610d4a9190612392565b602060405180830381865afa158015610d67573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d8b91906126b7565b6001600160a01b0316141580610e1e57506000610da6610863565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b8152600401610dd19190612392565b602060405180830381865afa158015610dee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e1291906126b7565b6001600160a01b031614155b80610e3c5750610e3c600080516020612a938339815191523361128b565b610e795760405162461bcd60e51b815260206004820152600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606401610784565b610e8289611b3f565b505050505050505a610e9490826126fe565b610ea09061a410612711565b6101045490915033906108fc90610ec790600160201b90046001600160401b031684612624565b6040518115909202916000818181858888f19350505050158015610713573d6000803e3d6000fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610f375760405162461bcd60e51b815260040161078490612643565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610f6961198c565b6001600160a01b031614610f8f5760405162461bcd60e51b81526004016107849061267d565b610f98826119a8565b610797828260016119b3565b6000306001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161461103f5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610784565b50600080516020612a7383398151915290565b600054610100900460ff16158080156110725750600054600160ff909116105b80611093575061108130611e89565b158015611093575060005460ff166001145b6110f65760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610784565b6000805460ff191660011790558015611119576000805461ff0019166101001790555b611121611e98565b61112c600083611f03565b6001600160a01b0383161561115357611153600080516020612a9383398151915284611f03565b6101048054600160201b600160601b031916600160201b6001600160401b03878116820292909217928390556111a2926111949291900416620927c061277a565b6001600160401b03166106c0565b61010480544260fe5561010080546001600160a01b0319166001600160a01b03891617905563ffffffff600160601b03600160a01b03191660036501f40000000160611b011790556101058054600160a01b600160e01b03191661027160a31b179055801561124b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b600061125d81611895565b5061010480546001600160401b03909216600160201b02600160201b600160601b0319909216919091179055565b600091825260c9602090815260408084206001600160a01b0393909316845291905290205460ff1690565b61010454600090600160801b900463ffffffff168411156113045760405162461bcd60e51b8152602060048201526008602482015267736c69707061676560c01b6044820152606401610784565b6000611312838501856123eb565b6040805160028082526060820183529293508392600092602083019080368337019050509050338160008151811061134c5761134c612724565b60200260200101906001600160a01b031690816001600160a01b031681525050816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa1580156113aa573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113ce91906126b7565b816001815181106113e1576113e1612724565b6001600160a01b03928316602091820292909201015260405163095ea7b360e01b815290841660048201526000196024820152339063095ea7b3906044016020604051808303816000875af115801561143e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061146291906127a9565b506040516318cbafe560e01b81526001600160a01b038316906318cbafe590611498908a9060009086908e9042906004016127cb565b6000604051808303816000875af11580156114b7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526114df919081019061283c565b50600198975050505050505050565b6114f7826106e2565b61150081611895565b6107138383611925565b61010554600160a01b90046001600160401b0316600003611541576101058054600160a01b600160e01b03191661027160a31b1790555b565b6000816001600160a01b03163160fc54101561156157506000919050565b600061156b610863565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b81526004016115969190612392565b602060405180830381865afa1580156115b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115d791906126b7565b90506001600160a01b038116156115ee57806115f0565b825b925060006201518060fe544261160691906126fe565b61161091906128e1565b6001600160a01b03851660009081526101036020526040812054919250906001600160801b03808416911614158061166f57506001600160a01b038516600090815261010360205260409020546003600160801b90910463ffffffff16105b80156116cc57506001600160a01b0385166000908152610102602052604090205460ff161580156116b9575061010554610106546001600160401b03600160a01b90920482169116105b806116cc57506001600160a01b03831615155b6001600160a01b03861660009081526101036020526040808220815160e0810192839052939450919291600101906007908285855b82829054906101000a90046001600160801b03166001600160801b031681526020019060100190602082600f0104928301926001038202915080841161170157905050505050509050600060078461175991906126ea565b6001600160a01b038816600090815261010360205260408120549192509061178a906001600160801b0316866126fe565b90506007811161179a578061179d565b60075b90508181116117ac57806117b7565b6117b7826001612711565b90506000816117c7846001612711565b6117d191906126fe565b90505b8281116118145760008482600781106117ef576117ef612724565b6001600160801b0390921660209290920201528061180c8161273a565b9150506117d4565b506000805b8381116118555784816007811061183257611832612724565b60200201516118419083612753565b91508061184d8161273a565b915050611819565b5084801561188857506101045460fb5461187c91600160601b900463ffffffff1690612624565b816001600160801b0316105b9998505050505050505050565b6108608133611f0d565b6118a9828261128b565b61079757600082815260c9602090815260408083206001600160a01b03851684529091529020805460ff191660011790556118e13390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b61192f828261128b565b1561079757600082815260c9602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080516020612a73833981519152546001600160a01b031690565b600061079781611895565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156119e65761071383611f66565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611a40575060408051601f3d908101601f19168201909252611a3d918101906128f5565b60015b611aa35760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610784565b600080516020612a738339815191528114611b125760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610784565b50610713838383612000565b6201518060fe5442611b3091906126fe565b611b3a91906128e1565b60ff55565b806000611b4a610863565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b8152600401611b759190612392565b602060405180830381865afa158015611b92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611bb691906126b7565b90506001600160a01b03811615611bcd5780611bcf565b825b9250826001600160a01b03163160fc5411611be957600080fd5b6000836001600160a01b03163160fc54611c0391906126fe565b90506000600760ff54611c1691906126ea565b60ff546001600160a01b038716600090815261010360205260409020549192506001600160801b03908116911603611ca5576001600160a01b038516600090815261010360205260409020805460019190601090611c82908490600160801b900463ffffffff1661290e565b92506101000a81548163ffffffff021916908363ffffffff160217905550611cd3565b6001600160a01b038516600090815261010360205260409020805463ffffffff60801b1916600160801b1790555b60ff546001600160a01b03861660009081526101036020526040902080546001600160801b0319166001600160801b0390921691909117815582906001018260078110611d2257611d22612724565b600291828204019190066010028282829054906101000a90046001600160801b0316611d4e9190612753565b82546001600160801b039182166101009390930a9283029190920219909116179055506001600160a01b0385166000908152610102602052604090205460ff16158015611da257506001600160a01b038316155b15611de75761010680546001600160401b0316906000611dc18361292b565b91906101000a8154816001600160401b0302191690836001600160401b03160217905550505b6001600160a01b0380861660009081526101026020526040808220805460ff19166001179055519186169184156108fc0291859190818181858888f19350505050158015611e39573d6000803e3d6000fd5b50604080518381526001600160a01b0385811660208301523392908716917f7872034fbcc87890e73d66eac55389e0ffdba157b89a73bd2011157ebac1d66e910160405180910390a35050505050565b6001600160a01b03163b151590565b600054610100900460ff166115415760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610784565b610797828261189f565b611f17828261128b565b61079757611f248161202b565b611f2f83602061203d565b604051602001611f4092919061297d565b60408051601f198184030181529082905262461bcd60e51b8252610784916004016129ec565b611f6f81611e89565b611fd15760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610784565b600080516020612a7383398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612009836121df565b6000825111806120165750805b1561071357612025838361221f565b50505050565b60606106ba6001600160a01b03831660145b6060600061204c836002612624565b612057906002612711565b6001600160401b0381111561206e5761206e612408565b6040519080825280601f01601f191660200182016040528015612098576020820181803683370190505b509050600360fc1b816000815181106120b3576120b3612724565b60200101906001600160f81b031916908160001a905350600f60fb1b816001815181106120e2576120e2612724565b60200101906001600160f81b031916908160001a9053506000612106846002612624565b612111906001612711565b90505b6001811115612189576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061214557612145612724565b1a60f81b82828151811061215b5761215b612724565b60200101906001600160f81b031916908160001a90535060049490941c9361218281612a1f565b9050612114565b5083156121d85760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610784565b9392505050565b6121e881611f66565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061222a83611e89565b6122855760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610784565b600080846001600160a01b0316846040516122a09190612a36565b600060405180830381855af49150503d80600081146122db576040519150601f19603f3d011682016040523d82523d6000602084013e6122e0565b606091505b50915091506123088282604051806060016040528060278152602001612ab360279139612311565b95945050505050565b606083156123205750816121d8565b6121d883838151156123355781518083602001fd5b8060405162461bcd60e51b815260040161078491906129ec565b60006020828403121561236157600080fd5b81356001600160e01b0319811681146121d857600080fd5b60006020828403121561238b57600080fd5b5035919050565b6001600160a01b0391909116815260200190565b6001600160a01b038116811461086057600080fd5b600080604083850312156123ce57600080fd5b8235915060208301356123e0816123a6565b809150509250929050565b6000602082840312156123fd57600080fd5b81356121d8816123a6565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561244657612446612408565b604052919050565b6000806040838503121561246157600080fd5b823561246c816123a6565b91506020838101356001600160401b038082111561248957600080fd5b818601915086601f83011261249d57600080fd5b8135818111156124af576124af612408565b6124c1601f8201601f1916850161241e565b915080825287848285010111156124d757600080fd5b80848401858401376000848284010152508093505050509250929050565b80356001600160401b038116811461250c57600080fd5b919050565b6000806000806080858703121561252757600080fd5b8435612532816123a6565b9350612540602086016124f5565b92506040850135612550816123a6565b91506060850135612560816123a6565b939692955090935050565b60006020828403121561257d57600080fd5b6121d8826124f5565b6000806000806060858703121561259c57600080fd5b84356125a7816123a6565b93506020850135925060408501356001600160401b03808211156125ca57600080fd5b818701915087601f8301126125de57600080fd5b8135818111156125ed57600080fd5b8860208285010111156125ff57600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600081600019048311821515161561263e5761263e61260e565b500290565b6020808252602c90820152600080516020612a5383398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612a5383398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6000602082840312156126c957600080fd5b81516121d8816123a6565b634e487b7160e01b600052601260045260246000fd5b6000826126f9576126f96126d4565b500690565b818103818111156106ba576106ba61260e565b808201808211156106ba576106ba61260e565b634e487b7160e01b600052603260045260246000fd5b60006001820161274c5761274c61260e565b5060010190565b6001600160801b038181168382160190808211156127735761277361260e565b5092915050565b60006001600160401b03828116848216811515828404821116156127a0576127a061260e565b02949350505050565b6000602082840312156127bb57600080fd5b815180151581146121d857600080fd5b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b8181101561281b5784516001600160a01b0316835293830193918301916001016127f6565b50506001600160a01b03969096166060850152505050608001529392505050565b6000602080838503121561284f57600080fd5b82516001600160401b038082111561286657600080fd5b818501915085601f83011261287a57600080fd5b81518181111561288c5761288c612408565b8060051b915061289d84830161241e565b81815291830184019184810190888411156128b757600080fd5b938501935b838510156128d5578451825293850193908501906128bc565b98975050505050505050565b6000826128f0576128f06126d4565b500490565b60006020828403121561290757600080fd5b5051919050565b63ffffffff8181168382160190808211156127735761277361260e565b60006001600160401b038281166002600160401b0319810161294f5761294f61260e565b6001019392505050565b60005b8381101561297457818101518382015260200161295c565b50506000910152565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b8152600083516129af816017850160208801612959565b7001034b99036b4b9b9b4b733903937b6329607d1b60179184019182015283516129e0816028840160208801612959565b01602801949350505050565b6020815260008251806020840152612a0b816040850160208701612959565b601f01601f19169190910160400192915050565b600081612a2e57612a2e61260e565b506000190190565b60008251612a48818460208701612959565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc802cf867c2da464d4ff0ebc4dfcccdfbd65d75a8bc1c273fb02e80bf3446b516416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b4bb14a938a571c54248ad312b8471a9751cf47a832b62648bfa7b98b88c72c364736f6c63430008100033";
764
+ "0x60a06040523060805234801561001457600080fd5b50608051612c6061004c600039600081816107fd0152818161083d01528181610f6801528181610fa801526110200152612c606000f3fe6080604052600436106101ae5760003560e01c806301ffc9a7146101ba57806315126799146101ef5780631ece9b1214610212578063248a9ca3146102405780632f2ff15d146102605780632f5a3d151461028257806336568abe146102985780633659cfe6146102b857806336afc6fa146102d85780633771dcf8146102ed5780633e6326fc1461030d5780634f1ef2861461032e57806352d1902d1461034157806354fd4d50146103565780635b61e2c1146103905780635bc758e2146103d05780635c9302c9146103e65780636294c311146103fc5780636bdd72421461041c57806370c635911461043c57806378e979251461045c5780637befab101461047257806389b08f111461049757806391d1485414610501578063926d7d7f1461052157806393a08de414610543578063a217fddf14610561578063a4c0ed3614610576578063aa31e45914610596578063c573cb40146105c7578063c5da1033146105e8578063cce987d414610621578063d547741f14610646578063d55ec69714610666578063e97eefd21461067b578063f84b40f51461069b578063fe173b97146106b157600080fd5b366101b557005b600080fd5b3480156101c657600080fd5b506101da6101d53660046124b6565b6106d9565b60405190151581526020015b60405180910390f35b3480156101fb57600080fd5b50610204610710565b6040519081526020016101e6565b34801561021e57600080fd5b5061010554610233906001600160a01b031681565b6040516101e691906124e0565b34801561024c57600080fd5b5061020461025b3660046124f4565b61073a565b34801561026c57600080fd5b5061028061027b366004612522565b61074f565b005b34801561028e57600080fd5b5061020460fc5481565b3480156102a457600080fd5b506102806102b3366004612522565b610770565b3480156102c457600080fd5b506102806102d3366004612552565b6107f3565b3480156102e457600080fd5b506102336108bb565b3480156102f957600080fd5b50610280610308366004612552565b610942565b34801561031957600080fd5b5061010054610233906001600160a01b031681565b61028061033c3660046125b5565b610f5e565b34801561034d57600080fd5b50610204611013565b34801561036257600080fd5b506101065461037b90600160401b900463ffffffff1681565b60405163ffffffff90911681526020016101e6565b34801561039c57600080fd5b50610105546103b890600160a01b90046001600160401b031681565b6040516001600160401b0390911681526020016101e6565b3480156103dc57600080fd5b5061020460fd5481565b3480156103f257600080fd5b5061020460ff5481565b34801561040857600080fd5b50610280610417366004612678565b6110c1565b34801561042857600080fd5b506102806104373660046126d2565b6112ae565b34801561044857600080fd5b506102806104573660046124f4565b6112e7565b34801561046857600080fd5b5061020460fe5481565b34801561047e57600080fd5b506101045461037b90600160601b900463ffffffff1681565b3480156104a357600080fd5b506104dd6104b2366004612552565b610103602052600090815260409020546001600160801b03811690600160801b900463ffffffff1682565b604080516001600160801b03909316835263ffffffff9091166020830152016101e6565b34801561050d57600080fd5b506101da61051c366004612522565b611309565b34801561052d57600080fd5b50610204600080516020612be483398151915281565b34801561054f57600080fd5b506101045461037b9063ffffffff1681565b34801561056d57600080fd5b50610204600081565b34801561058257600080fd5b506101da6105913660046126ed565b611334565b3480156105a257600080fd5b506101da6105b1366004612552565b6101026020526000908152604090205460ff1681565b3480156105d357600080fd5b50610106546103b8906001600160401b031681565b3480156105f457600080fd5b50610204610603366004612522565b61010160209081526000928352604080842090915290825290205481565b34801561062d57600080fd5b506101045461037b90600160801b900463ffffffff1681565b34801561065257600080fd5b50610280610661366004612522565b61156c565b34801561067257600080fd5b50610280611588565b34801561068757600080fd5b506101da610696366004612552565b61167f565b3480156106a757600080fd5b5061020460fb5481565b3480156106bd57600080fd5b50610104546103b890600160201b90046001600160401b031681565b60006001600160e01b03198216637965db0b60e01b148061070a57506301ffc9a760e01b6001600160e01b03198316145b92915050565b6101045460fc5460009161073591600160201b9091046001600160401b03169061278b565b905090565b600090815260c9602052604090206001015490565b6107588261073a565b610761816119f2565b61076b83836119fc565b505050565b6001600160a01b03811633146107e55760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6107ef8282611a82565b5050565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361083b5760405162461bcd60e51b81526004016107dc906127aa565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661086d611ae9565b6001600160a01b0316146108935760405162461bcd60e51b81526004016107dc906127e4565b61089c81611b05565b604080516000808252602082019092526108b891839190611b10565b50565b6101005460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561091e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610735919061281e565b60005a90508160006109526108bb565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b815260040161097d91906124e0565b602060405180830381865afa15801561099a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109be919061281e565b90506001600160a01b038116156109d557806109d7565b815b60ff549092506109e5611c7b565b8060ff5414610a005761010680546001600160401b03191690555b60ff546001600160a01b038416600090815261010360205260409020546001600160801b039081169116141580610a655750610104546001600160a01b0384166000908152610103602052604090205463ffffffff918216600160801b909104909116105b610aa65760405162461bcd60e51b81526020600482015260126024820152716d6178206461696c7920746f7070696e677360701b60448201526064016107dc565b6001600160a01b0383166000908152610102602052604090205460ff16158015610ae9575061010554610106546001600160401b03600160a01b90920482169116105b80610afc57506001600160a01b03821615155b610b575760405162461bcd60e51b815260206004820152602660248201527f55736572206e6f742077686974656c6973746564206f72206e6f742066697273604482015265742074696d6560d01b60648201526084016107dc565b6000600760ff54610b689190612851565b6001600160a01b0385166000908152610103602052604081205460ff549293509091610b9d916001600160801b031690612865565b905060078111610bad5780610bb0565b60075b9050818111610bbf5780610bca565b610bca826001612878565b9050600081610bda846001612878565b610be49190612865565b90505b828111610c5d576001600160a01b0386166000908152610103602052604081206001018260078110610c1b57610c1b61288b565b600291828204019190066010026101000a8154816001600160801b0302191690836001600160801b031602179055508080610c55906128a1565b915050610be7565b506000805b838111610cd4576001600160a01b0387166000908152610103602052604090206001018160078110610c9657610c9661288b565b600291828204019190066010029054906101000a90046001600160801b031682610cc091906128ba565b915080610ccc816128a1565b915050610c62565b506101045460fb54600160601b820463ffffffff1691610d0591600160201b9091046001600160401b03169061278b565b610d0f919061278b565b816001600160801b031610610d835760405162461bcd60e51b815260206004820152603460248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f206044820152736d616e792074696d65732074686973207765656b60601b60648201526084016107dc565b876000610d8e6108bb565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b8152600401610db991906124e0565b602060405180830381865afa158015610dd6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dfa919061281e565b6001600160a01b0316141580610e8d57506000610e156108bb565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b8152600401610e4091906124e0565b602060405180830381865afa158015610e5d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e81919061281e565b6001600160a01b031614155b80610eab5750610eab600080516020612be483398151915233611309565b610ee85760405162461bcd60e51b815260206004820152600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b60448201526064016107dc565b610ef189611c9c565b505050505050505a610f039082612865565b610f0f9061a410612878565b6101045490915033906108fc90610f3690600160201b90046001600160401b03168461278b565b6040518115909202916000818181858888f1935050505015801561076b573d6000803e3d6000fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610fa65760405162461bcd60e51b81526004016107dc906127aa565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610fd8611ae9565b6001600160a01b031614610ffe5760405162461bcd60e51b81526004016107dc906127e4565b61100782611b05565b6107ef82826001611b10565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146110ae5760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b60648201526084016107dc565b50600080516020612bc483398151915290565b600054610100900460ff16158080156110e15750600054600160ff909116105b8061110257506110f030611ff0565b158015611102575060005460ff166001145b6111655760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016107dc565b6000805460ff191660011790558015611188576000805461ff0019166101001790555b611190611fff565b61119b60008361206a565b6001600160a01b038316156111c2576111c2600080516020612be48339815191528461206a565b6101048054600160201b600160601b031916600160201b6001600160401b03871602179055620f424060fc8190556111fb90600261278b565b60fb5561010480544260fe5561010080546001600160a01b0319166001600160a01b03891617905563ffffffff600160601b03600160a01b03191660036501f40000000160611b011790556101058054600160a01b600160e01b03191661027160a31b17905580156112a7576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b60006112b9816119f2565b5061010480546001600160401b03909216600160201b02600160201b600160601b0319909216919091179055565b60006112f2816119f2565b60fc82905561130282600261278b565b60fb555050565b600091825260c9602090815260408084206001600160a01b0393909316845291905290205460ff1690565b61010454600090600160801b900463ffffffff168411156113825760405162461bcd60e51b8152602060048201526008602482015267736c69707061676560c01b60448201526064016107dc565b600061139083850185612552565b604080516002808252606082018352929350839260009260208301908036833701905050905033816000815181106113ca576113ca61288b565b60200260200101906001600160a01b031690816001600160a01b031681525050816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015611428573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061144c919061281e565b8160018151811061145f5761145f61288b565b6001600160a01b03928316602091820292909201015260405163095ea7b360e01b815290841660048201526000196024820152339063095ea7b3906044016020604051808303816000875af11580156114bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114e091906128e1565b506040516318cbafe560e01b81526001600160a01b038316906318cbafe590611516908a9060009086908e904290600401612903565b6000604051808303816000875af1158015611535573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261155d9190810190612974565b50600198975050505050505050565b6115758261073a565b61157e816119f2565b61076b8383611a82565b61010654600160401b900463ffffffff16156115d95760405162461bcd60e51b815260206004820152601060248201526f185b1c9958591e481d5c19dc9859195960821b60448201526064016107dc565b61010554600160a01b90046001600160401b0316600003611610576101058054600160a01b600160e01b03191661027160a31b1790555b6101068054600160401b900463ffffffff1690600861162e83612a19565b91906101000a81548163ffffffff021916908363ffffffff1602179055505061167d61010460049054906101000a90046001600160401b03166001600160401b031660fc546104579190612a3c565b565b6000816001600160a01b031631611694610710565b10156116a257506000919050565b60006116ac6108bb565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b81526004016116d791906124e0565b602060405180830381865afa1580156116f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611718919061281e565b90506001600160a01b0381161561172f5780611731565b825b925060006201518060fe54426117479190612865565b6117519190612a3c565b6001600160a01b03851660009081526101036020526040812054919250906001600160801b0380841691161415806117b057506001600160a01b038516600090815261010360205260409020546003600160801b90910463ffffffff16105b801561180d57506001600160a01b0385166000908152610102602052604090205460ff161580156117fa575061010554610106546001600160401b03600160a01b90920482169116105b8061180d57506001600160a01b03831615155b6001600160a01b03861660009081526101036020526040808220815160e0810192839052939450919291600101906007908285855b82829054906101000a90046001600160801b03166001600160801b031681526020019060100190602082600f0104928301926001038202915080841161184257905050505050509050600060078461189a9190612851565b6001600160a01b03881660009081526101036020526040812054919250906118cb906001600160801b031686612865565b9050600781116118db57806118de565b60075b90508181116118ed57806118f8565b6118f8826001612878565b9050600081611908846001612878565b6119129190612865565b90505b8281116119555760008482600781106119305761193061288b565b6001600160801b0390921660209290920201528061194d816128a1565b915050611915565b506000805b838111611996578481600781106119735761197361288b565b602002015161198290836128ba565b91508061198e816128a1565b91505061195a565b508480156119e557506101045460fb54600160601b820463ffffffff16916119cf91600160201b9091046001600160401b03169061278b565b6119d9919061278b565b816001600160801b0316105b9998505050505050505050565b6108b88133612074565b611a068282611309565b6107ef57600082815260c9602090815260408083206001600160a01b03851684529091529020805460ff19166001179055611a3e3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b611a8c8282611309565b156107ef57600082815260c9602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080516020612bc4833981519152546001600160a01b031690565b60006107ef816119f2565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611b435761076b836120cd565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611b9d575060408051601f3d908101601f19168201909252611b9a91810190612a50565b60015b611c005760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b60648201526084016107dc565b600080516020612bc48339815191528114611c6f5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b60648201526084016107dc565b5061076b838383612167565b6201518060fe5442611c8d9190612865565b611c979190612a3c565b60ff55565b806000611ca76108bb565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b8152600401611cd291906124e0565b602060405180830381865afa158015611cef573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d13919061281e565b90506001600160a01b03811615611d2a5780611d2c565b825b9250826001600160a01b031631611d41610710565b11611d4b57600080fd5b6000836001600160a01b031631611d60610710565b611d6a9190612865565b90506000600760ff54611d7d9190612851565b60ff546001600160a01b038716600090815261010360205260409020549192506001600160801b03908116911603611e0c576001600160a01b038516600090815261010360205260409020805460019190601090611de9908490600160801b900463ffffffff16612a69565b92506101000a81548163ffffffff021916908363ffffffff160217905550611e3a565b6001600160a01b038516600090815261010360205260409020805463ffffffff60801b1916600160801b1790555b60ff546001600160a01b03861660009081526101036020526040902080546001600160801b0319166001600160801b0390921691909117815582906001018260078110611e8957611e8961288b565b600291828204019190066010028282829054906101000a90046001600160801b0316611eb591906128ba565b82546001600160801b039182166101009390930a9283029190920219909116179055506001600160a01b0385166000908152610102602052604090205460ff16158015611f0957506001600160a01b038316155b15611f4e5761010680546001600160401b0316906000611f2883612a86565b91906101000a8154816001600160401b0302191690836001600160401b03160217905550505b6001600160a01b0380861660009081526101026020526040808220805460ff19166001179055519186169184156108fc0291859190818181858888f19350505050158015611fa0573d6000803e3d6000fd5b50604080518381526001600160a01b0385811660208301523392908716917f7872034fbcc87890e73d66eac55389e0ffdba157b89a73bd2011157ebac1d66e910160405180910390a35050505050565b6001600160a01b03163b151590565b600054610100900460ff1661167d5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b60648201526084016107dc565b6107ef82826119fc565b61207e8282611309565b6107ef5761208b81612192565b6120968360206121a4565b6040516020016120a7929190612ace565b60408051601f198184030181529082905262461bcd60e51b82526107dc91600401612b3d565b6120d681611ff0565b6121385760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016107dc565b600080516020612bc483398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61217083612346565b60008251118061217d5750805b1561076b5761218c8383612386565b50505050565b606061070a6001600160a01b03831660145b606060006121b383600261278b565b6121be906002612878565b6001600160401b038111156121d5576121d561256f565b6040519080825280601f01601f1916602001820160405280156121ff576020820181803683370190505b509050600360fc1b8160008151811061221a5761221a61288b565b60200101906001600160f81b031916908160001a905350600f60fb1b816001815181106122495761224961288b565b60200101906001600160f81b031916908160001a905350600061226d84600261278b565b612278906001612878565b90505b60018111156122f0576f181899199a1a9b1b9c1cb0b131b232b360811b85600f16601081106122ac576122ac61288b565b1a60f81b8282815181106122c2576122c261288b565b60200101906001600160f81b031916908160001a90535060049490941c936122e981612b70565b905061227b565b50831561233f5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e7460448201526064016107dc565b9392505050565b61234f816120cd565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061239183611ff0565b6123ec5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b60648201526084016107dc565b600080846001600160a01b0316846040516124079190612b87565b600060405180830381855af49150503d8060008114612442576040519150601f19603f3d011682016040523d82523d6000602084013e612447565b606091505b509150915061246f8282604051806060016040528060278152602001612c0460279139612478565b95945050505050565b6060831561248757508161233f565b61233f838381511561249c5781518083602001fd5b8060405162461bcd60e51b81526004016107dc9190612b3d565b6000602082840312156124c857600080fd5b81356001600160e01b03198116811461233f57600080fd5b6001600160a01b0391909116815260200190565b60006020828403121561250657600080fd5b5035919050565b6001600160a01b03811681146108b857600080fd5b6000806040838503121561253557600080fd5b8235915060208301356125478161250d565b809150509250929050565b60006020828403121561256457600080fd5b813561233f8161250d565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156125ad576125ad61256f565b604052919050565b600080604083850312156125c857600080fd5b82356125d38161250d565b91506020838101356001600160401b03808211156125f057600080fd5b818601915086601f83011261260457600080fd5b8135818111156126165761261661256f565b612628601f8201601f19168501612585565b9150808252878482850101111561263e57600080fd5b80848401858401376000848284010152508093505050509250929050565b80356001600160401b038116811461267357600080fd5b919050565b6000806000806080858703121561268e57600080fd5b84356126998161250d565b93506126a76020860161265c565b925060408501356126b78161250d565b915060608501356126c78161250d565b939692955090935050565b6000602082840312156126e457600080fd5b61233f8261265c565b6000806000806060858703121561270357600080fd5b843561270e8161250d565b93506020850135925060408501356001600160401b038082111561273157600080fd5b818701915087601f83011261274557600080fd5b81358181111561275457600080fd5b88602082850101111561276657600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b60008160001904831182151516156127a5576127a5612775565b500290565b6020808252602c90820152600080516020612ba483398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612ba483398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561283057600080fd5b815161233f8161250d565b634e487b7160e01b600052601260045260246000fd5b6000826128605761286061283b565b500690565b8181038181111561070a5761070a612775565b8082018082111561070a5761070a612775565b634e487b7160e01b600052603260045260246000fd5b6000600182016128b3576128b3612775565b5060010190565b6001600160801b038181168382160190808211156128da576128da612775565b5092915050565b6000602082840312156128f357600080fd5b8151801515811461233f57600080fd5b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b818110156129535784516001600160a01b03168352938301939183019160010161292e565b50506001600160a01b03969096166060850152505050608001529392505050565b6000602080838503121561298757600080fd5b82516001600160401b038082111561299e57600080fd5b818501915085601f8301126129b257600080fd5b8151818111156129c4576129c461256f565b8060051b91506129d5848301612585565b81815291830184019184810190888411156129ef57600080fd5b938501935b83851015612a0d578451825293850193908501906129f4565b98975050505050505050565b600063ffffffff808316818103612a3257612a32612775565b6001019392505050565b600082612a4b57612a4b61283b565b500490565b600060208284031215612a6257600080fd5b5051919050565b63ffffffff8181168382160190808211156128da576128da612775565b60006001600160401b038281166002600160401b03198101612a3257612a32612775565b60005b83811015612ac5578181015183820152602001612aad565b50506000910152565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351612b00816017850160208801612aaa565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351612b31816028840160208801612aaa565b01602801949350505050565b6020815260008251806020840152612b5c816040850160208701612aaa565b601f01601f19169190910160400192915050565b600081612b7f57612b7f612775565b506000190190565b60008251612b99818460208701612aaa565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc802cf867c2da464d4ff0ebc4dfcccdfbd65d75a8bc1c273fb02e80bf3446b516416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122027467b5e662e343b385db4d3b586f97c663ff2801387dd6d3df6ebd466678e9b64736f6c63430008100033";
739
765
 
740
766
  type FaucetConstructorParams =
741
767
  | [signer?: Signer]