Merge pull request #5 from FinBook/master

merge changes from master
DuoNetwork · Jan 22, 2019 · b7e3ef7 · b7e3ef7
2 parents bf08da4 + 220bfcb
commit b7e3ef7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/DualClassWrapper.ts b/src/DualClassWrapper.ts
@@ -46,7 +46,7 @@ export default class DualClassWrapper extends BaseContractWrapper {
 	public async fetchPrice(account: string, option: ITransactionOption = {}) {
 		if (!this.web3Wrapper.isLocal()) return this.web3Wrapper.wrongEnvReject();
 		const gasPrice = option.gasPrice || (await this.web3Wrapper.getGasPrice());
-		const gasLimit = option.gasLimit || CST.START_CUSTODIAN_GAS;
+		const gasLimit = option.gasLimit || CST.FETCH_PRICE_GAS;
 		const nonce = option.nonce || (await this.web3Wrapper.getTransactionCount(this.address));
 		return this.contract.methods.fetchPrice().send({
 			from: account,
@@ -74,7 +74,7 @@ export default class DualClassWrapper extends BaseContractWrapper {
 						gasPrice: gasPrice,
 						gas: gasLimit
 					})
-					.on('transactionHash', txHash => resolve(txHash));
+					.on('transactionHash', (txHash: string) => resolve(txHash));
 			else
 				this.contract.methods
 					.create()
@@ -84,7 +84,7 @@ export default class DualClassWrapper extends BaseContractWrapper {
 						gasPrice: gasPrice,
 						gas: gasLimit
 					})
-					.on('transactionHash', txHash => resolve(txHash));
+					.on('transactionHash', (txHash: string) => resolve(txHash));
 		});
 	}
 
@@ -101,7 +101,7 @@ export default class DualClassWrapper extends BaseContractWrapper {
 					gasPrice: gasPrice,
 					gas: gasLimit
 				})
-				.on('transactionHash', txHash => resolve(txHash))
+				.on('transactionHash', (txHash: string) => resolve(txHash))
 		);
 	}
 
@@ -117,7 +117,7 @@ export default class DualClassWrapper extends BaseContractWrapper {
 					gasPrice: gasPrice,
 					gas: gasLimit
 				})
-				.on('transactionHash', txHash => resolve(txHash))
+				.on('transactionHash', (txHash: string) => resolve(txHash))
 		);
 	}
 

diff --git a/src/Web3Wrapper.ts b/src/Web3Wrapper.ts
@@ -188,7 +188,7 @@ export default class Web3Wrapper {
 				.send({
 					from: from
 				})
-				.on('transactionHash', txHash => resolve(txHash));
+				.on('transactionHash', (txHash: string) => resolve(txHash));
 		});
 	}
 

diff --git a/src/__snapshots__/DualClassWrapper.test.ts.snap b/src/__snapshots__/DualClassWrapper.test.ts.snap
@@ -242,7 +242,7 @@ Array [
   Array [
     Object {
       "from": "account",
-      "gas": 1000000,
+      "gas": 150000,
       "gasPrice": 1000000000,
       "nonce": 2,
     },

diff --git a/src/constants.ts b/src/constants.ts
@@ -113,8 +113,9 @@ export const RESET_GAS_LIMIT = 4000000;
 export const EVENT_FETCH_BLOCK_INTERVAL = 100;
 export const EVENT_FETCH_TIME_INVERVAL = 600000;
 export const START_CUSTODIAN_GAS = 1000000;
-export const START_MAGI_GAS = 1000000;
-export const COMMIT_PRICE_GAS = 200000;
+export const FETCH_PRICE_GAS = 150000;
+export const START_MAGI_GAS = 120000;
+export const COMMIT_PRICE_GAS = 60000;
 export const DEFAULT_TX_GAS_LIMIT = 30000;
 
 export const BTV_STATE = {