Skip to content

fix gas calculation #1224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alexcos20 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix gas calculation #1224

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ad548e
fix gas calculation
alexcos20 Feb 24, 2026
8d8d453
lint
alexcos20 Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 26 additions & 50 deletions src/utils/blockchain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import { OceanNodeConfig } from '../@types/OceanNode.js'
import { KeyManager } from '../components/KeyManager/index.js'

const MIN_GAS_FEE_POLYGON = 30000000000 // minimum recommended 30 gwei polygon main and mumbai fees
const MIN_GAS_FEE_SEPOLIA = 4000000000 // minimum 4 gwei for eth sepolia testnet
// const MIN_GAS_FEE_SEPOLIA = 4000000000 // minimum 4 gwei for eth sepolia testnet
const MIN_GAS_FEE_SAPPHIRE = 10000000000 // recommended for mainnet and testnet 10 gwei
const POLYGON_NETWORK_ID = 137
const MUMBAI_NETWORK_ID = 80001
const SEPOLIA_NETWORK_ID = 11155111
// const SEPOLIA_NETWORK_ID = 11155111

export class Blockchain {
private config?: OceanNodeConfig // Optional for new constructor
Expand Down Expand Up @@ -185,58 +185,34 @@ export class Blockchain {
} else return x.toString()
}

public async getGasOptions(estGas: bigint, gasFeeMultiplier: number): Promise<{}> {
public async getGasOptions(estGas: bigint, gasFeeMultiplier: number) {
const { chainId } = await this.signer.provider.getNetwork()
const feeHistory = await this.signer.provider.getFeeData()
const gasLimit = estGas + BigInt(20000)
const feeData = await this.signer.provider.getFeeData()
const gasLimit = estGas + 20_000n

if (feeHistory.maxPriorityFeePerGas) {
let aggressiveFeePriorityFeePerGas = feeHistory.maxPriorityFeePerGas.toString()
let aggressiveFeePerGas = feeHistory.maxFeePerGas.toString()
if (gasFeeMultiplier > 1) {
aggressiveFeePriorityFeePerGas = (
(feeHistory.maxPriorityFeePerGas * BigInt(gasFeeMultiplier * 100)) /
BigInt(100)
).toString()
aggressiveFeePerGas = (
(feeHistory.maxFeePerGas * BigInt(gasFeeMultiplier * 100)) /
BigInt(100)
).toString()
}
const overrides = {
gasLimit,
maxPriorityFeePerGas:
(chainId === BigInt(MUMBAI_NETWORK_ID) ||
chainId === BigInt(POLYGON_NETWORK_ID)) &&
Number(aggressiveFeePriorityFeePerGas) < MIN_GAS_FEE_POLYGON
? MIN_GAS_FEE_POLYGON
: chainId === BigInt(SEPOLIA_NETWORK_ID) &&
Number(aggressiveFeePriorityFeePerGas) < MIN_GAS_FEE_SEPOLIA
? MIN_GAS_FEE_SEPOLIA
: KNOWN_CONFIDENTIAL_EVMS.includes(chainId) &&
Number(aggressiveFeePriorityFeePerGas) < MIN_GAS_FEE_SAPPHIRE
? MIN_GAS_FEE_SAPPHIRE
: Number(aggressiveFeePriorityFeePerGas),
maxFeePerGas:
(chainId === BigInt(MUMBAI_NETWORK_ID) ||
chainId === BigInt(POLYGON_NETWORK_ID)) &&
Number(aggressiveFeePerGas) < MIN_GAS_FEE_POLYGON
? MIN_GAS_FEE_POLYGON
: chainId === BigInt(SEPOLIA_NETWORK_ID) &&
Number(aggressiveFeePerGas) < MIN_GAS_FEE_SEPOLIA
? MIN_GAS_FEE_SEPOLIA
: KNOWN_CONFIDENTIAL_EVMS.includes(chainId) &&
Number(aggressiveFeePerGas) < MIN_GAS_FEE_SAPPHIRE
? MIN_GAS_FEE_SAPPHIRE
: Number(aggressiveFeePerGas)
}
return overrides
} else {
const overrides = {
if (feeData.maxPriorityFeePerGas) {
const multiplier = BigInt(Math.round(gasFeeMultiplier * 100))

const priority = (feeData.maxPriorityFeePerGas * multiplier) / 100n
const maxFee = (feeData.maxFeePerGas * multiplier) / 100n

const minFee =
chainId === BigInt(POLYGON_NETWORK_ID) || chainId === BigInt(MUMBAI_NETWORK_ID)
? MIN_GAS_FEE_POLYGON
: KNOWN_CONFIDENTIAL_EVMS.includes(chainId)
? MIN_GAS_FEE_SAPPHIRE
: 0n

return {
gasLimit,
gasPrice: feeHistory.gasPrice
maxPriorityFeePerGas: priority < minFee ? minFee : priority,
maxFeePerGas: maxFee < minFee ? minFee : maxFee
}
return overrides
}

return {
gasLimit,
gasPrice: feeData.gasPrice
}
}
}
Expand Down
Loading