From 7ef523aaaebb431b684182907b1b24314dbdff12 Mon Sep 17 00:00:00 2001 From: Ben Hauser Date: Tue, 30 Jan 2024 19:50:34 +0400 Subject: [PATCH 1/2] chore: set priority_fee as default behavior for live networks --- brownie/data/default-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brownie/data/default-config.yaml b/brownie/data/default-config.yaml index fb997062b..a0c5ad16f 100644 --- a/brownie/data/default-config.yaml +++ b/brownie/data/default-config.yaml @@ -27,9 +27,9 @@ networks: live: gas_limit: auto gas_buffer: 1.1 - gas_price: auto + gas_price: null max_fee: null - priority_fee: null + priority_fee: auto reverting_tx_gas_limit: false default_contract_owner: false From f3c0dd9fd7b69061e50d1e4ec1b50d5bc5b0f20f Mon Sep 17 00:00:00 2001 From: Ben Hauser Date: Tue, 30 Jan 2024 19:50:53 +0400 Subject: [PATCH 2/2] feat: use legacy-style gas if network does not support eip1559 --- brownie/network/account.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/brownie/network/account.py b/brownie/network/account.py index c1f70f708..df0cff4fd 100644 --- a/brownie/network/account.py +++ b/brownie/network/account.py @@ -728,7 +728,12 @@ def _make_transaction( priority_fee = CONFIG.active_network["settings"]["priority_fee"] or None if priority_fee == "auto": - priority_fee = Chain().priority_fee + try: + priority_fee = Chain().priority_fee + except ValueError: + # fallback to legacy transactions if network does not support EIP1559 + CONFIG.active_network["settings"]["priority_fee"] = None + priority_fee = None try: # if max fee and priority fee are not set, use gas price