tornado-packages/tornado-oracles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tx object in getGas method & bump version to 0.2.1

Browse Source
This commit is contained in:
Theo 2023-08-19 10:55:41 -07:00
parent 85b057fbed
commit 03e6af5614
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@tornado/tornado-oracles", "name": "@tornado/tornado-oracles",
"version": "0.2.0", "version": "0.2.1",
"description": "Gas oracle for Tornado-specific transactions", "description": "Gas oracle for Tornado-specific transactions",
"main": "./lib/index.js", "main": "./lib/index.js",
"types": "./lib/index.d.ts", "types": "./lib/index.d.ts",

4
src/feeOracle.ts
View File

@ -45,9 +45,9 @@ export abstract class TornadoFeeOracle implements ITornadoFeeOracle {
type: TxType = 'other', type: TxType = 'other',
speed: LegacyGasPriceKey = 'fast', speed: LegacyGasPriceKey = 'fast',
): Promise<BigNumber> { ): Promise<BigNumber> {
const gasPrice = await this.getGasPrice(type, speed); const gasPrice = await this.getGasPriceInHex(type, speed);
let gas = BigNumber.from(0); let gas = BigNumber.from(0);
gas = gas.add(calculateGasPriceInWei(gasPrice)); gas = gas.add(gasPrice);
if (tx) tx = Object.assign(tx, { gasPrice }); if (tx) tx = Object.assign(tx, { gasPrice });
gas = gas.mul(await this.getGasLimit(tx, type)); gas = gas.mul(await this.getGasLimit(tx, type));
if (this.chainId === ChainId.OPTIMISM) gas = gas.add(await this.fetchL1OptimismFee(tx)); if (this.chainId === ChainId.OPTIMISM) gas = gas.add(await this.fetchL1OptimismFee(tx));