@gooddollar/goodprotocol 2.0.32 → 2.0.34-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/artifacts/abis/BuyFromReserveHelper.min.json +1 -0
- package/artifacts/abis/Faucet.min.json +1 -1
- package/artifacts/abis/GoodDollar2.min.json +1 -0
- package/artifacts/abis/ISuperToken.min.json +1 -1
- package/artifacts/abis/IdentityV3.min.json +1 -0
- package/artifacts/abis/SuperGoodDollar.min.json +1 -1
- package/artifacts/abis/SuperToken.min.json +1 -1
- package/artifacts/abis/SuperfluidFaucet.min.json +1 -1
- package/artifacts/abis/UBISchemeV2.min.json +1 -1
- package/artifacts/contracts/DAOStackInterfaces.sol/Avatar.dbg.json +1 -1
- package/artifacts/contracts/DAOStackInterfaces.sol/Controller.dbg.json +1 -1
- package/artifacts/contracts/DAOStackInterfaces.sol/GlobalConstraintInterface.dbg.json +1 -1
- package/artifacts/contracts/DAOStackInterfaces.sol/IntVoteInterface.dbg.json +1 -1
- package/artifacts/contracts/DAOStackInterfaces.sol/ReputationInterface.dbg.json +1 -1
- package/artifacts/contracts/DAOStackInterfaces.sol/SchemeRegistrar.dbg.json +1 -1
- package/artifacts/contracts/IQuoter.sol/IQuoterV2.dbg.json +4 -0
- package/artifacts/contracts/IQuoter.sol/IQuoterV2.json +211 -0
- package/artifacts/contracts/Interfaces.sol/AggregatorV3Interface.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/ERC20.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IAaveIncentivesController.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IAdminWallet.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IDonationStaking.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IERC2917.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IFirstClaimPool.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IGoodDollar.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IGoodStaking.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IHasRouter.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IIdentity.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IIdentityV2.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/ILendingPool.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IMultichainRouter.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/INameService.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IQuoterV2.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/ISwapRouter.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/IUBIScheme.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/ProxyAdmin.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/Reserve.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/Uniswap.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/UniswapFactory.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/UniswapPair.dbg.json +1 -1
- package/artifacts/contracts/Interfaces.sol/cERC20.dbg.json +1 -1
- package/artifacts/contracts/MentoInterfaces.sol/IBancorExchangeProvider.dbg.json +1 -1
- package/artifacts/contracts/MentoInterfaces.sol/IBroker.dbg.json +1 -1
- package/artifacts/contracts/MentoInterfaces.sol/IGoodDollarExchangeProvider.dbg.json +1 -1
- package/artifacts/contracts/MentoInterfaces.sol/IGoodDollarExpansionController.dbg.json +1 -1
- package/artifacts/contracts/MentoInterfaces.sol/IMentoReserve.dbg.json +1 -1
- package/artifacts/contracts/MentoInterfaces.sol/ITradingLimits.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +57 -2
- package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/FuseFaucet.sol/FuseFaucet.json +2 -2
- package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.json +2 -2
- package/artifacts/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.json +46 -28
- package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
- package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.json +2 -2
- package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
- package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.json +2 -2
- package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
- package/artifacts/contracts/governance/GReputation.sol/GReputation.json +2 -2
- package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
- package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.json +2 -2
- package/artifacts/contracts/governance/GoodDollarStaking.sol/IGovernanceStaking.dbg.json +1 -1
- package/artifacts/contracts/governance/GoodDollarStaking.sol/IStakingUpgrade.dbg.json +1 -1
- package/artifacts/contracts/governance/GoodDollarStaking.sol/RewardsMinter.dbg.json +1 -1
- package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.dbg.json +1 -1
- package/artifacts/contracts/governance/GovernanceStaking.sol/GovernanceStaking.json +2 -2
- package/artifacts/contracts/governance/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
- package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
- package/artifacts/contracts/governance/Reputation.sol/Reputation.json +2 -2
- package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.dbg.json +1 -1
- package/artifacts/contracts/governance/StakersDistribution.sol/StakersDistribution.json +2 -2
- package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.dbg.json +1 -1
- package/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
- package/artifacts/contracts/identity/IdentityV3.sol/IdentityV3.dbg.json +4 -0
- package/artifacts/contracts/identity/IdentityV3.sol/IdentityV3.json +1089 -0
- package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.dbg.json +1 -1
- package/artifacts/contracts/invite/InvitesFuseV2.sol/InvitesFuseV2.json +2 -2
- package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.dbg.json +1 -1
- package/artifacts/contracts/invite/InvitesV1.sol/InvitesV1.json +2 -2
- package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.dbg.json +1 -1
- package/artifacts/contracts/invite/InvitesV2.sol/InvitesV2.json +2 -2
- package/artifacts/contracts/invite/OneTimeReward.sol/OneTimeReward.dbg.json +1 -1
- package/artifacts/contracts/invite/OneTimeReward.sol/OneTimeReward.json +2 -2
- package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/AaveMock.sol/AaveMock.json +2 -2
- package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/AaveUSDMockOracle.sol/AaveUSDMockOracle.json +2 -2
- package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.json +2 -2
- package/artifacts/contracts/mocks/CeloDistributionHelperTest.sol/CeloDistributionHelperTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/CeloDistributionHelperTest.sol/CeloDistributionHelperTest.json +2 -2
- package/artifacts/contracts/mocks/CeloDistributionHelperTest.sol/CeloDistributionHelperTestHelper.dbg.json +1 -1
- package/artifacts/contracts/mocks/CeloDistributionHelperTest.sol/CeloDistributionHelperTestHelper.json +2 -2
- package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.json +2 -2
- package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.json +2 -2
- package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.json +2 -2
- package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.json +2 -2
- package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.json +2 -2
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +2 -2
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +2 -2
- package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/EthUSDMockOracle.sol/EthUSDMockOracle.json +2 -2
- package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock.json +2 -2
- package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.json +2 -2
- package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +2 -2
- package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/GoodDollarStakingMock.sol/GoodDollarStakingMock.json +2 -2
- package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/GoodFundManagerTest.sol/GoodFundManagerTest.json +2 -2
- package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/IdentityMock.sol/IdentityMock.json +2 -2
- package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/IncentiveControllerMock.sol/IncentiveControllerMock.json +2 -2
- package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.json +2 -2
- package/artifacts/contracts/mocks/MultichainRouterMock.sol/IWrapper.dbg.json +1 -1
- package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock.json +2 -2
- package/artifacts/contracts/mocks/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
- package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.json +2 -2
- package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.dbg.json +1 -1
- package/artifacts/contracts/mocks/OverMintTesterRegularStake.sol/OverMintTesterRegularStake.json +2 -2
- package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/PayableMock.sol/PayableMock.json +2 -2
- package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.json +2 -2
- package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
- package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.json +2 -2
- package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.json +2 -2
- package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.json +2 -2
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.json +2 -2
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.json +2 -2
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.json +2 -2
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.json +2 -2
- package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.json +2 -2
- package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.json +2 -2
- package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.json +2 -2
- package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.json +2 -2
- package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.json +2 -2
- package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.json +2 -2
- package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.json +2 -2
- package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.json +2 -2
- package/artifacts/contracts/reserve/CeloDistributionHelper.sol/CeloDistributionHelper.dbg.json +1 -1
- package/artifacts/contracts/reserve/CeloDistributionHelper.sol/CeloDistributionHelper.json +2 -2
- package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
- package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +2 -2
- package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.dbg.json +1 -1
- package/artifacts/contracts/reserve/ExchangeHelper.sol/ExchangeHelper.json +2 -2
- package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.dbg.json +1 -1
- package/artifacts/contracts/reserve/GoodMarketMaker.sol/GoodMarketMaker.json +2 -2
- package/artifacts/contracts/reserve/GoodReserveCDai.sol/ContributionCalc.dbg.json +1 -1
- package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.dbg.json +1 -1
- package/artifacts/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai.json +2 -2
- package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.dbg.json +1 -1
- package/artifacts/contracts/staking/BaseShareField.sol/BaseShareField.json +2 -2
- package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
- package/artifacts/contracts/staking/BaseShareFieldV2.sol/BaseShareFieldV2.json +2 -2
- package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/DonationsStaking.sol/DonationsStaking.json +2 -2
- package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.dbg.json +1 -1
- package/artifacts/contracts/staking/FuseStakingV3.sol/FuseStakingV3.json +2 -2
- package/artifacts/contracts/staking/FuseStakingV3.sol/IConsensus.dbg.json +1 -1
- package/artifacts/contracts/staking/FuseStakingV3.sol/PegSwap.dbg.json +1 -1
- package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.dbg.json +1 -1
- package/artifacts/contracts/staking/GoodFundManager.sol/GoodFundManager.json +2 -2
- package/artifacts/contracts/staking/SimpleStaking.sol/SimpleStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/SimpleStakingV2.sol/SimpleStakingV2.dbg.json +1 -1
- package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.dbg.json +1 -1
- package/artifacts/contracts/staking/UniswapV2SwapHelper.sol/UniswapV2SwapHelper.json +2 -2
- package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.dbg.json +1 -1
- package/artifacts/contracts/staking/aave/AaveStakingFactory.sol/AaveStakingFactory.json +2 -2
- package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/aave/GoodAaveStaking.sol/GoodAaveStaking.json +2 -2
- package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.dbg.json +1 -1
- package/artifacts/contracts/staking/aave/GoodAaveStakingV2.sol/GoodAaveStakingV2.json +2 -2
- package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.dbg.json +1 -1
- package/artifacts/contracts/staking/compound/CompoundStakingFactory.sol/CompoundStakingFactory.json +2 -2
- package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/compound/GoodCompoundStaking.sol/GoodCompoundStaking.json +2 -2
- package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.dbg.json +1 -1
- package/artifacts/contracts/staking/compound/GoodCompoundStakingV2.sol/GoodCompoundStakingV2.json +2 -2
- package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.dbg.json +1 -1
- package/artifacts/contracts/staking/utils/Math64X64.sol/Math64x64.json +2 -2
- package/artifacts/contracts/staking/utils/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
- package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
- package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.json +2 -2
- package/artifacts/contracts/token/ERC677.sol/ERC677.dbg.json +1 -1
- package/artifacts/contracts/token/ERC677.sol/ERC677Receiver.dbg.json +1 -1
- package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
- package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.json +2 -2
- package/artifacts/contracts/token/GoodDollar2.sol/GoodDollar2.dbg.json +4 -0
- package/artifacts/contracts/token/GoodDollar2.sol/GoodDollar2.json +1206 -0
- package/artifacts/contracts/token/IFeesFormula.sol/IFeesFormula.dbg.json +1 -1
- package/artifacts/contracts/token/MultichainFeeFormula.sol/MultichainFeeFormula.dbg.json +1 -1
- package/artifacts/contracts/token/MultichainFeeFormula.sol/MultichainFeeFormula.json +2 -2
- package/artifacts/contracts/token/superfluid/ERC20Permit.sol/ERC20Permit.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/ERC20Permit.sol/SelfApprove.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/IGoodDollarCustom.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/ISuperGoodDollar.sol/ISuperGoodDollar.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/ISuperToken.sol/ISuperToken.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/ISuperToken.sol/ISuperToken.json +0 -52
- package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +2 -74
- package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.json +2 -54
- package/artifacts/contracts/token/superfluid/SuperfluidToken.sol/SuperfluidToken.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/UUPSProxiable.sol/UUPSProxiable.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/UUPSProxy.sol/Proxy.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +2 -2
- package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSUtils.json +2 -2
- package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
- package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.json +2 -2
- package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.dbg.json +1 -1
- package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.json +2 -7
- package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
- package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.json +2 -2
- package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
- package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.json +2 -2
- package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
- package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.json +2 -2
- package/artifacts/contracts/utils/BulkProof.sol/BulkProof.dbg.json +1 -1
- package/artifacts/contracts/utils/BulkProof.sol/BulkProof.json +2 -2
- package/artifacts/contracts/utils/BulkWhitelist.sol/BulkWhitelist.dbg.json +1 -1
- package/artifacts/contracts/utils/BulkWhitelist.sol/BulkWhitelist.json +2 -2
- package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
- package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +2 -2
- package/artifacts/contracts/utils/BuyFromReserveHelper.sol/BuyFromReserveHelper.dbg.json +4 -0
- package/artifacts/contracts/utils/BuyFromReserveHelper.sol/BuyFromReserveHelper.json +476 -0
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDClone.dbg.json +1 -1
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDClone.json +2 -2
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.dbg.json +1 -1
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.json +2 -2
- package/artifacts/contracts/utils/BuyGDClone.sol/DonateGDClone.dbg.json +1 -1
- package/artifacts/contracts/utils/BuyGDClone.sol/DonateGDClone.json +2 -2
- package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
- package/artifacts/contracts/utils/DAOContract.sol/DAOContract.json +2 -2
- package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
- package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.json +2 -2
- package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
- package/artifacts/contracts/utils/DSMath.sol/DSMath.json +2 -2
- package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
- package/artifacts/contracts/utils/DataTypes.sol/DataTypes.json +2 -2
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/EternalStorage.dbg.json +1 -1
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/EternalStorage.json +2 -2
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill.dbg.json +1 -1
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill.json +2 -2
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/IUpgradeabilityOwnerStorage.dbg.json +1 -1
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Initializable.dbg.json +1 -1
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Initializable.json +2 -2
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Ownable.dbg.json +1 -1
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Ownable.json +2 -2
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Upgradeable.dbg.json +1 -1
- package/artifacts/contracts/utils/FuseOldBridgeKill.sol/Upgradeable.json +2 -2
- package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.dbg.json +1 -1
- package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.json +2 -2
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.json +2 -2
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json +1 -1
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json +1 -1
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json +1 -1
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json +2 -2
- package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.dbg.json +1 -1
- package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.json +2 -2
- package/artifacts/contracts/utils/LastauthReduction.sol/LastauthReduction.dbg.json +1 -1
- package/artifacts/contracts/utils/LastauthReduction.sol/LastauthReduction.json +2 -2
- package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
- package/artifacts/contracts/utils/MultiCall.sol/Multicall.json +2 -2
- package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
- package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.json +2 -2
- package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
- package/artifacts/contracts/utils/NameService.sol/NameService.json +2 -2
- package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +1 -1
- package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.json +2 -2
- package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json +1 -1
- package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.json +2 -2
- package/artifacts/contracts/utils/ProtoclUpgradeV4Mento.sol/MentoExchange.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtoclUpgradeV4Mento.sol/ProtocolUpgradeV4Mento.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtoclUpgradeV4Mento.sol/ProtocolUpgradeV4Mento.json +2 -2
- package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.json +2 -2
- package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.json +2 -2
- package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.json +2 -2
- package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json +2 -2
- package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
- package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +2 -2
- package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
- package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.json +2 -2
- package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
- package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json +2 -2
- package/artifacts/contracts/utils/ReserveRestore.sol/ReserveRestore.dbg.json +1 -1
- package/artifacts/contracts/utils/ReserveRestore.sol/ReserveRestore.json +2 -2
- package/contracts/IQuoter.sol +108 -0
- package/contracts/fuseFaucet/Faucet.sol +49 -37
- package/contracts/fuseFaucet/SuperfluidFacuet.sol +29 -8
- package/contracts/identity/IdentityV3.sol +534 -0
- package/contracts/token/ERC20PresetMinterPauserUpgradeable.sol +8 -9
- package/contracts/token/GoodDollar.sol +1 -1
- package/contracts/token/GoodDollar2.sol +13 -0
- package/contracts/token/superfluid/ISuperToken.sol +0 -19
- package/contracts/token/superfluid/SuperGoodDollar.sol +2 -21
- package/contracts/token/superfluid/SuperToken.sol +2 -2
- package/contracts/token/superfluid/SuperfluidToken.sol +66 -67
- package/contracts/ubi/UBISchemeV2.sol +12 -18
- package/contracts/utils/BuyFromReserveHelper.sol +129 -0
- package/dist/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
- package/dist/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +177 -256
- package/dist/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +2 -2
- package/dist/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +2 -2
- package/dist/test-sdk/deploySuperGoodDollar.d.ts +1 -1
- package/dist/test-sdk/deploySuperGoodDollar.js +4 -8
- package/dist/test-sdk/index.js +1 -5
- package/hardhat.config.ts +37 -30
- package/package.json +3 -2
- package/releases/deploy-settings.json +5 -1
- package/releases/deployment.json +27 -1
- package/releases/olddao.json +1 -1
- package/scripts/analytics/activeGDStakers.ts +188 -0
- package/scripts/fv.ts +19 -1
- package/scripts/multichain-deploy/0_proxyFactory-deploy.ts +28 -5
- package/scripts/multichain-deploy/1_basicdao-deploy.ts +111 -73
- package/scripts/multichain-deploy/2_helpers-deploy.ts +13 -8
- package/scripts/multichain-deploy/4_ubi-deploy.ts +17 -19
- package/scripts/multichain-deploy/5_gov-deploy.ts +58 -26
- package/scripts/multichain-deploy/flattened/Avatar.sol +913 -0
- package/scripts/multichain-deploy/flattened/Controller.sol +1891 -0
- package/scripts/multichain-deploy/flattened/FeeFormula.sol +1290 -0
- package/scripts/multichain-deploy/fulldeploy.sh +17 -17
- package/scripts/multichain-deploy/helpers.ts +203 -70
- package/scripts/multichain-deploy/verify.ts +41 -0
- package/test/governance/ClaimersDistribution.test.ts +1 -1
- package/test/helpers.ts +59 -46
- package/test/identity/IdentityV2.test.ts +4 -1
- package/test/identity/IdentityV3.test.ts +449 -0
- package/test/invite/InvitesV2.test.ts +1 -1
- package/test/token/GoodDollar.test.ts +1 -1
- package/test/token/SuperGoodDollar.nohost.test.ts +383 -0
- package/test/token/SuperGoodDollar.test.ts +2 -10
- package/test/ubi/UBIScheme.e2e.test.ts +5 -5
- package/test/ubi/UBISchemeCycle.test.ts +69 -22
- package/test/ubi/UBISchemeV2.test.ts +636 -0
- package/test/utils/AdminWallet.test.ts +1 -1
- package/test/utils/ProxyFactory.test.ts +4 -1
- package/types/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.ts +108 -0
- package/types/@openzeppelin/contracts/proxy/ERC1967/index.ts +1 -0
- package/types/contracts/IQuoter.sol/IQuoterV2.ts +297 -0
- package/types/contracts/IQuoter.sol/index.ts +4 -0
- package/types/contracts/Interfaces.sol/AToken.ts +81 -0
- package/types/contracts/Interfaces.sol/IAaveIncentivesControllerV3.ts +156 -0
- package/types/contracts/Interfaces.sol/ILendingPoolV3.ts +254 -0
- package/types/contracts/fuseFaucet/Faucet.ts +109 -11
- package/types/contracts/fuseFaucet/SuperfluidBaseFacuet.sol/EthDistributor.ts +648 -0
- package/types/contracts/fuseFaucet/SuperfluidBaseFacuet.sol/EthDistributorUpgradeable.ts +843 -0
- package/types/contracts/fuseFaucet/SuperfluidBaseFacuet.sol/index.ts +4 -0
- package/types/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet.ts +79 -41
- package/types/contracts/identity/IdentityV3.ts +1899 -0
- package/types/contracts/identity/index.ts +1 -0
- package/types/contracts/index.ts +2 -0
- package/types/contracts/mocks/CeloDistributionHelperTest.sol/DistributionHelperTestHelper.ts +1252 -0
- package/types/contracts/reserve/GoodReserveADai.ts +2212 -0
- package/types/contracts/staking/aave/GoodAave3StakingV2.sol/GoodAaveStakingV2.ts +1808 -0
- package/types/contracts/staking/aave/GoodAave3StakingV2.sol/index.ts +4 -0
- package/types/contracts/token/GoodDollar18.ts +1871 -0
- package/types/contracts/token/GoodDollar2.ts +1871 -0
- package/types/contracts/token/index.ts +1 -0
- package/types/contracts/token/superfluid/ISuperToken.ts +0 -84
- package/types/contracts/token/superfluid/SuperGoodDollar.ts +12 -126
- package/types/contracts/token/superfluid/SuperToken.ts +0 -84
- package/types/contracts/ubi/UBISchemeV2.ts +3 -14
- package/types/contracts/utils/BuyFromReserveHelper.ts +699 -0
- package/types/contracts/utils/BuyGDClone.sol/IQuoterV2.ts +184 -0
- package/types/contracts/utils/BuyGDClone.sol/ISwapRouter.ts +306 -0
- package/types/contracts/utils/FuseOldBridgeKill.sol/BasicAMBErc677ToErc677.ts +108 -0
- package/types/contracts/utils/ProtocolUpgradeV4Mento.sol/MentoExchange.ts +81 -0
- package/types/contracts/utils/ProtocolUpgradeV4Mento.sol/ProtocolUpgradeV4Mento.ts +161 -0
- package/types/contracts/utils/ProtocolUpgradeV4Mento.sol/index.ts +5 -0
- package/types/contracts/utils/ReserveRestore.sol/MentoExchange.ts +81 -0
- package/types/contracts/utils/ReserveRestore.sol/ReserveRestore.ts +112 -0
- package/types/contracts/utils/ReserveRestore.sol/index.ts +5 -0
- package/types/contracts/utils/index.ts +1 -0
- package/types/factories/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy__factory.ts +146 -0
- package/types/factories/@openzeppelin/contracts/proxy/ERC1967/index.ts +1 -0
- package/types/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory.ts +1 -1
- package/types/factories/@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable__factory.ts +1 -1
- package/types/factories/@openzeppelin/contracts-upgradeable/token/ERC20/presets/ERC20PresetMinterPauserUpgradeable__factory.ts +1 -1
- package/types/factories/@superfluid-finance/ethereum-contracts/contracts/libs/EventsEmitter__factory.ts +1 -1
- package/types/factories/@superfluid-finance/ethereum-contracts/contracts/superfluid/ConstantInflowNFT__factory.ts +1 -1
- package/types/factories/@superfluid-finance/ethereum-contracts/contracts/superfluid/ConstantOutflowNFT__factory.ts +1 -1
- package/types/factories/contracts/IQuoter.sol/IQuoterV2__factory.ts +226 -0
- package/types/factories/contracts/IQuoter.sol/index.ts +4 -0
- package/types/factories/contracts/Interfaces.sol/AToken__factory.ts +36 -0
- package/types/factories/contracts/Interfaces.sol/IAaveIncentivesControllerV3__factory.ts +88 -0
- package/types/factories/contracts/Interfaces.sol/ILendingPoolV3__factory.ts +186 -0
- package/types/factories/contracts/fuseFaucet/Faucet__factory.ts +56 -1
- package/types/factories/contracts/fuseFaucet/FuseFaucetV2__factory.ts +1 -1
- package/types/factories/contracts/fuseFaucet/FuseFaucet__factory.ts +1 -1
- package/types/factories/contracts/fuseFaucet/SuperfluidBaseFacuet.sol/EthDistributorUpgradeable__factory.ts +572 -0
- package/types/factories/contracts/fuseFaucet/SuperfluidBaseFacuet.sol/EthDistributor__factory.ts +482 -0
- package/types/factories/contracts/fuseFaucet/SuperfluidBaseFacuet.sol/index.ts +4 -0
- package/types/factories/contracts/fuseFaucet/SuperfluidFacuet.sol/SuperfluidFaucet__factory.ts +45 -27
- package/types/factories/contracts/governance/ClaimersDistribution__factory.ts +1 -1
- package/types/factories/contracts/governance/CompoundVotingMachine__factory.ts +1 -1
- package/types/factories/contracts/governance/GReputation__factory.ts +1 -1
- package/types/factories/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking__factory.ts +1 -1
- package/types/factories/contracts/governance/GovernanceStaking__factory.ts +1 -1
- package/types/factories/contracts/governance/Reputation__factory.ts +1 -1
- package/types/factories/contracts/governance/StakersDistribution__factory.ts +1 -1
- package/types/factories/contracts/identity/IdentityV2__factory.ts +1 -1
- package/types/factories/contracts/identity/IdentityV3__factory.ts +1140 -0
- package/types/factories/contracts/identity/index.ts +1 -0
- package/types/factories/contracts/index.ts +1 -0
- package/types/factories/contracts/invite/InvitesFuseV2__factory.ts +1 -1
- package/types/factories/contracts/invite/InvitesV1__factory.ts +1 -1
- package/types/factories/contracts/invite/InvitesV2__factory.ts +1 -1
- package/types/factories/contracts/invite/OneTimeReward__factory.ts +1 -1
- package/types/factories/contracts/mocks/AaveMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/AaveUSDMockOracle__factory.ts +1 -1
- package/types/factories/contracts/mocks/BatUSDMockOracle__factory.ts +1 -1
- package/types/factories/contracts/mocks/CBATMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CDAILowWorthMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CDAIMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CDAINonMintableMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CDecimalsMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CSDTMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CUSDCMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/CeloDistributionHelperTest.sol/CeloDistributionHelperTestHelper__factory.ts +1 -1
- package/types/factories/contracts/mocks/CeloDistributionHelperTest.sol/CeloDistributionHelperTest__factory.ts +1 -1
- package/types/factories/contracts/mocks/CeloDistributionHelperTest.sol/DistributionHelperTestHelper__factory.ts +929 -0
- package/types/factories/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle__factory.ts +1 -1
- package/types/factories/contracts/mocks/DAIMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/DaiEthPriceMockOracle__factory.ts +1 -1
- package/types/factories/contracts/mocks/DecimalsMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/DistributionBridgeMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper__factory.ts +1 -1
- package/types/factories/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest__factory.ts +1 -1
- package/types/factories/contracts/mocks/EthUSDMockOracle__factory.ts +1 -1
- package/types/factories/contracts/mocks/FeesFormularMock.sol/FeesFormulaMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/GasPriceMockOracle__factory.ts +1 -1
- package/types/factories/contracts/mocks/GoodCompoundStakingTest__factory.ts +1 -1
- package/types/factories/contracts/mocks/GoodDollarStakingMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/GoodFundManagerTest__factory.ts +1 -1
- package/types/factories/contracts/mocks/IdentityMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/IncentiveControllerMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/LendingPoolMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/MultichainRouterMock.sol/MultichainRouterMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/OverMintTester.sol/OverMintTester__factory.ts +1 -1
- package/types/factories/contracts/mocks/OverMintTesterRegularStake__factory.ts +1 -1
- package/types/factories/contracts/mocks/PayableMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/SixteenDecimalsTokenMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/StakingMockFixedAPY__factory.ts +1 -1
- package/types/factories/contracts/mocks/SwapHelperTest__factory.ts +1 -1
- package/types/factories/contracts/mocks/TwentyDecimalsTokenMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock2__factory.ts +1 -1
- package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock3__factory.ts +1 -1
- package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock4__factory.ts +1 -1
- package/types/factories/contracts/mocks/UpgradableMocks.sol/UpgradableMock__factory.ts +1 -1
- package/types/factories/contracts/mocks/UsdcMock.sol/USDCMock__factory.ts +1 -1
- package/types/factories/contracts/reserve/CeloDistributionHelper__factory.ts +1 -1
- package/types/factories/contracts/reserve/DistributionHelper__factory.ts +1 -1
- package/types/factories/contracts/reserve/ExchangeHelper__factory.ts +1 -1
- package/types/factories/contracts/reserve/GoodMarketMaker__factory.ts +1 -1
- package/types/factories/contracts/reserve/GoodReserveADai__factory.ts +1502 -0
- package/types/factories/contracts/reserve/GoodReserveCDai.sol/GoodReserveCDai__factory.ts +1 -1
- package/types/factories/contracts/staking/BaseShareFieldV2__factory.ts +1 -1
- package/types/factories/contracts/staking/BaseShareField__factory.ts +1 -1
- package/types/factories/contracts/staking/DonationsStaking__factory.ts +1 -1
- package/types/factories/contracts/staking/FuseStakingV3.sol/FuseStakingV3__factory.ts +1 -1
- package/types/factories/contracts/staking/GoodFundManager__factory.ts +1 -1
- package/types/factories/contracts/staking/UniswapV2SwapHelper__factory.ts +1 -1
- package/types/factories/contracts/staking/aave/AaveStakingFactory__factory.ts +1 -1
- package/types/factories/contracts/staking/aave/GoodAave3StakingV2.sol/GoodAaveStakingV2__factory.ts +1240 -0
- package/types/factories/contracts/staking/aave/GoodAave3StakingV2.sol/index.ts +4 -0
- package/types/factories/contracts/staking/aave/GoodAaveStakingV2__factory.ts +1 -1
- package/types/factories/contracts/staking/aave/GoodAaveStaking__factory.ts +1 -1
- package/types/factories/contracts/staking/compound/CompoundStakingFactory__factory.ts +1 -1
- package/types/factories/contracts/staking/compound/GoodCompoundStakingV2__factory.ts +1 -1
- package/types/factories/contracts/staking/compound/GoodCompoundStaking__factory.ts +1 -1
- package/types/factories/contracts/token/ERC20PresetMinterPauserUpgradeable__factory.ts +1 -1
- package/types/factories/contracts/token/GoodDollar18__factory.ts +1257 -0
- package/types/factories/contracts/token/GoodDollar2__factory.ts +1257 -0
- package/types/factories/contracts/token/GoodDollar__factory.ts +1 -1
- package/types/factories/contracts/token/MultichainFeeFormula__factory.ts +1 -1
- package/types/factories/contracts/token/index.ts +1 -0
- package/types/factories/contracts/token/superfluid/ISuperToken__factory.ts +0 -52
- package/types/factories/contracts/token/superfluid/SuperGoodDollar__factory.ts +1 -73
- package/types/factories/contracts/token/superfluid/SuperToken__factory.ts +1 -53
- package/types/factories/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy__factory.ts +1 -1
- package/types/factories/contracts/ubi/UBISchemeV2__factory.ts +1 -6
- package/types/factories/contracts/ubi/UBIScheme__factory.ts +1 -1
- package/types/factories/contracts/utils/AdminWalletFuse__factory.ts +1 -1
- package/types/factories/contracts/utils/AdminWallet__factory.ts +1 -1
- package/types/factories/contracts/utils/BancorFormula__factory.ts +1 -1
- package/types/factories/contracts/utils/BulkWhitelist__factory.ts +1 -1
- package/types/factories/contracts/utils/BuyAndBridgeHelper__factory.ts +1 -1
- package/types/factories/contracts/utils/BuyFromReserveHelper__factory.ts +566 -0
- package/types/factories/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory__factory.ts +1 -1
- package/types/factories/contracts/utils/BuyGDClone.sol/BuyGDClone__factory.ts +1 -1
- package/types/factories/contracts/utils/BuyGDClone.sol/DonateGDClone__factory.ts +1 -1
- package/types/factories/contracts/utils/BuyGDClone.sol/IQuoterV2__factory.ts +126 -0
- package/types/factories/contracts/utils/BuyGDClone.sol/ISwapRouter__factory.ts +220 -0
- package/types/factories/contracts/utils/DAOContract__factory.ts +1 -1
- package/types/factories/contracts/utils/DAOUpgradeableContract__factory.ts +1 -1
- package/types/factories/contracts/utils/FuseOldBridgeKill.sol/BasicAMBErc677ToErc677__factory.ts +86 -0
- package/types/factories/contracts/utils/FuseOldBridgeKill.sol/FuseOldBridgeKill__factory.ts +1 -1
- package/types/factories/contracts/utils/FuseOldBridgeKill.sol/Initializable__factory.ts +1 -1
- package/types/factories/contracts/utils/FuseOldBridgeKill.sol/Ownable__factory.ts +1 -1
- package/types/factories/contracts/utils/GDFaucet__factory.ts +1 -1
- package/types/factories/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper__factory.ts +1 -1
- package/types/factories/contracts/utils/IdentityFix__factory.ts +1 -1
- package/types/factories/contracts/utils/LastauthReduction__factory.ts +1 -1
- package/types/factories/contracts/utils/MultiCall.sol/Multicall__factory.ts +1 -1
- package/types/factories/contracts/utils/MultichainBridgeHelper__factory.ts +1 -1
- package/types/factories/contracts/utils/NameService__factory.ts +1 -1
- package/types/factories/contracts/utils/OneTimePaymentsV2__factory.ts +1 -1
- package/types/factories/contracts/utils/OneTimePayments__factory.ts +1 -1
- package/types/factories/contracts/utils/ProtoclUpgradeV4Mento.sol/ProtocolUpgradeV4Mento__factory.ts +1 -1
- package/types/factories/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade__factory.ts +1 -1
- package/types/factories/contracts/utils/ProtocolUpgradeFuseRecover__factory.ts +1 -1
- package/types/factories/contracts/utils/ProtocolUpgradeFuse__factory.ts +1 -1
- package/types/factories/contracts/utils/ProtocolUpgradeRecover__factory.ts +1 -1
- package/types/factories/contracts/utils/ProtocolUpgradeV4Mento.sol/MentoExchange__factory.ts +39 -0
- package/types/factories/contracts/utils/ProtocolUpgradeV4Mento.sol/ProtocolUpgradeV4Mento__factory.ts +152 -0
- package/types/factories/contracts/utils/ProtocolUpgradeV4Mento.sol/index.ts +5 -0
- package/types/factories/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy__factory.ts +1 -1
- package/types/factories/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967__factory.ts +1 -1
- package/types/factories/contracts/utils/ReputationTestHelper__factory.ts +1 -1
- package/types/factories/contracts/utils/ReserveRestore.sol/MentoExchange__factory.ts +39 -0
- package/types/factories/contracts/utils/ReserveRestore.sol/ReserveRestore__factory.ts +95 -0
- package/types/factories/contracts/utils/ReserveRestore.sol/index.ts +5 -0
- package/types/factories/contracts/utils/ReserveRestore__factory.ts +1 -1
- package/types/factories/contracts/utils/index.ts +1 -0
- package/types/hardhat.d.ts +45 -0
- package/types/index.ts +8 -2
|
@@ -165,8 +165,8 @@
|
|
|
165
165
|
"type": "function"
|
|
166
166
|
}
|
|
167
167
|
],
|
|
168
|
-
"bytecode": "
|
|
169
|
-
"deployedBytecode": "
|
|
168
|
+
"bytecode": "0x608060405234801561001057600080fd5b5060405161002060208201610044565b601f1982820381018352601f90910116604052805160209190910120600055610051565b6105c680610d8383390190565b610d23806100606000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106c9565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106e5565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c68061072883390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b50506000910152565b600082516106db8184602087016106a5565b9190910192915050565b60018060a01b038316815260406020820152600082518060408401526107128160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220a052ed38aeaa366b056c414db515d80820b6c3e4f102ba57be1a4c2dc0f60e6d64736f6c63430008130033a2646970667358221220c219a52ffd1d85e967482a4bef1ddd314c4c96bc3a9b6123fa5a915da413cb4064736f6c63430008130033608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220a052ed38aeaa366b056c414db515d80820b6c3e4f102ba57be1a4c2dc0f60e6d64736f6c63430008130033",
|
|
169
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630bf61a011461005c5780631b903b841461008557806340ad200d1461009857806381ae1f5b146100ab578063b3eeb5e2146100be575b600080fd5b61006f61006a366004610512565b6100d1565b60405161007c9190610568565b60405180910390f35b61006f61009336600461057c565b6100e7565b61006f6100a63660046105f7565b61016c565b61006f6100b936600461062c565b6101df565b61006f6100cc366004610658565b6101f5565b60006100df848484336102f2565b949350505050565b60008061012b853386868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506103cd92505050565b90507fcf78cf0d6f3d8371e1075c69c492ab4ec5d8cf23a1a239b6a51a1d00be7ca3128160405161015c9190610568565b60405180910390a1949350505050565b60008061017985856103fe565b6040516001600160f81b031960208201526001600160601b03193060601b166021820152603581018290526055810185905290915060009060750160408051808303601f1901815291905280516020909101206001600160a01b03169695505050505050565b60006101ee838360005461016c565b9392505050565b6000808360601b9050604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528160148201526e5af43d82803e903d91602b57fd5bf360881b60288201526037816000f09250507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349826040516102709190610568565b60405180910390a18251156102eb576000826001600160a01b03168460405161029991906106c9565b6000604051808303816000865af19150503d80600081146102d6576040519150601f19603f3d011682016040523d82523d6000602084013e6102db565b606091505b50509050806102e957600080fd5b505b5092915050565b6000806040518060200161030590610447565b601f1982820381018352601f90910116604052905060006103278785846103cd565b60405163347d5e2560e21b815290915081906001600160a01b0382169063d1f578949061035a908a908a906004016106e5565b600060405180830381600087803b15801561037457600080fd5b505af1158015610388573d6000803e3d6000fd5b505050507efffc2da0b561cae30d9826d37709e9421c4725faebc226cbbb7ef5fc5e7349816040516103ba9190610568565b60405180910390a1979650505050505050565b60008060006103dc86866103fe565b9050808451602086016000f59150813b6103f557600080fd5b50949350505050565b6000828260405160200161042992919091825260601b6001600160601b031916602082015260340190565b60405160208183030381529060405280519060200120905092915050565b6105c68061072883390190565b80356001600160a01b038116811461046b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261049757600080fd5b81356001600160401b03808211156104b1576104b1610470565b604051601f8301601f19908116603f011681019082821181831017156104d9576104d9610470565b816040528381528660208588010111156104f257600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060006060848603121561052757600080fd5b8335925061053760208501610454565b915060408401356001600160401b0381111561055257600080fd5b61055e86828701610486565b9150509250925092565b6001600160a01b0391909116815260200190565b60008060006040848603121561059157600080fd5b8335925060208401356001600160401b03808211156105af57600080fd5b818601915086601f8301126105c357600080fd5b8135818111156105d257600080fd5b8760208285010111156105e457600080fd5b6020830194508093505050509250925092565b60008060006060848603121561060c57600080fd5b8335925061061c60208501610454565b9150604084013590509250925092565b6000806040838503121561063f57600080fd5b8235915061064f60208401610454565b90509250929050565b6000806040838503121561066b57600080fd5b61067483610454565b915060208301356001600160401b0381111561068f57600080fd5b61069b85828601610486565b9150509250929050565b60005b838110156106c05781810151838201526020016106a8565b50506000910152565b600082516106db8184602087016106a5565b9190910192915050565b60018060a01b038316815260406020820152600082518060408401526107128160608501602087016106a5565b601f01601f191691909101606001939250505056fe608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220a052ed38aeaa366b056c414db515d80820b6c3e4f102ba57be1a4c2dc0f60e6d64736f6c63430008130033a2646970667358221220c219a52ffd1d85e967482a4bef1ddd314c4c96bc3a9b6123fa5a915da413cb4064736f6c63430008130033",
|
|
170
170
|
"linkReferences": {},
|
|
171
171
|
"deployedLinkReferences": {}
|
|
172
172
|
}
|
|
@@ -74,8 +74,8 @@
|
|
|
74
74
|
"type": "function"
|
|
75
75
|
}
|
|
76
76
|
],
|
|
77
|
-
"bytecode": "
|
|
78
|
-
"deployedBytecode": "
|
|
77
|
+
"bytecode": "0x608060405234801561001057600080fd5b5060405161033c38038061033c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102a9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fe58b3ba4a36af651c4135eafdc3d82a7d0e7d4e2696cf6bf0c343365bfd9a6764736f6c63430008130033",
|
|
78
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101c9565b61009d565b005b6100596100693660046101c9565b610136565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b81811015610130576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da908790879060040161020a565b6020604051808303816000875af11580156100f9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011d9190610223565b50806101288161024c565b9150506100a0565b50505050565b60005b8181101561013057600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac90610173908790879060040161020a565b6020604051808303816000875af1158015610192573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101b69190610223565b50806101c18161024c565b915050610139565b6000806000606084860312156101de57600080fd5b83356001600160a01b03811681146101f557600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561023557600080fd5b8151801515811461024557600080fd5b9392505050565b60006001820161026c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fe58b3ba4a36af651c4135eafdc3d82a7d0e7d4e2696cf6bf0c343365bfd9a6764736f6c63430008130033",
|
|
79
79
|
"linkReferences": {},
|
|
80
80
|
"deployedLinkReferences": {}
|
|
81
81
|
}
|
|
@@ -84,8 +84,8 @@
|
|
|
84
84
|
"type": "function"
|
|
85
85
|
}
|
|
86
86
|
],
|
|
87
|
-
"bytecode": "0x608060405234801561001057600080fd5b50604051620021cc380380620021cc8339810160408190526100319161005f565b600080546001600160a01b039092166001600160a01b0319928316179055600180549091163317905561008f565b60006020828403121561007157600080fd5b81516001600160a01b038116811461008857600080fd5b9392505050565b61212d806200009f6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630535df641461005c57806331a38c891461007b578063e0622b271461009f578063e69d849d146100b4578063efbe1c1c146100c7575b600080fd5b61006864e24b0714f081565b6040519081526020015b60405180910390f35b60005461008f90600160a01b900460ff1681565b6040519015158152602001610072565b6100b26100ad366004611cd1565b6100cf565b005b6100b26100c2366004611cd1565b610fb0565b6100b2611a21565b6001546001600160a01b031633146101025760405162461bcd60e51b81526004016100f990611cfd565b60405180910390fd5b600054600160a01b900460ff161561014f5760405162461bcd60e51b815260206004820152601060248201526f185b1c9958591e481d5c19dc9859195960821b60448201526064016100f9565b6000805460ff60a01b198116600160a01b17825560408051634162169f60e01b815290516001600160a01b0390921691634162169f916004808201926020929091908290030181865afa1580156101aa573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ce9190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561020b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061026390600401611d44565b602060405180830381865afa158015610280573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102a49190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac1906102d390600401611d65565b602060405180830381865afa1580156102f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103149190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b815260040161034393929190611d82565b6020604051808303816000875af1158015610362573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103869190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906103b690600401611d65565b602060405180830381865afa1580156103d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016104229190611dd6565b602060405180830381865afa15801561043f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104639190611dea565b9050690a968163f0a57b4000008110156104b45760405162461bcd60e51b81526020600482015260126024820152716e6f7420656e6f756768207265736572766560701b60448201526064016100f9565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906104e390600401611e03565b602060405180830381865afa158015610500573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105249190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061055890600401611d65565b602060405180830381865afa158015610575573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105999190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105ca9085908790600401611e21565b6020604051808303816000875af11580156105e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060d9190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015610658573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067c9190611dea565b9050801561069c5760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a08231906106cb903090600401611dd6565b602060405180830381865afa1580156106e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070c9190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb9061073d9089908590600401611e21565b6020604051808303816000875af115801561075c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107809190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906107ad908990600401611dd6565b602060405180830381865afa1580156107ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ee9190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061082790600401611e67565b602060405180830381865afa158015610844573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108689190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c99190611dea565b6108d39190611ea1565b90506109016040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000856001600160a01b031663182df0f56040518163ffffffff1660e01b8152600401602060405180830381865afa158015610941573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109659190611dea565b61097c906904ee2d6d415b85acef8160201b611eba565b90506109b460405180604001604052806014815260200173696e697469616c5072696365436461693a20257360601b81525082611c4f565b6109e56040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b60006109f18383611edc565b6109fc856064611edc565b610a0990620f4240611edc565b610a139190611eba565b9050610a4d6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190610a7c90600401611ef3565b602060405180830381865afa158015610a99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610abd9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b0e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b329190611d20565b8b888a8842604051602401610b4b959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610b9d9493929190611f9b565b6000604051808303816000875af1158015610bbc573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610be49190810190611fe5565b50905080610c045760405162461bcd60e51b81526004016100f9906120a5565b60005460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b038481169263d1b7089a9291169063bf40fac190606401602060405180830381865afa158015610c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca29190611d20565b60405167016345785d8a00006024820152670de0b6b3a76400006044820152606401604051602081830303815290604052631f06244f60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610d169493929190611f9b565b6000604051808303816000875af1158015610d35573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d5d9190810190611fe5565b50905080610dab5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d10dbdb9d1c9a589d5d1a5bdb94985d1a5bc819985a5b1959602a1b60448201526064016100f9565b60405160016024820181905260448201526001600160a01b0383169063d1b7089a908d90606401604051602081830303815290604052634345e97960e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610e249493929190611f9b565b6000604051808303816000875af1158015610e43573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e6b9190810190611fe5565b50905080610eb05760405162461bcd60e51b815260206004820152601260248201527119d91e08191a5cd8589b194819985a5b195960721b60448201526064016100f9565b816001600160a01b031663d1b7089a8c604051602401604051602081830303815290604052633f4ba83a60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610f189493929190611f9b565b6000604051808303816000875af1158015610f37573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f5f9190810190611fe5565b50905080610fa05760405162461bcd60e51b815260206004820152600e60248201526d1d5b9c185d5cd94819985a5b195960921b60448201526064016100f9565b5050505050505050505050505050565b6001546001600160a01b03163314610fda5760405162461bcd60e51b81526004016100f990611cfd565b60008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561102e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110529190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561108f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b39190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac1906110e790600401611d44565b602060405180830381865afa158015611104573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111289190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061115790600401611d65565b602060405180830381865afa158015611174573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111989190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b81526004016111c793929190611d82565b6020604051808303816000875af11580156111e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061120a9190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061123a90600401611d65565b602060405180830381865afa158015611257573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061127b9190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016112a69190611dd6565b602060405180830381865afa1580156112c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112e79190611dea565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061131b90600401611e03565b602060405180830381865afa158015611338573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135c9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061139090600401611d65565b602060405180830381865afa1580156113ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113d19190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906114029085908790600401611e21565b6020604051808303816000875af1158015611421573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114459190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015611490573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114b49190611dea565b905080156114d45760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a0823190611503903090600401611dd6565b602060405180830381865afa158015611520573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115449190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb906115759089908590600401611e21565b6020604051808303816000875af1158015611594573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b89190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906115e5908990600401611dd6565b602060405180830381865afa158015611602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116269190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061165f90600401611e67565b602060405180830381865afa15801561167c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116a09190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156116dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117019190611dea565b61170b9190611ea1565b90506117396040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000876001600160a01b0316639d1b464a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611779573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179d9190611dea565b90506117d16040518060400160405280601081526020016f63757272656e7450726963653a20257360801b81525082611c4f565b6118026040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b600061180e8383611edc565b611819856064611edc565b61182690620f4240611edc565b6118309190611eba565b905061186a6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061189990600401611ef3565b602060405180830381865afa1580156118b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118da9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561192b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061194f9190611d20565b8b888a8842604051602401611968959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b81526004016119ba9493929190611f9b565b6000604051808303816000875af11580156119d9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a019190810190611fe5565b50905080610fa05760405162461bcd60e51b81526004016100f9906120a5565b6001546001600160a01b03163314611a4b5760405162461bcd60e51b81526004016100f990611cfd565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190611a7a90600401611ef3565b602060405180830381865afa158015611a97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611abb9190611d20565b905060008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b11573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b359190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b969190611d20565b604051636c525b1360e01b81529091506001600160a01b03831690636c525b1390611bc5908490600401611dd6565b6020604051808303816000875af1158015611be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c089190611dbb565b611c4b5760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b60448201526064016100f9565b5050565b611c4b8282604051602401611c659291906120d5565b60408051601f198184030181529190526020810180516001600160e01b0316632d839cb360e21b179052611c9881611c9b565b50565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6001600160a01b0381168114611c9857600080fd5b60008060408385031215611ce457600080fd5b8235611cef81611cbc565b946020939093013593505050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b600060208284031215611d3257600080fd5b8151611d3d81611cbc565b9392505050565b6020808252600790820152665245534552564560c81b604082015260600190565b60208082526003908201526244414960e81b604082015260600190565b6001600160a01b039384168152919092166020820152604081019190915260600190565b80518015158114611db657600080fd5b919050565b600060208284031215611dcd57600080fd5b611d3d82611da6565b6001600160a01b0391909116815260200190565b600060208284031215611dfc57600080fd5b5051919050565b6020808252600490820152634344414960e01b604082015260600190565b6001600160a01b03929092168252602082015260400190565b602080825260139082015272135a5b9d1a5b99c818d1185a4819985a5b1959606a1b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b634e487b7160e01b600052601160045260246000fd5b81810381811115611eb457611eb4611e8b565b92915050565b600082611ed757634e487b7160e01b600052601260045260246000fd5b500490565b8082028115828204841417611eb457611eb4611e8b565b6020808252600a908201526921a7a72a2927a62622a960b11b604082015260600190565b6001600160a01b039590951685526020850193909352604084019190915263ffffffff166060830152608082015260a00190565b60005b83811015611f66578181015183820152602001611f4e565b50506000910152565b60008151808452611f87816020860160208601611f4b565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152611fbd6080840187611f6f565b94166040830152506060015292915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611ff857600080fd5b61200183611da6565b60208401519092506001600160401b038082111561201e57600080fd5b818501915085601f83011261203257600080fd5b81518181111561204457612044611fcf565b604051601f8201601f19908116603f0116810190838211818310171561206c5761206c611fcf565b8160405282815288602084870101111561208557600080fd5b612096836020830160208801611f4b565b80955050505050509250929050565b6020808252601690820152751a5b9a5d1a585b1a5e99551bdad95b8819985a5b195960521b604082015260600190565b6040815260006120e86040830185611f6f565b9050826020830152939250505056fea2646970667358221220ffb38134d731545d99fae169284a88aed40adf0aee76e62c961694e116d95e5064736f6c63430008130033",
|
|
88
|
-
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630535df641461005c57806331a38c891461007b578063e0622b271461009f578063e69d849d146100b4578063efbe1c1c146100c7575b600080fd5b61006864e24b0714f081565b6040519081526020015b60405180910390f35b60005461008f90600160a01b900460ff1681565b6040519015158152602001610072565b6100b26100ad366004611cd1565b6100cf565b005b6100b26100c2366004611cd1565b610fb0565b6100b2611a21565b6001546001600160a01b031633146101025760405162461bcd60e51b81526004016100f990611cfd565b60405180910390fd5b600054600160a01b900460ff161561014f5760405162461bcd60e51b815260206004820152601060248201526f185b1c9958591e481d5c19dc9859195960821b60448201526064016100f9565b6000805460ff60a01b198116600160a01b17825560408051634162169f60e01b815290516001600160a01b0390921691634162169f916004808201926020929091908290030181865afa1580156101aa573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ce9190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561020b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061026390600401611d44565b602060405180830381865afa158015610280573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102a49190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac1906102d390600401611d65565b602060405180830381865afa1580156102f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103149190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b815260040161034393929190611d82565b6020604051808303816000875af1158015610362573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103869190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906103b690600401611d65565b602060405180830381865afa1580156103d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016104229190611dd6565b602060405180830381865afa15801561043f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104639190611dea565b9050690a968163f0a57b4000008110156104b45760405162461bcd60e51b81526020600482015260126024820152716e6f7420656e6f756768207265736572766560701b60448201526064016100f9565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906104e390600401611e03565b602060405180830381865afa158015610500573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105249190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061055890600401611d65565b602060405180830381865afa158015610575573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105999190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105ca9085908790600401611e21565b6020604051808303816000875af11580156105e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060d9190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015610658573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067c9190611dea565b9050801561069c5760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a08231906106cb903090600401611dd6565b602060405180830381865afa1580156106e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070c9190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb9061073d9089908590600401611e21565b6020604051808303816000875af115801561075c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107809190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906107ad908990600401611dd6565b602060405180830381865afa1580156107ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ee9190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061082790600401611e67565b602060405180830381865afa158015610844573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108689190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c99190611dea565b6108d39190611ea1565b90506109016040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000856001600160a01b031663182df0f56040518163ffffffff1660e01b8152600401602060405180830381865afa158015610941573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109659190611dea565b61097c906904ee2d6d415b85acef8160201b611eba565b90506109b460405180604001604052806014815260200173696e697469616c5072696365436461693a20257360601b81525082611c4f565b6109e56040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b60006109f18383611edc565b6109fc856064611edc565b610a0990620f4240611edc565b610a139190611eba565b9050610a4d6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190610a7c90600401611ef3565b602060405180830381865afa158015610a99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610abd9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b0e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b329190611d20565b8b888a8842604051602401610b4b959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610b9d9493929190611f9b565b6000604051808303816000875af1158015610bbc573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610be49190810190611fe5565b50905080610c045760405162461bcd60e51b81526004016100f9906120a5565b60005460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b038481169263d1b7089a9291169063bf40fac190606401602060405180830381865afa158015610c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca29190611d20565b60405167016345785d8a00006024820152670de0b6b3a76400006044820152606401604051602081830303815290604052631f06244f60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610d169493929190611f9b565b6000604051808303816000875af1158015610d35573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d5d9190810190611fe5565b50905080610dab5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d10dbdb9d1c9a589d5d1a5bdb94985d1a5bc819985a5b1959602a1b60448201526064016100f9565b60405160016024820181905260448201526001600160a01b0383169063d1b7089a908d90606401604051602081830303815290604052634345e97960e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610e249493929190611f9b565b6000604051808303816000875af1158015610e43573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e6b9190810190611fe5565b50905080610eb05760405162461bcd60e51b815260206004820152601260248201527119d91e08191a5cd8589b194819985a5b195960721b60448201526064016100f9565b816001600160a01b031663d1b7089a8c604051602401604051602081830303815290604052633f4ba83a60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610f189493929190611f9b565b6000604051808303816000875af1158015610f37573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f5f9190810190611fe5565b50905080610fa05760405162461bcd60e51b815260206004820152600e60248201526d1d5b9c185d5cd94819985a5b195960921b60448201526064016100f9565b5050505050505050505050505050565b6001546001600160a01b03163314610fda5760405162461bcd60e51b81526004016100f990611cfd565b60008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561102e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110529190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561108f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b39190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac1906110e790600401611d44565b602060405180830381865afa158015611104573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111289190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061115790600401611d65565b602060405180830381865afa158015611174573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111989190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b81526004016111c793929190611d82565b6020604051808303816000875af11580156111e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061120a9190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061123a90600401611d65565b602060405180830381865afa158015611257573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061127b9190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016112a69190611dd6565b602060405180830381865afa1580156112c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112e79190611dea565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061131b90600401611e03565b602060405180830381865afa158015611338573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135c9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061139090600401611d65565b602060405180830381865afa1580156113ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113d19190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906114029085908790600401611e21565b6020604051808303816000875af1158015611421573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114459190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015611490573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114b49190611dea565b905080156114d45760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a0823190611503903090600401611dd6565b602060405180830381865afa158015611520573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115449190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb906115759089908590600401611e21565b6020604051808303816000875af1158015611594573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b89190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906115e5908990600401611dd6565b602060405180830381865afa158015611602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116269190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061165f90600401611e67565b602060405180830381865afa15801561167c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116a09190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156116dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117019190611dea565b61170b9190611ea1565b90506117396040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000876001600160a01b0316639d1b464a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611779573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179d9190611dea565b90506117d16040518060400160405280601081526020016f63757272656e7450726963653a20257360801b81525082611c4f565b6118026040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b600061180e8383611edc565b611819856064611edc565b61182690620f4240611edc565b6118309190611eba565b905061186a6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061189990600401611ef3565b602060405180830381865afa1580156118b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118da9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561192b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061194f9190611d20565b8b888a8842604051602401611968959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b81526004016119ba9493929190611f9b565b6000604051808303816000875af11580156119d9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a019190810190611fe5565b50905080610fa05760405162461bcd60e51b81526004016100f9906120a5565b6001546001600160a01b03163314611a4b5760405162461bcd60e51b81526004016100f990611cfd565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190611a7a90600401611ef3565b602060405180830381865afa158015611a97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611abb9190611d20565b905060008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b11573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b359190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b969190611d20565b604051636c525b1360e01b81529091506001600160a01b03831690636c525b1390611bc5908490600401611dd6565b6020604051808303816000875af1158015611be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c089190611dbb565b611c4b5760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b60448201526064016100f9565b5050565b611c4b8282604051602401611c659291906120d5565b60408051601f198184030181529190526020810180516001600160e01b0316632d839cb360e21b179052611c9881611c9b565b50565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6001600160a01b0381168114611c9857600080fd5b60008060408385031215611ce457600080fd5b8235611cef81611cbc565b946020939093013593505050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b600060208284031215611d3257600080fd5b8151611d3d81611cbc565b9392505050565b6020808252600790820152665245534552564560c81b604082015260600190565b60208082526003908201526244414960e81b604082015260600190565b6001600160a01b039384168152919092166020820152604081019190915260600190565b80518015158114611db657600080fd5b919050565b600060208284031215611dcd57600080fd5b611d3d82611da6565b6001600160a01b0391909116815260200190565b600060208284031215611dfc57600080fd5b5051919050565b6020808252600490820152634344414960e01b604082015260600190565b6001600160a01b03929092168252602082015260400190565b602080825260139082015272135a5b9d1a5b99c818d1185a4819985a5b1959606a1b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b634e487b7160e01b600052601160045260246000fd5b81810381811115611eb457611eb4611e8b565b92915050565b600082611ed757634e487b7160e01b600052601260045260246000fd5b500490565b8082028115828204841417611eb457611eb4611e8b565b6020808252600a908201526921a7a72a2927a62622a960b11b604082015260600190565b6001600160a01b039590951685526020850193909352604084019190915263ffffffff166060830152608082015260a00190565b60005b83811015611f66578181015183820152602001611f4e565b50506000910152565b60008151808452611f87816020860160208601611f4b565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152611fbd6080840187611f6f565b94166040830152506060015292915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611ff857600080fd5b61200183611da6565b60208401519092506001600160401b038082111561201e57600080fd5b818501915085601f83011261203257600080fd5b81518181111561204457612044611fcf565b604051601f8201601f19908116603f0116810190838211818310171561206c5761206c611fcf565b8160405282815288602084870101111561208557600080fd5b612096836020830160208801611f4b565b80955050505050509250929050565b6020808252601690820152751a5b9a5d1a585b1a5e99551bdad95b8819985a5b195960521b604082015260600190565b6040815260006120e86040830185611f6f565b9050826020830152939250505056fea2646970667358221220ffb38134d731545d99fae169284a88aed40adf0aee76e62c961694e116d95e5064736f6c63430008130033",
|
|
87
|
+
"bytecode": "0x608060405234801561001057600080fd5b50604051620021cc380380620021cc8339810160408190526100319161005f565b600080546001600160a01b039092166001600160a01b0319928316179055600180549091163317905561008f565b60006020828403121561007157600080fd5b81516001600160a01b038116811461008857600080fd5b9392505050565b61212d806200009f6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630535df641461005c57806331a38c891461007b578063e0622b271461009f578063e69d849d146100b4578063efbe1c1c146100c7575b600080fd5b61006864e24b0714f081565b6040519081526020015b60405180910390f35b60005461008f90600160a01b900460ff1681565b6040519015158152602001610072565b6100b26100ad366004611cd1565b6100cf565b005b6100b26100c2366004611cd1565b610fb0565b6100b2611a21565b6001546001600160a01b031633146101025760405162461bcd60e51b81526004016100f990611cfd565b60405180910390fd5b600054600160a01b900460ff161561014f5760405162461bcd60e51b815260206004820152601060248201526f185b1c9958591e481d5c19dc9859195960821b60448201526064016100f9565b6000805460ff60a01b198116600160a01b17825560408051634162169f60e01b815290516001600160a01b0390921691634162169f916004808201926020929091908290030181865afa1580156101aa573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ce9190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561020b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061026390600401611d44565b602060405180830381865afa158015610280573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102a49190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac1906102d390600401611d65565b602060405180830381865afa1580156102f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103149190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b815260040161034393929190611d82565b6020604051808303816000875af1158015610362573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103869190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906103b690600401611d65565b602060405180830381865afa1580156103d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016104229190611dd6565b602060405180830381865afa15801561043f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104639190611dea565b9050690a968163f0a57b4000008110156104b45760405162461bcd60e51b81526020600482015260126024820152716e6f7420656e6f756768207265736572766560701b60448201526064016100f9565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906104e390600401611e03565b602060405180830381865afa158015610500573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105249190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061055890600401611d65565b602060405180830381865afa158015610575573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105999190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105ca9085908790600401611e21565b6020604051808303816000875af11580156105e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060d9190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015610658573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067c9190611dea565b9050801561069c5760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a08231906106cb903090600401611dd6565b602060405180830381865afa1580156106e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070c9190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb9061073d9089908590600401611e21565b6020604051808303816000875af115801561075c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107809190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906107ad908990600401611dd6565b602060405180830381865afa1580156107ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ee9190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061082790600401611e67565b602060405180830381865afa158015610844573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108689190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c99190611dea565b6108d39190611ea1565b90506109016040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000856001600160a01b031663182df0f56040518163ffffffff1660e01b8152600401602060405180830381865afa158015610941573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109659190611dea565b61097c906904ee2d6d415b85acef8160201b611eba565b90506109b460405180604001604052806014815260200173696e697469616c5072696365436461693a20257360601b81525082611c4f565b6109e56040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b60006109f18383611edc565b6109fc856064611edc565b610a0990620f4240611edc565b610a139190611eba565b9050610a4d6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190610a7c90600401611ef3565b602060405180830381865afa158015610a99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610abd9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b0e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b329190611d20565b8b888a8842604051602401610b4b959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610b9d9493929190611f9b565b6000604051808303816000875af1158015610bbc573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610be49190810190611fe5565b50905080610c045760405162461bcd60e51b81526004016100f9906120a5565b60005460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b038481169263d1b7089a9291169063bf40fac190606401602060405180830381865afa158015610c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca29190611d20565b60405167016345785d8a00006024820152670de0b6b3a76400006044820152606401604051602081830303815290604052631f06244f60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610d169493929190611f9b565b6000604051808303816000875af1158015610d35573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d5d9190810190611fe5565b50905080610dab5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d10dbdb9d1c9a589d5d1a5bdb94985d1a5bc819985a5b1959602a1b60448201526064016100f9565b60405160016024820181905260448201526001600160a01b0383169063d1b7089a908d90606401604051602081830303815290604052634345e97960e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610e249493929190611f9b565b6000604051808303816000875af1158015610e43573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e6b9190810190611fe5565b50905080610eb05760405162461bcd60e51b815260206004820152601260248201527119d91e08191a5cd8589b194819985a5b195960721b60448201526064016100f9565b816001600160a01b031663d1b7089a8c604051602401604051602081830303815290604052633f4ba83a60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610f189493929190611f9b565b6000604051808303816000875af1158015610f37573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f5f9190810190611fe5565b50905080610fa05760405162461bcd60e51b815260206004820152600e60248201526d1d5b9c185d5cd94819985a5b195960921b60448201526064016100f9565b5050505050505050505050505050565b6001546001600160a01b03163314610fda5760405162461bcd60e51b81526004016100f990611cfd565b60008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561102e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110529190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561108f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b39190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac1906110e790600401611d44565b602060405180830381865afa158015611104573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111289190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061115790600401611d65565b602060405180830381865afa158015611174573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111989190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b81526004016111c793929190611d82565b6020604051808303816000875af11580156111e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061120a9190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061123a90600401611d65565b602060405180830381865afa158015611257573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061127b9190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016112a69190611dd6565b602060405180830381865afa1580156112c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112e79190611dea565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061131b90600401611e03565b602060405180830381865afa158015611338573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135c9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061139090600401611d65565b602060405180830381865afa1580156113ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113d19190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906114029085908790600401611e21565b6020604051808303816000875af1158015611421573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114459190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015611490573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114b49190611dea565b905080156114d45760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a0823190611503903090600401611dd6565b602060405180830381865afa158015611520573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115449190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb906115759089908590600401611e21565b6020604051808303816000875af1158015611594573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b89190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906115e5908990600401611dd6565b602060405180830381865afa158015611602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116269190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061165f90600401611e67565b602060405180830381865afa15801561167c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116a09190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156116dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117019190611dea565b61170b9190611ea1565b90506117396040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000876001600160a01b0316639d1b464a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611779573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179d9190611dea565b90506117d16040518060400160405280601081526020016f63757272656e7450726963653a20257360801b81525082611c4f565b6118026040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b600061180e8383611edc565b611819856064611edc565b61182690620f4240611edc565b6118309190611eba565b905061186a6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061189990600401611ef3565b602060405180830381865afa1580156118b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118da9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561192b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061194f9190611d20565b8b888a8842604051602401611968959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b81526004016119ba9493929190611f9b565b6000604051808303816000875af11580156119d9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a019190810190611fe5565b50905080610fa05760405162461bcd60e51b81526004016100f9906120a5565b6001546001600160a01b03163314611a4b5760405162461bcd60e51b81526004016100f990611cfd565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190611a7a90600401611ef3565b602060405180830381865afa158015611a97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611abb9190611d20565b905060008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b11573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b359190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b969190611d20565b604051636c525b1360e01b81529091506001600160a01b03831690636c525b1390611bc5908490600401611dd6565b6020604051808303816000875af1158015611be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c089190611dbb565b611c4b5760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b60448201526064016100f9565b5050565b611c4b8282604051602401611c659291906120d5565b60408051601f198184030181529190526020810180516001600160e01b0316632d839cb360e21b179052611c9881611c9b565b50565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6001600160a01b0381168114611c9857600080fd5b60008060408385031215611ce457600080fd5b8235611cef81611cbc565b946020939093013593505050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b600060208284031215611d3257600080fd5b8151611d3d81611cbc565b9392505050565b6020808252600790820152665245534552564560c81b604082015260600190565b60208082526003908201526244414960e81b604082015260600190565b6001600160a01b039384168152919092166020820152604081019190915260600190565b80518015158114611db657600080fd5b919050565b600060208284031215611dcd57600080fd5b611d3d82611da6565b6001600160a01b0391909116815260200190565b600060208284031215611dfc57600080fd5b5051919050565b6020808252600490820152634344414960e01b604082015260600190565b6001600160a01b03929092168252602082015260400190565b602080825260139082015272135a5b9d1a5b99c818d1185a4819985a5b1959606a1b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b634e487b7160e01b600052601160045260246000fd5b81810381811115611eb457611eb4611e8b565b92915050565b600082611ed757634e487b7160e01b600052601260045260246000fd5b500490565b8082028115828204841417611eb457611eb4611e8b565b6020808252600a908201526921a7a72a2927a62622a960b11b604082015260600190565b6001600160a01b039590951685526020850193909352604084019190915263ffffffff166060830152608082015260a00190565b60005b83811015611f66578181015183820152602001611f4e565b50506000910152565b60008151808452611f87816020860160208601611f4b565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152611fbd6080840187611f6f565b94166040830152506060015292915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611ff857600080fd5b61200183611da6565b60208401519092506001600160401b038082111561201e57600080fd5b818501915085601f83011261203257600080fd5b81518181111561204457612044611fcf565b604051601f8201601f19908116603f0116810190838211818310171561206c5761206c611fcf565b8160405282815288602084870101111561208557600080fd5b612096836020830160208801611f4b565b80955050505050509250929050565b6020808252601690820152751a5b9a5d1a585b1a5e99551bdad95b8819985a5b195960521b604082015260600190565b6040815260006120e86040830185611f6f565b9050826020830152939250505056fea26469706673582212209f45da7caf161673de83636a0932d38140fafe8cfa0f579a7ccb755d1c9b194564736f6c63430008130033",
|
|
88
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630535df641461005c57806331a38c891461007b578063e0622b271461009f578063e69d849d146100b4578063efbe1c1c146100c7575b600080fd5b61006864e24b0714f081565b6040519081526020015b60405180910390f35b60005461008f90600160a01b900460ff1681565b6040519015158152602001610072565b6100b26100ad366004611cd1565b6100cf565b005b6100b26100c2366004611cd1565b610fb0565b6100b2611a21565b6001546001600160a01b031633146101025760405162461bcd60e51b81526004016100f990611cfd565b60405180910390fd5b600054600160a01b900460ff161561014f5760405162461bcd60e51b815260206004820152601060248201526f185b1c9958591e481d5c19dc9859195960821b60448201526064016100f9565b6000805460ff60a01b198116600160a01b17825560408051634162169f60e01b815290516001600160a01b0390921691634162169f916004808201926020929091908290030181865afa1580156101aa573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ce9190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561020b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061026390600401611d44565b602060405180830381865afa158015610280573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102a49190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac1906102d390600401611d65565b602060405180830381865afa1580156102f0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103149190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b815260040161034393929190611d82565b6020604051808303816000875af1158015610362573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103869190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906103b690600401611d65565b602060405180830381865afa1580156103d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016104229190611dd6565b602060405180830381865afa15801561043f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104639190611dea565b9050690a968163f0a57b4000008110156104b45760405162461bcd60e51b81526020600482015260126024820152716e6f7420656e6f756768207265736572766560701b60448201526064016100f9565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906104e390600401611e03565b602060405180830381865afa158015610500573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105249190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061055890600401611d65565b602060405180830381865afa158015610575573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105999190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105ca9085908790600401611e21565b6020604051808303816000875af11580156105e9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060d9190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015610658573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061067c9190611dea565b9050801561069c5760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a08231906106cb903090600401611dd6565b602060405180830381865afa1580156106e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070c9190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb9061073d9089908590600401611e21565b6020604051808303816000875af115801561075c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107809190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906107ad908990600401611dd6565b602060405180830381865afa1580156107ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ee9190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061082790600401611e67565b602060405180830381865afa158015610844573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108689190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c99190611dea565b6108d39190611ea1565b90506109016040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000856001600160a01b031663182df0f56040518163ffffffff1660e01b8152600401602060405180830381865afa158015610941573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109659190611dea565b61097c906904ee2d6d415b85acef8160201b611eba565b90506109b460405180604001604052806014815260200173696e697469616c5072696365436461693a20257360601b81525082611c4f565b6109e56040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b60006109f18383611edc565b6109fc856064611edc565b610a0990620f4240611edc565b610a139190611eba565b9050610a4d6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190610a7c90600401611ef3565b602060405180830381865afa158015610a99573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610abd9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b0e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b329190611d20565b8b888a8842604051602401610b4b959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610b9d9493929190611f9b565b6000604051808303816000875af1158015610bbc573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610be49190810190611fe5565b50905080610c045760405162461bcd60e51b81526004016100f9906120a5565b60005460405163bf40fac160e01b815260206004820152601860248201527721a7a72a2924a12aaa24a7a72fa1a0a621aaa620aa24a7a760411b60448201526001600160a01b038481169263d1b7089a9291169063bf40fac190606401602060405180830381865afa158015610c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca29190611d20565b60405167016345785d8a00006024820152670de0b6b3a76400006044820152606401604051602081830303815290604052631f06244f60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610d169493929190611f9b565b6000604051808303816000875af1158015610d35573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d5d9190810190611fe5565b50905080610dab5760405162461bcd60e51b815260206004820152601b60248201527a1cd95d10dbdb9d1c9a589d5d1a5bdb94985d1a5bc819985a5b1959602a1b60448201526064016100f9565b60405160016024820181905260448201526001600160a01b0383169063d1b7089a908d90606401604051602081830303815290604052634345e97960e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610e249493929190611f9b565b6000604051808303816000875af1158015610e43573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e6b9190810190611fe5565b50905080610eb05760405162461bcd60e51b815260206004820152601260248201527119d91e08191a5cd8589b194819985a5b195960721b60448201526064016100f9565b816001600160a01b031663d1b7089a8c604051602401604051602081830303815290604052633f4ba83a60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b8152600401610f189493929190611f9b565b6000604051808303816000875af1158015610f37573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610f5f9190810190611fe5565b50905080610fa05760405162461bcd60e51b815260206004820152600e60248201526d1d5b9c185d5cd94819985a5b195960921b60448201526064016100f9565b5050505050505050505050505050565b6001546001600160a01b03163314610fda5760405162461bcd60e51b81526004016100f990611cfd565b60008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561102e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110529190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa15801561108f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110b39190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac1906110e790600401611d44565b602060405180830381865afa158015611104573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111289190611d20565b60005460405163bf40fac160e01b81529192506001600160a01b03169063bf40fac19061115790600401611d65565b602060405180830381865afa158015611174573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111989190611d20565b6001600160a01b03166323b872dd8530866040518463ffffffff1660e01b81526004016111c793929190611d82565b6020604051808303816000875af11580156111e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061120a9190611dbb565b506000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061123a90600401611d65565b602060405180830381865afa158015611257573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061127b9190611d20565b6001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016112a69190611dd6565b602060405180830381865afa1580156112c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112e79190611dea565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061131b90600401611e03565b602060405180830381865afa158015611338573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135c9190611d20565b6000805460405163bf40fac160e01b815292935090916001600160a01b039091169063bf40fac19061139090600401611d65565b602060405180830381865afa1580156113ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113d19190611d20565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906114029085908790600401611e21565b6020604051808303816000875af1158015611421573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114459190611dbb565b5060405163140e25ad60e31b8152600481018490526000906001600160a01b0384169063a0712d68906024016020604051808303816000875af1158015611490573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114b49190611dea565b905080156114d45760405162461bcd60e51b81526004016100f990611e3a565b6040516370a0823160e01b81526000906001600160a01b038516906370a0823190611503903090600401611dd6565b602060405180830381865afa158015611520573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115449190611dea565b60405163a9059cbb60e01b81529091506001600160a01b0385169063a9059cbb906115759089908590600401611e21565b6020604051808303816000875af1158015611594573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115b89190611dbb565b506040516370a0823160e01b81526001600160a01b038516906370a08231906115e5908990600401611dd6565b602060405180830381865afa158015611602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116269190611dea565b6000805460405163bf40fac160e01b8152929350909164e24b0714f0916001600160a01b03169063bf40fac19061165f90600401611e67565b602060405180830381865afa15801561167c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116a09190611d20565b6001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156116dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117019190611dea565b61170b9190611ea1565b90506117396040518060400160405280600a815260200169737570706c793a20257360b01b81525082611c4f565b6000876001600160a01b0316639d1b464a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611779573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179d9190611dea565b90506117d16040518060400160405280601081526020016f63757272656e7450726963653a20257360801b81525082611c4f565b6118026040518060400160405280600f81526020016e6364616942616c616e63653a20257360881b81525084611c4f565b600061180e8383611edc565b611819856064611edc565b61182690620f4240611edc565b6118309190611eba565b905061186a6040518060400160405280601081526020016f72657365727665526174696f3a20257360801b8152508263ffffffff16611c4f565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061189990600401611ef3565b602060405180830381865afa1580156118b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118da9190611d20565b90506000816001600160a01b031663d1b7089a8c6001600160a01b031663e092b0676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561192b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061194f9190611d20565b8b888a8842604051602401611968959493929190611f17565b604051602081830303815290604052638ee090fb60e01b6020820180516001600160e01b0383818316178352505050508f60006040518563ffffffff1660e01b81526004016119ba9493929190611f9b565b6000604051808303816000875af11580156119d9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a019190810190611fe5565b50905080610fa05760405162461bcd60e51b81526004016100f9906120a5565b6001546001600160a01b03163314611a4b5760405162461bcd60e51b81526004016100f990611cfd565b6000805460405163bf40fac160e01b81526001600160a01b039091169063bf40fac190611a7a90600401611ef3565b602060405180830381865afa158015611a97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611abb9190611d20565b905060008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b11573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b359190611d20565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa158015611b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b969190611d20565b604051636c525b1360e01b81529091506001600160a01b03831690636c525b1390611bc5908490600401611dd6565b6020604051808303816000875af1158015611be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c089190611dbb565b611c4b5760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b60448201526064016100f9565b5050565b611c4b8282604051602401611c659291906120d5565b60408051601f198184030181529190526020810180516001600160e01b0316632d839cb360e21b179052611c9881611c9b565b50565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6001600160a01b0381168114611c9857600080fd5b60008060408385031215611ce457600080fd5b8235611cef81611cbc565b946020939093013593505050565b6020808252600990820152683737ba1037bbb732b960b91b604082015260600190565b600060208284031215611d3257600080fd5b8151611d3d81611cbc565b9392505050565b6020808252600790820152665245534552564560c81b604082015260600190565b60208082526003908201526244414960e81b604082015260600190565b6001600160a01b039384168152919092166020820152604081019190915260600190565b80518015158114611db657600080fd5b919050565b600060208284031215611dcd57600080fd5b611d3d82611da6565b6001600160a01b0391909116815260200190565b600060208284031215611dfc57600080fd5b5051919050565b6020808252600490820152634344414960e01b604082015260600190565b6001600160a01b03929092168252602082015260400190565b602080825260139082015272135a5b9d1a5b99c818d1185a4819985a5b1959606a1b604082015260600190565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b634e487b7160e01b600052601160045260246000fd5b81810381811115611eb457611eb4611e8b565b92915050565b600082611ed757634e487b7160e01b600052601260045260246000fd5b500490565b8082028115828204841417611eb457611eb4611e8b565b6020808252600a908201526921a7a72a2927a62622a960b11b604082015260600190565b6001600160a01b039590951685526020850193909352604084019190915263ffffffff166060830152608082015260a00190565b60005b83811015611f66578181015183820152602001611f4e565b50506000910152565b60008151808452611f87816020860160208601611f4b565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152611fbd6080840187611f6f565b94166040830152506060015292915050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215611ff857600080fd5b61200183611da6565b60208401519092506001600160401b038082111561201e57600080fd5b818501915085601f83011261203257600080fd5b81518181111561204457612044611fcf565b604051601f8201601f19908116603f0116810190838211818310171561206c5761206c611fcf565b8160405282815288602084870101111561208557600080fd5b612096836020830160208801611f4b565b80955050505050509250929050565b6020808252601690820152751a5b9a5d1a585b1a5e99551bdad95b8819985a5b195960521b604082015260600190565b6040815260006120e86040830185611f6f565b9050826020830152939250505056fea26469706673582212209f45da7caf161673de83636a0932d38140fafe8cfa0f579a7ccb755d1c9b194564736f6c63430008130033",
|
|
89
89
|
"linkReferences": {},
|
|
90
90
|
"deployedLinkReferences": {}
|
|
91
91
|
}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
2
|
+
pragma solidity >=0.7.5;
|
|
3
|
+
pragma abicoder v2;
|
|
4
|
+
|
|
5
|
+
/// @title QuoterV2 Interface
|
|
6
|
+
/// @notice Supports quoting the calculated amounts from exact input or exact output swaps.
|
|
7
|
+
/// @notice For each pool also tells you the number of initialized ticks crossed and the sqrt price of the pool after the swap.
|
|
8
|
+
/// @dev These functions are not marked view because they rely on calling non-view functions and reverting
|
|
9
|
+
/// to compute the result. They are also not gas efficient and should not be called on-chain.
|
|
10
|
+
interface IQuoterV2 {
|
|
11
|
+
/// @notice Returns the amount out received for a given exact input swap without executing the swap
|
|
12
|
+
/// @param path The path of the swap, i.e. each token pair and the pool fee
|
|
13
|
+
/// @param amountIn The amount of the first token to swap
|
|
14
|
+
/// @return amountOut The amount of the last token that would be received
|
|
15
|
+
/// @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
|
|
16
|
+
/// @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
|
|
17
|
+
/// @return gasEstimate The estimate of the gas that the swap consumes
|
|
18
|
+
function quoteExactInput(
|
|
19
|
+
bytes memory path,
|
|
20
|
+
uint256 amountIn
|
|
21
|
+
)
|
|
22
|
+
external
|
|
23
|
+
returns (
|
|
24
|
+
uint256 amountOut,
|
|
25
|
+
uint160[] memory sqrtPriceX96AfterList,
|
|
26
|
+
uint32[] memory initializedTicksCrossedList,
|
|
27
|
+
uint256 gasEstimate
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
struct QuoteExactInputSingleParams {
|
|
31
|
+
address tokenIn;
|
|
32
|
+
address tokenOut;
|
|
33
|
+
uint256 amountIn;
|
|
34
|
+
uint24 fee;
|
|
35
|
+
uint160 sqrtPriceLimitX96;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/// @notice Returns the amount out received for a given exact input but for a swap of a single pool
|
|
39
|
+
/// @param params The params for the quote, encoded as `QuoteExactInputSingleParams`
|
|
40
|
+
/// tokenIn The token being swapped in
|
|
41
|
+
/// tokenOut The token being swapped out
|
|
42
|
+
/// fee The fee of the token pool to consider for the pair
|
|
43
|
+
/// amountIn The desired input amount
|
|
44
|
+
/// sqrtPriceLimitX96 The price limit of the pool that cannot be exceeded by the swap
|
|
45
|
+
/// @return amountOut The amount of `tokenOut` that would be received
|
|
46
|
+
/// @return sqrtPriceX96After The sqrt price of the pool after the swap
|
|
47
|
+
/// @return initializedTicksCrossed The number of initialized ticks that the swap crossed
|
|
48
|
+
/// @return gasEstimate The estimate of the gas that the swap consumes
|
|
49
|
+
function quoteExactInputSingle(
|
|
50
|
+
QuoteExactInputSingleParams memory params
|
|
51
|
+
)
|
|
52
|
+
external
|
|
53
|
+
returns (
|
|
54
|
+
uint256 amountOut,
|
|
55
|
+
uint160 sqrtPriceX96After,
|
|
56
|
+
uint32 initializedTicksCrossed,
|
|
57
|
+
uint256 gasEstimate
|
|
58
|
+
);
|
|
59
|
+
|
|
60
|
+
/// @notice Returns the amount in required for a given exact output swap without executing the swap
|
|
61
|
+
/// @param path The path of the swap, i.e. each token pair and the pool fee. Path must be provided in reverse order
|
|
62
|
+
/// @param amountOut The amount of the last token to receive
|
|
63
|
+
/// @return amountIn The amount of first token required to be paid
|
|
64
|
+
/// @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
|
|
65
|
+
/// @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
|
|
66
|
+
/// @return gasEstimate The estimate of the gas that the swap consumes
|
|
67
|
+
function quoteExactOutput(
|
|
68
|
+
bytes memory path,
|
|
69
|
+
uint256 amountOut
|
|
70
|
+
)
|
|
71
|
+
external
|
|
72
|
+
returns (
|
|
73
|
+
uint256 amountIn,
|
|
74
|
+
uint160[] memory sqrtPriceX96AfterList,
|
|
75
|
+
uint32[] memory initializedTicksCrossedList,
|
|
76
|
+
uint256 gasEstimate
|
|
77
|
+
);
|
|
78
|
+
|
|
79
|
+
struct QuoteExactOutputSingleParams {
|
|
80
|
+
address tokenIn;
|
|
81
|
+
address tokenOut;
|
|
82
|
+
uint256 amount;
|
|
83
|
+
uint24 fee;
|
|
84
|
+
uint160 sqrtPriceLimitX96;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/// @notice Returns the amount in required to receive the given exact output amount but for a swap of a single pool
|
|
88
|
+
/// @param params The params for the quote, encoded as `QuoteExactOutputSingleParams`
|
|
89
|
+
/// tokenIn The token being swapped in
|
|
90
|
+
/// tokenOut The token being swapped out
|
|
91
|
+
/// fee The fee of the token pool to consider for the pair
|
|
92
|
+
/// amountOut The desired output amount
|
|
93
|
+
/// sqrtPriceLimitX96 The price limit of the pool that cannot be exceeded by the swap
|
|
94
|
+
/// @return amountIn The amount required as the input for the swap in order to receive `amountOut`
|
|
95
|
+
/// @return sqrtPriceX96After The sqrt price of the pool after the swap
|
|
96
|
+
/// @return initializedTicksCrossed The number of initialized ticks that the swap crossed
|
|
97
|
+
/// @return gasEstimate The estimate of the gas that the swap consumes
|
|
98
|
+
function quoteExactOutputSingle(
|
|
99
|
+
QuoteExactOutputSingleParams memory params
|
|
100
|
+
)
|
|
101
|
+
external
|
|
102
|
+
returns (
|
|
103
|
+
uint256 amountIn,
|
|
104
|
+
uint160 sqrtPriceX96After,
|
|
105
|
+
uint32 initializedTicksCrossed,
|
|
106
|
+
uint256 gasEstimate
|
|
107
|
+
);
|
|
108
|
+
}
|
|
@@ -35,7 +35,9 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
35
35
|
struct Wallet {
|
|
36
36
|
uint128 lastDayTopped;
|
|
37
37
|
uint32 dailyToppingCount;
|
|
38
|
-
uint128[7]
|
|
38
|
+
uint128[7] unused_lastWeekToppings; //kept because of upgrade
|
|
39
|
+
uint128 weeklyToppingSum; // Total gas topped since lastWeekTopped
|
|
40
|
+
uint128 lastWeekTopped; // Timestamp of last week reset
|
|
39
41
|
}
|
|
40
42
|
|
|
41
43
|
mapping(address => Wallet) public wallets;
|
|
@@ -48,6 +50,7 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
48
50
|
uint64 public dailyNewWalletsCount;
|
|
49
51
|
uint32 public version;
|
|
50
52
|
uint8 public minTopping; //percentage of topping amount, that user can request to top
|
|
53
|
+
address public votingContract; //flowstate voting users get extra gas
|
|
51
54
|
|
|
52
55
|
function initialize(
|
|
53
56
|
NameService _ns,
|
|
@@ -122,22 +125,15 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
122
125
|
"User not whitelisted or not first time"
|
|
123
126
|
);
|
|
124
127
|
|
|
125
|
-
//
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
dayDiff = dayDiff > dayOfWeek ? dayOfWeek + 1 : dayDiff;
|
|
130
|
-
for (uint256 day = dayOfWeek + 1 - dayDiff; day <= dayOfWeek; day++) {
|
|
131
|
-
wallets[_user].lastWeekToppings[day] = 0;
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
uint128 weekTotal = 0;
|
|
135
|
-
for (uint256 i = 0; i <= dayOfWeek; i++) {
|
|
136
|
-
weekTotal += wallets[_user].lastWeekToppings[uint256(i)];
|
|
128
|
+
// Reset weekly sum if more than a week has passed
|
|
129
|
+
if (block.timestamp - wallets[_user].lastWeekTopped >= 7 days) {
|
|
130
|
+
wallets[_user].weeklyToppingSum = 0;
|
|
131
|
+
wallets[_user].lastWeekTopped = uint128(block.timestamp);
|
|
137
132
|
}
|
|
138
133
|
|
|
139
134
|
require(
|
|
140
|
-
|
|
135
|
+
wallets[_user].weeklyToppingSum <
|
|
136
|
+
perDayRoughLimit * gasPrice * maxPerWeekMultiplier,
|
|
141
137
|
"User wallet has been topped too many times this week"
|
|
142
138
|
);
|
|
143
139
|
_;
|
|
@@ -150,9 +146,10 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
150
146
|
}
|
|
151
147
|
|
|
152
148
|
function canTop(address _user) external view returns (bool) {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
149
|
+
uint256 toppingAmount = getToppingAmount(_user);
|
|
150
|
+
if (toppingAmount < address(_user).balance) return false;
|
|
151
|
+
uint256 toTop = toppingAmount - address(_user).balance;
|
|
152
|
+
if ((toTop * 100) / toppingAmount < minTopping) return false;
|
|
156
153
|
|
|
157
154
|
address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
|
|
158
155
|
_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
|
|
@@ -164,22 +161,13 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
164
161
|
dailyNewWalletsCount < maxDailyNewWallets) ||
|
|
165
162
|
whitelistedRoot != address(0));
|
|
166
163
|
|
|
167
|
-
uint128
|
|
168
|
-
//
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
dayDiff = dayDiff > 7 ? 7 : dayDiff;
|
|
172
|
-
dayDiff = dayDiff > dayOfWeek ? dayOfWeek + 1 : dayDiff;
|
|
173
|
-
|
|
174
|
-
for (uint256 day = dayOfWeek + 1 - dayDiff; day <= dayOfWeek; day++) {
|
|
175
|
-
lastWeekToppings[day] = 0;
|
|
164
|
+
uint128 weeklySum = wallets[_user].weeklyToppingSum;
|
|
165
|
+
// Reset sum if more than a week has passed
|
|
166
|
+
if (block.timestamp - wallets[_user].lastWeekTopped >= 7 days) {
|
|
167
|
+
weeklySum = 0;
|
|
176
168
|
}
|
|
177
169
|
|
|
178
|
-
|
|
179
|
-
for (uint256 i = 0; i <= dayOfWeek; i++) {
|
|
180
|
-
weekTotal += lastWeekToppings[uint256(i)];
|
|
181
|
-
}
|
|
182
|
-
can = can && weekTotal < perDayRoughLimit * gasPrice * maxPerWeekMultiplier;
|
|
170
|
+
can = can && weeklySum < perDayRoughLimit * gasPrice * maxPerWeekMultiplier;
|
|
183
171
|
return can;
|
|
184
172
|
}
|
|
185
173
|
|
|
@@ -202,16 +190,17 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
202
190
|
? _wallet
|
|
203
191
|
: payable(whitelistedRoot);
|
|
204
192
|
|
|
205
|
-
uint256
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
uint256 dayOfWeek = currentDay % 7;
|
|
193
|
+
uint256 toppingAmount = getToppingAmount(_wallet);
|
|
194
|
+
uint256 toTop = toppingAmount - address(_wallet).balance;
|
|
195
|
+
require((toTop * 100) / toppingAmount >= minTopping, "low toTop");
|
|
209
196
|
|
|
210
197
|
if (wallets[_wallet].lastDayTopped == uint128(currentDay))
|
|
211
198
|
wallets[_wallet].dailyToppingCount += 1;
|
|
212
199
|
else wallets[_wallet].dailyToppingCount = 1;
|
|
213
200
|
wallets[_wallet].lastDayTopped = uint128(currentDay);
|
|
214
|
-
|
|
201
|
+
|
|
202
|
+
// Reset weekly sum if more than a week has passed already happens at toppingLimit modifier
|
|
203
|
+
wallets[_wallet].weeklyToppingSum += uint128(toTop);
|
|
215
204
|
|
|
216
205
|
if (notFirstTime[_wallet] == false && whitelistedRoot == address(0)) {
|
|
217
206
|
dailyNewWalletsCount++;
|
|
@@ -242,7 +231,24 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
242
231
|
}
|
|
243
232
|
|
|
244
233
|
function getToppingAmount() public view returns (uint256) {
|
|
245
|
-
return
|
|
234
|
+
return getToppingAmount(msg.sender);
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
function getToppingAmount(address _user) public view returns (uint256) {
|
|
238
|
+
uint256 baseAmount = gasTopping * gasPrice;
|
|
239
|
+
|
|
240
|
+
// Check voting balance if contract is set
|
|
241
|
+
if (votingContract != address(0)) {
|
|
242
|
+
try ERC20(votingContract).balanceOf(_user) returns (uint256 balance) {
|
|
243
|
+
if (balance > 0) {
|
|
244
|
+
return baseAmount * 2; // Double amount for voters
|
|
245
|
+
}
|
|
246
|
+
} catch {
|
|
247
|
+
// Silently fail if call fails
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
return baseAmount;
|
|
246
252
|
}
|
|
247
253
|
|
|
248
254
|
function setGasTopping(
|
|
@@ -259,4 +265,10 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
|
|
|
259
265
|
function setMinTopping(uint8 _minTop) external onlyRole(DEFAULT_ADMIN_ROLE) {
|
|
260
266
|
minTopping = _minTop;
|
|
261
267
|
}
|
|
268
|
+
|
|
269
|
+
function setVotingContract(
|
|
270
|
+
address _voting
|
|
271
|
+
) external onlyRole(DEFAULT_ADMIN_ROLE) {
|
|
272
|
+
votingContract = _voting;
|
|
273
|
+
}
|
|
262
274
|
}
|
|
@@ -17,8 +17,6 @@ contract SuperfluidFaucet is
|
|
|
17
17
|
using SafeMathUpgradeable for uint256;
|
|
18
18
|
|
|
19
19
|
bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
|
|
20
|
-
uint public constant GAS_TOPPING_AMOUNT = 350000;
|
|
21
|
-
uint public constant FIRST_GAS_TOPPING_AMOUNT = 15e5;
|
|
22
20
|
|
|
23
21
|
uint256 public _deprecated;
|
|
24
22
|
uint256 public maxValuePerPeriod;
|
|
@@ -31,6 +29,9 @@ contract SuperfluidFaucet is
|
|
|
31
29
|
|
|
32
30
|
mapping(address => RecipientInfo) public recipientInfo;
|
|
33
31
|
|
|
32
|
+
uint public gasToppingAmount;
|
|
33
|
+
uint public firstGasToppingAmount;
|
|
34
|
+
|
|
34
35
|
event WalletTopped(address recipient, uint256 amount);
|
|
35
36
|
event SettingsUpdated(uint256 maxValuePerPeriod, uint256 toppingPeriod);
|
|
36
37
|
|
|
@@ -51,7 +52,9 @@ contract SuperfluidFaucet is
|
|
|
51
52
|
_setupRole(ADMIN_ROLE, msg.sender);
|
|
52
53
|
_grantRole(ADMIN_ROLE, _admin);
|
|
53
54
|
maxValuePerPeriod = _maxValuePerPeriod;
|
|
54
|
-
toppingPeriod = _toppingPeriod;
|
|
55
|
+
toppingPeriod = _toppingPeriod * 1 days;
|
|
56
|
+
gasToppingAmount = 500000;
|
|
57
|
+
firstGasToppingAmount = 20e5;
|
|
55
58
|
}
|
|
56
59
|
|
|
57
60
|
function updateSettings(
|
|
@@ -59,7 +62,7 @@ contract SuperfluidFaucet is
|
|
|
59
62
|
uint256 _toppingPeriod
|
|
60
63
|
) external onlyRole(ADMIN_ROLE) {
|
|
61
64
|
maxValuePerPeriod = _maxValuePerPeriod;
|
|
62
|
-
toppingPeriod = _toppingPeriod;
|
|
65
|
+
toppingPeriod = _toppingPeriod * 1 days;
|
|
63
66
|
emit SettingsUpdated(_maxValuePerPeriod, _toppingPeriod);
|
|
64
67
|
}
|
|
65
68
|
|
|
@@ -78,6 +81,11 @@ contract SuperfluidFaucet is
|
|
|
78
81
|
|
|
79
82
|
uint256 currentPeriod = block.timestamp / toppingPeriod;
|
|
80
83
|
|
|
84
|
+
// fix bug where period was divid by 30 and not by 30days, (for non effected users lsatWithdrawlPeriod will be < 57947235 for sure)
|
|
85
|
+
if (info.lastWithdrawalPeriod > 0 && info.lastWithdrawalPeriod > 57947235) {
|
|
86
|
+
if (currentPeriod > (info.lastWithdrawalPeriod * 30) / toppingPeriod)
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
81
89
|
if (currentPeriod > info.lastWithdrawalPeriod) {
|
|
82
90
|
return true; // New period, reset counters
|
|
83
91
|
}
|
|
@@ -97,15 +105,22 @@ contract SuperfluidFaucet is
|
|
|
97
105
|
return canTop(recipient, blockFee);
|
|
98
106
|
}
|
|
99
107
|
|
|
108
|
+
function updateGasToppingAmounts(
|
|
109
|
+
uint _gasToppingAmount,
|
|
110
|
+
uint _firstGasToppingAmount
|
|
111
|
+
) external onlyRole(ADMIN_ROLE) {
|
|
112
|
+
gasToppingAmount = _gasToppingAmount;
|
|
113
|
+
firstGasToppingAmount = _firstGasToppingAmount;
|
|
114
|
+
}
|
|
115
|
+
|
|
100
116
|
function getToppingValue(
|
|
101
117
|
bool firstTime,
|
|
102
118
|
uint baseFee
|
|
103
|
-
) public
|
|
119
|
+
) public view returns (uint) {
|
|
104
120
|
//top wallet with current base fee + 10% for priority fee and l1 fees
|
|
105
121
|
return
|
|
106
|
-
((firstTime ?
|
|
107
|
-
|
|
108
|
-
110) / 100;
|
|
122
|
+
((firstTime ? firstGasToppingAmount : gasToppingAmount) * baseFee * 110) /
|
|
123
|
+
100;
|
|
109
124
|
}
|
|
110
125
|
|
|
111
126
|
function topWallet(address payable recipient) external onlyRole(ADMIN_ROLE) {
|
|
@@ -115,6 +130,12 @@ contract SuperfluidFaucet is
|
|
|
115
130
|
uint amount = getToppingValue(firstTime, block.basefee);
|
|
116
131
|
uint256 currentPeriod = block.timestamp / toppingPeriod;
|
|
117
132
|
|
|
133
|
+
// fix bug where period was divid by 30 and not by 30days, (for non effected users lsatWithdrawlPeriod will be < 57947235 for sure)
|
|
134
|
+
if (info.lastWithdrawalPeriod > 0 && info.lastWithdrawalPeriod > 57947235) {
|
|
135
|
+
info.lastWithdrawalPeriod =
|
|
136
|
+
(info.lastWithdrawalPeriod * 30) /
|
|
137
|
+
toppingPeriod;
|
|
138
|
+
}
|
|
118
139
|
if (currentPeriod > info.lastWithdrawalPeriod) {
|
|
119
140
|
info.totalWithdrawnThisPeriod = 0;
|
|
120
141
|
info.lastWithdrawalPeriod = currentPeriod;
|