add aurora && moonriver

This commit is contained in:
owen05
2021-11-05 09:11:16 +08:00
parent 605981e6fa
commit 7fdb3cc7db
10 changed files with 8056 additions and 7778 deletions

70
config/aurora-config.js Normal file
View File

@@ -0,0 +1,70 @@
module.exports = {
AURORA_CONFIG: {
//DODOZoo: "0xf50BDc9E90B7a1c138cb7935071b85c417C4cb8e",
//DODO: "0xB5Dc5E183c2aCf02aB879A8569aB4EDAf147d537",
//TOKEN
WETH: "0xC9BdeEd33CD01541e1eeD10f90519d2C06Fe3feB",
CHI: "0x0000000000000000000000000000000000000000",
DODO: "",
//Helper
DODOSellHelper: "0x72d220cE168C4f361dD4deE5D826a01AD8598f6C",
DODOCalleeHelper: "0x738Ebf387A0CE0eb46b0eF8Fa5DEa2EaE6B1Df51",
DODOV1PmmHelper: "0xbAb9F4ff4A19a0e8EEBC56b06750253228ffAc6E",
DODOV2RouteHelper: "0xa2CB66EBB947D217f61510882096F6e95c1DE97D",
CurveSample: "",
MultiCall: "0x989DcAA95801C527C5B73AA65d3962dF9aCe1b0C",
DODOSwapCalcHelper: "0x80930Cb1849F7D42531506fF45E66724338A821b",
ERC20Helper: "0xE8C9A78725D0451FA19878D5f8A3dC0D55FECF25",
//Template
CloneFactory: "0x6B208E08dcF6BD51F50C5Da09d15B2D8E5C46Cf2",
FeeRateModel: "0xb57Dd5c265dBb13CA014F2332069E90CD0e22e65",
//FeeRateDIP3: "0x7737fd30535c69545deeEa54AB8Dd590ccaEBD3c",
PermissionManager: "0xE55154D09265b18aC7CDAC6E646672A5460389a1",
DVM: "0x043957f7554275b90c5178872faE851dcfC1089D",
DPP: "0x85351262f7474Ebe23FfAcD633cf20A491F1325D",
DSP: "0x0596908263Ef2724fBfBcAfA1c983FCD7a629038",
DPPAdmin: "0x44D5dF24d5Ef52A791D6436Fa45A8D426f6de34e",
CP: "0xB76de21f04F677f07D9881174a1D8E624276314C",
//ERC20MineV2: "0xaeB5CF31b97dce6134e416129845e01106fFB177",
ERC20MineV3: "0x9B64c81ba54eA51e1f6B7fefb3cfF8AA6F1e2A09",
ERC20: "0x6373ceB657C83C91088d328622573FB766064Ac4",
CustomERC20: "0x3CD6D7F5fF977bf8069548eA1F9441b061162b42",
//Factory
DVMFactory: "0x5515363c0412AdD5c72d3E302fE1bD7dCBCF93Fe",
DPPFactory: "0x40672211D4310ad71daDc8cDE7Aa3Fb90d420855",
DSPFactory: "0xbe9a66e49503e84ae59a4d0545365AABedf33b40",
UpCpFactory: "0xa356867fDCEa8e71AEaF87805808803806231FdC",
CrowdPoolingFactory: "0xc6962a577A3Be5311f9f9Ab9B8b6A69a25bBc817",
ERC20V2Factory: "0xDfaf9584F5d229A9DBE5978523317820A8897C5A",
//DODOMineV2Factory: "0x9aE501385Bc7996A2A4a1FBb00c8d3820611BCB5",
DODOMineV3Registry: "0xfDDCA6ffCE24dF5bE3e8AaD32081822f86178048",
//Approve
DODOApprove: "0x335aC99bb3E51BDbF22025f092Ebc1Cf2c5cC619",
DODOApproveProxy: "0x6B4Fa0bc61Eddc928e0Df9c7f01e407BfcD3e5EF",
//Adapter
DODOV1Adapter: "",
DODOV2Adapter: "",
UniAdapter: "",
CurveAdapter: "",
//Proxy
DODOV2Proxy: "",
DSPProxy: "",
CpProxy: "",
DPPProxy: "",
RouteProxy: "",
DODOMineV3Proxy: "",
//Account
multiSigAddress: "0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be",
defaultMaintainer: "0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be",
}
}

View File

@@ -1,69 +1,70 @@
module.exports = {
BOBA_TEST_CONFIG: {
// DODOZoo: "",
// DODO: "",
//TOKEN
WETH: "",
WETH: "0x42e50568d436b0376a4203517Bd3AF274c5546B2",
CHI: "0x0000000000000000000000000000000000000000",
DODO: "",
//Helper
//MultiCall: "",
//DODOSwapCalcHelper: "",
//DODOZoo: "",
//DODO: "",
//ERC20Helper: "",
DODOSellHelper: "",
DODOCalleeHelper: "",
DODOV1PmmHelper: "",
DODOV2RouteHelper: "",
MultiCall: "0x459645726a949f9877556c86E0f0e64430a4717d",
DODOSwapCalcHelper: "0x6DfB41B3f8A02a43376CFCca4f22680D62F4384E",
ERC20Helper: "0x365f4B1C994Ac136d7AD5acf4dE8d46096bC9f52",
DODOSellHelper: "0xf0f889393B2E9517568F6d061C0230bCBc224AD4",
DODOCalleeHelper: "0xc4E476AaCE8c53143fC8fB3b64c33777031809CF",
DODOV1PmmHelper: "0xaafDC59086a01269405B864EF4213e1490366DCE",
DODOV2RouteHelper: "0xDc21D37F4f5dAC4d14b19f51467cA2454F83F471",
CurveSample: "",
//Template
CloneFactory: "",
FeeRateModel: "",
//FeeRateDIP3: "",
PermissionManager: "",
DVM: "",
DPP: "",
DSP: "",
DPPAdmin: "",
CP: "",
CloneFactory: "0x4A82CD9E93f35b67962695268Afc602aCd34d088",
FeeRateModel: "0xa0f3499CE2fBF18dd179452d5dA52Db2E38c77d9",
FeeRateDIP3: "0x4b408F5FeE325De4B9D4fe73a49b08601b3c0aCD",
PermissionManager: "0xcB0Ae9A103CC0aCB74267a8a738dee21B965b463",
DVM: "0x4d6F9Ec882B0faE906D130789Df9004A79A61809",
DPP: "0xBCFBed364e1e9Ac687fD6430A31B1a097F19c5e6",
DSP: "0x5C1E05d419940e110F3a8f3F7b1360d35Fd4147D",
DPPAdmin: "0xf190622B38B8acE7a6E7A85d14e9d5401E4bC3BD",
CP: "0x730674eC7C9018c65308f1967ff6d53Dc948B01a",
//ERC20MineV2: "",
ERC20MineV3: "",
ERC20MineV3: "0x5CD2dA42341607E522d6BE9C8ab06598F59BC3a2",
ERC20: "",
CustomERC20: "",
ERC20: "0xBAC0B198C379673FbdC3E66243526B40407A3A20",
CustomERC20: "0xaf4BE9aa7cBC4844d99cBdDeA6Ce106E90226E66",
//Factory
DVMFactory: "",
DPPFactory: "",
DSPFactory: "",
UpCpFactory: "",
CrowdPoolingFactory: "",
ERC20V2Factory: "",
DVMFactory: "0x5BbfdF91e29D2887E686eF1bEbF5Ca0ea33290E7",
DPPFactory: "0xCAbB86069B37D5055E39f392D0475Cfb7dF52E98",
DSPFactory: "0x4A0a1ECa17323068Ba359B6B42fe7e048d65e982",
UpCpFactory: "0xd08e5cF0551aaEc0dA2f4FC595193F9E6b0295e0",
CrowdPoolingFactory: "0x8515a592Ccd2f9Ab68Fe18DD5a512Bb251Fb5F2a",
ERC20V2Factory: "0xBC205D025f4789Ba5Fd27cE3F9d3C88D086daA56",
//DODOMineV2Factory: "",
DODOMineV3Registry: "",
DODOMineV3Registry: "0x216D46F1E1aBB5003a6e22E841661c49050Db96c",
//Approve
DODOApprove: "",
DODOApproveProxy: "",
DODOApprove: "0x39316EF9747bDDECA1FAAB020A336B83D9F40D9b",
DODOApproveProxy: "0x76e844cee3ce99A42e93Ed7E964444BE0a39C8CF",
//Adapter
DODOV1Adapter: "",
DODOV2Adapter: "",
UniAdapter: "",
DODOV1Adapter: "0xe2D96eC0e6Aa99Ce724e9c3c4aD5f2D9f5161a5A",
DODOV2Adapter: "0x2f0d3135ea488aEeF7c0Cb2e67f365c06b07377E",
UniAdapter: "0x087eb7221EEee96736Fee8595beeE62EF211A797",
CurveAdapter: "",
//Proxy
DODOV2Proxy: "",
DSPProxy: "",
CpProxy: "",
DPPProxy: "",
RouteProxy: "",
DODOMineV3Proxy: "",
DODOV2Proxy: "0xb6A8Eb18A13c31F8fF608Bbe32AB731048fa1bf5",
DSPProxy: "0x0479cCBc518d257Fb802B4b2ac1139F7b78DC6DE",
CpProxy: "0xf75D4E8EAFc86B47cCB58Af616d7feD3EA4a5496",
DPPProxy: "0x441E595Fed6e2630d62966caeBeF25823cE466ef",
RouteProxy: "0xAAd3c11331Ad1da77C339A96867Efa5f40EDf62e",
DODOMineV3Proxy: "0x8F8b19d148Ed33c9b9bC9ab931CE008f07796A35",
//Account
multiSigAddress: "0x7e83d9d94837eE82F0cc18a691da6f42F03F1d86",
defaultMaintainer: "0x7e83d9d94837eE82F0cc18a691da6f42F03F1d86",
multiSigAddress: "0xbC7814de9e42945C9fFd89D2BFff1a45e07Bdb10",
defaultMaintainer: "0xbC7814de9e42945C9fFd89D2BFff1a45e07Bdb10",
}
}

View File

@@ -6,67 +6,63 @@ module.exports = {
DODO: "",
//Helper
//MultiCall: "0xA922EeEB7909E4a06DCb4b2bff0335Cd027cCfbF",
//MultiCall: "0x2ff2CeE6E9359F9eA1cF2f51d18bF9F2045447E4",
//DODOSwapCalcHelper: "0xA45b1105d21dFd3915EaDF1b5523196B458C7614",
//DODOZoo: "0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7",//not verify
//DODO: "0xB5397B2210f49e96a5EB2c9747Aa2bD9397d90C0",//not verify
//ERC20Helper: "0x6373ceB657C83C91088d328622573FB766064Ac4", //not verify
DODOSellHelper: "0x5e84190a270333aCe5B9202a3F4ceBf11b81bB01", //not verify
DODOCalleeHelper: "0xc4436fBAE6eBa5d95bf7d53Ae515F8A707Bd402A",
DODOV1PmmHelper: "0x3CD6D7F5fF977bf8069548eA1F9441b061162b42", //not verify
DODOV2RouteHelper: "",//0x6B4Fa0bc61Eddc928e0Df9c7f01e407BfcD3e5EF
//DODOZoo: "0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7",
//DODO: "0xB5397B2210f49e96a5EB2c9747Aa2bD9397d90C0",
//ERC20Helper: "0x6373ceB657C83C91088d328622573FB766064Ac4",
DODOSellHelper: "0x5e84190a270333aCe5B9202a3F4ceBf11b81bB01",
DODOCalleeHelper: "", //0xc4436fBAE6eBa5d95bf7d53Ae515F8A707Bd402A replace weth
DODOV1PmmHelper: "0x3CD6D7F5fF977bf8069548eA1F9441b061162b42",
DODOV2RouteHelper: "",//待升级
CurveSample: "",
//Template
CloneFactory: "0xDfaf9584F5d229A9DBE5978523317820A8897C5A", //not verify
CloneFactory: "0xDfaf9584F5d229A9DBE5978523317820A8897C5A",
FeeRateModel: "0x2BBD66fC4898242BDBD2583BBe1d76E8b8f71445",
//FeeRateDIP3: "0xbef0C8Cd420b76e9d31509abbfd7f8C9f664527c", //not verify
PermissionManager: "0x729f7f44bf64Ce814716b6261e267DbE6cdf021c", //not verify
DVM: "0xC3BeD579CaB3EC29B22D9AB99F4E586af42496b9",//not verify
DPP: "0x989DcAA95801C527C5B73AA65d3962dF9aCe1b0C",//not verify
DSP: "0x550B2e7bD9605b8dcdd20d01bA73f1feB6ce289b",
DPPAdmin: "0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be",//not verify
//FeeRateDIP3: "0xbef0C8Cd420b76e9d31509abbfd7f8C9f664527c",
PermissionManager: "0x729f7f44bf64Ce814716b6261e267DbE6cdf021c",
DVM: "0xC3BeD579CaB3EC29B22D9AB99F4E586af42496b9",
DPP: "0x6fdDB76c93299D985f4d3FC7ac468F9A168577A4",
DSP: "0x0672952Fab6BD1336C57AE09E49DB6D3e78B1896",
DPPAdmin: "0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be",
CP: "0x72d220cE168C4f361dD4deE5D826a01AD8598f6C",
//ERC20MineV2: "0xD734a08359296e44b87F4d404135cd0832A7a363",
ERC20MineV3: "0xf50BDc9E90B7a1c138cb7935071b85c417C4cb8e",//not verify
ERC20MineV3: "0x4599ed18F34cFE06820E3684bF0aACB8D75c644d",
ERC20: "0x80930Cb1849F7D42531506fF45E66724338A821b",//not verify
CustomERC20: "0xB5Dc5E183c2aCf02aB879A8569aB4EDAf147d537",//not verify
ERC20: "0x80930Cb1849F7D42531506fF45E66724338A821b",
CustomERC20: "0xB5Dc5E183c2aCf02aB879A8569aB4EDAf147d537",
//not verify
//Factory
DVMFactory: "0x738Ebf387A0CE0eb46b0eF8Fa5DEa2EaE6B1Df51",
DPPFactory: "",//0xb57Dd5c265dBb13CA014F2332069E90CD0e22e65
DSPFactory: "0xB76de21f04F677f07D9881174a1D8E624276314C",
DPPFactory: "0xd0e1aA51dF0896c126Ce6F8A064E551e0DD3D39b",
DSPFactory: "0xB76de21f04F677f07D9881174a1D8E624276314C", //待修改DSP模板
UpCpFactory: "0x043957f7554275b90c5178872faE851dcfC1089D",
CrowdPoolingFactory: "0x0596908263Ef2724fBfBcAfA1c983FCD7a629038",
ERC20V2Factory: "0xaeB5CF31b97dce6134e416129845e01106fFB177",
//DODOMineV2Factory: "0xe71C0660CEC20F74CcB243d6c33AFC12419e8f41",
DODOMineV3Registry: "0x5515363c0412AdD5c72d3E302fE1bD7dCBCF93Fe",
//not verify
//Approve
DODOApprove: "0xE8C9A78725D0451FA19878D5f8A3dC0D55FECF25",
DODOApproveProxy: "0x7737fd30535c69545deeEa54AB8Dd590ccaEBD3c",
//not verify
//Adapter
DODOV1Adapter: "0x40672211D4310ad71daDc8cDE7Aa3Fb90d420855",
DODOV2Adapter: "0xbe9a66e49503e84ae59a4d0545365AABedf33b40",
UniAdapter: "0xa356867fDCEa8e71AEaF87805808803806231FdC",
CurveAdapter: "",
//not verify
//Proxy
DODOV2Proxy: "0xd9deC7c3C06e62a4c1BeEB07CadF568f496b14c2",
DSPProxy: "0x9f015aa5557ffBb47850c045Df67Bf229B07f2eA",
CpProxy: "0x357c5E9cfA8B834EDcef7C7aAbD8F9Db09119d11",
DPPProxy: "",
DPPProxy: "",//待配置
RouteProxy: "0x0125Cd41312F72a0774112Ca639D65A2C02e3627",
DODOMineV3Proxy: "0xb159260989012fA98af560A3Fa6D9cd11a64cf6E", //not verify
DODOMineV3Proxy: "0xb159260989012fA98af560A3Fa6D9cd11a64cf6E", //替换ERC20MineV3
//Account
multiSigAddress: "0xef49a6DBa1C8DF859E49c17E9A485B439c7689d3",
@@ -88,16 +84,5 @@ module.exports = {
DODONFTRegistry: "",
DODONFTProxy: "",
//================= DropsV1 =================
MysteryBoxV1: "",
RandomGenerator: "",
RandomPool: [
"",
],
//================= DropsV2 ==================
DropsFeeModel: "",
DropsProxy: ""
}
}

View File

@@ -28,7 +28,7 @@ module.exports = {
//Factory
DVMFactory: "0x17DddEFA0c82E0c850a4Adac2aFE3F1fe977A242",
DPPFactory: "",//0x510b49803E356C750f3a93bA5508C0FFD9f71bDD
DPPFactory: "0x510b49803E356C750f3a93bA5508C0FFD9f71bDD",
DSPFactory: "0xa1ab675cB49BA0DC3F39fA4C20E216572A8dD3c8",
CrowdPoolingFactory: "0xDD43520779dDCfbDe373174Ee36aEaD39771cD4f",
UpCpFactory: "0xb09E91505347234Cb722D67042290f50F1C13749",
@@ -52,7 +52,7 @@ module.exports = {
DODOV2Proxy: "0xba001E96AF87bF9d8D0BDA667067A9921FE6d294",
DSPProxy: "0x0f6345D1d07C134BB0973AD102F38eA9195F6f78",
CpProxy: "0x2E483CBb9e76fE6543168DEd698d9244EE1ED8Dd",
DPPProxy: "",
DPPProxy: "0x45136c2455Dd2631E31ab884cf167eC618CCf39a",
RouteProxy: "0xe2b538a781eB5a115a1359B8f363B9703Fd19dE6",
DODOMineV3Proxy: "0xcb15BBb59AC8a4B64A4db9B8d9F66c397d89Bd22",

4
configAdapter.js Normal file → Executable file
View File

@@ -6,6 +6,7 @@ const { MATIC_CONFIG } = require("./config/matic-config");
const { ARB_CONFIG } = require("./config/arb-config");
const { RINKEBY_CONFIG } = require("./config/rinkeby-config");
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");
@@ -33,6 +34,9 @@ exports.GetConfig = function (network, accounts) {
case "moonriver":
CONFIG = MOONRIVER_CONFIG
break;
case "aurora":
CONFIG = AURORA_CONFIG
break;
//testnet
case "kovan":
CONFIG = KOVAN_CONFIG

View File

@@ -486,8 +486,8 @@ module.exports = async (deployer, network, accounts) => {
logger.log("DODOApprove Init tx: ", tx.tx);
//Set FeeRateDIP3
const FeeRateModelInstance = await FeeRateModel.at(DefaultMtFeeRateAddress);
tx = await FeeRateModelInstance.setProxy(FeeRateDIP3Address);
const FeeRateModelInstance = await FeeRateModelTemplate.at(DefaultMtFeeRateAddress);
tx = await FeeRateModelInstance.setFeeProxy(FeeRateDIP3Address);
logger.log("Set FeeRateDIP3 tx: ", tx.tx);
//ERC20V2Factory 设置fee

View File

@@ -37,7 +37,7 @@ const DODOMineV3Registry = artifacts.require("DODOMineV3Registry");
const DODOMineV3Proxy = artifacts.require("DODOMineV3Proxy");
const CurveAdapter = artifacts.require("CurveUnderlyingAdapter");
const CurveAdapter = artifacts.require("CurveAdapter");
module.exports = async (deployer, network, accounts) => {
let CONFIG = GetConfig(network, accounts)
@@ -76,7 +76,6 @@ module.exports = async (deployer, network, accounts) => {
let DODOMineV3RegistryAddress = CONFIG.DODOMineV3Registry;
let DODOMineV3ProxyAddress = CONFIG.DODOMineV3Proxy;
if (deploySwitch.MineV3) {
logger.log("====================================================");
logger.log("network type: " + network);

15555
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -24,11 +24,11 @@
"node": "ganache-cli --port 8545 -l 0x1fffffffffffff -i 5777 -g 1 --allowUnlimitedContractSize"
},
"dependencies": {
"@truffle/hdwallet-provider": "^1.5.1",
"@types/chai": "^4.2.11",
"@types/es6-promisify": "^6.0.0",
"@types/ethereumjs-abi": "^0.6.3",
"@types/mocha": "^7.0.2",
"arb-ethers-web3-bridge": "^0.7.3",
"assert": "^2.0.0",
"axios": "^0.20.0",
"babel-cli": "^6.26.0",
@@ -43,20 +43,19 @@
"lodash": "^4.17.20",
"mocha": "^7.2.0",
"solc": "^0.6.9",
"truffle-hdwallet-provider": "^1.0.17",
"ts-node": "^8.10.2",
"typescript": "^3.9.5",
"web3": "^1.2.8",
"web3": "^1.2.9",
"web3-core-helpers": "^1.2.8",
"web3-eth-contract": "^1.2.8"
},
"devDependencies": {
"@truffle/hdwallet-provider": "1.4.0",
"chai": "^4.2.0",
"ganache-cli": "^6.9.1",
"prettier": "^2.0.5",
"prettier-plugin-solidity": "^1.0.0-alpha.52",
"solidity-coverage": "^0.7.7",
"truffle-assertions": "^0.9.2"
"truffle-assertions": "^0.9.2",
"web3-provider-engine": "~15.0.12"
}
}

37
truffle-config.js Normal file → Executable file
View File

@@ -18,11 +18,11 @@
*
*/
var HDWalletProvider = require("truffle-hdwallet-provider");
var wrapProvider = require('arb-ethers-web3-bridge').wrapProvider;
var HDWalletProvider = require("@truffle/hdwallet-provider");
const NonceTrackerSubprovider = require('web3-provider-engine/subproviders/nonce-tracker')
var privKey = process.env.privKey;
var infuraId = process.env.infuraId;
//
// const fs = require('fs');
// const mnemonic = fs.readFileSync(".secret").toString().trim();
require("ts-node/register"); // eslint-disable-line
@@ -141,7 +141,18 @@ module.exports = {
provider: () => {
return new HDWalletProvider(privKey, 'https://rpc.moonriver.moonbeam.network');
},
network_id: 1285,
network_id: 1285
},
aurora: {
networkCheckTimeout: 100000,
provider: () => {
let hdWalletProvider = new HDWalletProvider(privKey, 'https://mainnet.aurora.dev');
hdWalletProvider.engine.addProvider(new NonceTrackerSubprovider())
return hdWalletProvider
},
network_id: 0x4e454152,
gas: 10000000
},
oktest: {
@@ -169,10 +180,16 @@ module.exports = {
boba_test: {
networkCheckTimeout: 100000,
provider: () => {
return new HDWalletProvider(privKey, 'https://rinkeby-v2.boba.network')
return new HDWalletProvider({
privateKeys: [privKey],
providerOrUrl: 'https://rinkeby.boba.network',
chainId: 28
})
},
network_id: 420,
network_id: 28,
gasPrice: 0,
timeoutBlocks: 200,
skipDryRun: true
},
neon_test: {
@@ -181,17 +198,11 @@ module.exports = {
return new HDWalletProvider(privKey, 'https://proxy.testnet.neonlabs.org/solana')
},
network_id: 111,
gasPrice: 0,
gasPrice: 0
},
arb: {
networkCheckTimeout: 100000,
// provider: function () {
// return wrapProvider(
// new HDWalletProvider(privKey, "https://arb1.arbitrum.io/rpc")
// // new HDWalletProvider(privKey, 'https://arbitrum-mainnet.infura.io/v3/' + infuraId)
// )
// },
provider: function () {
return new HDWalletProvider(privKey, "https://arb1.arbitrum.io/rpc")
},