Compare commits
2 Commits
16ffc1e491
...
46e6674caf
Author | SHA1 | Date | |
---|---|---|---|
46e6674caf | |||
b65b0ee16b |
2
lib/feeOracle.d.ts
vendored
2
lib/feeOracle.d.ts
vendored
@ -118,5 +118,5 @@ export declare abstract class TornadoFeeOracle implements ITornadoFeeOracle {
|
|||||||
*
|
*
|
||||||
* @returns {Promise<HexadecimalStringifiedNumber>} Fee in WEI (hexed string)
|
* @returns {Promise<HexadecimalStringifiedNumber>} Fee in WEI (hexed string)
|
||||||
*/
|
*/
|
||||||
calculateWithdrawalFeeViaRelayer({ tx, txType, relayerFeePercent, currency, amount, decimals, refundInEth, tokenPriceInEth, predefinedGasLimit, predefinedGasPrice, bumpGasLimitPercent, bumpGasPricePercent, }: GetWithdrawalFeeViaRelayerInput): Promise<HexadecimalStringifiedNumber>;
|
calculateWithdrawalFeeViaRelayer({ tx, txType, relayerFeePercent, currency, amount, decimals, refundInEth, tokenPriceInEth, predefinedGasLimit, predefinedGasPrice, }: GetWithdrawalFeeViaRelayerInput): Promise<HexadecimalStringifiedNumber>;
|
||||||
}
|
}
|
||||||
|
@ -341,21 +341,14 @@ var TornadoFeeOracle = /** @class */ (function () {
|
|||||||
* @returns {Promise<HexadecimalStringifiedNumber>} Fee in WEI (hexed string)
|
* @returns {Promise<HexadecimalStringifiedNumber>} Fee in WEI (hexed string)
|
||||||
*/
|
*/
|
||||||
TornadoFeeOracle.prototype.calculateWithdrawalFeeViaRelayer = function (_a) {
|
TornadoFeeOracle.prototype.calculateWithdrawalFeeViaRelayer = function (_a) {
|
||||||
var tx = _a.tx, txType = _a.txType, relayerFeePercent = _a.relayerFeePercent, currency = _a.currency, amount = _a.amount, decimals = _a.decimals, refundInEth = _a.refundInEth, tokenPriceInEth = _a.tokenPriceInEth, predefinedGasLimit = _a.predefinedGasLimit, predefinedGasPrice = _a.predefinedGasPrice, bumpGasLimitPercent = _a.bumpGasLimitPercent, bumpGasPricePercent = _a.bumpGasPricePercent;
|
var tx = _a.tx, txType = _a.txType, relayerFeePercent = _a.relayerFeePercent, currency = _a.currency, amount = _a.amount, decimals = _a.decimals, refundInEth = _a.refundInEth, tokenPriceInEth = _a.tokenPriceInEth, predefinedGasLimit = _a.predefinedGasLimit, predefinedGasPrice = _a.predefinedGasPrice;
|
||||||
return __awaiter(this, void 0, void 0, function () {
|
return __awaiter(this, void 0, void 0, function () {
|
||||||
var relayerFee, _b, gasPrice, gasLimit, gasCosts, hasTokenPrice, feeInEth;
|
var relayerFee, _b, gasPrice, gasLimit, gasCosts, hasTokenPrice, feeInEth;
|
||||||
return __generator(this, function (_c) {
|
return __generator(this, function (_c) {
|
||||||
switch (_c.label) {
|
switch (_c.label) {
|
||||||
case 0:
|
case 0:
|
||||||
relayerFee = this.calculateRelayerFeeInWei(relayerFeePercent, amount, decimals);
|
relayerFee = this.calculateRelayerFeeInWei(relayerFeePercent, amount, decimals);
|
||||||
return [4 /*yield*/, this.getGasParams({
|
return [4 /*yield*/, this.getGasParams({ tx: tx, txType: txType, predefinedGasLimit: predefinedGasLimit, predefinedGasPrice: predefinedGasPrice })];
|
||||||
tx: tx,
|
|
||||||
txType: txType,
|
|
||||||
predefinedGasLimit: predefinedGasLimit,
|
|
||||||
predefinedGasPrice: predefinedGasPrice,
|
|
||||||
bumpGasLimitPercent: bumpGasLimitPercent,
|
|
||||||
bumpGasPricePercent: bumpGasPricePercent,
|
|
||||||
})];
|
|
||||||
case 1:
|
case 1:
|
||||||
_b = _c.sent(), gasPrice = _b.gasPrice, gasLimit = _b.gasLimit;
|
_b = _c.sent(), gasPrice = _b.gasPrice, gasLimit = _b.gasLimit;
|
||||||
gasCosts = ethers_1.BigNumber.from(gasPrice).mul(gasLimit);
|
gasCosts = ethers_1.BigNumber.from(gasPrice).mul(gasLimit);
|
||||||
|
File diff suppressed because one or more lines are too long
2
lib/types.d.ts
vendored
2
lib/types.d.ts
vendored
@ -89,6 +89,4 @@ export type GetWithdrawalFeeViaRelayerInput = {
|
|||||||
tokenPriceInEth?: HexadecimalStringifiedNumber | string;
|
tokenPriceInEth?: HexadecimalStringifiedNumber | string;
|
||||||
predefinedGasPrice?: HexadecimalStringifiedNumber;
|
predefinedGasPrice?: HexadecimalStringifiedNumber;
|
||||||
predefinedGasLimit?: number;
|
predefinedGasLimit?: number;
|
||||||
bumpGasLimitPercent?: number;
|
|
||||||
bumpGasPricePercent?: number;
|
|
||||||
};
|
};
|
||||||
|
@ -283,18 +283,9 @@ export abstract class TornadoFeeOracle implements ITornadoFeeOracle {
|
|||||||
tokenPriceInEth,
|
tokenPriceInEth,
|
||||||
predefinedGasLimit,
|
predefinedGasLimit,
|
||||||
predefinedGasPrice,
|
predefinedGasPrice,
|
||||||
bumpGasLimitPercent,
|
|
||||||
bumpGasPricePercent,
|
|
||||||
}: GetWithdrawalFeeViaRelayerInput): Promise<HexadecimalStringifiedNumber> {
|
}: GetWithdrawalFeeViaRelayerInput): Promise<HexadecimalStringifiedNumber> {
|
||||||
const relayerFee = this.calculateRelayerFeeInWei(relayerFeePercent, amount, decimals);
|
const relayerFee = this.calculateRelayerFeeInWei(relayerFeePercent, amount, decimals);
|
||||||
const { gasPrice, gasLimit } = await this.getGasParams({
|
const { gasPrice, gasLimit } = await this.getGasParams({ tx, txType, predefinedGasLimit, predefinedGasPrice });
|
||||||
tx,
|
|
||||||
txType,
|
|
||||||
predefinedGasLimit,
|
|
||||||
predefinedGasPrice,
|
|
||||||
bumpGasLimitPercent,
|
|
||||||
bumpGasPricePercent,
|
|
||||||
});
|
|
||||||
const gasCosts = BigNumber.from(gasPrice).mul(gasLimit);
|
const gasCosts = BigNumber.from(gasPrice).mul(gasLimit);
|
||||||
|
|
||||||
const hasTokenPrice =
|
const hasTokenPrice =
|
||||||
|
@ -117,6 +117,4 @@ export type GetWithdrawalFeeViaRelayerInput = {
|
|||||||
tokenPriceInEth?: HexadecimalStringifiedNumber | string; // Token (currency) price in ETH wei, if withdrawing non-native currency
|
tokenPriceInEth?: HexadecimalStringifiedNumber | string; // Token (currency) price in ETH wei, if withdrawing non-native currency
|
||||||
predefinedGasPrice?: HexadecimalStringifiedNumber; // Predefined gas price for withdrawal tx (wont be calculated again in function)
|
predefinedGasPrice?: HexadecimalStringifiedNumber; // Predefined gas price for withdrawal tx (wont be calculated again in function)
|
||||||
predefinedGasLimit?: number; // Predefined gas limit for withdrawal tx (wont be calculated again in function)
|
predefinedGasLimit?: number; // Predefined gas limit for withdrawal tx (wont be calculated again in function)
|
||||||
bumpGasLimitPercent?: number; // Gas limit bump percent to prioritize transaction (recenlty used)
|
|
||||||
bumpGasPricePercent?: number; // Gas price bump percent to prioritize transaction (rarely used)
|
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user