d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix apdater && add approve proxy

Browse Source
This commit is contained in:
owen05
2021-01-26 17:53:49 +08:00
parent f5704e4803
commit a525e0a839
16 changed files with 1417 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/utils/Contracts.ts
View File

@@ -35,11 +35,12 @@ export const DVM_PROXY_NAME = "DVMProxy"
export const CONST_FEE_RATE_MODEL_NAME = "ConstFeeRateModel"
export const PERMISSION_MANAGER_NAME = "PermissionManager"
export const EXTERNAL_VALUE_NAME = "ExternalValue"
export const DODO_PROXY_NAME = "DODOV2Proxy01"
export const DODO_PROXY_NAME = "DODOV2Proxy02"
export const FEE_RATE_MODEL_NAME = "FeeRateModel"
export const DPP_NAME = "DPP"
export const DPP_FACTORY_NAME = "DPPFactory"
export const SMART_APPROVE = "DODOApprove"
export const SMART_APPROVE_PROXY = "DODOApproveProxy"
export const DODO_SELL_HELPER = "DODOSellHelper"
export const DPP_ADMIN_NAME = "DPPAdmin"
export const DODO_CALLEE_HELPER_NAME = "DODOCalleeHelper"

15
test/utils/ProxyContextV2.ts
View File

@@ -28,6 +28,7 @@ export class ProxyContext {
DPPFactory: Contract;
CPFactory: Contract;
DODOApprove: Contract;
DODOApproveProxy: Contract;
DODOCalleeHelper: Contract;
DODOSellHelper: Contract;
@@ -95,6 +96,11 @@ export class ProxyContext {
contracts.SMART_APPROVE
);
this.DODOApproveProxy = await contracts.newContract(
contracts.SMART_APPROVE_PROXY,
[this.DODOApprove.options.address]
)
//DODO Incentive
this.DODOIncentive = await contracts.newContract(
contracts.DODO_INCENTIVE,
@@ -108,7 +114,7 @@ export class ProxyContext {
dppAdminTemplate.options.address,
this.Deployer,
mtFeeRateModelTemplate.options.address,
this.DODOApprove.options.address
this.DODOApproveProxy.options.address
]
)
@@ -134,7 +140,7 @@ export class ProxyContext {
this.DPPFactory.options.address,
this.CPFactory.options.address,
this.WETH.options.address,
this.DODOApprove.options.address,
this.DODOApproveProxy.options.address,
this.DODOSellHelper.options.address,
"0x0000000000000000000000000000000000000000",
this.DODOIncentive.options.address
@@ -142,9 +148,10 @@ export class ProxyContext {
);
await this.DODOProxyV2.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer));
await this.DODOApprove.methods.init(this.Deployer,this.DODOProxyV2.options.address).send(this.sendParam(this.Deployer));
await this.DODOApprove.methods.init(this.Deployer,this.DODOApproveProxy.options.address).send(this.sendParam(this.Deployer));
await this.DODOApproveProxy.methods.init(this.Deployer, [this.DODOProxyV2.options.address]).send(this.sendParam(this.Deployer));
await this.DODOIncentive.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer));
await this.DODOIncentive.methods.changeDODOProxy(this.DODOProxyV2.options.address).send(this.sendParam(this.Deployer));
this.DODOCalleeHelper = await contracts.newContract(