@gooddollar/goodprotocol 2.0.13 → 2.0.14-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/DistributionBridgeMock.min.json +1 -1
- package/artifacts/abis/DistributionHelper.min.json +1 -1
- package/artifacts/abis/DistributionHelperTest.min.json +1 -1
- package/artifacts/abis/DistributionHelperTestHelper.min.json +1 -1
- package/artifacts/abis/GasPriceMockOracle.min.json +1 -1
- package/artifacts/abis/GoodCompoundStakingTest.min.json +1 -1
- package/artifacts/abis/GoodReserveCDai.min.json +1 -1
- package/artifacts/abis/IFeesFormula.min.json +1 -1
- package/artifacts/abis/ISuperGoodDollar.min.json +1 -1
- package/artifacts/abis/ISuperToken.min.json +1 -0
- package/artifacts/abis/MultichainFeeFormula.min.json +1 -0
- package/artifacts/abis/SuperGoodDollar.min.json +1 -1
- package/artifacts/abis/SuperToken.min.json +1 -1
- package/artifacts/abis/UBIScheme.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/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/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/fuseFaucet/Faucet.sol/Faucet.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/Faucet.sol/Faucet.json +2 -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/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/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/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/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 +122 -17
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTest.json +242 -17
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.dbg.json +1 -1
- package/artifacts/contracts/mocks/DistributionHelperTest.sol/DistributionHelperTestHelper.json +256 -18
- 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 +15 -2
- package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/GoodCompoundStakingTest.sol/GoodCompoundStakingTest.json +6 -6
- 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/DistributionHelper.sol/DistributionHelper.dbg.json +1 -1
- package/artifacts/contracts/reserve/DistributionHelper.sol/DistributionHelper.json +242 -17
- 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 +45 -19
- 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/IFeesFormula.sol/IFeesFormula.dbg.json +4 -0
- package/artifacts/contracts/token/{FeesFormula.sol → IFeesFormula.sol}/IFeesFormula.json +1 -1
- package/artifacts/contracts/token/MultichainFeeFormula.sol/MultichainFeeFormula.dbg.json +4 -0
- package/artifacts/contracts/token/MultichainFeeFormula.sol/MultichainFeeFormula.json +58 -0
- 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/ISuperGoodDollar.sol/ISuperGoodDollar.json +159 -5
- package/artifacts/contracts/token/superfluid/ISuperToken.sol/ISuperToken.dbg.json +4 -0
- package/artifacts/contracts/token/superfluid/ISuperToken.sol/ISuperToken.json +1609 -0
- package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +233 -190
- package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.json +198 -193
- 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 +20 -2
- package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.dbg.json +1 -1
- package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.json +20 -2
- 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/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.dbg.json +1 -1
- package/artifacts/contracts/utils/BuyAndBridgeHelper.sol/BuyAndBridgeHelper.json +2 -2
- 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/ISwapRouter.dbg.json +1 -1
- 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/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/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/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/contracts/invite/InvitesFuseV2.sol +3 -2
- package/contracts/mocks/DistributionBridgeMock.sol +42 -15
- package/contracts/mocks/DistributionHelperTest.sol +6 -2
- package/contracts/mocks/FeesFormularMock.sol +14 -14
- package/contracts/mocks/GasPriceMockOracle.sol +7 -1
- package/contracts/reserve/DistributionHelper.sol +147 -23
- package/contracts/reserve/GoodReserveCDai.sol +39 -47
- package/contracts/staking/GoodFundManager.sol +18 -37
- package/contracts/token/GoodDollar.sol +11 -16
- package/contracts/token/MultichainFeeFormula.sol +34 -0
- package/contracts/token/superfluid/ConstantFlowNFTs.sol +3 -0
- package/contracts/token/superfluid/ISuperGoodDollar.sol +4 -5
- package/contracts/token/superfluid/ISuperToken.sol +464 -0
- package/contracts/token/superfluid/SuperGoodDollar.sol +408 -376
- package/contracts/token/superfluid/SuperToken.sol +144 -144
- package/contracts/ubi/UBIScheme.sol +9 -5
- package/contracts/ubi/UBISchemeV2.sol +6 -0
- package/contracts/utils/AdminWallet.sol +2 -1
- package/contracts/utils/AdminWalletFuse.sol +2 -1
- package/contracts/utils/BuyAndBridgeHelper.sol +13 -13
- package/contracts/utils/MultiCall.sol +8 -10
- package/dist/artifacts/contracts/identity/IdentityV2.sol/IdentityV2.json +2 -2
- package/dist/artifacts/contracts/token/superfluid/SuperGoodDollar.sol/SuperGoodDollar.json +233 -190
- package/dist/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json +2 -2
- package/dist/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.json +2 -2
- package/hardhat.config.ts +46 -15
- package/package.json +7 -7
- package/releases/deploy-settings.json +3 -1
- package/releases/deployment.json +6 -2
- package/scripts/analytics/faucetStats.ts +19 -15
- package/scripts/fv.ts +305 -0
- package/scripts/multichain-deploy/1_basicdao-deploy.ts +18 -9
- package/scripts/multichain-deploy/helpers.ts +204 -64
- package/scripts/proposals/gip-15.ts +427 -0
- package/scripts/upgrades/multichain-formula-upgrade.ts +140 -0
- package/scripts/upgrades/restoreFunds.ts +91 -0
- package/scripts/upgrades/superfluid-nft-celo-gas-token.ts +159 -0
- package/scripts/utils.ts +15 -0
- package/test/helpers.ts +73 -10
- package/test/reserve/DistributionHelper.test.ts +183 -218
- package/test/reserve/GoodReserveCDai.distribution.test.ts +21 -144
- package/test/reserve/GoodReserveCDai.test.ts +98 -302
- package/test/staking/StakingRewards.test.ts +324 -936
- package/test/token/CeloGasToken.test.ts +108 -0
- package/test/token/SuperGoodDollar.test.ts +15 -6
- package/test/utils/AdminWallet.test.ts +97 -38
- package/test/utils/BuyAndBridgeHelper.test.ts +9 -33
- package/truffle-config.js +24 -6
- package/types/ConstantInflowNFT.ts +969 -0
- package/types/ConstantOutflowNFT.ts +1031 -0
- package/types/DistributionBridgeMock.ts +203 -70
- package/types/DistributionHelper.ts +325 -30
- package/types/DistributionHelperTest.ts +325 -30
- package/types/DistributionHelperTestHelper.ts +355 -35
- package/types/FlowNFTBase.ts +887 -0
- package/types/GasPriceMockOracle.ts +29 -0
- package/types/GoodReserveCDai.ts +79 -20
- package/types/IConstantFlowAgreementV1.ts +1391 -0
- package/types/IConstantInflowNFT.ts +772 -0
- package/types/IConstantOutflowNFT.ts +834 -0
- package/types/IERC721.ts +487 -0
- package/types/IERC721Metadata.ts +538 -0
- package/types/IFlowNFTBase.ts +711 -0
- package/types/IInstantDistributionAgreementV1.ts +1183 -0
- package/types/ILayerZeroFeeEstimator.ts +136 -0
- package/types/IMessagePassingBridge.ts +774 -0
- package/types/ISETH.ts +2668 -0
- package/types/ISETHCustom.ts +161 -0
- package/types/ISuperGoodDollar.ts +277 -25
- package/types/ISuperToken.ts +202 -346
- package/types/ISuperfluid.ts +7 -2
- package/types/ISuperfluidGovernance.ts +40 -5
- package/types/MultichainFeeFormula.ts +130 -0
- package/types/SuperGoodDollar.ts +383 -349
- package/types/SuperToken.ts +319 -344
- package/types/UBIScheme.ts +36 -0
- package/types/UBISchemeV2.ts +36 -0
- package/types/factories/AaveMock__factory.ts +1 -1
- package/types/factories/AaveStakingFactory__factory.ts +1 -1
- package/types/factories/AaveUSDMockOracle__factory.ts +1 -1
- package/types/factories/AdminWalletFuse__factory.ts +1 -1
- package/types/factories/AdminWallet__factory.ts +1 -1
- package/types/factories/BancorFormula__factory.ts +1 -1
- package/types/factories/BaseShareFieldV2__factory.ts +1 -1
- package/types/factories/BaseShareField__factory.ts +1 -1
- package/types/factories/BatUSDMockOracle__factory.ts +1 -1
- package/types/factories/BuyAndBridgeHelper__factory.ts +1 -1
- package/types/factories/BuyGDCloneFactory__factory.ts +1 -1
- package/types/factories/BuyGDClone__factory.ts +1 -1
- package/types/factories/CBATMock__factory.ts +1 -1
- package/types/factories/CDAILowWorthMock__factory.ts +1 -1
- package/types/factories/CDAIMock__factory.ts +1 -1
- package/types/factories/CDAINonMintableMock__factory.ts +1 -1
- package/types/factories/CDecimalsMock__factory.ts +1 -1
- package/types/factories/CSDTMock__factory.ts +1 -1
- package/types/factories/CUSDCMock__factory.ts +1 -1
- package/types/factories/ClaimersDistribution__factory.ts +1 -1
- package/types/factories/CompUSDMockOracle__factory.ts +1 -1
- package/types/factories/CompoundStakingFactory__factory.ts +1 -1
- package/types/factories/CompoundVotingMachine__factory.ts +1 -1
- package/types/factories/ConstantInflowNFT__factory.ts +758 -0
- package/types/factories/ConstantOutflowNFT__factory.ts +817 -0
- package/types/factories/DAIMock__factory.ts +1 -1
- package/types/factories/DAOContract__factory.ts +1 -1
- package/types/factories/DAOUpgradeableContract__factory.ts +1 -1
- package/types/factories/DaiEthPriceMockOracle__factory.ts +1 -1
- package/types/factories/DecimalsMock__factory.ts +1 -1
- package/types/factories/DistributionBridgeMock__factory.ts +121 -16
- package/types/factories/DistributionHelperTestHelper__factory.ts +255 -17
- package/types/factories/DistributionHelperTest__factory.ts +241 -16
- package/types/factories/DistributionHelper__factory.ts +241 -16
- package/types/factories/DonationsStaking__factory.ts +1 -1
- package/types/factories/ERC1967Proxy__factory.ts +1 -1
- package/types/factories/ERC20PresetMinterPauserUpgradeable__factory.ts +1 -1
- package/types/factories/ERC20Upgradeable__factory.ts +1 -1
- package/types/factories/EthUSDMockOracle__factory.ts +1 -1
- package/types/factories/EventsEmitter__factory.ts +1 -1
- package/types/factories/ExchangeHelper__factory.ts +1 -1
- package/types/factories/Faucet__factory.ts +1 -1
- package/types/factories/FeesFormulaMock__factory.ts +1 -1
- package/types/factories/FlowNFTBase__factory.ts +642 -0
- package/types/factories/FuseFaucetV2__factory.ts +1 -1
- package/types/factories/FuseFaucet__factory.ts +1 -1
- package/types/factories/FuseStakingV3__factory.ts +1 -1
- package/types/factories/GDFaucet__factory.ts +1 -1
- package/types/factories/GReputation__factory.ts +1 -1
- package/types/factories/GasPriceMockOracle__factory.ts +14 -1
- package/types/factories/GoodAaveStakingV2__factory.ts +1 -1
- package/types/factories/GoodAaveStaking__factory.ts +1 -1
- package/types/factories/GoodCompoundStakingTest__factory.ts +1 -1
- package/types/factories/GoodCompoundStakingV2__factory.ts +1 -1
- package/types/factories/GoodCompoundStaking__factory.ts +1 -1
- package/types/factories/GoodDollarMintBurnWrapper__factory.ts +1 -1
- package/types/factories/GoodDollarStakingMock__factory.ts +1 -1
- package/types/factories/GoodDollarStaking__factory.ts +1 -1
- package/types/factories/GoodDollar__factory.ts +1 -1
- package/types/factories/GoodFundManagerTest__factory.ts +1 -1
- package/types/factories/GoodFundManager__factory.ts +1 -1
- package/types/factories/GoodMarketMaker__factory.ts +1 -1
- package/types/factories/GoodReserveCDai__factory.ts +44 -18
- package/types/factories/GovernanceStaking__factory.ts +1 -1
- package/types/factories/IConstantFlowAgreementV1__factory.ts +1064 -0
- package/types/factories/IConstantInflowNFT__factory.ts +551 -0
- package/types/factories/IConstantOutflowNFT__factory.ts +614 -0
- package/types/factories/IERC721Metadata__factory.ts +356 -0
- package/types/factories/IERC721__factory.ts +308 -0
- package/types/factories/IFlowNFTBase__factory.ts +512 -0
- package/types/factories/IInstantDistributionAgreementV1__factory.ts +1015 -0
- package/types/factories/ILayerZeroFeeEstimator__factory.ts +79 -0
- package/types/factories/IMessagePassingBridge__factory.ts +446 -0
- package/types/factories/ISETHCustom__factory.ts +56 -0
- package/types/factories/ISETH__factory.ts +1866 -0
- package/types/factories/ISuperGoodDollar__factory.ts +159 -5
- package/types/factories/ISuperTokenFactory__factory.ts +5 -0
- package/types/factories/ISuperToken__factory.ts +130 -191
- package/types/factories/ISuperfluidGovernance__factory.ts +23 -5
- package/types/factories/ISuperfluid__factory.ts +10 -0
- package/types/factories/IdentityFix__factory.ts +1 -1
- package/types/factories/IdentityMock__factory.ts +1 -1
- package/types/factories/IdentityV2__factory.ts +1 -1
- package/types/factories/IncentiveControllerMock__factory.ts +1 -1
- package/types/factories/InvitesFuseV2__factory.ts +1 -1
- package/types/factories/InvitesV1__factory.ts +1 -1
- package/types/factories/InvitesV2__factory.ts +1 -1
- package/types/factories/LendingPoolMock__factory.ts +1 -1
- package/types/factories/Multicall__factory.ts +1 -1
- package/types/factories/MultichainBridgeHelper__factory.ts +1 -1
- package/types/factories/MultichainFeeFormula__factory.ts +113 -0
- package/types/factories/MultichainRouterMock__factory.ts +1 -1
- package/types/factories/NameService__factory.ts +1 -1
- package/types/factories/OneTimePaymentsV2__factory.ts +1 -1
- package/types/factories/OneTimePayments__factory.ts +1 -1
- package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
- package/types/factories/OverMintTester__factory.ts +1 -1
- package/types/factories/PayableMock__factory.ts +1 -1
- package/types/factories/ProtocolUpgradeFuseRecover__factory.ts +1 -1
- package/types/factories/ProtocolUpgradeFuse__factory.ts +1 -1
- package/types/factories/ProtocolUpgradeRecover__factory.ts +1 -1
- package/types/factories/ProtocolUpgrade__factory.ts +1 -1
- package/types/factories/ProxyFactory1967__factory.ts +1 -1
- package/types/factories/ReputationTestHelper__factory.ts +1 -1
- package/types/factories/Reputation__factory.ts +1 -1
- package/types/factories/SixteenDecimalsTokenMock__factory.ts +1 -1
- package/types/factories/StakersDistribution__factory.ts +1 -1
- package/types/factories/StakingMockFixedAPY__factory.ts +1 -1
- package/types/factories/SuperGoodDollar__factory.ts +230 -187
- package/types/factories/SuperToken__factory.ts +197 -192
- package/types/factories/SwapHelperTest__factory.ts +1 -1
- package/types/factories/TwentyDecimalsTokenMock__factory.ts +1 -1
- package/types/factories/UBISchemeV2__factory.ts +19 -1
- package/types/factories/UBIScheme__factory.ts +19 -1
- package/types/factories/USDCMock__factory.ts +1 -1
- package/types/factories/UUPSProxy__factory.ts +1 -1
- package/types/factories/UniswapV2SwapHelper__factory.ts +1 -1
- package/types/factories/UpgradableMock2__factory.ts +1 -1
- package/types/factories/UpgradableMock3__factory.ts +1 -1
- package/types/factories/UpgradableMock4__factory.ts +1 -1
- package/types/factories/UpgradableMock__factory.ts +1 -1
- package/types/hardhat.d.ts +166 -4
- package/types/index.ts +34 -4
- package/yarn.lock +1288 -719
- package/artifacts/contracts/token/FeesFormula.sol/IFeesFormula.dbg.json +0 -4
- /package/contracts/token/{FeesFormula.sol → IFeesFormula.sol} +0 -0
|
@@ -1,16 +1,11 @@
|
|
|
1
|
-
import { ethers,
|
|
2
|
-
import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
|
|
1
|
+
import { ethers, upgrades, artifacts } from "hardhat";
|
|
2
|
+
import { loadFixture, setCode } from "@nomicfoundation/hardhat-network-helpers";
|
|
3
3
|
import { expect } from "chai";
|
|
4
|
-
import {
|
|
5
|
-
GoodReserveCDai,
|
|
6
|
-
DistributionHelperTestHelper,
|
|
7
|
-
DistributionBridgeMock,
|
|
8
|
-
IGoodDollar
|
|
9
|
-
} from "../../types";
|
|
4
|
+
import { GoodReserveCDai, DistributionHelperTestHelper, DistributionBridgeMock, IGoodDollar } from "../../types";
|
|
10
5
|
import { createDAO, increaseTime } from "../helpers";
|
|
11
|
-
import { Contract } from "ethers";
|
|
12
6
|
import { FormatTypes } from "@ethersproject/abi";
|
|
13
|
-
import
|
|
7
|
+
import * as waffle from "ethereum-waffle";
|
|
8
|
+
import { BaseContract } from "ethers";
|
|
14
9
|
|
|
15
10
|
const BN = ethers.BigNumber;
|
|
16
11
|
export const NULL_ADDRESS = ethers.constants.AddressZero;
|
|
@@ -18,18 +13,10 @@ export const BLOCK_INTERVAL = 1;
|
|
|
18
13
|
|
|
19
14
|
describe("DistributionHelper", () => {
|
|
20
15
|
let goodReserve: GoodReserveCDai;
|
|
21
|
-
let goodDollar: IGoodDollar,
|
|
22
|
-
genericCall,
|
|
23
|
-
avatar,
|
|
24
|
-
founder,
|
|
25
|
-
signers,
|
|
26
|
-
setDAOAddress,
|
|
27
|
-
nameService,
|
|
28
|
-
cDai;
|
|
16
|
+
let goodDollar: IGoodDollar, genericCall, avatar, founder, signers, setDAOAddress, nameService, cDai;
|
|
29
17
|
|
|
30
18
|
before(async () => {
|
|
31
19
|
[founder, ...signers] = await ethers.getSigners();
|
|
32
|
-
|
|
33
20
|
let {
|
|
34
21
|
controller: ctrl,
|
|
35
22
|
avatar: av,
|
|
@@ -65,113 +52,108 @@ describe("DistributionHelper", () => {
|
|
|
65
52
|
goodReserve = reserve as GoodReserveCDai;
|
|
66
53
|
});
|
|
67
54
|
|
|
68
|
-
const fixture = async (
|
|
69
|
-
const
|
|
70
|
-
const rf = await ethers.getContractFactory("DistributionBridgeMock");
|
|
55
|
+
const fixture = async () => {
|
|
56
|
+
const mpbf = await artifacts.readArtifact("IStaticOracle");
|
|
71
57
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
// abi: JSON.parse(df.interface.format(FormatTypes.json) as string) as any[],
|
|
75
|
-
// bytecode: df.bytecode
|
|
76
|
-
// })) as DistributionHelperTestHelper;
|
|
58
|
+
let oracle = await waffle.deployMockContract(founder, mpbf.abi);
|
|
59
|
+
oracle.mock.quoteSpecificFeeTiersWithTimePeriod.returns(1e13, []);
|
|
77
60
|
|
|
78
|
-
// await distHelper.initialize(nameService.address);
|
|
79
61
|
const distHelper = (await upgrades.deployProxy(
|
|
80
62
|
await ethers.getContractFactory("DistributionHelperTestHelper"),
|
|
81
63
|
[nameService.address],
|
|
82
64
|
{ kind: "uups" }
|
|
83
65
|
)) as DistributionHelperTestHelper;
|
|
84
66
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
})
|
|
67
|
+
await distHelper.setOracle(oracle.address);
|
|
68
|
+
|
|
69
|
+
//make sure disthelper has enough native token so it doesnt try to swap G$s
|
|
70
|
+
await founder.sendTransaction({ to: distHelper.address, value: ethers.constants.WeiPerEther });
|
|
71
|
+
const bridge = (await ethers.deployContract("DistributionBridgeMock")) as DistributionBridgeMock;
|
|
72
|
+
|
|
73
|
+
const encodedCall = distHelper.interface.encodeFunctionData("setFeeSettings", [
|
|
74
|
+
{
|
|
75
|
+
axelarBaseFeeUSD: "100000000000000000",
|
|
76
|
+
bridgeExecuteGas: 400000,
|
|
77
|
+
targetChainGasPrice: 5e9,
|
|
78
|
+
maxFee: "5000000000000000",
|
|
79
|
+
minBalanceForFees: "10000000000000000",
|
|
80
|
+
percentageToSellForFee: "5"
|
|
81
|
+
}
|
|
82
|
+
]);
|
|
83
|
+
|
|
84
|
+
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
89
85
|
|
|
90
86
|
await distHelper.setBridges(bridge.address, bridge.address);
|
|
91
|
-
|
|
87
|
+
|
|
88
|
+
return { distHelper, bridge, oracle };
|
|
92
89
|
};
|
|
93
90
|
|
|
94
91
|
it("should not allow to add recipient", async () => {
|
|
95
|
-
const { distHelper } = await
|
|
92
|
+
const { distHelper } = await loadFixture(fixture);
|
|
96
93
|
|
|
97
94
|
const recipient = signers[0];
|
|
98
95
|
|
|
99
96
|
await expect(
|
|
100
97
|
distHelper.addOrUpdateRecipient({
|
|
101
98
|
bps: 3000,
|
|
102
|
-
chainId:
|
|
99
|
+
chainId: 42220,
|
|
103
100
|
addr: recipient.address,
|
|
104
101
|
transferType: 0
|
|
105
102
|
})
|
|
106
|
-
).to.be.revertedWith(
|
|
107
|
-
"is missing role 0x0000000000000000000000000000000000000000000000000000000000000000"
|
|
108
|
-
);
|
|
103
|
+
).to.be.revertedWith("is missing role 0x0000000000000000000000000000000000000000000000000000000000000000");
|
|
109
104
|
});
|
|
110
105
|
|
|
111
106
|
it("should allow to add recipient by avatar", async () => {
|
|
112
|
-
const { distHelper } = await
|
|
107
|
+
const { distHelper } = await loadFixture(fixture);
|
|
113
108
|
|
|
114
109
|
const recipient = signers[0];
|
|
115
110
|
|
|
116
|
-
const encodedCall = distHelper.interface.encodeFunctionData(
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
]
|
|
126
|
-
);
|
|
111
|
+
const encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
112
|
+
{
|
|
113
|
+
bps: 3000,
|
|
114
|
+
chainId: 42220,
|
|
115
|
+
addr: recipient.address,
|
|
116
|
+
transferType: 0
|
|
117
|
+
}
|
|
118
|
+
]);
|
|
127
119
|
|
|
128
120
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
129
121
|
const dr = await distHelper.distributionRecipients(0);
|
|
130
122
|
expect(dr.addr).to.equal(recipient.address);
|
|
131
|
-
expect(dr.chainId).to.equal(
|
|
123
|
+
expect(dr.chainId).to.equal(42220);
|
|
132
124
|
expect(dr.bps).to.equal(3000);
|
|
133
125
|
expect(dr.transferType).to.equal(0);
|
|
134
126
|
});
|
|
135
127
|
|
|
136
128
|
it("should allow to update recipient by avatar", async () => {
|
|
137
|
-
const { distHelper } = await
|
|
129
|
+
const { distHelper } = await loadFixture(fixture);
|
|
138
130
|
|
|
139
131
|
const recipient = signers[0];
|
|
140
132
|
|
|
141
|
-
let encodedCall = distHelper.interface.encodeFunctionData(
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
}
|
|
150
|
-
]
|
|
151
|
-
);
|
|
133
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
134
|
+
{
|
|
135
|
+
bps: 1000,
|
|
136
|
+
chainId: 2,
|
|
137
|
+
addr: recipient.address,
|
|
138
|
+
transferType: 1
|
|
139
|
+
}
|
|
140
|
+
]);
|
|
152
141
|
|
|
153
142
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
154
143
|
|
|
155
|
-
encodedCall = distHelper.interface.encodeFunctionData(
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
}
|
|
164
|
-
]
|
|
165
|
-
);
|
|
144
|
+
encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
145
|
+
{
|
|
146
|
+
bps: 1500,
|
|
147
|
+
chainId: 45,
|
|
148
|
+
addr: recipient.address,
|
|
149
|
+
transferType: 2
|
|
150
|
+
}
|
|
151
|
+
]);
|
|
166
152
|
|
|
167
153
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
168
154
|
|
|
169
|
-
const updEvents = await distHelper.queryFilter(
|
|
170
|
-
|
|
171
|
-
);
|
|
172
|
-
const addEvents = await distHelper.queryFilter(
|
|
173
|
-
distHelper.filters.RecipientAdded()
|
|
174
|
-
);
|
|
155
|
+
const updEvents = await distHelper.queryFilter(distHelper.filters.RecipientUpdated());
|
|
156
|
+
const addEvents = await distHelper.queryFilter(distHelper.filters.RecipientAdded());
|
|
175
157
|
|
|
176
158
|
const dr = await distHelper.distributionRecipients(0);
|
|
177
159
|
expect(dr.addr).to.equal(recipient.address);
|
|
@@ -181,29 +163,24 @@ describe("DistributionHelper", () => {
|
|
|
181
163
|
});
|
|
182
164
|
|
|
183
165
|
it("should distribute via fuse bridge", async () => {
|
|
184
|
-
const { distHelper, bridge } = await
|
|
166
|
+
const { distHelper, bridge } = await loadFixture(fixture);
|
|
185
167
|
|
|
186
168
|
const recipient = signers[0];
|
|
187
169
|
|
|
188
|
-
let encodedCall = distHelper.interface.encodeFunctionData(
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
}
|
|
197
|
-
]
|
|
198
|
-
);
|
|
170
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
171
|
+
{
|
|
172
|
+
bps: 2000,
|
|
173
|
+
chainId: 42220,
|
|
174
|
+
addr: recipient.address,
|
|
175
|
+
transferType: 0
|
|
176
|
+
}
|
|
177
|
+
]);
|
|
199
178
|
|
|
200
179
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
201
180
|
|
|
202
181
|
await goodDollar.mint(distHelper.address, "100000000000");
|
|
203
182
|
await distHelper.onDistribution("100000000000");
|
|
204
|
-
expect(await goodDollar.balanceOf(bridge.address)).to.equal(
|
|
205
|
-
(100000000000 * 2000) / 10000
|
|
206
|
-
);
|
|
183
|
+
expect(await goodDollar.balanceOf(bridge.address)).to.equal((100000000000 * 2000) / 10000);
|
|
207
184
|
|
|
208
185
|
const events = await bridge.queryFilter(bridge.filters.OnToken());
|
|
209
186
|
expect(events[0].args.sender).to.equal(distHelper.address);
|
|
@@ -211,185 +188,173 @@ describe("DistributionHelper", () => {
|
|
|
211
188
|
expect(events[0].args.data).to.equal(recipient.address.toLowerCase());
|
|
212
189
|
});
|
|
213
190
|
|
|
214
|
-
it("should distribute via
|
|
215
|
-
const { distHelper, bridge } = await
|
|
191
|
+
it("should distribute via layerzero bridge", async () => {
|
|
192
|
+
const { distHelper, bridge } = await loadFixture(fixture);
|
|
193
|
+
|
|
194
|
+
const recipient = signers[0];
|
|
195
|
+
|
|
196
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
197
|
+
{
|
|
198
|
+
bps: 2000,
|
|
199
|
+
chainId: 42220,
|
|
200
|
+
addr: recipient.address, //needs to be a contract for transferAndCall to work
|
|
201
|
+
transferType: 1
|
|
202
|
+
}
|
|
203
|
+
]);
|
|
204
|
+
|
|
205
|
+
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
206
|
+
|
|
207
|
+
await goodDollar.mint(distHelper.address, "100000000000");
|
|
208
|
+
await founder.sendTransaction({ to: distHelper.address, value: ethers.constants.WeiPerEther });
|
|
209
|
+
await distHelper.onDistribution("100000000000");
|
|
210
|
+
expect(await goodDollar.allowance(distHelper.address, bridge.address)).to.equal((100000000000 * 2000) / 10000);
|
|
211
|
+
|
|
212
|
+
const events = await bridge.queryFilter(bridge.filters.BridgeLz());
|
|
213
|
+
expect(events[0].args.recipient).to.equal(recipient.address);
|
|
214
|
+
expect(events[0].args.amount).to.equal((100000000000 * 2000) / 10000);
|
|
215
|
+
expect(events[0].args.chainId).to.equal(42220);
|
|
216
|
+
expect(events[0].args.fee).to.equal(5e14);
|
|
217
|
+
});
|
|
218
|
+
|
|
219
|
+
it("should distribute via axelar bridge", async () => {
|
|
220
|
+
const { distHelper, bridge } = await loadFixture(fixture);
|
|
216
221
|
|
|
217
222
|
const recipient = signers[0];
|
|
218
223
|
|
|
219
|
-
let encodedCall = distHelper.interface.encodeFunctionData(
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
}
|
|
228
|
-
]
|
|
229
|
-
);
|
|
224
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
225
|
+
{
|
|
226
|
+
bps: 2000,
|
|
227
|
+
chainId: 42220,
|
|
228
|
+
addr: recipient.address, //needs to be a contract for transferAndCall to work
|
|
229
|
+
transferType: 2
|
|
230
|
+
}
|
|
231
|
+
]);
|
|
230
232
|
|
|
231
233
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
232
234
|
|
|
233
235
|
await goodDollar.mint(distHelper.address, "100000000000");
|
|
236
|
+
await founder.sendTransaction({ to: distHelper.address, value: ethers.constants.WeiPerEther });
|
|
234
237
|
await distHelper.onDistribution("100000000000");
|
|
235
|
-
expect(
|
|
236
|
-
await goodDollar.allowance(distHelper.address, bridge.address)
|
|
237
|
-
).to.equal((100000000000 * 2000) / 10000);
|
|
238
|
+
expect(await goodDollar.allowance(distHelper.address, bridge.address)).to.equal((100000000000 * 2000) / 10000);
|
|
238
239
|
|
|
239
|
-
const events = await bridge.queryFilter(bridge.filters.
|
|
240
|
-
expect(events[0].args.token).to.equal(await distHelper.anyGoodDollar());
|
|
240
|
+
const events = await bridge.queryFilter(bridge.filters.BridgeAxl());
|
|
241
241
|
expect(events[0].args.recipient).to.equal(recipient.address);
|
|
242
242
|
expect(events[0].args.amount).to.equal((100000000000 * 2000) / 10000);
|
|
243
|
-
expect(events[0].args.chainId).to.equal(
|
|
243
|
+
expect(events[0].args.chainId).to.equal(42220);
|
|
244
|
+
expect(events[0].args.fee).to.equal(2.2e13); //fee should be 2e13 with 10% extra
|
|
245
|
+
expect(events[0].args.gasRefund).to.equal(await distHelper.getTargetChainRefundAddress(42220));
|
|
244
246
|
});
|
|
245
247
|
|
|
246
248
|
it("should distribute via transferAndCall", async () => {
|
|
247
|
-
const { distHelper, bridge } = await
|
|
249
|
+
const { distHelper, bridge } = await loadFixture(fixture);
|
|
248
250
|
|
|
249
251
|
const recipient = signers[0];
|
|
250
252
|
|
|
251
|
-
let encodedCall = distHelper.interface.encodeFunctionData(
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
}
|
|
260
|
-
]
|
|
261
|
-
);
|
|
253
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
254
|
+
{
|
|
255
|
+
bps: 2555,
|
|
256
|
+
chainId: 42220,
|
|
257
|
+
addr: signers[0].address,
|
|
258
|
+
transferType: 3
|
|
259
|
+
}
|
|
260
|
+
]);
|
|
262
261
|
|
|
263
262
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
264
263
|
|
|
265
264
|
await goodDollar.mint(distHelper.address, "100000000000");
|
|
266
265
|
await distHelper.onDistribution("100000000000");
|
|
267
|
-
expect(await goodDollar.balanceOf(signers[0].address)).to.equal(
|
|
268
|
-
(100000000000 * 2555) / 10000
|
|
269
|
-
);
|
|
266
|
+
expect(await goodDollar.balanceOf(signers[0].address)).to.equal((100000000000 * 2555) / 10000);
|
|
270
267
|
});
|
|
271
268
|
|
|
272
269
|
it("should distribute to multiple recipients", async () => {
|
|
273
|
-
const { distHelper, bridge } = await
|
|
270
|
+
const { distHelper, bridge } = await loadFixture(fixture);
|
|
274
271
|
|
|
275
272
|
const recipient = signers[0];
|
|
276
273
|
|
|
277
|
-
let encodedCall = distHelper.interface.encodeFunctionData(
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
}
|
|
286
|
-
]
|
|
287
|
-
);
|
|
274
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
275
|
+
{
|
|
276
|
+
bps: 2555,
|
|
277
|
+
chainId: 42220,
|
|
278
|
+
addr: signers[0].address,
|
|
279
|
+
transferType: 3
|
|
280
|
+
}
|
|
281
|
+
]);
|
|
288
282
|
|
|
289
283
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
290
284
|
|
|
291
|
-
encodedCall = distHelper.interface.encodeFunctionData(
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
}
|
|
300
|
-
]
|
|
301
|
-
);
|
|
285
|
+
encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
286
|
+
{
|
|
287
|
+
bps: 1000,
|
|
288
|
+
chainId: 42220,
|
|
289
|
+
addr: signers[1].address,
|
|
290
|
+
transferType: 3
|
|
291
|
+
}
|
|
292
|
+
]);
|
|
302
293
|
|
|
303
294
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
304
295
|
|
|
305
|
-
encodedCall = distHelper.interface.encodeFunctionData(
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
}
|
|
314
|
-
]
|
|
315
|
-
);
|
|
296
|
+
encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
297
|
+
{
|
|
298
|
+
bps: 5,
|
|
299
|
+
chainId: 42220,
|
|
300
|
+
addr: signers[2].address,
|
|
301
|
+
transferType: 3
|
|
302
|
+
}
|
|
303
|
+
]);
|
|
316
304
|
|
|
317
305
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
318
306
|
|
|
319
307
|
await goodDollar.mint(distHelper.address, "100000000000");
|
|
320
308
|
await distHelper.onDistribution("100000000000");
|
|
321
|
-
expect(await goodDollar.balanceOf(signers[0].address)).to.equal(
|
|
322
|
-
|
|
323
|
-
);
|
|
324
|
-
expect(await goodDollar.balanceOf(signers[1].address)).to.equal(
|
|
325
|
-
(100000000000 * 1000) / 10000
|
|
326
|
-
);
|
|
327
|
-
expect(await goodDollar.balanceOf(signers[2].address)).to.equal(
|
|
328
|
-
(100000000000 * 5) / 10000
|
|
329
|
-
);
|
|
309
|
+
expect(await goodDollar.balanceOf(signers[0].address)).to.equal((100000000000 * 2555) / 10000);
|
|
310
|
+
expect(await goodDollar.balanceOf(signers[1].address)).to.equal((100000000000 * 1000) / 10000);
|
|
311
|
+
expect(await goodDollar.balanceOf(signers[2].address)).to.equal((100000000000 * 5) / 10000);
|
|
330
312
|
});
|
|
331
313
|
|
|
332
314
|
it("should emit distribution event for multiple recipients", async () => {
|
|
333
|
-
const { distHelper, bridge } = await
|
|
315
|
+
const { distHelper, bridge } = await loadFixture(fixture);
|
|
334
316
|
|
|
335
317
|
const recipient = signers[0];
|
|
336
318
|
|
|
337
|
-
let encodedCall = distHelper.interface.encodeFunctionData(
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
}
|
|
346
|
-
]
|
|
347
|
-
);
|
|
319
|
+
let encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
320
|
+
{
|
|
321
|
+
bps: 2555,
|
|
322
|
+
chainId: 42220,
|
|
323
|
+
addr: signers[0].address,
|
|
324
|
+
transferType: 3
|
|
325
|
+
}
|
|
326
|
+
]);
|
|
348
327
|
|
|
349
328
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
350
329
|
|
|
351
|
-
encodedCall = distHelper.interface.encodeFunctionData(
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
}
|
|
360
|
-
]
|
|
361
|
-
);
|
|
330
|
+
encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
331
|
+
{
|
|
332
|
+
bps: 1000,
|
|
333
|
+
chainId: 42220,
|
|
334
|
+
addr: signers[1].address,
|
|
335
|
+
transferType: 3
|
|
336
|
+
}
|
|
337
|
+
]);
|
|
362
338
|
|
|
363
339
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
364
340
|
|
|
365
|
-
encodedCall = distHelper.interface.encodeFunctionData(
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
}
|
|
374
|
-
]
|
|
375
|
-
);
|
|
341
|
+
encodedCall = distHelper.interface.encodeFunctionData("addOrUpdateRecipient", [
|
|
342
|
+
{
|
|
343
|
+
bps: 5,
|
|
344
|
+
chainId: 42220,
|
|
345
|
+
addr: signers[2].address,
|
|
346
|
+
transferType: 3
|
|
347
|
+
}
|
|
348
|
+
]);
|
|
376
349
|
|
|
377
350
|
await genericCall(distHelper.address, encodedCall, avatar.address, 0);
|
|
378
351
|
|
|
379
352
|
await goodDollar.mint(distHelper.address, "100000000000");
|
|
380
353
|
await distHelper.onDistribution("100000000000");
|
|
381
354
|
|
|
382
|
-
const DistributionEvents = await distHelper.queryFilter(
|
|
383
|
-
|
|
384
|
-
);
|
|
385
|
-
expect(DistributionEvents[0].args.distributionRecipients[
|
|
386
|
-
signers[0].address
|
|
387
|
-
);
|
|
388
|
-
expect(DistributionEvents[0].args.distributionRecipients[1].addr).eq(
|
|
389
|
-
signers[1].address
|
|
390
|
-
);
|
|
391
|
-
expect(DistributionEvents[0].args.distributionRecipients[2].addr).eq(
|
|
392
|
-
signers[2].address
|
|
393
|
-
);
|
|
355
|
+
const DistributionEvents = await distHelper.queryFilter(distHelper.filters.Distribution());
|
|
356
|
+
expect(DistributionEvents[0].args.distributionRecipients[0].addr).eq(signers[0].address);
|
|
357
|
+
expect(DistributionEvents[0].args.distributionRecipients[1].addr).eq(signers[1].address);
|
|
358
|
+
expect(DistributionEvents[0].args.distributionRecipients[2].addr).eq(signers[2].address);
|
|
394
359
|
});
|
|
395
360
|
});
|