diff --git a/config/aurora-config.js b/config/aurora-config.js index 079c9c0..4d74afe 100644 --- a/config/aurora-config.js +++ b/config/aurora-config.js @@ -22,8 +22,6 @@ module.exports = { CloneFactory: "0x6B208E08dcF6BD51F50C5Da09d15B2D8E5C46Cf2", FeeRateModel: "0xb57Dd5c265dBb13CA014F2332069E90CD0e22e65", //FeeRateDIP3: "0x7737fd30535c69545deeEa54AB8Dd590ccaEBD3c", - FeeRateImpl: "", - UserQuota: "", PermissionManager: "0xE55154D09265b18aC7CDAC6E646672A5460389a1", DVM: "0x043957f7554275b90c5178872faE851dcfC1089D", DPP: "0x85351262f7474Ebe23FfAcD633cf20A491F1325D", @@ -52,18 +50,18 @@ module.exports = { DODOApproveProxy: "0x6B4Fa0bc61Eddc928e0Df9c7f01e407BfcD3e5EF", //Adapter - DODOV1Adapter: "", - DODOV2Adapter: "", - UniAdapter: "", + DODOV1Adapter: "0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7", + DODOV2Adapter: "0xbef0C8Cd420b76e9d31509abbfd7f8C9f664527c", + UniAdapter: "0xc4436fBAE6eBa5d95bf7d53Ae515F8A707Bd402A", CurveAdapter: "", //Proxy - DODOV2Proxy: "", - DSPProxy: "", - CpProxy: "", - DPPProxy: "", - RouteProxy: "", - DODOMineV3Proxy: "", + DODOV2Proxy: "0xd9deC7c3C06e62a4c1BeEB07CadF568f496b14c2", + DSPProxy: "0x53233ABD9108761258a4B6B7822abFD6716B129B", + CpProxy: "0x9f015aa5557ffBb47850c045Df67Bf229B07f2eA", + DPPProxy: "0x357c5E9cfA8B834EDcef7C7aAbD8F9Db09119d11", + RouteProxy: "0x0125Cd41312F72a0774112Ca639D65A2C02e3627", + DODOMineV3Proxy: "0x4775b1858f1e417C9609D455C3Ad8751ec01daC4", //Account multiSigAddress: "0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be", diff --git a/config/boba-config.js b/config/boba-config.js new file mode 100644 index 0000000..c6caa1b --- /dev/null +++ b/config/boba-config.js @@ -0,0 +1,70 @@ +module.exports = { + BOBA_CONFIG: { + // DODOZoo: "", + // DODO: "", + + //TOKEN + WETH: "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000", + CHI: "0x0000000000000000000000000000000000000000", + DODO: "", + + //Helper + MultiCall: "0xD56281EF996B6B29874C77D2e1464216E8043127", + DODOSwapCalcHelper: "0x61b21603A527b487C4a3A80a69224b87751D0F6a", + ERC20Helper: "0x9FCFD9ff955D36856F8EE480471B05488C0eB5cA", + DODOSellHelper: "0x9B6C328E4959E72866A9ed0f93632C7758741813", + DODOCalleeHelper: "0xF7c5311B618E6dFBBc34210c92D2C9675D7EdDCA", + DODOV1PmmHelper: "0x4EfF1D851366b8cc51d553a87e2d12dA8Da46F2a", + DODOV2RouteHelper: "0x028136c77786B4EA7Fd382a41fb7c38171CF0c5b", + CurveSample: "", + + //Template + CloneFactory: "0x67ee3Cb086F8a16f34beE3ca72FAD36F7Db929e2", + FeeRateModel: "0x790B4A80Fb1094589A3c0eFC8740aA9b0C1733fB", + // FeeRateDIP3: "0x97f0153E7F5749640aDF3Ff9CFC518b79D6Fe53b", + PermissionManager: "0xAfe0A75DFFb395eaaBd0a7E1BBbd0b11f8609eeF", + DVM: "0xC3528D128CC227fd60793007b5e3FdF7c2945282", + DPP: "0x77106d0f8c5B8ADF95a7feaae5bea130b1D2D748", + DSP: "0xF31162ef57b61D2FBA4f64dBbaC536bFc782D37c", + DPPAdmin: "0xf94435Ad7Edc3D5aDd1C1345622Bb745D0387416", + CP: "0x1cC529DB2a7D45F68B698A7019D4eE1e6FB2D58F", + //ERC20MineV2: "0x80223ab1F41d4Ec8D8321b9cc88A835737D57592", + ERC20MineV3: "0x1c31c6d0032768463EaBABe1A47D04c6470d31fE", + + ERC20: "0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d", + CustomERC20: "0x18AA6Bb215CDBd179E7beAE10F66C21B26971306", + + + //Factory + DVMFactory: "0x2F2f9460500F27db68AAfBfa0472cEDDb168a5a6", + DPPFactory: "0x3a60A76aCAe8feeC74D6B5b665d4DBaab2abC406", + DSPFactory: "0xfF133A6D335b50bDAa6612D19E1352B049A8aE6a", + UpCpFactory: "0xCFea63e3DE31De53D68780Dd65675F169439e470", + CrowdPoolingFactory: "0x96a75d73b3de29c009863fA6329D96b2181D3Dc4", + ERC20V2Factory: "0x313fcb27BD83607C33998AA60E409C79Fb2251fd", + //DODOMineV2Factory: "0xb7865a5ceE051d35B09A48b624D7057d3362655a", + DODOMineV3Registry: "0x2b0d94Eb7A63B8a2909dE1CB3951ecF7Ae76D2fE", + + //Approve + DODOApprove: "0x8F8Dd7DB1bDA5eD3da8C9daf3bfa471c12d58486", + DODOApproveProxy: "0x70eFB31271C0796833f80dA4E6538d05B2AFA72C", + + //Adapter + DODOV1Adapter: "0x778DF5B12170e8af8dF94356BfC864E57CE185DC", + DODOV2Adapter: "0x1565666CD77bB6DDE193e1D37Ad7b07900e6f4c0", + UniAdapter: "0x1dc8D1f1600B7C1D39e6b60FBC7b021Bc4F9C993", + CurveAdapter: "", + + //Proxy + DODOV2Proxy: "0x55793C2c8A796cCE00EF2D1a86CCA2E0399BF285", + DSPProxy: "0x25B2f945Fec30F34b05d416C7c0b5c6c51A3ADdC", + CpProxy: "0x141b4497a298340E8B451ac4eeE947B00aDbe07A", + DPPProxy: "0xCDFD45f965De9932367833Ca7187e4c9C43A2380", + RouteProxy: "0x0fe261aeE0d1C4DFdDee4102E82Dd425999065F4", + DODOMineV3Proxy: "0xb0C7cB15b52b0093130487209e96CFeC0Ba4Ff66", + + //Account + multiSigAddress: "0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7", + defaultMaintainer: "0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7", + } +} \ No newline at end of file diff --git a/configAdapter.js b/configAdapter.js index 1064837..2b9735e 100755 --- a/configAdapter.js +++ b/configAdapter.js @@ -9,6 +9,7 @@ const { OK_CONFIG } = require("./config/ok-config"); const { AURORA_CONFIG } = require("./config/aurora-config"); const { MOONRIVER_CONFIG } = require("./config/moonriver-config"); const { BOBA_TEST_CONFIG } = require("./config/boba-test-config"); +const { BOBA_CONFIG } = require("./config/boba-config"); exports.GetConfig = function (network, accounts) { var CONFIG = {} @@ -37,6 +38,9 @@ exports.GetConfig = function (network, accounts) { case "aurora": CONFIG = AURORA_CONFIG break; + case "boba": + CONFIG = BOBA_CONFIG + break; //testnet case "kovan": CONFIG = KOVAN_CONFIG diff --git a/contracts/DODOFee/UserQuota.sol b/contracts/DODOFee/UserQuota.sol index cdc078d..8fb8863 100644 --- a/contracts/DODOFee/UserQuota.sol +++ b/contracts/DODOFee/UserQuota.sol @@ -24,7 +24,7 @@ contract UserQuota is InitializableOwnable, IQuota { for(uint256 i = 0; i< users.length; i++) { require(users[i] != address(0), "USER_INVALID"); userQuota[users[i]] = quotas[i]; - emit SetQuota(users[i],quotas[i]); + // emit SetQuota(users[i],quotas[i]); } } diff --git a/truffle-config.js b/truffle-config.js index e7e7ed0..68597d1 100755 --- a/truffle-config.js +++ b/truffle-config.js @@ -192,6 +192,21 @@ module.exports = { skipDryRun: true }, + boba: { + networkCheckTimeout: 100000, + provider: () => { + return new HDWalletProvider({ + privateKeys: [privKey], + providerOrUrl: 'https://mainnet.boba.network', + chainId: 288 + }) + }, + network_id: 288, + gasPrice: 10000000000, + timeoutBlocks: 200, + skipDryRun: true + }, + neon_test: { networkCheckTimeout: 100000, provider: () => {