fix dvm test context
This commit is contained in:
@@ -19,8 +19,8 @@ let trader: string;
|
||||
async function init(ctx: DVMContext): Promise<void> {
|
||||
lp = ctx.SpareAccounts[0];
|
||||
trader = ctx.SpareAccounts[1];
|
||||
await ctx.approveRoute(lp);
|
||||
await ctx.approveRoute(trader);
|
||||
await ctx.approveProxy(lp);
|
||||
await ctx.approveProxy(trader);
|
||||
|
||||
await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000"));
|
||||
await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000"));
|
||||
@@ -47,7 +47,7 @@ describe("Funding", () => {
|
||||
|
||||
it("buy shares from init states", async () => {
|
||||
|
||||
await logGas(ctx.Route.methods
|
||||
await logGas(ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0"))
|
||||
, ctx.sendParam(lp), "buy shares");
|
||||
|
||||
@@ -74,7 +74,7 @@ describe("Funding", () => {
|
||||
});
|
||||
|
||||
it("buy shares from init states with quote != 0", async () => {
|
||||
await ctx.Route.methods
|
||||
await ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("100"))
|
||||
.send(ctx.sendParam(lp));
|
||||
assert.equal(await ctx.Vault.methods.balanceOf(lp).call(), decimalStr("10"))
|
||||
@@ -82,16 +82,16 @@ describe("Funding", () => {
|
||||
})
|
||||
|
||||
it("buy shares with balanced input", async () => {
|
||||
await ctx.Route.methods
|
||||
await ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0"))
|
||||
.send(ctx.sendParam(lp));
|
||||
await ctx.Route.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader))
|
||||
await ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader))
|
||||
|
||||
var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call())
|
||||
var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.Vault.options.address).call())
|
||||
var increaseRatio = new BigNumber("0.1")
|
||||
|
||||
await ctx.Route.methods.depositToDVM(ctx.DVM.options.address, trader, vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0), vaultQuoteBalance.multipliedBy(increaseRatio).toFixed(0)).send(ctx.sendParam(trader))
|
||||
await ctx.DVMProxy.methods.depositToDVM(ctx.DVM.options.address, trader, vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0), vaultQuoteBalance.multipliedBy(increaseRatio).toFixed(0)).send(ctx.sendParam(trader))
|
||||
|
||||
assert.equal(
|
||||
await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
@@ -106,15 +106,15 @@ describe("Funding", () => {
|
||||
})
|
||||
|
||||
it("buy shares with unbalanced input (less quote)", async () => {
|
||||
await ctx.Route.methods
|
||||
await ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0"))
|
||||
.send(ctx.sendParam(lp));
|
||||
await ctx.Route.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader))
|
||||
await ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader))
|
||||
|
||||
var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call())
|
||||
var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.Vault.options.address).call())
|
||||
var increaseRatio = new BigNumber("0.1")
|
||||
await ctx.Route.methods.depositToDVM(
|
||||
await ctx.DVMProxy.methods.depositToDVM(
|
||||
ctx.DVM.options.address,
|
||||
trader,
|
||||
vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0),
|
||||
@@ -124,15 +124,15 @@ describe("Funding", () => {
|
||||
})
|
||||
|
||||
it("buy shares with unbalanced input (less base)", async () => {
|
||||
await ctx.Route.methods
|
||||
await ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0"))
|
||||
.send(ctx.sendParam(lp));
|
||||
await ctx.Route.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader))
|
||||
await ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader))
|
||||
|
||||
var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call())
|
||||
var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.Vault.options.address).call())
|
||||
var increaseRatio = new BigNumber("0.1")
|
||||
await ctx.Route.methods.depositToDVM(
|
||||
await ctx.DVMProxy.methods.depositToDVM(
|
||||
ctx.DVM.options.address,
|
||||
trader,
|
||||
vaultBaseBalance.multipliedBy(increaseRatio).div(2).toFixed(0),
|
||||
@@ -144,7 +144,7 @@ describe("Funding", () => {
|
||||
|
||||
describe("sell shares", () => {
|
||||
it.only("sell shares", async () => {
|
||||
await ctx.Route.methods
|
||||
await ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("100"))
|
||||
.send(ctx.sendParam(lp));
|
||||
var vaultShares = await ctx.Vault.methods.balanceOf(lp).call()
|
||||
|
||||
@@ -18,18 +18,16 @@ let trader: string;
|
||||
async function init(ctx: DVMContext): Promise<void> {
|
||||
lp = ctx.SpareAccounts[0];
|
||||
trader = ctx.SpareAccounts[1];
|
||||
await ctx.approveRoute(lp);
|
||||
await ctx.approveRoute(trader);
|
||||
await ctx.approveProxy(lp);
|
||||
await ctx.approveProxy(trader);
|
||||
|
||||
await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000"));
|
||||
await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000"));
|
||||
|
||||
await ctx.Route.methods
|
||||
await ctx.DVMProxy.methods
|
||||
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0"))
|
||||
.send(ctx.sendParam(lp));
|
||||
|
||||
console.log(await ctx.Vault.methods.getVaultBalance().call())
|
||||
|
||||
console.log("deposit")
|
||||
}
|
||||
|
||||
@@ -51,12 +49,16 @@ describe("Trader", () => {
|
||||
});
|
||||
|
||||
describe("trade", () => {
|
||||
it.only("basic check", async () => {
|
||||
console.log(await ctx.DVM.methods.getPMMState().call())
|
||||
console.log(await ctx.DVM.methods.querySellQuote(ctx.Deployer, decimalStr("200")).call())
|
||||
})
|
||||
it("buy & sell", async () => {
|
||||
|
||||
console.log("BASE0 before buy", await ctx.DVM.methods.getBase0().call())
|
||||
|
||||
// buy
|
||||
await logGas(ctx.Route.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token")
|
||||
await logGas(ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token")
|
||||
console.log("BASE0 after buy", await ctx.DVM.methods.getBase0().call())
|
||||
// trader balances
|
||||
assert.equal(
|
||||
@@ -69,11 +71,11 @@ describe("Trader", () => {
|
||||
);
|
||||
// vault balances
|
||||
assert.equal(
|
||||
await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
|
||||
"8051283784161162863"
|
||||
);
|
||||
assert.equal(
|
||||
await ctx.QUOTE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
|
||||
decimalStr("200")
|
||||
);
|
||||
// maintainer balances
|
||||
@@ -87,7 +89,7 @@ describe("Trader", () => {
|
||||
);
|
||||
|
||||
// sell
|
||||
await logGas(ctx.Route.methods.sellBaseOnDVM(ctx.DVM.options.address, trader, decimalStr("1"), decimalStr("100")), ctx.sendParam(trader), "sell base token")
|
||||
await logGas(ctx.DVMProxy.methods.sellBaseOnDVM(ctx.DVM.options.address, trader, decimalStr("1"), decimalStr("100")), ctx.sendParam(trader), "sell base token")
|
||||
console.log("BASE0 after sell", await ctx.DVM.methods.getBase0().call())
|
||||
// trader balances
|
||||
assert.equal(
|
||||
@@ -100,11 +102,11 @@ describe("Trader", () => {
|
||||
);
|
||||
// vault balances
|
||||
assert.equal(
|
||||
await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
|
||||
"9051283784161162863"
|
||||
);
|
||||
assert.equal(
|
||||
await ctx.QUOTE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
|
||||
"96474456349930717298"
|
||||
);
|
||||
// maintainer balances
|
||||
@@ -118,7 +120,7 @@ describe("Trader", () => {
|
||||
);
|
||||
|
||||
// buy when quoet is not 0
|
||||
await logGas(ctx.Route.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token")
|
||||
await logGas(ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token")
|
||||
console.log("BASE0 after second buy", await ctx.DVM.methods.getBase0().call())
|
||||
// trader balances
|
||||
console.log(
|
||||
@@ -131,11 +133,11 @@ describe("Trader", () => {
|
||||
);
|
||||
// vault balances
|
||||
console.log(
|
||||
await ctx.BASE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
|
||||
"7158622099620899913"
|
||||
);
|
||||
console.log(
|
||||
await ctx.QUOTE.methods.balanceOf(ctx.Vault.options.address).call(),
|
||||
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
|
||||
"296474456349930717298"
|
||||
);
|
||||
// maintainer balances
|
||||
|
||||
@@ -31,10 +31,10 @@ export const DODO_MINE_READER_NAME = "DODOMineReader"
|
||||
export const DVM_VAULT_NAME = "DVMVault"
|
||||
export const DVM_NAME = "DVM"
|
||||
export const DVM_FACTORY_NAME = "DVMFactory"
|
||||
export const SMART_ROUTE_NAME = "SmartRoute"
|
||||
export const DVM_PROXY_NAME = "DVMProxy"
|
||||
export const CONST_FEE_RATE_MODEL_NAME = "ConstFeeRateModel"
|
||||
export const PERMISSION_MANAGER_NAME = "PermissionManager"
|
||||
export const GAS_PRICE_SOURCE_NAME = "GasPriceSource"
|
||||
export const EXTERNAL_VALUE_NAME = "ExternalValue"
|
||||
|
||||
interface ContractJson {
|
||||
abi: any;
|
||||
|
||||
@@ -49,10 +49,9 @@ export let DefaultDVMContextInitConfig = {
|
||||
export class DVMContext {
|
||||
EVM: EVM;
|
||||
Web3: Web3;
|
||||
Route: Contract;
|
||||
DVMProxy: Contract;
|
||||
DVMFactory: Contract;
|
||||
DVM: Contract;
|
||||
Vault: Contract;
|
||||
BASE: Contract;
|
||||
QUOTE: Contract;
|
||||
Deployer: string;
|
||||
@@ -64,20 +63,18 @@ export class DVMContext {
|
||||
async init(config: DVMContextInitConfig) {
|
||||
this.EVM = new EVM();
|
||||
this.Web3 = getDefaultWeb3();
|
||||
this.Route = await contracts.newContract(contracts.SMART_ROUTE_NAME)
|
||||
this.DVMProxy = await contracts.newContract(contracts.DVM_PROXY_NAME)
|
||||
|
||||
var cloneFactory = await contracts.newContract(
|
||||
contracts.CLONE_FACTORY_CONTRACT_NAME
|
||||
);
|
||||
var vaultTemplate = await contracts.newContract(contracts.DVM_VAULT_NAME)
|
||||
var dvmTemplate = await contracts.newContract(contracts.DVM_NAME)
|
||||
var feeRateModelTemplate = await contracts.newContract(contracts.CONST_FEE_RATE_MODEL_NAME)
|
||||
var permissionManagerTemplate = await contracts.newContract(contracts.PERMISSION_MANAGER_NAME)
|
||||
var gasPriceSource = await contracts.newContract(contracts.GAS_PRICE_SOURCE_NAME)
|
||||
var gasPriceSource = await contracts.newContract(contracts.EXTERNAL_VALUE_NAME)
|
||||
|
||||
this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
|
||||
[cloneFactory.options.address,
|
||||
vaultTemplate.options.address,
|
||||
dvmTemplate.options.address,
|
||||
feeRateModelTemplate.options.address,
|
||||
permissionManagerTemplate.options.address,
|
||||
@@ -98,7 +95,7 @@ export class DVMContext {
|
||||
this.Maintainer = allAccounts[1];
|
||||
this.SpareAccounts = allAccounts.slice(2, 10);
|
||||
|
||||
await this.DVMFactory.methods.createStandardDODOVendorMachine(
|
||||
await this.DVMFactory.methods.createStandardDODOVendingMachine(
|
||||
this.BASE.options.address,
|
||||
this.QUOTE.options.address,
|
||||
config.lpFeeRate,
|
||||
@@ -109,10 +106,10 @@ export class DVMContext {
|
||||
|
||||
var vendorMachines = await this.DVMFactory.methods.getVendorMachine(this.BASE.options.address, this.QUOTE.options.address).call()
|
||||
this.DVM = contracts.getContractWithAddress(contracts.DVM_NAME, vendorMachines[0])
|
||||
this.Vault = contracts.getContractWithAddress(contracts.DVM_VAULT_NAME, await this.DVM.methods._VAULT_().call())
|
||||
|
||||
await this.DVM.methods.setMaintainer(this.Maintainer).send(this.sendParam(this.Deployer))
|
||||
await gasPriceSource.methods.setGasPrice(MAX_UINT256).send(this.sendParam(this.Deployer))
|
||||
await gasPriceSource.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer))
|
||||
await gasPriceSource.methods.set(MAX_UINT256).send(this.sendParam(this.Deployer))
|
||||
|
||||
console.log(log.blueText("[Init DVM context]"));
|
||||
}
|
||||
@@ -133,12 +130,12 @@ export class DVMContext {
|
||||
.send(this.sendParam(this.Deployer));
|
||||
}
|
||||
|
||||
async approveRoute(account: string) {
|
||||
async approveProxy(account: string) {
|
||||
await this.BASE.methods
|
||||
.approve(this.Route.options.address, MAX_UINT256)
|
||||
.approve(this.DVMProxy.options.address, MAX_UINT256)
|
||||
.send(this.sendParam(account));
|
||||
await this.QUOTE.methods
|
||||
.approve(this.Route.options.address, MAX_UINT256)
|
||||
.approve(this.DVMProxy.options.address, MAX_UINT256)
|
||||
.send(this.sendParam(account));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user