set gas price to external contract

This commit is contained in:
mingda
2020-11-11 16:42:00 +08:00
parent 897b2a4759
commit 5fd411c50c
9 changed files with 59 additions and 9 deletions

View File

@@ -143,13 +143,13 @@ describe("Funding", () => {
});
describe("sell shares", () => {
it("sell shares", async () => {
it.only("sell shares", async () => {
await ctx.Route.methods
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("100"))
.send(ctx.sendParam(lp));
var vaultShares = await ctx.Vault.methods.balanceOf(lp).call()
var bob = ctx.SpareAccounts[0]
await ctx.DVM.methods.sellShares(bob, vaultShares).send(ctx.sendParam(lp))
var bob = ctx.SpareAccounts[5]
await ctx.DVM.methods.sellShares(bob, vaultShares, "0x").send(ctx.sendParam(lp))
assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("10"))
assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), decimalStr("100"))
})

View File

@@ -34,6 +34,7 @@ export const DVM_FACTORY_NAME = "DVMFactory"
export const SMART_ROUTE_NAME = "SmartRoute"
export const CONST_FEE_RATE_MODEL_NAME = "ConstFeeRateModel"
export const PERMISSION_MANAGER_NAME = "PermissionManager"
export const GAS_PRICE_SOURCE_NAME = "GasPriceSource"
interface ContractJson {
abi: any;

View File

@@ -73,13 +73,16 @@ export class DVMContext {
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)
this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
[cloneFactory.options.address,
vaultTemplate.options.address,
dvmTemplate.options.address,
feeRateModelTemplate.options.address,
permissionManagerTemplate.options.address])
permissionManagerTemplate.options.address,
gasPriceSource.options.address,
])
this.BASE = await contracts.newContract(
contracts.MINTABLE_ERC20_CONTRACT_NAME,
@@ -109,6 +112,7 @@ export class DVMContext {
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))
console.log(log.blueText("[Init DVM context]"));
}