@gooddollar/goodprotocol 2.0.7-beta.1 → 2.0.7-beta.3
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/BuyGDClone.min.json +1 -0
- package/artifacts/abis/BuyGDCloneFactory.min.json +1 -0
- package/artifacts/abis/GDFaucet.min.json +1 -0
- package/artifacts/abis/ISwapRouter.min.json +1 -0
- 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/FuseFaucet.sol/FuseFaucet.dbg.json +1 -1
- package/artifacts/contracts/fuseFaucet/FuseFaucetV2.sol/FuseFaucetV2.dbg.json +1 -1
- package/artifacts/contracts/governance/ClaimersDistribution.sol/ClaimersDistribution.dbg.json +1 -1
- package/artifacts/contracts/governance/CompoundVotingMachine.sol/CompoundVotingMachine.dbg.json +1 -1
- package/artifacts/contracts/governance/GReputation.sol/GReputation.dbg.json +1 -1
- package/artifacts/contracts/governance/GoodDollarStaking.sol/GoodDollarStaking.dbg.json +1 -1
- 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/MultiBaseGovernanceShareField.sol/MultiBaseGovernanceShareField.dbg.json +1 -1
- package/artifacts/contracts/governance/Reputation.sol/Reputation.dbg.json +1 -1
- 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/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/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/AaveUSDMockOracle.sol/AaveUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/BatUSDMockOracle.sol/BatUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/CompUsdMockOracle.sol/CompUSDMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/DAIMock.sol/DAIMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/DaiEthPriceMockOracle.sol/DaiEthPriceMockOracle.dbg.json +1 -1
- package/artifacts/contracts/mocks/DecimalsMock.sol/DecimalsMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/DistributionBridgeMock.sol/DistributionBridgeMock.dbg.json +1 -1
- 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/FeesFormularMock.sol/FeesFormulaMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/GasPriceMockOracle.sol/GasPriceMockOracle.dbg.json +1 -1
- 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/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/IncentiveControllerMock.sol/IncentiveControllerMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/LendingPoolMock.sol/LendingPoolMock.dbg.json +1 -1
- 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/OverMintTester.sol/IGoodDollarStakingTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/OverMintTester.sol/OverMintTester.dbg.json +1 -1
- 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/SixteenDecimalsTokenMock.sol/SixteenDecimalsTokenMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/StakingMockFixedAPY.sol/StakingMockFixedAPY.dbg.json +1 -1
- package/artifacts/contracts/mocks/SwapHelperTest.sol/SwapHelperTest.dbg.json +1 -1
- package/artifacts/contracts/mocks/TwentyDecimalsTokenMock.sol/TwentyDecimalsTokenMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock2.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock3.dbg.json +1 -1
- package/artifacts/contracts/mocks/UpgradableMocks.sol/UpgradableMock4.dbg.json +1 -1
- package/artifacts/contracts/mocks/UsdcMock.sol/USDCMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cBATMock.sol/cBATMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDAILowWorthMock.sol/cDAILowWorthMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDAIMock.sol/cDAIMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDAINonMintableMock.sol/cDAINonMintableMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cDecimalsMock.sol/cDecimalsMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cSDTMock.sol/cSDTMock.dbg.json +1 -1
- package/artifacts/contracts/mocks/cUSDCMock.sol/cUSDCMock.dbg.json +1 -1
- 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/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/BaseShareFieldV2.sol/BaseShareFieldV2.dbg.json +1 -1
- 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/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/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/StakingRewardsFixedAPY.sol/StakingRewardsFixedAPY.dbg.json +1 -1
- package/artifacts/contracts/token/ERC20PresetMinterPauserUpgradeable.sol/ERC20PresetMinterPauserUpgradeable.dbg.json +1 -1
- 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/FeesFormula.sol/IFeesFormula.dbg.json +1 -1
- package/artifacts/contracts/token/GoodDollar.sol/GoodDollar.dbg.json +1 -1
- 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/SuperGoodDollar.sol/SuperGoodDollar.dbg.json +1 -1
- package/artifacts/contracts/token/superfluid/SuperToken.sol/SuperToken.dbg.json +1 -1
- 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/UUPSUtils.dbg.json +1 -1
- package/artifacts/contracts/ubi/UBIScheme.sol/UBIScheme.dbg.json +1 -1
- package/artifacts/contracts/ubi/UBISchemeV2.sol/UBISchemeV2.dbg.json +1 -1
- package/artifacts/contracts/utils/AdminWallet.sol/AdminWallet.dbg.json +1 -1
- package/artifacts/contracts/utils/AdminWalletFuse.sol/AdminWalletFuse.dbg.json +1 -1
- package/artifacts/contracts/utils/BancorFormula.sol/BancorFormula.dbg.json +1 -1
- 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 +4 -0
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDClone.json +206 -0
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.dbg.json +4 -0
- package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.json +80 -0
- package/artifacts/contracts/utils/BuyGDClone.sol/ISwapRouter.dbg.json +4 -0
- package/artifacts/contracts/utils/BuyGDClone.sol/ISwapRouter.json +205 -0
- package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json +1 -1
- package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json +1 -1
- package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json +1 -1
- package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json +1 -1
- package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.dbg.json +4 -0
- package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.json +125 -0
- package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json +1 -1
- 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/IdentityFix.sol/IdentityFix.dbg.json +1 -1
- package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json +1 -1
- package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json +1 -1
- package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json +1 -1
- package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json +1 -1
- package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json +1 -1
- 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/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json +1 -1
- package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json +1 -1
- package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json +1 -1
- package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json +1 -1
- package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json +1 -1
- package/contracts/invite/InvitesFuseV2.sol +5 -3
- package/contracts/invite/InvitesV2.sol +5 -3
- package/contracts/reserve/DistributionHelper.sol +12 -9
- package/contracts/utils/BuyGDClone.sol +171 -0
- package/contracts/utils/GDFaucet.sol +28 -0
- package/hardhat.config.ts +10 -1
- package/package.json +1 -1
- package/releases/deployment.json +9 -4
- package/scripts/multichain-deploy/6_testnetFaucet.ts +85 -0
- package/scripts/multichain-deploy/helpers.ts +1 -1
- package/scripts/upgrades/multichain-temp-fix.ts +126 -0
- package/truffle-config.js +8 -0
- package/types/BuyGDClone.ts +277 -0
- package/types/BuyGDCloneFactory.ts +143 -0
- package/types/GDFaucet.ts +221 -0
- package/types/ISwapRouter.ts +298 -0
- package/types/factories/AaveStakingFactory__factory.ts +1 -1
- package/types/factories/BuyAndBridgeHelper__factory.ts +1 -1
- package/types/factories/BuyGDCloneFactory__factory.ts +142 -0
- package/types/factories/BuyGDClone__factory.ts +265 -0
- package/types/factories/CompoundStakingFactory__factory.ts +1 -1
- package/types/factories/DistributionHelperTestHelper__factory.ts +1 -1
- package/types/factories/DistributionHelperTest__factory.ts +1 -1
- package/types/factories/DistributionHelper__factory.ts +1 -1
- package/types/factories/DonationsStaking__factory.ts +1 -1
- package/types/factories/ExchangeHelper__factory.ts +1 -1
- package/types/factories/GDFaucet__factory.ts +188 -0
- 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/GoodFundManagerTest__factory.ts +1 -1
- package/types/factories/GoodFundManager__factory.ts +1 -1
- package/types/factories/GoodReserveCDai__factory.ts +1 -1
- package/types/factories/ISwapRouter__factory.ts +217 -0
- package/types/factories/InvitesFuseV2__factory.ts +1 -1
- package/types/factories/InvitesV2__factory.ts +1 -1
- package/types/factories/OverMintTesterRegularStake__factory.ts +1 -1
- package/types/factories/StakersDistribution__factory.ts +1 -1
- package/types/hardhat.d.ts +36 -0
- package/types/index.ts +8 -0
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_format": "hh-sol-artifact-1",
|
|
3
|
+
"contractName": "ISwapRouter",
|
|
4
|
+
"sourceName": "contracts/utils/BuyGDClone.sol",
|
|
5
|
+
"abi": [
|
|
6
|
+
{
|
|
7
|
+
"inputs": [
|
|
8
|
+
{
|
|
9
|
+
"components": [
|
|
10
|
+
{
|
|
11
|
+
"internalType": "bytes",
|
|
12
|
+
"name": "path",
|
|
13
|
+
"type": "bytes"
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
"internalType": "address",
|
|
17
|
+
"name": "recipient",
|
|
18
|
+
"type": "address"
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
"internalType": "uint256",
|
|
22
|
+
"name": "amountIn",
|
|
23
|
+
"type": "uint256"
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"internalType": "uint256",
|
|
27
|
+
"name": "amountOutMinimum",
|
|
28
|
+
"type": "uint256"
|
|
29
|
+
}
|
|
30
|
+
],
|
|
31
|
+
"internalType": "struct ISwapRouter.ExactInputParams",
|
|
32
|
+
"name": "params",
|
|
33
|
+
"type": "tuple"
|
|
34
|
+
}
|
|
35
|
+
],
|
|
36
|
+
"name": "exactInput",
|
|
37
|
+
"outputs": [
|
|
38
|
+
{
|
|
39
|
+
"internalType": "uint256",
|
|
40
|
+
"name": "amountOut",
|
|
41
|
+
"type": "uint256"
|
|
42
|
+
}
|
|
43
|
+
],
|
|
44
|
+
"stateMutability": "payable",
|
|
45
|
+
"type": "function"
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
"inputs": [
|
|
49
|
+
{
|
|
50
|
+
"components": [
|
|
51
|
+
{
|
|
52
|
+
"internalType": "address",
|
|
53
|
+
"name": "tokenIn",
|
|
54
|
+
"type": "address"
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
"internalType": "address",
|
|
58
|
+
"name": "tokenOut",
|
|
59
|
+
"type": "address"
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
"internalType": "uint24",
|
|
63
|
+
"name": "fee",
|
|
64
|
+
"type": "uint24"
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
"internalType": "address",
|
|
68
|
+
"name": "recipient",
|
|
69
|
+
"type": "address"
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
"internalType": "uint256",
|
|
73
|
+
"name": "amountIn",
|
|
74
|
+
"type": "uint256"
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
"internalType": "uint256",
|
|
78
|
+
"name": "amountOutMinimum",
|
|
79
|
+
"type": "uint256"
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
"internalType": "uint160",
|
|
83
|
+
"name": "sqrtPriceLimitX96",
|
|
84
|
+
"type": "uint160"
|
|
85
|
+
}
|
|
86
|
+
],
|
|
87
|
+
"internalType": "struct ISwapRouter.ExactInputSingleParams",
|
|
88
|
+
"name": "params",
|
|
89
|
+
"type": "tuple"
|
|
90
|
+
}
|
|
91
|
+
],
|
|
92
|
+
"name": "exactInputSingle",
|
|
93
|
+
"outputs": [
|
|
94
|
+
{
|
|
95
|
+
"internalType": "uint256",
|
|
96
|
+
"name": "amountOut",
|
|
97
|
+
"type": "uint256"
|
|
98
|
+
}
|
|
99
|
+
],
|
|
100
|
+
"stateMutability": "payable",
|
|
101
|
+
"type": "function"
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
"inputs": [
|
|
105
|
+
{
|
|
106
|
+
"components": [
|
|
107
|
+
{
|
|
108
|
+
"internalType": "bytes",
|
|
109
|
+
"name": "path",
|
|
110
|
+
"type": "bytes"
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
"internalType": "address",
|
|
114
|
+
"name": "recipient",
|
|
115
|
+
"type": "address"
|
|
116
|
+
},
|
|
117
|
+
{
|
|
118
|
+
"internalType": "uint256",
|
|
119
|
+
"name": "amountOut",
|
|
120
|
+
"type": "uint256"
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
"internalType": "uint256",
|
|
124
|
+
"name": "amountInMaximum",
|
|
125
|
+
"type": "uint256"
|
|
126
|
+
}
|
|
127
|
+
],
|
|
128
|
+
"internalType": "struct ISwapRouter.ExactOutputParams",
|
|
129
|
+
"name": "params",
|
|
130
|
+
"type": "tuple"
|
|
131
|
+
}
|
|
132
|
+
],
|
|
133
|
+
"name": "exactOutput",
|
|
134
|
+
"outputs": [
|
|
135
|
+
{
|
|
136
|
+
"internalType": "uint256",
|
|
137
|
+
"name": "amountIn",
|
|
138
|
+
"type": "uint256"
|
|
139
|
+
}
|
|
140
|
+
],
|
|
141
|
+
"stateMutability": "payable",
|
|
142
|
+
"type": "function"
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
"inputs": [
|
|
146
|
+
{
|
|
147
|
+
"components": [
|
|
148
|
+
{
|
|
149
|
+
"internalType": "address",
|
|
150
|
+
"name": "tokenIn",
|
|
151
|
+
"type": "address"
|
|
152
|
+
},
|
|
153
|
+
{
|
|
154
|
+
"internalType": "address",
|
|
155
|
+
"name": "tokenOut",
|
|
156
|
+
"type": "address"
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
"internalType": "uint24",
|
|
160
|
+
"name": "fee",
|
|
161
|
+
"type": "uint24"
|
|
162
|
+
},
|
|
163
|
+
{
|
|
164
|
+
"internalType": "address",
|
|
165
|
+
"name": "recipient",
|
|
166
|
+
"type": "address"
|
|
167
|
+
},
|
|
168
|
+
{
|
|
169
|
+
"internalType": "uint256",
|
|
170
|
+
"name": "amountOut",
|
|
171
|
+
"type": "uint256"
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
"internalType": "uint256",
|
|
175
|
+
"name": "amountInMaximum",
|
|
176
|
+
"type": "uint256"
|
|
177
|
+
},
|
|
178
|
+
{
|
|
179
|
+
"internalType": "uint160",
|
|
180
|
+
"name": "sqrtPriceLimitX96",
|
|
181
|
+
"type": "uint160"
|
|
182
|
+
}
|
|
183
|
+
],
|
|
184
|
+
"internalType": "struct ISwapRouter.ExactOutputSingleParams",
|
|
185
|
+
"name": "params",
|
|
186
|
+
"type": "tuple"
|
|
187
|
+
}
|
|
188
|
+
],
|
|
189
|
+
"name": "exactOutputSingle",
|
|
190
|
+
"outputs": [
|
|
191
|
+
{
|
|
192
|
+
"internalType": "uint256",
|
|
193
|
+
"name": "amountIn",
|
|
194
|
+
"type": "uint256"
|
|
195
|
+
}
|
|
196
|
+
],
|
|
197
|
+
"stateMutability": "payable",
|
|
198
|
+
"type": "function"
|
|
199
|
+
}
|
|
200
|
+
],
|
|
201
|
+
"bytecode": "0x",
|
|
202
|
+
"deployedBytecode": "0x",
|
|
203
|
+
"linkReferences": {},
|
|
204
|
+
"deployedLinkReferences": {}
|
|
205
|
+
}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
{
|
|
2
|
+
"_format": "hh-sol-artifact-1",
|
|
3
|
+
"contractName": "GDFaucet",
|
|
4
|
+
"sourceName": "contracts/utils/GDFaucet.sol",
|
|
5
|
+
"abi": [
|
|
6
|
+
{
|
|
7
|
+
"inputs": [
|
|
8
|
+
{
|
|
9
|
+
"internalType": "contract INameService",
|
|
10
|
+
"name": "_dao",
|
|
11
|
+
"type": "address"
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
"internalType": "uint256",
|
|
15
|
+
"name": "_dripAmount",
|
|
16
|
+
"type": "uint256"
|
|
17
|
+
}
|
|
18
|
+
],
|
|
19
|
+
"stateMutability": "nonpayable",
|
|
20
|
+
"type": "constructor"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"inputs": [],
|
|
24
|
+
"name": "avatar",
|
|
25
|
+
"outputs": [
|
|
26
|
+
{
|
|
27
|
+
"internalType": "address",
|
|
28
|
+
"name": "",
|
|
29
|
+
"type": "address"
|
|
30
|
+
}
|
|
31
|
+
],
|
|
32
|
+
"stateMutability": "view",
|
|
33
|
+
"type": "function"
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
"inputs": [],
|
|
37
|
+
"name": "dao",
|
|
38
|
+
"outputs": [
|
|
39
|
+
{
|
|
40
|
+
"internalType": "contract Controller",
|
|
41
|
+
"name": "",
|
|
42
|
+
"type": "address"
|
|
43
|
+
}
|
|
44
|
+
],
|
|
45
|
+
"stateMutability": "view",
|
|
46
|
+
"type": "function"
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
"inputs": [],
|
|
50
|
+
"name": "drip",
|
|
51
|
+
"outputs": [],
|
|
52
|
+
"stateMutability": "nonpayable",
|
|
53
|
+
"type": "function"
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
"inputs": [],
|
|
57
|
+
"name": "dripAmount",
|
|
58
|
+
"outputs": [
|
|
59
|
+
{
|
|
60
|
+
"internalType": "uint256",
|
|
61
|
+
"name": "",
|
|
62
|
+
"type": "uint256"
|
|
63
|
+
}
|
|
64
|
+
],
|
|
65
|
+
"stateMutability": "view",
|
|
66
|
+
"type": "function"
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"inputs": [
|
|
70
|
+
{
|
|
71
|
+
"internalType": "address",
|
|
72
|
+
"name": "",
|
|
73
|
+
"type": "address"
|
|
74
|
+
}
|
|
75
|
+
],
|
|
76
|
+
"name": "lastDripTime",
|
|
77
|
+
"outputs": [
|
|
78
|
+
{
|
|
79
|
+
"internalType": "uint256",
|
|
80
|
+
"name": "",
|
|
81
|
+
"type": "uint256"
|
|
82
|
+
}
|
|
83
|
+
],
|
|
84
|
+
"stateMutability": "view",
|
|
85
|
+
"type": "function"
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
"inputs": [],
|
|
89
|
+
"name": "nameService",
|
|
90
|
+
"outputs": [
|
|
91
|
+
{
|
|
92
|
+
"internalType": "contract INameService",
|
|
93
|
+
"name": "",
|
|
94
|
+
"type": "address"
|
|
95
|
+
}
|
|
96
|
+
],
|
|
97
|
+
"stateMutability": "view",
|
|
98
|
+
"type": "function"
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
"inputs": [],
|
|
102
|
+
"name": "nativeToken",
|
|
103
|
+
"outputs": [
|
|
104
|
+
{
|
|
105
|
+
"internalType": "contract IGoodDollar",
|
|
106
|
+
"name": "",
|
|
107
|
+
"type": "address"
|
|
108
|
+
}
|
|
109
|
+
],
|
|
110
|
+
"stateMutability": "view",
|
|
111
|
+
"type": "function"
|
|
112
|
+
},
|
|
113
|
+
{
|
|
114
|
+
"inputs": [],
|
|
115
|
+
"name": "updateAvatar",
|
|
116
|
+
"outputs": [],
|
|
117
|
+
"stateMutability": "nonpayable",
|
|
118
|
+
"type": "function"
|
|
119
|
+
}
|
|
120
|
+
],
|
|
121
|
+
"bytecode": "0x608060405234801561001057600080fd5b5060405161091838038061091883398101604081905261002f916101a3565b61003882610041565b603555506101f5565b600280546001600160a01b0319166001600160a01b038316179055610064610067565b50565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156100ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100ee91906101d1565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610148573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016c91906101d1565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038116811461006457600080fd5b600080604083850312156101b657600080fd5b82516101c18161018e565b6020939093015192949293505050565b6000602082840312156101e357600080fd5b81516101ee8161018e565b9392505050565b610714806102046000396000f3fe608060405234801561001057600080fd5b50600436106100785760003560e01c80631b3c90a81461007d57806335a1529b146100875780633e6326fc146100a35780634162169f146100ce5780635aef7de6146100e15780638b8a60bd146100f45780639f678cca14610114578063e1758bd81461011c575b600080fd5b610085610124565b005b61009060355481565b6040519081526020015b60405180910390f35b6002546100b6906001600160a01b031681565b6040516001600160a01b03909116815260200161009a565b6000546100b6906001600160a01b031681565b6001546100b6906001600160a01b031681565b61009061010236600461051a565b60366020526000908152604090205481565b61008561024b565b6100b6610478565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061053e565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610205573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610229919061053e565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b33600090815260366020526040902054620151809061026a9042610571565b10156102aa5760405162461bcd60e51b815260206004820152600a602482015269191c9a5c081b1a5b5a5d60b21b60448201526064015b60405180910390fd5b3360009081526036602052604081204290556102c4610478565b6001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610301573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610325919061058a565b60005460ff9190911691506001600160a01b0316636407e43261034983600a610691565b603554610356919061069d565b60005460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561039f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c3919061053e565b6040516001600160e01b031960e086901b16815260048101939093526001600160a01b0391821660248401521660448201526064016020604051808303816000875af1158015610417573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061043b91906106bc565b6104755760405162461bcd60e51b815260206004820152600b60248201526a1b5a5b9d0819985a5b195960aa1b60448201526064016102a1565b50565b60025460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156104dc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610500919061053e565b905090565b6001600160a01b038116811461047557600080fd5b60006020828403121561052c57600080fd5b813561053781610505565b9392505050565b60006020828403121561055057600080fd5b815161053781610505565b634e487b7160e01b600052601160045260246000fd5b818103818111156105845761058461055b565b92915050565b60006020828403121561059c57600080fd5b815160ff8116811461053757600080fd5b600181815b808511156105e85781600019048211156105ce576105ce61055b565b808516156105db57918102915b93841c93908002906105b2565b509250929050565b6000826105ff57506001610584565b8161060c57506000610584565b8160018114610622576002811461062c57610648565b6001915050610584565b60ff84111561063d5761063d61055b565b50506001821b610584565b5060208310610133831016604e8410600b841016171561066b575081810a610584565b61067583836105ad565b80600019048211156106895761068961055b565b029392505050565b600061053783836105f0565b60008160001904831182151516156106b7576106b761055b565b500290565b6000602082840312156106ce57600080fd5b8151801515811461053757600080fdfea26469706673582212204627259417c9f666bee47dee681f91cae710a71064eccdf1dcc21b64f221f89b64736f6c63430008100033",
|
|
122
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100785760003560e01c80631b3c90a81461007d57806335a1529b146100875780633e6326fc146100a35780634162169f146100ce5780635aef7de6146100e15780638b8a60bd146100f45780639f678cca14610114578063e1758bd81461011c575b600080fd5b610085610124565b005b61009060355481565b6040519081526020015b60405180910390f35b6002546100b6906001600160a01b031681565b6040516001600160a01b03909116815260200161009a565b6000546100b6906001600160a01b031681565b6001546100b6906001600160a01b031681565b61009061010236600461051a565b60366020526000908152604090205481565b61008561024b565b6100b6610478565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061053e565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610205573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610229919061053e565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b33600090815260366020526040902054620151809061026a9042610571565b10156102aa5760405162461bcd60e51b815260206004820152600a602482015269191c9a5c081b1a5b5a5d60b21b60448201526064015b60405180910390fd5b3360009081526036602052604081204290556102c4610478565b6001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610301573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610325919061058a565b60005460ff9190911691506001600160a01b0316636407e43261034983600a610691565b603554610356919061069d565b60005460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561039f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c3919061053e565b6040516001600160e01b031960e086901b16815260048101939093526001600160a01b0391821660248401521660448201526064016020604051808303816000875af1158015610417573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061043b91906106bc565b6104755760405162461bcd60e51b815260206004820152600b60248201526a1b5a5b9d0819985a5b195960aa1b60448201526064016102a1565b50565b60025460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156104dc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610500919061053e565b905090565b6001600160a01b038116811461047557600080fd5b60006020828403121561052c57600080fd5b813561053781610505565b9392505050565b60006020828403121561055057600080fd5b815161053781610505565b634e487b7160e01b600052601160045260246000fd5b818103818111156105845761058461055b565b92915050565b60006020828403121561059c57600080fd5b815160ff8116811461053757600080fd5b600181815b808511156105e85781600019048211156105ce576105ce61055b565b808516156105db57918102915b93841c93908002906105b2565b509250929050565b6000826105ff57506001610584565b8161060c57506000610584565b8160018114610622576002811461062c57610648565b6001915050610584565b60ff84111561063d5761063d61055b565b50506001821b610584565b5060208310610133831016604e8410600b841016171561066b575081810a610584565b61067583836105ad565b80600019048211156106895761068961055b565b029392505050565b600061053783836105f0565b60008160001904831182151516156106b7576106b761055b565b500290565b6000602082840312156106ce57600080fd5b8151801515811461053757600080fdfea26469706673582212204627259417c9f666bee47dee681f91cae710a71064eccdf1dcc21b64f221f89b64736f6c63430008100033",
|
|
123
|
+
"linkReferences": {},
|
|
124
|
+
"deployedLinkReferences": {}
|
|
125
|
+
}
|
|
@@ -272,11 +272,13 @@ contract InvitesFuseV2 is Initializable {
|
|
|
272
272
|
function collectBounties() public isActive {
|
|
273
273
|
address[] storage pendings = users[msg.sender].pending;
|
|
274
274
|
uint256 totalBounties = 0;
|
|
275
|
-
for (
|
|
276
|
-
if (gasleft() <
|
|
277
|
-
address pending = pendings[
|
|
275
|
+
for (uint256 i = pendings.length; i > 0; i--) {
|
|
276
|
+
if (gasleft() < 120000) break; // leave enough gas for the inviter transfer around 120k
|
|
277
|
+
address pending = pendings[i - 1];
|
|
278
278
|
if (canCollectBountyFor(pending)) {
|
|
279
|
+
if (gasleft() < 240000) break; // leave enough gas for the invitee+inviter transfer around 120k
|
|
279
280
|
totalBounties += _bountyFor(pending, false);
|
|
281
|
+
pendings[i - 1] = pendings[pendings.length - 1];
|
|
280
282
|
pendings.pop();
|
|
281
283
|
}
|
|
282
284
|
}
|
|
@@ -278,11 +278,13 @@ contract InvitesV2 is DAOUpgradeableContract {
|
|
|
278
278
|
function collectBounties() public isActive {
|
|
279
279
|
address[] storage pendings = users[msg.sender].pending;
|
|
280
280
|
uint256 totalBounties = 0;
|
|
281
|
-
for (
|
|
282
|
-
if (gasleft() < 185000) break; // leave enough gas for the
|
|
283
|
-
address pending = pendings[
|
|
281
|
+
for (uint256 i = pendings.length; i > 0; i--) {
|
|
282
|
+
if (gasleft() < 185000) break; // leave enough gas for the inviter transfer around 150k each if we are using supertoken
|
|
283
|
+
address pending = pendings[i - 1];
|
|
284
284
|
if (canCollectBountyFor(pending)) {
|
|
285
|
+
if (gasleft() < 300000) break; // leave enough gas for the invitee+inviter transfer around 150k each if we are using supertoken
|
|
285
286
|
totalBounties += _bountyFor(pending, false);
|
|
287
|
+
pendings[i - 1] = pendings[pendings.length - 1];
|
|
286
288
|
pendings.pop();
|
|
287
289
|
}
|
|
288
290
|
}
|
|
@@ -22,7 +22,8 @@ contract DistributionHelper is
|
|
|
22
22
|
enum TransferType {
|
|
23
23
|
FuseBridge,
|
|
24
24
|
MultichainBridge,
|
|
25
|
-
|
|
25
|
+
TransferAndCall,
|
|
26
|
+
Transfer
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
struct DistributionRecipient {
|
|
@@ -94,10 +95,9 @@ contract DistributionHelper is
|
|
|
94
95
|
* @notice add or update a recipient details, if address exists it will update, otherwise add
|
|
95
96
|
* to "remove" set recipient bps to 0. only ADMIN_ROLE can call this.
|
|
96
97
|
*/
|
|
97
|
-
function addOrUpdateRecipient(
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
{
|
|
98
|
+
function addOrUpdateRecipient(
|
|
99
|
+
DistributionRecipient memory _recipient
|
|
100
|
+
) external onlyRole(DEFAULT_ADMIN_ROLE) {
|
|
101
101
|
// console.log("addOrUpdate addr: %s", _recipient.addr);
|
|
102
102
|
for (uint256 i = 0; i < distributionRecipients.length; i++) {
|
|
103
103
|
// console.log(
|
|
@@ -122,9 +122,10 @@ contract DistributionHelper is
|
|
|
122
122
|
* @param _recipient data about the recipient
|
|
123
123
|
* @param _amount how much to send
|
|
124
124
|
*/
|
|
125
|
-
function distribute(
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
function distribute(
|
|
126
|
+
DistributionRecipient storage _recipient,
|
|
127
|
+
uint256 _amount
|
|
128
|
+
) internal {
|
|
128
129
|
if (_recipient.transferType == TransferType.FuseBridge) {
|
|
129
130
|
nativeToken().transferAndCall(
|
|
130
131
|
fuseBridge,
|
|
@@ -139,8 +140,10 @@ contract DistributionHelper is
|
|
|
139
140
|
_amount,
|
|
140
141
|
_recipient.chainId
|
|
141
142
|
);
|
|
142
|
-
} else if (_recipient.transferType == TransferType.
|
|
143
|
+
} else if (_recipient.transferType == TransferType.TransferAndCall) {
|
|
143
144
|
nativeToken().transferAndCall(_recipient.addr, _amount, "");
|
|
145
|
+
} else if (_recipient.transferType == TransferType.Transfer) {
|
|
146
|
+
nativeToken().transfer(_recipient.addr, _amount);
|
|
144
147
|
}
|
|
145
148
|
}
|
|
146
149
|
}
|