git.iko.soy/bridge
on master help sign in
reticket: use correct gas price for final funds transfer
13d4286Fang
src/lib/reticket.js+6−7
compare with master
unifiedsplit
@@ -148,13 +148,12 @@ export async function reticketPointBetweenWallets({
148
148
149 progress(TRANSACTION_PROGRESS.SIGNING);
149 progress(TRANSACTION_PROGRESS.SIGNING);
150
150
151− const suggestedGasPrice = await getSuggestedGasPrice(networkType);
151+ const gasPriceGwei = (await getSuggestedGasPrice(networkType)).toFixed();
152 const chainId = await web3.eth.net.getId();
152 const chainId = await web3.eth.net.getId();
153− const gasPrice = safeToWei(suggestedGasPrice.toFixed(), 'gwei');
153+ const gasPriceWeiBN = toBN(safeToWei(gasPriceGwei, 'gwei'));
154− const gasPriceBN = toBN(gasPrice);
155 let inviteNonce = await web3.eth.getTransactionCount(fromWallet.address);
154 let inviteNonce = await web3.eth.getTransactionCount(fromWallet.address);
156 const totalCost = txs.reduce(
155 const totalCost = txs.reduce(
157− (acc, tx) => acc.add(gasPriceBN.mul(toBN(tx.gas))),
156+ (acc, tx) => acc.add(gasPriceWeiBN.mul(toBN(tx.gas))),
158 toBN(0)
157 toBN(0)
159 );
158 );
160
159
@@ -170,7 +169,7 @@ export async function reticketPointBetweenWallets({
170 txn: txs[i],
169 txn: txs[i],
171 nonce: inviteNonce + i,
170 nonce: inviteNonce + i,
172 chainId,
171 chainId,
173− gasPrice: suggestedGasPrice.toFixed(),
172+ gasPrice: gasPriceGwei,
174 gasLimit: txs[i].gas,
173 gasLimit: txs[i].gas,
175 });
174 });
176 txPairs.push({
175 txPairs.push({
@@ -215,7 +214,7 @@ export async function reticketPointBetweenWallets({
215 // if non-trivial eth left in invite wallet, transfer to new ownership
214 // if non-trivial eth left in invite wallet, transfer to new ownership
216 let balance = toBN(await web3.eth.getBalance(fromWallet.address));
215 let balance = toBN(await web3.eth.getBalance(fromWallet.address));
217 const gasLimit = GAS_LIMITS.SEND_ETH;
216 const gasLimit = GAS_LIMITS.SEND_ETH;
218− const sendEthCost = gasPriceBN.mul(toBN(gasLimit));
217+ const sendEthCost = gasPriceWeiBN.mul(toBN(gasLimit));
219 if (transferEth && balance.gt(sendEthCost)) {
218 if (transferEth && balance.gt(sendEthCost)) {
220 const value = balance.sub(sendEthCost);
219 const value = balance.sub(sendEthCost);
221 const txn = {
220 const txn = {
@@ -229,7 +228,7 @@ export async function reticketPointBetweenWallets({
229 txn,
228 txn,
230 chainId,
229 chainId,
231 networkType,
230 networkType,
232− gasPrice: gasPriceBN,
231+ gasPrice: gasPriceGwei,
233 gasLimit,
232 gasLimit,
234 nonce: inviteNonce++,
233 nonce: inviteNonce++,
235 });
234 });