Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
cliff0412 committed Feb 13, 2019
1 parent 4882473 commit 9fbfec1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions src/MagiWrapper.ts
Expand Up @@ -43,7 +43,7 @@ export class MagiWrapper extends BaseContractWrapper {
priceUpdateCoolDown: (await this.contract.methods.priceUpdateCoolDown().call()) * 1000,
numOfPrices: Number(await this.contract.methods.numOfPrices().call()),
lastOperationTime: (await this.contract.methods.lastOperationTime().call()) * 1000,
operationCoolDown: (await this.contract.methods.lastOperationTime().call()) * 1000
operationCoolDown: (await this.contract.methods.operationCoolDown().call()) * 1000
};
}

Expand Down Expand Up @@ -138,7 +138,7 @@ export class MagiWrapper extends BaseContractWrapper {
.send(
await this.web3Wrapper.getTransactionOption(
account,
CST.UPDATE_ROLE_MANAGER_GAS,
CST.UPDATE_OPERATOR,
option
)
);
Expand Down
6 changes: 3 additions & 3 deletions src/__snapshots__/DualClassWrapper.test.ts.snap
Expand Up @@ -562,7 +562,7 @@ Array [
Array [
Object {
"from": "account",
"gas": 50000,
"gas": 100000,
"gasPrice": 1000000000,
"nonce": 10,
},
Expand All @@ -582,12 +582,12 @@ exports[`setValue 4`] = `
Array [
Array [
"account",
50000,
100000,
Object {},
],
Array [
"account",
50000,
100000,
Object {
"gasLimit": 20000,
"gasPrice": 2000000000,
Expand Down
14 changes: 7 additions & 7 deletions src/__snapshots__/MagiWrapper.test.ts.snap
Expand Up @@ -77,7 +77,7 @@ Object {
"isStarted": false,
"lastOperationTime": 1234567890000,
"numOfPrices": 0,
"operationCoolDown": 1234567890000,
"operationCoolDown": 1000000,
"priceFeedTimeTolerance": 60000,
"priceFeedTolerance": 0.01,
"priceTolerance": 0.05,
Expand Down Expand Up @@ -109,12 +109,12 @@ exports[`setValue 3`] = `
Array [
Array [
"account",
50000,
100000,
Object {},
],
Array [
"account",
50000,
100000,
Object {
"gasLimit": 200000,
"gasPrice": 2000000000,
Expand Down Expand Up @@ -178,12 +178,12 @@ exports[`updateOperator 2`] = `
Array [
Array [
"account",
1000000,
100000,
Object {},
],
Array [
"account",
1000000,
100000,
Object {
"gasLimit": 200000,
"gasPrice": 2000000000,
Expand All @@ -210,12 +210,12 @@ exports[`updatePriceFeed 3`] = `
Array [
Array [
"account",
120000,
100000,
Object {},
],
Array [
"account",
120000,
100000,
Object {
"gasLimit": 200000,
"gasPrice": 2000000000,
Expand Down
5 changes: 3 additions & 2 deletions src/constants.ts
Expand Up @@ -81,7 +81,7 @@ export const PROVIDER_MYETHER_MAIN = 'https://api.myetherapi.com/eth';
export const PROVIDER_INFURA_MAIN = 'https://mainnet.infura.io';
export const PROVIDER_INFURA_KOVAN = 'https://kovan.infura.io';
export const TRANSFER_TOKEN_GAS = 120000;
export const SET_VALUE_GAS = 50000;
export const SET_VALUE_GAS = 100000;
export const COLLECT_FEE_GAS = 40000;
export const ADD_ADDR_GAS = 40000;
export const REMOVE_ADDR_GAS = 40000;
Expand All @@ -94,7 +94,8 @@ export const RESET_GAS_LIMIT = 4000000;
export const START_CUSTODIAN_GAS = 1000000;
export const FETCH_PRICE_GAS = 150000;
export const START_MAGI_GAS = 120000;
export const UPDATE_PRICE_FEED = 120000;
export const UPDATE_PRICE_FEED = 100000;
export const UPDATE_OPERATOR = 100000;
export const COMMIT_PRICE_GAS = 80000;
export const UPDATE_ROLE_MANAGER_GAS = 1000000;
export const DEFAULT_TX_GAS_LIMIT = 30000;
Expand Down

0 comments on commit 9fbfec1

Please sign in to comment.