Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions rust/main/config/mainnet_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6007,7 +6007,12 @@
"index": {
"from": 860343
},
"gnosisSafeTransactionServiceUrl": "https://safe-transaction-ink.safe.global/"
"gnosisSafeTransactionServiceUrl": "https://safe-transaction-ink.safe.global/",
"transactionOverrides": {
"minGasPrice": 1,
"minFeePerGas": 1,
"minPriorityFeePerGas": 1
}
},
"soneium": {
"blockExplorers": [
Expand Down Expand Up @@ -6928,7 +6933,12 @@
"index": {
"from": 42656210
},
"gnosisSafeTransactionServiceUrl": "https://safe-transaction-ronin.safe.onchainden.com"
"gnosisSafeTransactionServiceUrl": "https://safe-transaction-ronin.safe.onchainden.com",
"transactionOverrides": {
"minGasPrice": 20000000000,
"minFeePerGas": 20000000000,
"minPriorityFeePerGas": 20000000000
}
},
"sophon": {
"blockExplorers": [
Expand Down
4 changes: 4 additions & 0 deletions rust/main/lander/src/adapter/chains/ethereum/adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ impl EthereumAdapter {

if gas_price == &tx_gas_price {
// If new gas price is the same as the old one, no point in resubmitting
info!(
?tx,
"not resubmitting transaction since new gas price is the same as the old one"
);
return Err(LanderError::TxAlreadyExists);
}

Expand Down
6 changes: 3 additions & 3 deletions rust/main/lander/src/transaction/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ impl TransactionStatus {
return TransactionStatus::Finalized;
} else if *included_count > 0 {
return TransactionStatus::Included;
} else if *pending_count > 0 {
return TransactionStatus::PendingInclusion;
} else if *mempool_count > 0 {
return TransactionStatus::Mempool;
} else if *pending_count > 0 {
return TransactionStatus::PendingInclusion;
} else if !status_counts.is_empty() {
// if the hashmap is not empty, it must mean that the hashes were dropped,
// because the hashmap is populated only if the status query was successful
Expand Down Expand Up @@ -191,7 +191,6 @@ mod tests {

let statuses = vec![
Ok(TransactionStatus::Dropped(DropReason::DroppedByChain)),
Ok(TransactionStatus::Mempool),
Ok(TransactionStatus::PendingInclusion),
Err(LanderError::NetworkError("Network error".to_string())),
];
Expand All @@ -208,6 +207,7 @@ mod tests {
let statuses = vec![
Err(LanderError::NetworkError("Network error".to_string())),
Ok(TransactionStatus::Mempool),
Ok(TransactionStatus::PendingInclusion),
Ok(TransactionStatus::Dropped(DropReason::DroppedByChain)),
];

Expand Down
14 changes: 14 additions & 0 deletions typescript/infra/config/environments/mainnet3/chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@ export const chainMetadataOverrides: ChainMap<Partial<ChainMetadata>> = {
minPriorityFeePerGas: 1 * 10 ** 9, // 1 gwei
},
},
ronin: {
transactionOverrides: {
minGasPrice: 20 * 10 ** 9, // 20 gwei
minFeePerGas: 20 * 10 ** 9, // 20 gwei
minPriorityFeePerGas: 20 * 10 ** 9, // 20 gwei
},
},
ink: {
transactionOverrides: {
minGasPrice: 1, // 1 wei
minFeePerGas: 1, // 1 wei
minPriorityFeePerGas: 1, // 1 wei
},
},
Comment thread
ameten marked this conversation as resolved.
// Deploy-only overrides, set when deploying contracts
// chilizmainnet: {
// transactionOverrides: {
Expand Down
Loading