@gooddollar/goodprotocol 2.0.7-beta.4 → 2.0.8

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 (174) hide show
  1. package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
  2. package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
  3. package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
  4. package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
  5. package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
  6. package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
  7. package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
  8. package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
  9. package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
  10. package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
  11. package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
  12. package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
  13. package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
  14. package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
  15. package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
  16. package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
  17. package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
  18. package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
  19. package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
  20. package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
  21. package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
  22. package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
  23. package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
  24. package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
  25. package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
  26. package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
  27. package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
  28. package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
  29. package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
  30. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
  31. package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +2 -2
  32. package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
  33. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
  34. package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +2 -2
  35. package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
  36. package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
  37. package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
  38. package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
  39. package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
  40. package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
  41. package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
  42. package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
  43. package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
  44. package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
  45. package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
  46. package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
  47. package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
  48. package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
  49. package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
  50. package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
  51. package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
  52. package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
  53. package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
  54. package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
  55. package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.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/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
  61. package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
  62. package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
  63. package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
  64. package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
  65. package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
  66. package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
  67. package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
  68. package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
  69. package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
  70. package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
  71. package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
  72. package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
  73. package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
  74. package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +1 -1
  75. package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
  76. package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
  77. package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
  78. package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
  79. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
  80. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
  81. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
  82. package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
  83. package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
  84. package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
  85. package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
  86. package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
  87. package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
  88. package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
  89. package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
  90. package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
  91. package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
  92. package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
  93. package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
  94. package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
  95. package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
  96. package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
  97. package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
  98. package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
  99. package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
  100. package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
  101. package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
  102. package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
  103. package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
  104. package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
  105. package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
  106. package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
  107. package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
  108. package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
  109. package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
  110. package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
  111. package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
  112. package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
  113. package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
  114. package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
  115. package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
  116. package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
  117. package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +1 -1
  118. package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
  119. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
  120. package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
  121. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
  122. package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
  123. package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
  124. package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
  125. package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
  126. package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
  127. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +1 -1
  128. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +1 -1
  129. package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +1 -1
  130. package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
  131. package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.dbg.json +1 -1
  132. package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
  133. package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
  134. package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
  135. package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
  136. package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
  137. package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDClone.dbg.json +1 -1
  138. package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.dbg.json +1 -1
  139. package/artifacts/contracts/utils/BuyGDClone.sol/IStaticOracle.dbg.json +1 -1
  140. package/artifacts/contracts/utils/BuyGDClone.sol/ISwapRouter.dbg.json +1 -1
  141. package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
  142. package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
  143. package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
  144. package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
  145. package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.dbg.json +1 -1
  146. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
  147. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
  148. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
  149. package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
  150. package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.dbg.json +1 -1
  151. package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
  152. package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
  153. package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
  154. package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +1 -1
  155. package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json +1 -1
  156. package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
  157. package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
  158. package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
  159. package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
  160. package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
  161. package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
  162. package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
  163. package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
  164. package/contracts/fuseFaucet/Faucet.sol +0 -1
  165. package/contracts/fuseFaucet/FuseFaucetV2.sol +0 -1
  166. package/hardhat.config.ts +2 -1
  167. package/package.json +1 -1
  168. package/releases/deploy-settings.json +3 -0
  169. package/releases/deployment.json +16 -1
  170. package/scripts/analytics/faucetStats.ts +61 -17
  171. package/scripts/multichain-deploy/1_basicdao-deploy.ts +20 -12
  172. package/scripts/multichain-deploy/3_gdSavings-deploy.ts +16 -88
  173. package/types/factories/Faucet__factory.ts +1 -1
  174. package/types/factories/FuseFaucetV2__factory.ts +1 -1
@@ -2,9 +2,8 @@ import { range, sortBy, toPairs } from "lodash";
2
2
  import PromisePool from "async-promise-pool";
3
3
  import fs from "fs";
4
4
  import { ethers } from "hardhat";
5
- import { start } from "repl";
6
5
  import { JsonRpcProvider } from "@ethersproject/providers";
7
- import { off } from "process";
6
+ import fetch from "node-fetch";
8
7
 
9
8
  function arrayToCsv(data) {
10
9
  return data
@@ -19,48 +18,88 @@ function arrayToCsv(data) {
19
18
  .join("\r\n"); // rows starting on new lines
20
19
  }
21
20
 
22
- const main = async () => {
23
- const archive = new JsonRpcProvider("https://explorer-node.fuse.io");
21
+ const celoStats = async () => {};
22
+ const main = async (isCelo = true) => {
23
+ const archive = new JsonRpcProvider(
24
+ isCelo
25
+ ? "https://celo-mainnet-archive.allthatnode.com"
26
+ : "https://explorer-node.fuse.io"
27
+ );
28
+ const faucetAddr = isCelo
29
+ ? "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84"
30
+ : "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9";
31
+
32
+ const adminAddr = "0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022";
24
33
  const blockStep = 10000;
25
- const pool = new PromisePool({ concurrency: 10 });
34
+ const pool = new PromisePool({ concurrency: 5 });
26
35
 
27
36
  let faucet = await ethers.getContractAt(
28
- ["event WalletTopped(address indexed user, uint256 amount)"],
29
- "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9"
37
+ [
38
+ "event WalletTopped(address indexed account, uint256 amount,address whitelistedRoot,address indexed relayerOrWhitelisted)"
39
+ ],
40
+ faucetAddr
30
41
  );
31
42
  const endBlock = Number(await ethers.provider.getBlockNumber());
32
- const daysBack = 30;
43
+ const daysBack = 60;
33
44
  const dayBlocks = 12 * 60 * 24;
34
45
  const startBlock = endBlock - dayBlocks * daysBack;
35
46
  const days = range(startBlock, endBlock, dayBlocks);
36
47
  const dailyBalance = [];
48
+ const dailyAdminBalance = [];
37
49
  for (let day of days) {
38
50
  dailyBalance.push(
39
- (await archive.getBalance("0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9", day)).div(1e10).toNumber() / 1e8
51
+ (await archive.getBalance(faucetAddr, day)).div(1e10).toNumber() / 1e8
52
+ // isCelo
53
+ // ?
54
+ // await fetch(
55
+ // `https://api.celoscan.io/api?module=account&action=balance&address=${faucetAddr}&tag=${day}&apikey=${process.env.CELOSCAN_KEY}`
56
+ // )
57
+ // .then(_ => _.json())
58
+ // .then(_ => _.result)
59
+ // : (await archive.getBalance(faucetAddr, day)).div(1e10).toNumber() / 1e8
40
60
  );
41
61
  }
42
- let curBlock = startBlock;
43
62
 
63
+ for (let day of days) {
64
+ dailyAdminBalance.push(
65
+ (await archive.getBalance(adminAddr, day)).div(1e10).toNumber() / 1e8
66
+ );
67
+ }
68
+ let curBlock = startBlock;
44
69
  const toppingsByAddress = {};
45
70
  const toppingsByAmount = {};
71
+ const toppingsByRelayer = {};
46
72
  let totalToppings = 0;
47
73
  let totalAmount = 0;
48
- console.log({ dailyBalance });
74
+ const dailyUsage = dailyBalance.map((v, i) =>
75
+ i < dailyBalance.length - 1 ? v - dailyBalance[i + 1] : 0
76
+ );
77
+ const dailyAdminUsage = dailyAdminBalance.map((v, i) =>
78
+ i < dailyAdminBalance.length - 1 ? v - dailyAdminBalance[i + 1] : 0
79
+ );
80
+ console.log({ dailyUsage, dailyAdminUsage });
49
81
  console.log({ startBlock, endBlock });
50
82
  while (curBlock <= endBlock) {
51
83
  const fromBlock = curBlock;
52
84
  const toBlock = Math.min(fromBlock + blockStep, endBlock);
53
85
  pool.add(async () => {
54
86
  const f = faucet.filters.WalletTopped();
55
- const events = await faucet.queryFilter(f, fromBlock, toBlock).catch(e => {
56
- console.log("failed", { fromBlock, toBlock });
57
- return [];
58
- });
87
+ const events = await faucet
88
+ .queryFilter(f, fromBlock, toBlock)
89
+ .catch(e => {
90
+ console.log("failed", { fromBlock, toBlock });
91
+ return [];
92
+ });
59
93
  events.forEach(e => {
60
94
  totalToppings += 1;
61
95
  totalAmount += Number(e.args.amount);
62
- toppingsByAddress[e.args.user] = (toppingsByAddress[e.args.user] || 0) + 1;
63
- toppingsByAmount[e.args.amount] = (toppingsByAmount[e.args.amount] || 0) + 1;
96
+ toppingsByAddress[e.args.whitelistedRoot] =
97
+ (toppingsByAddress[e.args.whitelistedRoot] || 0) + 1;
98
+ if (e.args.account !== e.args.relayerOrWhitelisted)
99
+ toppingsByRelayer[e.args.relayerOrWhitelisted] =
100
+ (toppingsByRelayer[e.args.relayerOrWhitelisted] || 0) + 1;
101
+ toppingsByAmount[e.args.amount] =
102
+ (toppingsByAmount[e.args.amount] || 0) + 1;
64
103
  });
65
104
  console.log("fetched events", {
66
105
  fromBlock,
@@ -74,13 +113,18 @@ const main = async () => {
74
113
 
75
114
  const topToppers = sortBy(toPairs(toppingsByAddress), "1").reverse();
76
115
  const topAmounts = sortBy(toPairs(toppingsByAmount), "1").reverse();
116
+ const topRelayers = sortBy(toPairs(toppingsByRelayer), "1").reverse();
117
+
77
118
  const totalWallets = topToppers.length;
78
119
 
79
120
  const avgToppingsPerWallet = totalToppings / totalWallets;
80
121
  const avgToppingAmount = totalAmount / totalToppings;
81
122
 
123
+ console.log(topRelayers.slice(0, 50));
82
124
  fs.writeFileSync("topToppers.csv", arrayToCsv(topToppers));
83
125
  fs.writeFileSync("topAmounts.csv", arrayToCsv(topAmounts));
126
+ fs.writeFileSync("topRelayers.csv", arrayToCsv(topRelayers));
127
+
84
128
  console.log({
85
129
  totalAmount,
86
130
  totalToppings,
@@ -56,20 +56,28 @@ export const createDAO = async () => {
56
56
  const salt = ethers.BigNumber.from(ethers.utils.keccak256(ethers.utils.toUtf8Bytes("NameService")));
57
57
  const nameserviceFutureAddress = await proxyFactory["getDeploymentAddress(uint256,address)"](salt, root.address);
58
58
  console.log("deploying identity", { nameserviceFutureAddress });
59
- const Identity = (await deployDeterministic(
60
- {
61
- name: "IdentityV2",
62
- salt: "Identity",
63
- isUpgradeable: true
64
- },
65
- [root.address, ethers.constants.AddressZero]
66
- ).then(printDeploy)) as Contract;
59
+ let Identity;
60
+ if (release.Identity) Identity = await ethers.getContractAt("IdentityV2", release.Identity);
61
+ else
62
+ Identity = (await deployDeterministic(
63
+ {
64
+ name: "IdentityV2",
65
+ salt: "Identity",
66
+ isUpgradeable: true
67
+ },
68
+ [root.address, ethers.constants.AddressZero]
69
+ ).then(printDeploy)) as Contract;
67
70
 
68
- const daoCreator = (await DAOCreatorFactory.deploy().then(printDeploy)) as Contract;
71
+ let daoCreator;
72
+ if (release.DAOCreator) daoCreator = await DAOCreatorFactory.attach(release.DAOCreator);
73
+ else daoCreator = (await DAOCreatorFactory.deploy().then(printDeploy)) as Contract;
69
74
 
70
- const FeeFormula = (await deployDeterministic({ name: "FeeFormula", factory: FeeFormulaFactory }, [0]).then(
71
- printDeploy
72
- )) as Contract;
75
+ let FeeFormula;
76
+ if (release.FeeFormula) FeeFormula = await FeeFormulaFactory.attach(release.FeeFormula);
77
+ else
78
+ FeeFormula = (await deployDeterministic({ name: "FeeFormula", factory: FeeFormulaFactory }, [0]).then(
79
+ printDeploy
80
+ )) as Contract;
73
81
 
74
82
  let GoodDollar;
75
83
  if (protocolSettings.superfluidHost) {
@@ -32,11 +32,7 @@ import releaser from "../../scripts/releaser";
32
32
  import ProtocolSettings from "../../releases/deploy-settings.json";
33
33
  import dao from "../../releases/deployment.json";
34
34
  import { deployWrapper } from "./multichainWrapper-deploy";
35
- import {
36
- GoodDollarMintBurnWrapper,
37
- Controller,
38
- NameService
39
- } from "../../types";
35
+ import { GoodDollarMintBurnWrapper, Controller, NameService } from "../../types";
40
36
  const { name: networkName } = network;
41
37
 
42
38
  export const deploySidechain = async () => {
@@ -46,30 +42,18 @@ export const deploySidechain = async () => {
46
42
  if (isProduction) verifyProductionSigner(root);
47
43
 
48
44
  let release: { [key: string]: any } = dao[networkName];
49
- let settings = defaultsDeep(
50
- {},
51
- ProtocolSettings[networkName],
52
- ProtocolSettings["default"]
53
- );
45
+ let settings = defaultsDeep({}, ProtocolSettings[networkName], ProtocolSettings["default"]);
54
46
 
55
47
  console.log("got signers:", {
56
48
  networkName,
57
49
  root: root.address,
58
- balance: await ethers.provider
59
- .getBalance(root.address)
60
- .then(_ => _.toString())
50
+ balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
61
51
  });
62
52
 
63
53
  let Wrapper;
64
- if (!release.GoodDollarMintBurnWrapper)
65
- Wrapper = (await deployWrapper(
66
- release.Avatar
67
- )) as GoodDollarMintBurnWrapper;
54
+ if (!release.GoodDollarMintBurnWrapper) Wrapper = (await deployWrapper(release.Avatar)) as GoodDollarMintBurnWrapper;
68
55
  else {
69
- Wrapper = await ethers.getContractAt(
70
- "GoodDollarMintBurnWrapper",
71
- release.GoodDollarMintBurnWrapper
72
- );
56
+ Wrapper = await ethers.getContractAt("GoodDollarMintBurnWrapper", release.GoodDollarMintBurnWrapper);
73
57
  }
74
58
 
75
59
  console.log("deploying savings...");
@@ -95,28 +79,15 @@ export const deploySidechain = async () => {
95
79
 
96
80
  await releaser(torelease, networkName, "deployment", false);
97
81
  } else {
98
- GDSavings = await ethers.getContractAt(
99
- "GoodDollarStaking",
100
- release.GoodDollarStaking
101
- );
82
+ GDSavings = await ethers.getContractAt("GoodDollarStaking", release.GoodDollarStaking);
102
83
  }
103
84
  if (networkName.includes("production"))
104
- return console.log(
105
- "Skipping proposal/upgrade for production, need to perform manually"
106
- );
85
+ return console.log("Skipping proposal/upgrade for production, need to perform manually");
107
86
 
108
- await executeProposal(
109
- GDSavings.address,
110
- Wrapper.address,
111
- settings.guardiansSafe
112
- );
87
+ await executeProposal(GDSavings.address, Wrapper.address, settings.guardiansSafe);
113
88
  };
114
89
 
115
- const executeProposal = async (
116
- savingsAddress: string,
117
- wrapperAddress: string,
118
- guardiansSafe: string
119
- ) => {
90
+ const executeProposal = async (savingsAddress: string, wrapperAddress: string, guardiansSafe: string) => {
120
91
  console.log("executing savings + wrapper proposal");
121
92
  const isProduction = networkName.includes("production");
122
93
  const viaGuardians = false;
@@ -134,15 +105,9 @@ const executeProposal = async (
134
105
  // ? new ethers.Wallet(process.env.PROPOSER_KEY, ethers.provider)
135
106
  // : root; //need proposer with 0.3% of GOOD tokens
136
107
 
137
- const ctrl = (await ethers.getContractAt(
138
- "Controller",
139
- release.Controller
140
- )) as Controller;
108
+ const ctrl = (await ethers.getContractAt("Controller", release.Controller)) as Controller;
141
109
 
142
- const ns = (await ethers.getContractAt(
143
- "NameService",
144
- release.NameService
145
- )) as NameService;
110
+ const ns = (await ethers.getContractAt("NameService", release.NameService)) as NameService;
146
111
 
147
112
  const proposalContracts = [
148
113
  wrapperAddress, //MinterWrapper -> add GDSavings
@@ -162,16 +127,7 @@ const executeProposal = async (
162
127
 
163
128
  const proposalFunctionInputs = [
164
129
  ethers.utils.defaultAbiCoder.encode(
165
- [
166
- "address",
167
- "uint256",
168
- "uint256",
169
- "uint32",
170
- "uint256",
171
- "uint256",
172
- "uint32",
173
- "bool"
174
- ],
130
+ ["address", "uint256", "uint256", "uint32", "uint256", "uint256", "uint32", "bool"],
175
131
  [savingsAddress, 0, 0, 30, 0, 0, 0, true]
176
132
  ), //function addMinter(
177
133
  ethers.utils.defaultAbiCoder.encode(
@@ -192,10 +148,7 @@ const executeProposal = async (
192
148
  release.Avatar
193
149
  ]
194
150
  ),
195
- ethers.utils.defaultAbiCoder.encode(
196
- ["string", "address"],
197
- ["MINTBURN_WRAPPER", wrapperAddress]
198
- )
151
+ ethers.utils.defaultAbiCoder.encode(["string", "address"], ["MINTBURN_WRAPPER", wrapperAddress])
199
152
  ];
200
153
 
201
154
  if (!viaGuardians) {
@@ -218,36 +171,11 @@ const executeProposal = async (
218
171
  proposalFunctionInputs,
219
172
  guardiansSafe
220
173
  );
221
-
222
- // const vm = (await ethers.getContractAt(
223
- // "CompoundVotingMachine",
224
- // release.CompoundVotingMachine
225
- // )) as CompoundVotingMachine;
226
-
227
- // await vm
228
- // .connect(proposer)
229
- // ["propose(address[],uint256[],string[],bytes[],string)"](
230
- // proposalContracts,
231
- // proposalEthValues,
232
- // proposalFunctionSignatures,
233
- // proposalFunctionInputs,
234
- // "https://discourse.gooddollar.org/t/gip-5-allocating-part-of-ubi-inflation-towards-g-savings-account/114/20"
235
- // )
236
- // .then(printDeploy);
237
174
  }
238
175
 
239
- const Controller = await ethers.getContractAt(
240
- "Controller",
241
- release.Controller
242
- );
243
- const wrapperDaoPermissions = await Controller.getSchemePermissions(
244
- wrapperAddress,
245
- release.Avatar
246
- );
247
- const savingsDaoPermissions = await Controller.getSchemePermissions(
248
- savingsAddress,
249
- release.Avatar
250
- );
176
+ const Controller = await ethers.getContractAt("Controller", release.Controller);
177
+ const wrapperDaoPermissions = await Controller.getSchemePermissions(wrapperAddress, release.Avatar);
178
+ const savingsDaoPermissions = await Controller.getSchemePermissions(savingsAddress, release.Avatar);
251
179
 
252
180
  console.log({
253
181
  wrapperDaoPermissions,
@@ -780,7 +780,7 @@ const _abi = [
780
780
  ];
781
781
 
782
782
  const _bytecode =
783
- "0x60a06040523060805234801561001457600080fd5b50608051612c5161004c600039600081816108470152818161088701528181610fb201528181610ff2015261106a0152612c516000f3fe6080604052600436106101b95760003560e01c806301ffc9a7146101c557806315126799146101fa5780631ece9b121461021d578063248a9ca31461024b5780632f2ff15d1461026b5780632f5a3d151461028d57806336568abe146102a35780633659cfe6146102c357806336afc6fa146102e35780633771dcf8146102f85780633e6326fc146103185780634f1ef2861461033957806352d1902d1461034c57806354fd4d50146103615780635b61e2c11461039b5780635bc758e2146103db5780635c9302c9146103f15780636294c311146104075780636bdd72421461042757806370c635911461044757806378e97925146104675780637befab101461047d57806389b08f11146104a257806391d148541461050c578063926d7d7f1461052c57806393a08de41461054e578063969172c91461056c578063a217fddf14610591578063a4c0ed36146105a6578063aa31e459146105c6578063aaab4c1d146105f7578063c573cb401461062b578063c5da10331461064c578063c8eb754914610685578063d547741f146106a5578063e97eefd2146106c5578063f84b40f5146106e5578063fe173b97146106fb57600080fd5b366101c057005b600080fd5b3480156101d157600080fd5b506101e56101e036600461249d565b610723565b60405190151581526020015b60405180910390f35b34801561020657600080fd5b5061020f61075a565b6040519081526020016101f1565b34801561022957600080fd5b506101055461023e906001600160a01b031681565b6040516101f191906124c7565b34801561025757600080fd5b5061020f6102663660046124db565b610784565b34801561027757600080fd5b5061028b610286366004612509565b610799565b005b34801561029957600080fd5b5061020f60fc5481565b3480156102af57600080fd5b5061028b6102be366004612509565b6107ba565b3480156102cf57600080fd5b5061028b6102de366004612539565b61083d565b3480156102ef57600080fd5b5061023e610905565b34801561030457600080fd5b5061028b610313366004612539565b61098c565b34801561032457600080fd5b506101005461023e906001600160a01b031681565b61028b61034736600461259c565b610fa8565b34801561035857600080fd5b5061020f61105d565b34801561036d57600080fd5b506101065461038690600160401b900463ffffffff1681565b60405163ffffffff90911681526020016101f1565b3480156103a757600080fd5b50610105546103c390600160a01b90046001600160401b031681565b6040516001600160401b0390911681526020016101f1565b3480156103e757600080fd5b5061020f60fd5481565b3480156103fd57600080fd5b5061020f60ff5481565b34801561041357600080fd5b5061028b61042236600461265f565b61110b565b34801561043357600080fd5b5061028b6104423660046126b9565b611304565b34801561045357600080fd5b5061028b6104623660046124db565b61133d565b34801561047357600080fd5b5061020f60fe5481565b34801561048957600080fd5b506101045461038690600160601b900463ffffffff1681565b3480156104ae57600080fd5b506104e86104bd366004612539565b610103602052600090815260409020546001600160801b03811690600160801b900463ffffffff1682565b604080516001600160801b03909316835263ffffffff9091166020830152016101f1565b34801561051857600080fd5b506101e5610527366004612509565b61135f565b34801561053857600080fd5b5061020f600080516020612bd583398151915281565b34801561055a57600080fd5b50610104546103869063ffffffff1681565b34801561057857600080fd5b506101045461038690600160801b900463ffffffff1681565b34801561059d57600080fd5b5061020f600081565b3480156105b257600080fd5b506101e56105c13660046126d4565b61138a565b3480156105d257600080fd5b506101e56105e1366004612539565b6101026020526000908152604090205460ff1681565b34801561060357600080fd5b506101065461061990600160601b900460ff1681565b60405160ff90911681526020016101f1565b34801561063757600080fd5b50610106546103c3906001600160401b031681565b34801561065857600080fd5b5061020f610667366004612509565b61010160209081526000928352604080842090915290825290205481565b34801561069157600080fd5b5061028b6106a036600461275c565b611575565b3480156106b157600080fd5b5061028b6106c0366004612509565b6115a2565b3480156106d157600080fd5b506101e56106e0366004612539565b6115be565b3480156106f157600080fd5b5061020f60fb5481565b34801561070757600080fd5b50610104546103c390600160201b90046001600160401b031681565b60006001600160e01b03198216637965db0b60e01b148061075457506301ffc9a760e01b6001600160e01b03198316145b92915050565b6101045460fc5460009161077f91600160201b9091046001600160401b031690612795565b905090565b600090815260c9602052604090206001015490565b6107a282610784565b6107ab8161198e565b6107b58383611998565b505050565b6001600160a01b038116331461082f5760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6108398282611a1e565b5050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036108855760405162461bcd60e51b8152600401610826906127b4565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166108b7611a85565b6001600160a01b0316146108dd5760405162461bcd60e51b8152600401610826906127ee565b6108e681611aa1565b6040805160008082526020820190925261090291839190611aac565b50565b6101005460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610968573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061077f9190612828565b60005a905081600061099c610905565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b81526004016109c791906124c7565b602060405180830381865afa1580156109e4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a089190612828565b90506001600160a01b03811615610a1f5780610a21565b815b60ff54909250610a2f611c17565b8060ff5414610a4a5761010680546001600160401b03191690555b60ff546001600160a01b038416600090815261010360205260409020546001600160801b039081169116141580610aaf5750610104546001600160a01b0384166000908152610103602052604090205463ffffffff918216600160801b909104909116105b610af05760405162461bcd60e51b81526020600482015260126024820152716d6178206461696c7920746f7070696e677360701b6044820152606401610826565b6001600160a01b0383166000908152610102602052604090205460ff16158015610b33575061010554610106546001600160401b03600160a01b90920482169116105b80610b4657506001600160a01b03821615155b610ba15760405162461bcd60e51b815260206004820152602660248201527f55736572206e6f742077686974656c6973746564206f72206e6f742066697273604482015265742074696d6560d01b6064820152608401610826565b6000600760ff54610bb2919061285b565b6001600160a01b0385166000908152610103602052604081205460ff549293509091610be7916001600160801b03169061286f565b905060078111610bf75780610bfa565b60075b9050818111610c095780610c14565b610c14826001612882565b9050600081610c24846001612882565b610c2e919061286f565b90505b828111610ca7576001600160a01b0386166000908152610103602052604081206001018260078110610c6557610c65612895565b600291828204019190066010026101000a8154816001600160801b0302191690836001600160801b031602179055508080610c9f906128ab565b915050610c31565b506000805b838111610d1e576001600160a01b0387166000908152610103602052604090206001018160078110610ce057610ce0612895565b600291828204019190066010029054906101000a90046001600160801b031682610d0a91906128c4565b915080610d16816128ab565b915050610cac565b506101045460fb54600160601b820463ffffffff1691610d4f91600160201b9091046001600160401b031690612795565b610d599190612795565b816001600160801b031610610dcd5760405162461bcd60e51b815260206004820152603460248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f206044820152736d616e792074696d65732074686973207765656b60601b6064820152608401610826565b876000610dd8610905565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b8152600401610e0391906124c7565b602060405180830381865afa158015610e20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e449190612828565b6001600160a01b0316141580610ed757506000610e5f610905565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b8152600401610e8a91906124c7565b602060405180830381865afa158015610ea7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ecb9190612828565b6001600160a01b031614155b80610ef55750610ef5600080516020612bd58339815191523361135f565b610f325760405162461bcd60e51b815260206004820152600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606401610826565b610f3b89611c38565b505050505050505a610f4d908261286f565b610f599061a410612882565b6101045490915033906108fc90610f8090600160201b90046001600160401b031684612795565b6040518115909202916000818181858888f193505050501580156107b5573d6000803e3d6000fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610ff05760405162461bcd60e51b8152600401610826906127b4565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611022611a85565b6001600160a01b0316146110485760405162461bcd60e51b8152600401610826906127ee565b61105182611aa1565b61083982826001611aac565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146110f85760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610826565b50600080516020612bb583398151915290565b600054610100900460ff161580801561112b5750600054600160ff909116105b8061114c575061113a30611fd5565b15801561114c575060005460ff166001145b6111af5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610826565b6000805460ff1916600117905580156111d2576000805461ff0019166101001790555b6111da611fe4565b6111e5600083612051565b6001600160a01b0383161561120c5761120c600080516020612bd583398151915284612051565b6101048054600160201b600160601b031916600160201b6001600160401b03871602179055620f424060fc819055611245906002612795565b60fb5561010480544260fe5561010080546001600160a01b0319166001600160a01b03891617905563ffffffff63ffffffff60601b0119166003600160611b011790556101058054600160a01b600160e01b03191661027160a31b179055610106805460ff60601b1916600f60601b17905580156112fd576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b600061130f8161198e565b5061010480546001600160401b03909216600160201b02600160201b600160601b0319909216919091179055565b60006113488161198e565b60fc829055611358826002612795565b60fb555050565b600091825260c9602090815260408084206001600160a01b0393909316845291905290205460ff1690565b60008061139983850185612539565b604080516002808252606082018352929350839260009260208301908036833701905050905033816000815181106113d3576113d3612895565b60200260200101906001600160a01b031690816001600160a01b031681525050816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015611431573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114559190612828565b8160018151811061146857611468612895565b6001600160a01b03928316602091820292909201015260405163095ea7b360e01b815290841660048201526000196024820152339063095ea7b3906044016020604051808303816000875af11580156114c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114e991906128eb565b506040516318cbafe560e01b81526001600160a01b038316906318cbafe59061151f908a9060009086908e90429060040161290d565b6000604051808303816000875af115801561153e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611566919081019061297e565b50600198975050505050505050565b60006115808161198e565b50610106805460ff909216600160601b0260ff60601b19909216919091179055565b6115ab82610784565b6115b48161198e565b6107b58383611a1e565b6000816001600160a01b0316316115d361075a565b10156115e157506000919050565b6000826001600160a01b0316316115f661075a565b611600919061286f565b61010654909150600160601b900460ff1661161961075a565b611624836064612795565b61162e9190612a23565b101561163d5750600092915050565b6000611647610905565b6001600160a01b0316632d0e9b46856040518263ffffffff1660e01b815260040161167291906124c7565b602060405180830381865afa15801561168f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116b39190612828565b90506001600160a01b038116156116ca57806116cc565b835b935060006201518060fe54426116e2919061286f565b6116ec9190612a23565b6001600160a01b03861660009081526101036020526040812054919250906001600160801b03808416911614158061174b57506001600160a01b038616600090815261010360205260409020546003600160801b90910463ffffffff16105b80156117a857506001600160a01b0386166000908152610102602052604090205460ff16158015611795575061010554610106546001600160401b03600160a01b90920482169116105b806117a857506001600160a01b03831615155b6001600160a01b03871660009081526101036020526040808220815160e0810192839052939450919291600101906007908285855b82829054906101000a90046001600160801b03166001600160801b031681526020019060100190602082600f010492830192600103820291508084116117dd579050505050505090506000600784611835919061285b565b6001600160a01b0389166000908152610103602052604081205491925090611866906001600160801b03168661286f565b9050600781116118765780611879565b60075b90508181116118885780611893565b611893826001612882565b90506000816118a3846001612882565b6118ad919061286f565b90505b8281116118f05760008482600781106118cb576118cb612895565b6001600160801b039092166020929092020152806118e8816128ab565b9150506118b0565b506000805b8381116119315784816007811061190e5761190e612895565b602002015161191d90836128c4565b915080611929816128ab565b9150506118f5565b5084801561198057506101045460fb54600160601b820463ffffffff169161196a91600160201b9091046001600160401b031690612795565b6119749190612795565b816001600160801b0316105b9a9950505050505050505050565b610902813361205b565b6119a2828261135f565b61083957600082815260c9602090815260408083206001600160a01b03851684529091529020805460ff191660011790556119da3390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b611a28828261135f565b1561083957600082815260c9602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080516020612bb5833981519152546001600160a01b031690565b60006108398161198e565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611adf576107b5836120b4565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611b39575060408051601f3d908101601f19168201909252611b3691810190612a37565b60015b611b9c5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610826565b600080516020612bb58339815191528114611c0b5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610826565b506107b583838361214e565b6201518060fe5442611c29919061286f565b611c339190612a23565b60ff55565b806000611c43610905565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b8152600401611c6e91906124c7565b602060405180830381865afa158015611c8b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611caf9190612828565b90506001600160a01b03811615611cc65780611cc8565b825b92506000836001600160a01b031631611cdf61075a565b611ce9919061286f565b61010654909150600160601b900460ff16611d0261075a565b611d0d836064612795565b611d179190612a23565b1015611d515760405162461bcd60e51b815260206004820152600960248201526806c6f7720746f546f760bc1b6044820152606401610826565b6000600760ff54611d62919061285b565b60ff546001600160a01b038716600090815261010360205260409020549192506001600160801b03908116911603611df1576001600160a01b038516600090815261010360205260409020805460019190601090611dce908490600160801b900463ffffffff16612a50565b92506101000a81548163ffffffff021916908363ffffffff160217905550611e1f565b6001600160a01b038516600090815261010360205260409020805463ffffffff60801b1916600160801b1790555b60ff546001600160a01b03861660009081526101036020526040902080546001600160801b0319166001600160801b0390921691909117815582906001018260078110611e6e57611e6e612895565b600291828204019190066010028282829054906101000a90046001600160801b0316611e9a91906128c4565b82546001600160801b039182166101009390930a9283029190920219909116179055506001600160a01b0385166000908152610102602052604090205460ff16158015611eee57506001600160a01b038316155b15611f335761010680546001600160401b0316906000611f0d83612a6d565b91906101000a8154816001600160401b0302191690836001600160401b03160217905550505b6001600160a01b0380861660009081526101026020526040808220805460ff19166001179055519186169184156108fc0291859190818181858888f19350505050158015611f85573d6000803e3d6000fd5b50604080518381526001600160a01b0385811660208301523392908716917f7872034fbcc87890e73d66eac55389e0ffdba157b89a73bd2011157ebac1d66e910160405180910390a35050505050565b6001600160a01b03163b151590565b600054610100900460ff1661204f5760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610826565b565b6108398282611998565b612065828261135f565b6108395761207281612179565b61207d83602061218b565b60405160200161208e929190612abf565b60408051601f198184030181529082905262461bcd60e51b825261082691600401612b2e565b6120bd81611fd5565b61211f5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610826565b600080516020612bb583398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6121578361232d565b6000825111806121645750805b156107b557612173838361236d565b50505050565b60606107546001600160a01b03831660145b6060600061219a836002612795565b6121a5906002612882565b6001600160401b038111156121bc576121bc612556565b6040519080825280601f01601f1916602001820160405280156121e6576020820181803683370190505b509050600360fc1b8160008151811061220157612201612895565b60200101906001600160f81b031916908160001a905350600f60fb1b8160018151811061223057612230612895565b60200101906001600160f81b031916908160001a9053506000612254846002612795565b61225f906001612882565b90505b60018111156122d7576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061229357612293612895565b1a60f81b8282815181106122a9576122a9612895565b60200101906001600160f81b031916908160001a90535060049490941c936122d081612b61565b9050612262565b5083156123265760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610826565b9392505050565b612336816120b4565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061237883611fd5565b6123d35760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610826565b600080846001600160a01b0316846040516123ee9190612b78565b600060405180830381855af49150503d8060008114612429576040519150601f19603f3d011682016040523d82523d6000602084013e61242e565b606091505b50915091506124568282604051806060016040528060278152602001612bf56027913961245f565b95945050505050565b6060831561246e575081612326565b61232683838151156124835781518083602001fd5b8060405162461bcd60e51b81526004016108269190612b2e565b6000602082840312156124af57600080fd5b81356001600160e01b03198116811461232657600080fd5b6001600160a01b0391909116815260200190565b6000602082840312156124ed57600080fd5b5035919050565b6001600160a01b038116811461090257600080fd5b6000806040838503121561251c57600080fd5b82359150602083013561252e816124f4565b809150509250929050565b60006020828403121561254b57600080fd5b8135612326816124f4565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561259457612594612556565b604052919050565b600080604083850312156125af57600080fd5b82356125ba816124f4565b91506020838101356001600160401b03808211156125d757600080fd5b818601915086601f8301126125eb57600080fd5b8135818111156125fd576125fd612556565b61260f601f8201601f1916850161256c565b9150808252878482850101111561262557600080fd5b80848401858401376000848284010152508093505050509250929050565b80356001600160401b038116811461265a57600080fd5b919050565b6000806000806080858703121561267557600080fd5b8435612680816124f4565b935061268e60208601612643565b9250604085013561269e816124f4565b915060608501356126ae816124f4565b939692955090935050565b6000602082840312156126cb57600080fd5b61232682612643565b600080600080606085870312156126ea57600080fd5b84356126f5816124f4565b93506020850135925060408501356001600160401b038082111561271857600080fd5b818701915087601f83011261272c57600080fd5b81358181111561273b57600080fd5b88602082850101111561274d57600080fd5b95989497505060200194505050565b60006020828403121561276e57600080fd5b813560ff8116811461232657600080fd5b634e487b7160e01b600052601160045260246000fd5b60008160001904831182151516156127af576127af61277f565b500290565b6020808252602c90820152600080516020612b9583398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612b9583398151915260408201526b6163746976652070726f787960a01b606082015260800190565b60006020828403121561283a57600080fd5b8151612326816124f4565b634e487b7160e01b600052601260045260246000fd5b60008261286a5761286a612845565b500690565b818103818111156107545761075461277f565b808201808211156107545761075461277f565b634e487b7160e01b600052603260045260246000fd5b6000600182016128bd576128bd61277f565b5060010190565b6001600160801b038181168382160190808211156128e4576128e461277f565b5092915050565b6000602082840312156128fd57600080fd5b8151801515811461232657600080fd5b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b8181101561295d5784516001600160a01b031683529383019391830191600101612938565b50506001600160a01b03969096166060850152505050608001529392505050565b6000602080838503121561299157600080fd5b82516001600160401b03808211156129a857600080fd5b818501915085601f8301126129bc57600080fd5b8151818111156129ce576129ce612556565b8060051b91506129df84830161256c565b81815291830184019184810190888411156129f957600080fd5b938501935b83851015612a17578451825293850193908501906129fe565b98975050505050505050565b600082612a3257612a32612845565b500490565b600060208284031215612a4957600080fd5b5051919050565b63ffffffff8181168382160190808211156128e4576128e461277f565b60006001600160401b038281166002600160401b03198101612a9157612a9161277f565b6001019392505050565b60005b83811015612ab6578181015183820152602001612a9e565b50506000910152565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351612af1816017850160208801612a9b565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351612b22816028840160208801612a9b565b01602801949350505050565b6020815260008251806020840152612b4d816040850160208701612a9b565b601f01601f19169190910160400192915050565b600081612b7057612b7061277f565b506000190190565b60008251612b8a818460208701612a9b565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc802cf867c2da464d4ff0ebc4dfcccdfbd65d75a8bc1c273fb02e80bf3446b516416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220ebd55a0ea31e35675cf1550658a3c94f7c2e2826a82567fc828249941c6a0fed64736f6c63430008100033";
783
+ "0x60a06040523060805234801561001457600080fd5b50608051612bc961004c600039600081816108470152818161088701528181610f2a01528181610f6a0152610fe20152612bc96000f3fe6080604052600436106101b95760003560e01c806301ffc9a7146101c557806315126799146101fa5780631ece9b121461021d578063248a9ca31461024b5780632f2ff15d1461026b5780632f5a3d151461028d57806336568abe146102a35780633659cfe6146102c357806336afc6fa146102e35780633771dcf8146102f85780633e6326fc146103185780634f1ef2861461033957806352d1902d1461034c57806354fd4d50146103615780635b61e2c11461039b5780635bc758e2146103db5780635c9302c9146103f15780636294c311146104075780636bdd72421461042757806370c635911461044757806378e97925146104675780637befab101461047d57806389b08f11146104a257806391d148541461050c578063926d7d7f1461052c57806393a08de41461054e578063969172c91461056c578063a217fddf14610591578063a4c0ed36146105a6578063aa31e459146105c6578063aaab4c1d146105f7578063c573cb401461062b578063c5da10331461064c578063c8eb754914610685578063d547741f146106a5578063e97eefd2146106c5578063f84b40f5146106e5578063fe173b97146106fb57600080fd5b366101c057005b600080fd5b3480156101d157600080fd5b506101e56101e0366004612415565b610723565b60405190151581526020015b60405180910390f35b34801561020657600080fd5b5061020f61075a565b6040519081526020016101f1565b34801561022957600080fd5b506101055461023e906001600160a01b031681565b6040516101f1919061243f565b34801561025757600080fd5b5061020f610266366004612453565b610784565b34801561027757600080fd5b5061028b610286366004612481565b610799565b005b34801561029957600080fd5b5061020f60fc5481565b3480156102af57600080fd5b5061028b6102be366004612481565b6107ba565b3480156102cf57600080fd5b5061028b6102de3660046124b1565b61083d565b3480156102ef57600080fd5b5061023e610905565b34801561030457600080fd5b5061028b6103133660046124b1565b61098c565b34801561032457600080fd5b506101005461023e906001600160a01b031681565b61028b610347366004612514565b610f20565b34801561035857600080fd5b5061020f610fd5565b34801561036d57600080fd5b506101065461038690600160401b900463ffffffff1681565b60405163ffffffff90911681526020016101f1565b3480156103a757600080fd5b50610105546103c390600160a01b90046001600160401b031681565b6040516001600160401b0390911681526020016101f1565b3480156103e757600080fd5b5061020f60fd5481565b3480156103fd57600080fd5b5061020f60ff5481565b34801561041357600080fd5b5061028b6104223660046125d7565b611083565b34801561043357600080fd5b5061028b610442366004612631565b61127c565b34801561045357600080fd5b5061028b610462366004612453565b6112b5565b34801561047357600080fd5b5061020f60fe5481565b34801561048957600080fd5b506101045461038690600160601b900463ffffffff1681565b3480156104ae57600080fd5b506104e86104bd3660046124b1565b610103602052600090815260409020546001600160801b03811690600160801b900463ffffffff1682565b604080516001600160801b03909316835263ffffffff9091166020830152016101f1565b34801561051857600080fd5b506101e5610527366004612481565b6112d7565b34801561053857600080fd5b5061020f600080516020612b4d83398151915281565b34801561055a57600080fd5b50610104546103869063ffffffff1681565b34801561057857600080fd5b506101045461038690600160801b900463ffffffff1681565b34801561059d57600080fd5b5061020f600081565b3480156105b257600080fd5b506101e56105c136600461264c565b611302565b3480156105d257600080fd5b506101e56105e13660046124b1565b6101026020526000908152604090205460ff1681565b34801561060357600080fd5b506101065461061990600160601b900460ff1681565b60405160ff90911681526020016101f1565b34801561063757600080fd5b50610106546103c3906001600160401b031681565b34801561065857600080fd5b5061020f610667366004612481565b61010160209081526000928352604080842090915290825290205481565b34801561069157600080fd5b5061028b6106a03660046126d4565b6114ed565b3480156106b157600080fd5b5061028b6106c0366004612481565b61151a565b3480156106d157600080fd5b506101e56106e03660046124b1565b611536565b3480156106f157600080fd5b5061020f60fb5481565b34801561070757600080fd5b50610104546103c390600160201b90046001600160401b031681565b60006001600160e01b03198216637965db0b60e01b148061075457506301ffc9a760e01b6001600160e01b03198316145b92915050565b6101045460fc5460009161077f91600160201b9091046001600160401b03169061270d565b905090565b600090815260c9602052604090206001015490565b6107a282610784565b6107ab81611906565b6107b58383611910565b505050565b6001600160a01b038116331461082f5760405162461bcd60e51b815260206004820152602f60248201527f416363657373436f6e74726f6c3a2063616e206f6e6c792072656e6f756e636560448201526e103937b632b9903337b91039b2b63360891b60648201526084015b60405180910390fd5b6108398282611996565b5050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036108855760405162461bcd60e51b81526004016108269061272c565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166108b76119fd565b6001600160a01b0316146108dd5760405162461bcd60e51b815260040161082690612766565b6108e681611a19565b6040805160008082526020820190925261090291839190611a24565b50565b6101005460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610968573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061077f91906127a0565b60005a905081600061099c610905565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b81526004016109c7919061243f565b602060405180830381865afa1580156109e4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a0891906127a0565b90506001600160a01b03811615610a1f5780610a21565b815b60ff54909250610a2f611b8f565b8060ff5414610a4a5761010680546001600160401b03191690555b60ff546001600160a01b038416600090815261010360205260409020546001600160801b039081169116141580610aaf5750610104546001600160a01b0384166000908152610103602052604090205463ffffffff918216600160801b909104909116105b610af05760405162461bcd60e51b81526020600482015260126024820152716d6178206461696c7920746f7070696e677360701b6044820152606401610826565b6001600160a01b0383166000908152610102602052604090205460ff16158015610b33575061010554610106546001600160401b03600160a01b90920482169116105b80610b4657506001600160a01b03821615155b610ba15760405162461bcd60e51b815260206004820152602660248201527f55736572206e6f742077686974656c6973746564206f72206e6f742066697273604482015265742074696d6560d01b6064820152608401610826565b6000600760ff54610bb291906127d3565b6001600160a01b0385166000908152610103602052604081205460ff549293509091610be7916001600160801b0316906127e7565b905060078111610bf75780610bfa565b60075b9050818111610c095780610c14565b610c148260016127fa565b9050600081610c248460016127fa565b610c2e91906127e7565b90505b828111610ca7576001600160a01b0386166000908152610103602052604081206001018260078110610c6557610c6561280d565b600291828204019190066010026101000a8154816001600160801b0302191690836001600160801b031602179055508080610c9f90612823565b915050610c31565b506000805b838111610d1e576001600160a01b0387166000908152610103602052604090206001018160078110610ce057610ce061280d565b600291828204019190066010029054906101000a90046001600160801b031682610d0a919061283c565b915080610d1681612823565b915050610cac565b506101045460fb54600160601b820463ffffffff1691610d4f91600160201b9091046001600160401b03169061270d565b610d59919061270d565b816001600160801b031610610dcd5760405162461bcd60e51b815260206004820152603460248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f206044820152736d616e792074696d65732074686973207765656b60601b6064820152608401610826565b876000610dd8610905565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b8152600401610e03919061243f565b602060405180830381865afa158015610e20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4491906127a0565b6001600160a01b0316141580610e6d5750610e6d600080516020612b4d833981519152336112d7565b610eaa5760405162461bcd60e51b815260206004820152600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606401610826565b610eb389611bb0565b505050505050505a610ec590826127e7565b610ed19061a4106127fa565b6101045490915033906108fc90610ef890600160201b90046001600160401b03168461270d565b6040518115909202916000818181858888f193505050501580156107b5573d6000803e3d6000fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610f685760405162461bcd60e51b81526004016108269061272c565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610f9a6119fd565b6001600160a01b031614610fc05760405162461bcd60e51b815260040161082690612766565b610fc982611a19565b61083982826001611a24565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146110705760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b6064820152608401610826565b50600080516020612b2d83398151915290565b600054610100900460ff16158080156110a35750600054600160ff909116105b806110c457506110b230611f4d565b1580156110c4575060005460ff166001145b6111275760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610826565b6000805460ff19166001179055801561114a576000805461ff0019166101001790555b611152611f5c565b61115d600083611fc9565b6001600160a01b0383161561118457611184600080516020612b4d83398151915284611fc9565b6101048054600160201b600160601b031916600160201b6001600160401b03871602179055620f424060fc8190556111bd90600261270d565b60fb5561010480544260fe5561010080546001600160a01b0319166001600160a01b03891617905563ffffffff63ffffffff60601b0119166003600160611b011790556101058054600160a01b600160e01b03191661027160a31b179055610106805460ff60601b1916600f60601b1790558015611275576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b600061128781611906565b5061010480546001600160401b03909216600160201b02600160201b600160601b0319909216919091179055565b60006112c081611906565b60fc8290556112d082600261270d565b60fb555050565b600091825260c9602090815260408084206001600160a01b0393909316845291905290205460ff1690565b600080611311838501856124b1565b6040805160028082526060820183529293508392600092602083019080368337019050509050338160008151811061134b5761134b61280d565b60200260200101906001600160a01b031690816001600160a01b031681525050816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa1580156113a9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113cd91906127a0565b816001815181106113e0576113e061280d565b6001600160a01b03928316602091820292909201015260405163095ea7b360e01b815290841660048201526000196024820152339063095ea7b3906044016020604051808303816000875af115801561143d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114619190612863565b506040516318cbafe560e01b81526001600160a01b038316906318cbafe590611497908a9060009086908e904290600401612885565b6000604051808303816000875af11580156114b6573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526114de91908101906128f6565b50600198975050505050505050565b60006114f881611906565b50610106805460ff909216600160601b0260ff60601b19909216919091179055565b61152382610784565b61152c81611906565b6107b58383611996565b6000816001600160a01b03163161154b61075a565b101561155957506000919050565b6000826001600160a01b03163161156e61075a565b61157891906127e7565b61010654909150600160601b900460ff1661159161075a565b61159c83606461270d565b6115a6919061299b565b10156115b55750600092915050565b60006115bf610905565b6001600160a01b0316632d0e9b46856040518263ffffffff1660e01b81526004016115ea919061243f565b602060405180830381865afa158015611607573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061162b91906127a0565b90506001600160a01b038116156116425780611644565b835b935060006201518060fe544261165a91906127e7565b611664919061299b565b6001600160a01b03861660009081526101036020526040812054919250906001600160801b0380841691161415806116c357506001600160a01b038616600090815261010360205260409020546003600160801b90910463ffffffff16105b801561172057506001600160a01b0386166000908152610102602052604090205460ff1615801561170d575061010554610106546001600160401b03600160a01b90920482169116105b8061172057506001600160a01b03831615155b6001600160a01b03871660009081526101036020526040808220815160e0810192839052939450919291600101906007908285855b82829054906101000a90046001600160801b03166001600160801b031681526020019060100190602082600f010492830192600103820291508084116117555790505050505050905060006007846117ad91906127d3565b6001600160a01b03891660009081526101036020526040812054919250906117de906001600160801b0316866127e7565b9050600781116117ee57806117f1565b60075b9050818111611800578061180b565b61180b8260016127fa565b905060008161181b8460016127fa565b61182591906127e7565b90505b8281116118685760008482600781106118435761184361280d565b6001600160801b0390921660209290920201528061186081612823565b915050611828565b506000805b8381116118a9578481600781106118865761188661280d565b6020020151611895908361283c565b9150806118a181612823565b91505061186d565b508480156118f857506101045460fb54600160601b820463ffffffff16916118e291600160201b9091046001600160401b03169061270d565b6118ec919061270d565b816001600160801b0316105b9a9950505050505050505050565b6109028133611fd3565b61191a82826112d7565b61083957600082815260c9602090815260408083206001600160a01b03851684529091529020805460ff191660011790556119523390565b6001600160a01b0316816001600160a01b0316837f2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d60405160405180910390a45050565b6119a082826112d7565b1561083957600082815260c9602090815260408083206001600160a01b0385168085529252808320805460ff1916905551339285917ff6391f5c32d9c69d2a47ea670b442974b53935d1edc7fd64eb21e047a839171b9190a45050565b600080516020612b2d833981519152546001600160a01b031690565b600061083981611906565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611a57576107b58361202c565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611ab1575060408051601f3d908101601f19168201909252611aae918101906129af565b60015b611b145760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610826565b600080516020612b2d8339815191528114611b835760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610826565b506107b58383836120c6565b6201518060fe5442611ba191906127e7565b611bab919061299b565b60ff55565b806000611bbb610905565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b8152600401611be6919061243f565b602060405180830381865afa158015611c03573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c2791906127a0565b90506001600160a01b03811615611c3e5780611c40565b825b92506000836001600160a01b031631611c5761075a565b611c6191906127e7565b61010654909150600160601b900460ff16611c7a61075a565b611c8583606461270d565b611c8f919061299b565b1015611cc95760405162461bcd60e51b815260206004820152600960248201526806c6f7720746f546f760bc1b6044820152606401610826565b6000600760ff54611cda91906127d3565b60ff546001600160a01b038716600090815261010360205260409020549192506001600160801b03908116911603611d69576001600160a01b038516600090815261010360205260409020805460019190601090611d46908490600160801b900463ffffffff166129c8565b92506101000a81548163ffffffff021916908363ffffffff160217905550611d97565b6001600160a01b038516600090815261010360205260409020805463ffffffff60801b1916600160801b1790555b60ff546001600160a01b03861660009081526101036020526040902080546001600160801b0319166001600160801b0390921691909117815582906001018260078110611de657611de661280d565b600291828204019190066010028282829054906101000a90046001600160801b0316611e12919061283c565b82546001600160801b039182166101009390930a9283029190920219909116179055506001600160a01b0385166000908152610102602052604090205460ff16158015611e6657506001600160a01b038316155b15611eab5761010680546001600160401b0316906000611e85836129e5565b91906101000a8154816001600160401b0302191690836001600160401b03160217905550505b6001600160a01b0380861660009081526101026020526040808220805460ff19166001179055519186169184156108fc0291859190818181858888f19350505050158015611efd573d6000803e3d6000fd5b50604080518381526001600160a01b0385811660208301523392908716917f7872034fbcc87890e73d66eac55389e0ffdba157b89a73bd2011157ebac1d66e910160405180910390a35050505050565b6001600160a01b03163b151590565b600054610100900460ff16611fc75760405162461bcd60e51b815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201526a6e697469616c697a696e6760a81b6064820152608401610826565b565b6108398282611910565b611fdd82826112d7565b61083957611fea816120f1565b611ff5836020612103565b604051602001612006929190612a37565b60408051601f198184030181529082905262461bcd60e51b825261082691600401612aa6565b61203581611f4d565b6120975760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610826565b600080516020612b2d83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6120cf836122a5565b6000825111806120dc5750805b156107b5576120eb83836122e5565b50505050565b60606107546001600160a01b03831660145b6060600061211283600261270d565b61211d9060026127fa565b6001600160401b03811115612134576121346124ce565b6040519080825280601f01601f19166020018201604052801561215e576020820181803683370190505b509050600360fc1b816000815181106121795761217961280d565b60200101906001600160f81b031916908160001a905350600f60fb1b816001815181106121a8576121a861280d565b60200101906001600160f81b031916908160001a90535060006121cc84600261270d565b6121d79060016127fa565b90505b600181111561224f576f181899199a1a9b1b9c1cb0b131b232b360811b85600f166010811061220b5761220b61280d565b1a60f81b8282815181106122215761222161280d565b60200101906001600160f81b031916908160001a90535060049490941c9361224881612ad9565b90506121da565b50831561229e5760405162461bcd60e51b815260206004820181905260248201527f537472696e67733a20686578206c656e67746820696e73756666696369656e746044820152606401610826565b9392505050565b6122ae8161202c565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606122f083611f4d565b61234b5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610826565b600080846001600160a01b0316846040516123669190612af0565b600060405180830381855af49150503d80600081146123a1576040519150601f19603f3d011682016040523d82523d6000602084013e6123a6565b606091505b50915091506123ce8282604051806060016040528060278152602001612b6d602791396123d7565b95945050505050565b606083156123e657508161229e565b61229e83838151156123fb5781518083602001fd5b8060405162461bcd60e51b81526004016108269190612aa6565b60006020828403121561242757600080fd5b81356001600160e01b03198116811461229e57600080fd5b6001600160a01b0391909116815260200190565b60006020828403121561246557600080fd5b5035919050565b6001600160a01b038116811461090257600080fd5b6000806040838503121561249457600080fd5b8235915060208301356124a68161246c565b809150509250929050565b6000602082840312156124c357600080fd5b813561229e8161246c565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561250c5761250c6124ce565b604052919050565b6000806040838503121561252757600080fd5b82356125328161246c565b91506020838101356001600160401b038082111561254f57600080fd5b818601915086601f83011261256357600080fd5b813581811115612575576125756124ce565b612587601f8201601f191685016124e4565b9150808252878482850101111561259d57600080fd5b80848401858401376000848284010152508093505050509250929050565b80356001600160401b03811681146125d257600080fd5b919050565b600080600080608085870312156125ed57600080fd5b84356125f88161246c565b9350612606602086016125bb565b925060408501356126168161246c565b915060608501356126268161246c565b939692955090935050565b60006020828403121561264357600080fd5b61229e826125bb565b6000806000806060858703121561266257600080fd5b843561266d8161246c565b93506020850135925060408501356001600160401b038082111561269057600080fd5b818701915087601f8301126126a457600080fd5b8135818111156126b357600080fd5b8860208285010111156126c557600080fd5b95989497505060200194505050565b6000602082840312156126e657600080fd5b813560ff8116811461229e57600080fd5b634e487b7160e01b600052601160045260246000fd5b6000816000190483118215151615612727576127276126f7565b500290565b6020808252602c90820152600080516020612b0d83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612b0d83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b6000602082840312156127b257600080fd5b815161229e8161246c565b634e487b7160e01b600052601260045260246000fd5b6000826127e2576127e26127bd565b500690565b81810381811115610754576107546126f7565b80820180821115610754576107546126f7565b634e487b7160e01b600052603260045260246000fd5b600060018201612835576128356126f7565b5060010190565b6001600160801b0381811683821601908082111561285c5761285c6126f7565b5092915050565b60006020828403121561287557600080fd5b8151801515811461229e57600080fd5b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b818110156128d55784516001600160a01b0316835293830193918301916001016128b0565b50506001600160a01b03969096166060850152505050608001529392505050565b6000602080838503121561290957600080fd5b82516001600160401b038082111561292057600080fd5b818501915085601f83011261293457600080fd5b815181811115612946576129466124ce565b8060051b91506129578483016124e4565b818152918301840191848101908884111561297157600080fd5b938501935b8385101561298f57845182529385019390850190612976565b98975050505050505050565b6000826129aa576129aa6127bd565b500490565b6000602082840312156129c157600080fd5b5051919050565b63ffffffff81811683821601908082111561285c5761285c6126f7565b60006001600160401b038281166002600160401b03198101612a0957612a096126f7565b6001019392505050565b60005b83811015612a2e578181015183820152602001612a16565b50506000910152565b76020b1b1b2b9b9a1b7b73a3937b61d1030b1b1b7bab73a1604d1b815260008351612a69816017850160208801612a13565b7001034b99036b4b9b9b4b733903937b6329607d1b6017918401918201528351612a9a816028840160208801612a13565b01602801949350505050565b6020815260008251806020840152612ac5816040850160208701612a13565b601f01601f19169190910160400192915050565b600081612ae857612ae86126f7565b506000190190565b60008251612b02818460208701612a13565b919091019291505056fe46756e6374696f6e206d7573742062652063616c6c6564207468726f75676820360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc802cf867c2da464d4ff0ebc4dfcccdfbd65d75a8bc1c273fb02e80bf3446b516416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122075403b81e5bdf09b04cc99bef7ded778ef83362abd82cd6adc2ce7ffb636593564736f6c63430008100033";
784
784
 
785
785
  type FaucetConstructorParams =
786
786
  | [signer?: Signer]
@@ -543,7 +543,7 @@ const _abi = [
543
543
  ];
544
544
 
545
545
  const _bytecode =
546
- "0x608060405234801561001057600080fd5b50612165806100206000396000f3fe6080604052600436106101775760003560e01c806315126799146101835780631ece9b12146101ab5780632f5a3d15146101d857806336afc6fa146101ee5780633771dcf8146102035780633e6326fc1461022557806354fd4d50146102455780635b61e2c11461027e5780635bc758e2146102bd5780635c9302c9146102d35780636bdd7242146102e957806370c635911461030957806378e97925146103295780637befab101461033f5780638406c0791461036357806389b08f111461038a5780638da5cb5b146103f357806393a08de414610413578063a4c0ed3614610430578063aa31e45914610460578063aaab4c1d14610490578063c25673d5146104c3578063c573cb40146104d8578063c5da1033146104f8578063c8eb754914610530578063cce987d414610550578063d1c8e12514610574578063e97eefd214610594578063f000999e146105b4578063f83ecf99146105d4578063f84b40f5146105f4578063fe173b971461060a57600080fd5b3661017e57005b600080fd5b34801561018f57600080fd5b50610198610631565b6040519081526020015b60405180910390f35b3480156101b757600080fd5b50600b546101cb906001600160a01b031681565b6040516101a29190611bc6565b3480156101e457600080fd5b5061019860025481565b3480156101fa57600080fd5b506101cb61065a565b34801561020f57600080fd5b5061022361021e366004611bf2565b6106e0565b005b34801561023157600080fd5b506006546101cb906001600160a01b031681565b34801561025157600080fd5b50600d5461026990600160a01b900463ffffffff1681565b60405163ffffffff90911681526020016101a2565b34801561028a57600080fd5b50600b546102a590600160a01b90046001600160401b031681565b6040516001600160401b0390911681526020016101a2565b3480156102c957600080fd5b5061019860035481565b3480156102df57600080fd5b5061019860055481565b3480156102f557600080fd5b50610223610304366004611c32565b610cf8565b34801561031557600080fd5b50610223610324366004611c4d565b610d4e565b34801561033557600080fd5b5061019860045481565b34801561034b57600080fd5b50600a5461026990600160601b900463ffffffff1681565b34801561036f57600080fd5b50600c546101cb90600160401b90046001600160a01b031681565b34801561039657600080fd5b506103cf6103a5366004611bf2565b6009602052600090815260409020546001600160801b03811690600160801b900463ffffffff1682565b604080516001600160801b03909316835263ffffffff9091166020830152016101a2565b3480156103ff57600080fd5b50600d546101cb906001600160a01b031681565b34801561041f57600080fd5b50600a546102699063ffffffff1681565b34801561043c57600080fd5b5061045061044b366004611c66565b610d8e565b60405190151581526020016101a2565b34801561046c57600080fd5b5061045061047b366004611bf2565b60086020526000908152604090205460ff1681565b34801561049c57600080fd5b50600d546104b190600160c01b900460ff1681565b60405160ff90911681526020016101a2565b3480156104cf57600080fd5b50610223610fc5565b3480156104e457600080fd5b50600c546102a5906001600160401b031681565b34801561050457600080fd5b50610198610513366004611cee565b600760209081526000928352604080842090915290825290205481565b34801561053c57600080fd5b5061022361054b366004611d1e565b61107a565b34801561055c57600080fd5b50600a5461026990600160801b900463ffffffff1681565b34801561058057600080fd5b5061022361058f366004611d41565b6110c4565b3480156105a057600080fd5b506104506105af366004611bf2565b6112a8565b3480156105c057600080fd5b506102236105cf366004611d99565b61166f565b3480156105e057600080fd5b506102236105ef366004611bf2565b61176d565b34801561060057600080fd5b5061019860015481565b34801561061657600080fd5b50600a546102a590600160201b90046001600160401b031681565b600a5460025460009161065591600160201b9091046001600160401b031690611dfa565b905090565b60065460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106559190611e19565b60005a90508160006106f061065a565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b815260040161071b9190611bc6565b602060405180830381865afa158015610738573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075c9190611e19565b90506001600160a01b038116156107735780610775565b815b600554909250610783611810565b806005541461079d57600c80546001600160401b03191690555b6005546001600160a01b0384166000908152600960205260409020546001600160801b0390811691161415806107ff5750600a546001600160a01b03841660009081526009602052604090205463ffffffff918216600160801b909104909116105b6108455760405162461bcd60e51b81526020600482015260126024820152716d6178206461696c7920746f7070696e677360701b60448201526064015b60405180910390fd5b6001600160a01b03831660009081526008602052604090205460ff161580156108855750600b54600c546001600160401b03600160a01b90920482169116105b8061089857506001600160a01b03821615155b6108f35760405162461bcd60e51b815260206004820152602660248201527f55736572206e6f742077686974656c6973746564206f72206e6f742066697273604482015265742074696d6560d01b606482015260840161083c565b600060076005546109049190611e4c565b6001600160a01b0385166000908152600960205260408120546005549293509091610938916001600160801b031690611e60565b905060078111610948578061094b565b60075b905081811161095a5780610965565b610965826001611e79565b9050600081610975846001611e79565b61097f9190611e60565b90505b8281116109f7576001600160a01b038616600090815260096020526040812060010182600781106109b5576109b5611e8c565b600291828204019190066010026101000a8154816001600160801b0302191690836001600160801b0316021790555080806109ef90611ea2565b915050610982565b506000805b838111610a6d576001600160a01b03871660009081526009602052604090206001018160078110610a2f57610a2f611e8c565b600291828204019190066010029054906101000a90046001600160801b031682610a599190611ebb565b915080610a6581611ea2565b9150506109fc565b50600a54600154600160601b820463ffffffff1691610a9d91600160201b9091046001600160401b031690611dfa565b610aa79190611dfa565b816001600160801b031610610b1b5760405162461bcd60e51b815260206004820152603460248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f206044820152736d616e792074696d65732074686973207765656b60601b606482015260840161083c565b876000610b2661065a565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b8152600401610b519190611bc6565b602060405180830381865afa158015610b6e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b929190611e19565b6001600160a01b0316141580610c2557506000610bad61065a565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b8152600401610bd89190611bc6565b602060405180830381865afa158015610bf5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c199190611e19565b6001600160a01b031614155b80610c415750600c54600160401b90046001600160a01b031633145b610c7e5760405162461bcd60e51b815260206004820152600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b604482015260640161083c565b610c8789611831565b505050505050505a610c999082611e60565b610ca59061a410611e79565b600a5490915033906108fc90610ccb90600160201b90046001600160401b031684611dfa565b6040518115909202916000818181858888f19350505050158015610cf3573d6000803e3d6000fd5b505050565b600d546001600160a01b03163314610d225760405162461bcd60e51b815260040161083c90611ee2565b600a80546001600160401b03909216600160201b02600160201b600160601b0319909216919091179055565b600d546001600160a01b03163314610d785760405162461bcd60e51b815260040161083c90611ee2565b6002818155610d88908290611dfa565b60015550565b600a54600090600160801b900463ffffffff16841115610ddb5760405162461bcd60e51b8152602060048201526008602482015267736c69707061676560c01b604482015260640161083c565b6000610de983850185611bf2565b60408051600280825260608201835292935083926000926020830190803683370190505090503381600081518110610e2357610e23611e8c565b60200260200101906001600160a01b031690816001600160a01b031681525050816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e81573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ea59190611e19565b81600181518110610eb857610eb8611e8c565b6001600160a01b03928316602091820292909201015260405163095ea7b360e01b815290841660048201526000196024820152339063095ea7b3906044016020604051808303816000875af1158015610f15573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f399190611f1b565b506040516318cbafe560e01b81526001600160a01b038316906318cbafe590610f6f908a9060009086908e904290600401611f3d565b6000604051808303816000875af1158015610f8e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610fb69190810190611fae565b50600198975050505050505050565b6003610fd260018261206b565b600d54600160a01b900463ffffffff9081169116146110035760405162461bcd60e51b815260040161083c90612088565b600d8054600160a01b900463ffffffff16906014611020836120b7565b91906101000a81548163ffffffff021916908363ffffffff16021790555050600a60049054906101000a90046001600160401b03166001600160401b031660025461106b91906120da565b6002818155610d889190611dfa565b600d546001600160a01b031633146110a45760405162461bcd60e51b815260040161083c90611ee2565b600d805460ff909216600160c01b0260ff60c01b19909216919091179055565b600054610100900460ff16158080156110e45750600054600160ff909116105b806110fe5750303b1580156110fe575060005460ff166001145b6111615760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161083c565b6000805460ff191660011790558015611184576000805461ff0019166101001790555b600c8054600160401b600160e01b031916600160401b6001600160a01b03861602179055600a8054600160201b600160601b031916600160201b6001600160401b038781169190910291909117909155821660028181556111e59190611dfa565b600155600a805442600455600680546001600160a01b0319166001600160a01b03891617905563ffffffff600160601b03600160a01b03191660036501f40000000160611b01179055600b8054600160a01b600160e01b03191661027160a31b179055600d805460ff60c01b1916600f60c01b17905580156112a1576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b6000816001600160a01b0316316112bd610631565b10156112cb57506000919050565b6000826001600160a01b0316316112e0610631565b6112ea9190611e60565b600d54909150600160c01b900460ff16611302610631565b61130d836064611dfa565b61131791906120da565b10156113265750600092915050565b600061133061065a565b6001600160a01b0316632d0e9b46856040518263ffffffff1660e01b815260040161135b9190611bc6565b602060405180830381865afa158015611378573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061139c9190611e19565b90506001600160a01b038116156113b357806113b5565b835b9350600062015180600454426113cb9190611e60565b6113d591906120da565b6001600160a01b038616600090815260096020526040812054919250906001600160801b03808416911614158061143257506001600160a01b0386166000908152600960205260409020546003600160801b90910463ffffffff16105b801561148c57506001600160a01b03861660009081526008602052604090205460ff161580156114795750600b54600c546001600160401b03600160a01b90920482169116105b8061148c57506001600160a01b03831615155b6001600160a01b038716600090815260096020526040808220815160e0810192839052939450919291600101906007908285855b82829054906101000a90046001600160801b03166001600160801b031681526020019060100190602082600f010492830192600103820291508084116114c05790505050505050905060006007846115189190611e4c565b6001600160a01b03891660009081526009602052604081205491925090611548906001600160801b031686611e60565b905060078111611558578061155b565b60075b905081811161156a5780611575565b611575826001611e79565b9050600081611585846001611e79565b61158f9190611e60565b90505b8281116115d25760008482600781106115ad576115ad611e8c565b6001600160801b039092166020929092020152806115ca81611ea2565b915050611592565b506000805b838111611613578481600781106115f0576115f0611e8c565b60200201516115ff9083611ebb565b91508061160b81611ea2565b9150506115d7565b508480156116615750600a54600154600160601b820463ffffffff169161164b91600160201b9091046001600160401b031690611dfa565b6116559190611dfa565b816001600160801b0316105b9a9950505050505050505050565b600161167b818061206b565b600d54600160a01b900463ffffffff9081169116146116ac5760405162461bcd60e51b815260040161083c90612088565b600d8054600160a01b900463ffffffff169060146116c9836120b7565b82546101009290920a63ffffffff81810219909316919092169190910217905550600d80546001600160a01b0319166001600160a01b038516179055600b54600160a01b90046001600160401b031660000361173a57600b8054600160a01b600160e01b03191661027160a31b1790555b600c8054600160401b600160e01b031916600160401b6001600160a01b038716021790556117678261176d565b50505050565b600261177a60018261206b565b600d54600160a01b900463ffffffff9081169116146117ab5760405162461bcd60e51b815260040161083c90612088565b600d8054600160a01b900463ffffffff169060146117c8836120b7565b82546101009290920a63ffffffff81810219909316919092169190910217905550600680546001600160a01b0319166001600160a01b03841617905561180c610fc5565b5050565b62015180600454426118229190611e60565b61182c91906120da565b600555565b80600061183c61065a565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b81526004016118679190611bc6565b602060405180830381865afa158015611884573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118a89190611e19565b90506001600160a01b038116156118bf57806118c1565b825b92506000836001600160a01b0316316118d8610631565b6118e29190611e60565b600d54909150600160c01b900460ff166118fa610631565b611905836064611dfa565b61190f91906120da565b10156119495760405162461bcd60e51b815260206004820152600960248201526806c6f7720746f546f760bc1b604482015260640161083c565b6000600760055461195a9190611e4c565b6005546001600160a01b0387166000908152600960205260409020549192506001600160801b039081169116036119e7576001600160a01b03851660009081526009602052604090208054600191906010906119c4908490600160801b900463ffffffff166120ee565b92506101000a81548163ffffffff021916908363ffffffff160217905550611a14565b6001600160a01b0385166000908152600960205260409020805463ffffffff60801b1916600160801b1790555b6005546001600160a01b038616600090815260096020526040902080546001600160801b0319166001600160801b0390921691909117815582906001018260078110611a6257611a62611e8c565b600291828204019190066010028282829054906101000a90046001600160801b0316611a8e9190611ebb565b82546001600160801b039182166101009390930a9283029190920219909116179055506001600160a01b03851660009081526008602052604090205460ff16158015611ae157506001600160a01b038316155b15611b2557600c80546001600160401b0316906000611aff8361210b565b91906101000a8154816001600160401b0302191690836001600160401b03160217905550505b6001600160a01b03808616600090815260086020526040808220805460ff19166001179055519186169184156108fc0291859190818181858888f19350505050158015611b76573d6000803e3d6000fd5b50604080518381526001600160a01b0385811660208301523392908716917f7872034fbcc87890e73d66eac55389e0ffdba157b89a73bd2011157ebac1d66e910160405180910390a35050505050565b6001600160a01b0391909116815260200190565b6001600160a01b0381168114611bef57600080fd5b50565b600060208284031215611c0457600080fd5b8135611c0f81611bda565b9392505050565b80356001600160401b0381168114611c2d57600080fd5b919050565b600060208284031215611c4457600080fd5b611c0f82611c16565b600060208284031215611c5f57600080fd5b5035919050565b60008060008060608587031215611c7c57600080fd5b8435611c8781611bda565b93506020850135925060408501356001600160401b0380821115611caa57600080fd5b818701915087601f830112611cbe57600080fd5b813581811115611ccd57600080fd5b886020828501011115611cdf57600080fd5b95989497505060200194505050565b60008060408385031215611d0157600080fd5b823591506020830135611d1381611bda565b809150509250929050565b600060208284031215611d3057600080fd5b813560ff81168114611c0f57600080fd5b60008060008060808587031215611d5757600080fd5b8435611d6281611bda565b9350611d7060208601611c16565b92506040850135611d8081611bda565b9150611d8e60608601611c16565b905092959194509250565b600080600060608486031215611dae57600080fd5b8335611db981611bda565b92506020840135611dc981611bda565b91506040840135611dd981611bda565b809150509250925092565b634e487b7160e01b600052601160045260246000fd5b6000816000190483118215151615611e1457611e14611de4565b500290565b600060208284031215611e2b57600080fd5b8151611c0f81611bda565b634e487b7160e01b600052601260045260246000fd5b600082611e5b57611e5b611e36565b500690565b81810381811115611e7357611e73611de4565b92915050565b80820180821115611e7357611e73611de4565b634e487b7160e01b600052603260045260246000fd5b600060018201611eb457611eb4611de4565b5060010190565b6001600160801b03818116838216019080821115611edb57611edb611de4565b5092915050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b634e487b7160e01b600052604160045260246000fd5b600060208284031215611f2d57600080fd5b81518015158114611c0f57600080fd5b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b81811015611f8d5784516001600160a01b031683529383019391830191600101611f68565b50506001600160a01b03969096166060850152505050608001529392505050565b60006020808385031215611fc157600080fd5b82516001600160401b0380821115611fd857600080fd5b818501915085601f830112611fec57600080fd5b815181811115611ffe57611ffe611f05565b8060051b604051601f19603f8301168101818110858211171561202357612023611f05565b60405291825284820192508381018501918883111561204157600080fd5b938501935b8285101561205f57845184529385019392850192612046565b98975050505050505050565b63ffffffff828116828216039080821115611edb57611edb611de4565b6020808252601590820152743bb937b733903ab833b930b232903b32b939b4b7b760591b604082015260600190565b600063ffffffff8083168181036120d0576120d0611de4565b6001019392505050565b6000826120e9576120e9611e36565b500490565b63ffffffff818116838216019080821115611edb57611edb611de4565b60006001600160401b038281166002600160401b031981016120d0576120d0611de456fea2646970667358221220106aa74cacc6b706c429de01b97419801b3b7ab4dbcd415f2c21f09a453e6d4a64736f6c63430008100033";
546
+ "0x608060405234801561001057600080fd5b506120dd806100206000396000f3fe6080604052600436106101775760003560e01c806315126799146101835780631ece9b12146101ab5780632f5a3d15146101d857806336afc6fa146101ee5780633771dcf8146102035780633e6326fc1461022557806354fd4d50146102455780635b61e2c11461027e5780635bc758e2146102bd5780635c9302c9146102d35780636bdd7242146102e957806370c635911461030957806378e97925146103295780637befab101461033f5780638406c0791461036357806389b08f111461038a5780638da5cb5b146103f357806393a08de414610413578063a4c0ed3614610430578063aa31e45914610460578063aaab4c1d14610490578063c25673d5146104c3578063c573cb40146104d8578063c5da1033146104f8578063c8eb754914610530578063cce987d414610550578063d1c8e12514610574578063e97eefd214610594578063f000999e146105b4578063f83ecf99146105d4578063f84b40f5146105f4578063fe173b971461060a57600080fd5b3661017e57005b600080fd5b34801561018f57600080fd5b50610198610631565b6040519081526020015b60405180910390f35b3480156101b757600080fd5b50600b546101cb906001600160a01b031681565b6040516101a29190611b3e565b3480156101e457600080fd5b5061019860025481565b3480156101fa57600080fd5b506101cb61065a565b34801561020f57600080fd5b5061022361021e366004611b6a565b6106e0565b005b34801561023157600080fd5b506006546101cb906001600160a01b031681565b34801561025157600080fd5b50600d5461026990600160a01b900463ffffffff1681565b60405163ffffffff90911681526020016101a2565b34801561028a57600080fd5b50600b546102a590600160a01b90046001600160401b031681565b6040516001600160401b0390911681526020016101a2565b3480156102c957600080fd5b5061019860035481565b3480156102df57600080fd5b5061019860055481565b3480156102f557600080fd5b50610223610304366004611baa565b610c70565b34801561031557600080fd5b50610223610324366004611bc5565b610cc6565b34801561033557600080fd5b5061019860045481565b34801561034b57600080fd5b50600a5461026990600160601b900463ffffffff1681565b34801561036f57600080fd5b50600c546101cb90600160401b90046001600160a01b031681565b34801561039657600080fd5b506103cf6103a5366004611b6a565b6009602052600090815260409020546001600160801b03811690600160801b900463ffffffff1682565b604080516001600160801b03909316835263ffffffff9091166020830152016101a2565b3480156103ff57600080fd5b50600d546101cb906001600160a01b031681565b34801561041f57600080fd5b50600a546102699063ffffffff1681565b34801561043c57600080fd5b5061045061044b366004611bde565b610d06565b60405190151581526020016101a2565b34801561046c57600080fd5b5061045061047b366004611b6a565b60086020526000908152604090205460ff1681565b34801561049c57600080fd5b50600d546104b190600160c01b900460ff1681565b60405160ff90911681526020016101a2565b3480156104cf57600080fd5b50610223610f3d565b3480156104e457600080fd5b50600c546102a5906001600160401b031681565b34801561050457600080fd5b50610198610513366004611c66565b600760209081526000928352604080842090915290825290205481565b34801561053c57600080fd5b5061022361054b366004611c96565b610ff2565b34801561055c57600080fd5b50600a5461026990600160801b900463ffffffff1681565b34801561058057600080fd5b5061022361058f366004611cb9565b61103c565b3480156105a057600080fd5b506104506105af366004611b6a565b611220565b3480156105c057600080fd5b506102236105cf366004611d11565b6115e7565b3480156105e057600080fd5b506102236105ef366004611b6a565b6116e5565b34801561060057600080fd5b5061019860015481565b34801561061657600080fd5b50600a546102a590600160201b90046001600160401b031681565b600a5460025460009161065591600160201b9091046001600160401b031690611d72565b905090565b60065460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106559190611d91565b60005a90508160006106f061065a565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b815260040161071b9190611b3e565b602060405180830381865afa158015610738573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075c9190611d91565b90506001600160a01b038116156107735780610775565b815b600554909250610783611788565b806005541461079d57600c80546001600160401b03191690555b6005546001600160a01b0384166000908152600960205260409020546001600160801b0390811691161415806107ff5750600a546001600160a01b03841660009081526009602052604090205463ffffffff918216600160801b909104909116105b6108455760405162461bcd60e51b81526020600482015260126024820152716d6178206461696c7920746f7070696e677360701b60448201526064015b60405180910390fd5b6001600160a01b03831660009081526008602052604090205460ff161580156108855750600b54600c546001600160401b03600160a01b90920482169116105b8061089857506001600160a01b03821615155b6108f35760405162461bcd60e51b815260206004820152602660248201527f55736572206e6f742077686974656c6973746564206f72206e6f742066697273604482015265742074696d6560d01b606482015260840161083c565b600060076005546109049190611dc4565b6001600160a01b0385166000908152600960205260408120546005549293509091610938916001600160801b031690611dd8565b905060078111610948578061094b565b60075b905081811161095a5780610965565b610965826001611df1565b9050600081610975846001611df1565b61097f9190611dd8565b90505b8281116109f7576001600160a01b038616600090815260096020526040812060010182600781106109b5576109b5611e04565b600291828204019190066010026101000a8154816001600160801b0302191690836001600160801b0316021790555080806109ef90611e1a565b915050610982565b506000805b838111610a6d576001600160a01b03871660009081526009602052604090206001018160078110610a2f57610a2f611e04565b600291828204019190066010029054906101000a90046001600160801b031682610a599190611e33565b915080610a6581611e1a565b9150506109fc565b50600a54600154600160601b820463ffffffff1691610a9d91600160201b9091046001600160401b031690611d72565b610aa79190611d72565b816001600160801b031610610b1b5760405162461bcd60e51b815260206004820152603460248201527f557365722077616c6c657420686173206265656e20746f7070656420746f6f206044820152736d616e792074696d65732074686973207765656b60601b606482015260840161083c565b876000610b2661065a565b6001600160a01b0316632d0e9b46836040518263ffffffff1660e01b8152600401610b519190611b3e565b602060405180830381865afa158015610b6e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b929190611d91565b6001600160a01b0316141580610bb95750600c54600160401b90046001600160a01b031633145b610bf65760405162461bcd60e51b815260206004820152600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b604482015260640161083c565b610bff896117a9565b505050505050505a610c119082611dd8565b610c1d9061a410611df1565b600a5490915033906108fc90610c4390600160201b90046001600160401b031684611d72565b6040518115909202916000818181858888f19350505050158015610c6b573d6000803e3d6000fd5b505050565b600d546001600160a01b03163314610c9a5760405162461bcd60e51b815260040161083c90611e5a565b600a80546001600160401b03909216600160201b02600160201b600160601b0319909216919091179055565b600d546001600160a01b03163314610cf05760405162461bcd60e51b815260040161083c90611e5a565b6002818155610d00908290611d72565b60015550565b600a54600090600160801b900463ffffffff16841115610d535760405162461bcd60e51b8152602060048201526008602482015267736c69707061676560c01b604482015260640161083c565b6000610d6183850185611b6a565b60408051600280825260608201835292935083926000926020830190803683370190505090503381600081518110610d9b57610d9b611e04565b60200260200101906001600160a01b031690816001600160a01b031681525050816001600160a01b031663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610df9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e1d9190611d91565b81600181518110610e3057610e30611e04565b6001600160a01b03928316602091820292909201015260405163095ea7b360e01b815290841660048201526000196024820152339063095ea7b3906044016020604051808303816000875af1158015610e8d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eb19190611e93565b506040516318cbafe560e01b81526001600160a01b038316906318cbafe590610ee7908a9060009086908e904290600401611eb5565b6000604051808303816000875af1158015610f06573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f2e9190810190611f26565b50600198975050505050505050565b6003610f4a600182611fe3565b600d54600160a01b900463ffffffff908116911614610f7b5760405162461bcd60e51b815260040161083c90612000565b600d8054600160a01b900463ffffffff16906014610f988361202f565b91906101000a81548163ffffffff021916908363ffffffff16021790555050600a60049054906101000a90046001600160401b03166001600160401b0316600254610fe39190612052565b6002818155610d009190611d72565b600d546001600160a01b0316331461101c5760405162461bcd60e51b815260040161083c90611e5a565b600d805460ff909216600160c01b0260ff60c01b19909216919091179055565b600054610100900460ff161580801561105c5750600054600160ff909116105b806110765750303b158015611076575060005460ff166001145b6110d95760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161083c565b6000805460ff1916600117905580156110fc576000805461ff0019166101001790555b600c8054600160401b600160e01b031916600160401b6001600160a01b03861602179055600a8054600160201b600160601b031916600160201b6001600160401b0387811691909102919091179091558216600281815561115d9190611d72565b600155600a805442600455600680546001600160a01b0319166001600160a01b03891617905563ffffffff600160601b03600160a01b03191660036501f40000000160611b01179055600b8054600160a01b600160e01b03191661027160a31b179055600d805460ff60c01b1916600f60c01b1790558015611219576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050565b6000816001600160a01b031631611235610631565b101561124357506000919050565b6000826001600160a01b031631611258610631565b6112629190611dd8565b600d54909150600160c01b900460ff1661127a610631565b611285836064611d72565b61128f9190612052565b101561129e5750600092915050565b60006112a861065a565b6001600160a01b0316632d0e9b46856040518263ffffffff1660e01b81526004016112d39190611b3e565b602060405180830381865afa1580156112f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113149190611d91565b90506001600160a01b0381161561132b578061132d565b835b9350600062015180600454426113439190611dd8565b61134d9190612052565b6001600160a01b038616600090815260096020526040812054919250906001600160801b0380841691161415806113aa57506001600160a01b0386166000908152600960205260409020546003600160801b90910463ffffffff16105b801561140457506001600160a01b03861660009081526008602052604090205460ff161580156113f15750600b54600c546001600160401b03600160a01b90920482169116105b8061140457506001600160a01b03831615155b6001600160a01b038716600090815260096020526040808220815160e0810192839052939450919291600101906007908285855b82829054906101000a90046001600160801b03166001600160801b031681526020019060100190602082600f010492830192600103820291508084116114385790505050505050905060006007846114909190611dc4565b6001600160a01b038916600090815260096020526040812054919250906114c0906001600160801b031686611dd8565b9050600781116114d057806114d3565b60075b90508181116114e257806114ed565b6114ed826001611df1565b90506000816114fd846001611df1565b6115079190611dd8565b90505b82811161154a57600084826007811061152557611525611e04565b6001600160801b0390921660209290920201528061154281611e1a565b91505061150a565b506000805b83811161158b5784816007811061156857611568611e04565b60200201516115779083611e33565b91508061158381611e1a565b91505061154f565b508480156115d95750600a54600154600160601b820463ffffffff16916115c391600160201b9091046001600160401b031690611d72565b6115cd9190611d72565b816001600160801b0316105b9a9950505050505050505050565b60016115f38180611fe3565b600d54600160a01b900463ffffffff9081169116146116245760405162461bcd60e51b815260040161083c90612000565b600d8054600160a01b900463ffffffff169060146116418361202f565b82546101009290920a63ffffffff81810219909316919092169190910217905550600d80546001600160a01b0319166001600160a01b038516179055600b54600160a01b90046001600160401b03166000036116b257600b8054600160a01b600160e01b03191661027160a31b1790555b600c8054600160401b600160e01b031916600160401b6001600160a01b038716021790556116df826116e5565b50505050565b60026116f2600182611fe3565b600d54600160a01b900463ffffffff9081169116146117235760405162461bcd60e51b815260040161083c90612000565b600d8054600160a01b900463ffffffff169060146117408361202f565b82546101009290920a63ffffffff81810219909316919092169190910217905550600680546001600160a01b0319166001600160a01b038416179055611784610f3d565b5050565b620151806004544261179a9190611dd8565b6117a49190612052565b600555565b8060006117b461065a565b6001600160a01b0316632d0e9b46846040518263ffffffff1660e01b81526004016117df9190611b3e565b602060405180830381865afa1580156117fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118209190611d91565b90506001600160a01b038116156118375780611839565b825b92506000836001600160a01b031631611850610631565b61185a9190611dd8565b600d54909150600160c01b900460ff16611872610631565b61187d836064611d72565b6118879190612052565b10156118c15760405162461bcd60e51b815260206004820152600960248201526806c6f7720746f546f760bc1b604482015260640161083c565b600060076005546118d29190611dc4565b6005546001600160a01b0387166000908152600960205260409020549192506001600160801b0390811691160361195f576001600160a01b038516600090815260096020526040902080546001919060109061193c908490600160801b900463ffffffff16612066565b92506101000a81548163ffffffff021916908363ffffffff16021790555061198c565b6001600160a01b0385166000908152600960205260409020805463ffffffff60801b1916600160801b1790555b6005546001600160a01b038616600090815260096020526040902080546001600160801b0319166001600160801b03909216919091178155829060010182600781106119da576119da611e04565b600291828204019190066010028282829054906101000a90046001600160801b0316611a069190611e33565b82546001600160801b039182166101009390930a9283029190920219909116179055506001600160a01b03851660009081526008602052604090205460ff16158015611a5957506001600160a01b038316155b15611a9d57600c80546001600160401b0316906000611a7783612083565b91906101000a8154816001600160401b0302191690836001600160401b03160217905550505b6001600160a01b03808616600090815260086020526040808220805460ff19166001179055519186169184156108fc0291859190818181858888f19350505050158015611aee573d6000803e3d6000fd5b50604080518381526001600160a01b0385811660208301523392908716917f7872034fbcc87890e73d66eac55389e0ffdba157b89a73bd2011157ebac1d66e910160405180910390a35050505050565b6001600160a01b0391909116815260200190565b6001600160a01b0381168114611b6757600080fd5b50565b600060208284031215611b7c57600080fd5b8135611b8781611b52565b9392505050565b80356001600160401b0381168114611ba557600080fd5b919050565b600060208284031215611bbc57600080fd5b611b8782611b8e565b600060208284031215611bd757600080fd5b5035919050565b60008060008060608587031215611bf457600080fd5b8435611bff81611b52565b93506020850135925060408501356001600160401b0380821115611c2257600080fd5b818701915087601f830112611c3657600080fd5b813581811115611c4557600080fd5b886020828501011115611c5757600080fd5b95989497505060200194505050565b60008060408385031215611c7957600080fd5b823591506020830135611c8b81611b52565b809150509250929050565b600060208284031215611ca857600080fd5b813560ff81168114611b8757600080fd5b60008060008060808587031215611ccf57600080fd5b8435611cda81611b52565b9350611ce860208601611b8e565b92506040850135611cf881611b52565b9150611d0660608601611b8e565b905092959194509250565b600080600060608486031215611d2657600080fd5b8335611d3181611b52565b92506020840135611d4181611b52565b91506040840135611d5181611b52565b809150509250925092565b634e487b7160e01b600052601160045260246000fd5b6000816000190483118215151615611d8c57611d8c611d5c565b500290565b600060208284031215611da357600080fd5b8151611b8781611b52565b634e487b7160e01b600052601260045260246000fd5b600082611dd357611dd3611dae565b500690565b81810381811115611deb57611deb611d5c565b92915050565b80820180821115611deb57611deb611d5c565b634e487b7160e01b600052603260045260246000fd5b600060018201611e2c57611e2c611d5c565b5060010190565b6001600160801b03818116838216019080821115611e5357611e53611d5c565b5092915050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b634e487b7160e01b600052604160045260246000fd5b600060208284031215611ea557600080fd5b81518015158114611b8757600080fd5b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b81811015611f055784516001600160a01b031683529383019391830191600101611ee0565b50506001600160a01b03969096166060850152505050608001529392505050565b60006020808385031215611f3957600080fd5b82516001600160401b0380821115611f5057600080fd5b818501915085601f830112611f6457600080fd5b815181811115611f7657611f76611e7d565b8060051b604051601f19603f83011681018181108582111715611f9b57611f9b611e7d565b604052918252848201925083810185019188831115611fb957600080fd5b938501935b82851015611fd757845184529385019392850192611fbe565b98975050505050505050565b63ffffffff828116828216039080821115611e5357611e53611d5c565b6020808252601590820152743bb937b733903ab833b930b232903b32b939b4b7b760591b604082015260600190565b600063ffffffff80831681810361204857612048611d5c565b6001019392505050565b60008261206157612061611dae565b500490565b63ffffffff818116838216019080821115611e5357611e53611d5c565b60006001600160401b038281166002600160401b0319810161204857612048611d5c56fea26469706673582212206b03214e3b0e2489345acb664b00f5975e883807c0760b58df4f100246e1060264736f6c63430008100033";
547
547
 
548
548
  type FuseFaucetV2ConstructorParams =
549
549
  | [signer?: Signer]