Fix: Use base fee multiplier

Signed-off-by: OjusWiZard <[email protected]>

Author: OjusWiZard

HISTORY.md

@@ -1,5 +1,10 @@
 # Release History - open AEA
 
+## 1.64.0 (2025-02-12)
+
+Plugins:
+- `open-aea-ethereum` now multiplies the base gas fee as before.  #786
+
 ## 1.63.0 (2025-02-03)
 
 Plugins:

aea/__version__.py

@@ -23,7 +23,7 @@
 __title__ = "open-aea"
 __description__ = "Open Autonomous Economic Agent framework (without vendor lock-in)"
 __url__ = "https://github.com/valory-xyz/open-aea.git"
-__version__ = "1.63.0"
+__version__ = "1.64.0"
 __author__ = "Valory AG"
 __license__ = "Apache-2.0"
 __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited"

deploy-image/Dockerfile

@@ -16,7 +16,7 @@ RUN apk add --no-cache go
 
 # aea installation
 RUN pip install --upgrade pip
-RUN pip install --upgrade --force-reinstall open-aea[all]==1.63.0 "open-aea-cli-ipfs<2.0.0,>=1.63.0"
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.64.0 "open-aea-cli-ipfs<2.0.0,>=1.64.0"
 
 # directories and aea cli config
 WORKDIR /home/agents

deploy-image/README.md

@@ -11,7 +11,7 @@ The example uses the `fetchai/my_first_aea` project. You will likely want to mod
 Install subversion, then download the example directory to your local working directory
 
 ``` bash
-svn checkout https://github.com/valory-xyz/open-aea/tags/v1.63.0/packages packages
+svn checkout https://github.com/valory-xyz/open-aea/tags/v1.64.0/packages packages
 ```
 
 ### Modify scripts

develop-image/docker-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=valory/open-aea-develop:1.63.0
+DOCKER_IMAGE_TAG=valory/open-aea-develop:1.64.0
 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..

docs/upgrading.md

@@ -9,6 +9,10 @@ Below we describe the additional manual steps required to upgrade between differ
 
 ### Upgrade guide
 
+## `v1.63.0` to `v1.64.0`
+
+- No backwards incompatible changes
+
 ## `v1.62.0` to `v1.63.0`
 
 - No backwards incompatible changes

examples/tac_deploy/Dockerfile

@@ -19,7 +19,7 @@ RUN apk add --no-cache go
 
 # aea installation
 RUN python -m pip install --upgrade pip
-RUN pip install --upgrade --force-reinstall open-aea[all]==1.63.0
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.64.0
 
 # directories and aea cli config
 COPY /.aea /home/.aea

plugins/aea-cli-benchmark/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-cli-benchmark",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="CLI extension for AEA framework benchmarking.",

plugins/aea-cli-ipfs/setup.py

@@ -28,7 +28,7 @@
 
 setup(
     name="open-aea-cli-ipfs",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="CLI extension for open AEA framework wrapping IPFS functionality.",

plugins/aea-ledger-cosmos/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-ledger-cosmos",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.",

plugins/aea-ledger-ethereum-flashbots/setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name="open-aea-ledger-ethereum-flashbots",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package extending the default open-aea ethereum ledger plugin to add support for flashbots.",
@@ -41,7 +41,7 @@
     },
     python_requires=">=3.9,<4.0",
     install_requires=[
-        "open-aea-ledger-ethereum~=1.63.0",
+        "open-aea-ledger-ethereum~=1.64.0",
         "open-aea-flashbots==1.4.0",
     ],
     tests_require=["pytest"],

plugins/aea-ledger-ethereum-hwi/setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name="open-aea-ledger-ethereum-hwi",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and support for hardware wallet interactions.",
@@ -42,7 +42,7 @@
         "web3>=6.0.0,<7",
         "ipfshttpclient==0.8.0a2",
         "eth-account>=0.8.0,<0.9.0",
-        "open-aea-ledger-ethereum~=1.63.0",
+        "open-aea-ledger-ethereum~=1.64.0",
         "ledgerwallet==0.1.3",
         "protobuf<4.25.0,>=4.21.6",
         "construct<=2.10.61",

plugins/aea-ledger-ethereum/aea_ledger_ethereum/ethereum.py

@@ -282,6 +282,8 @@ def eip1559_price_strategy(
         if base_fee is None or block_number is None:
             return fallback()
 
+        base_fee_gwei = to_eth_unit(base_fee)
+
         estimated_priority_fee = estimate_priority_fee(
             web3,
             block_number,
@@ -295,9 +297,19 @@ def eip1559_price_strategy(
         if estimated_priority_fee is None:
             return fallback()
 
-        max_fee_per_gas = base_fee + estimated_priority_fee
+        multiplier = get_base_fee_multiplier(base_fee_gwei)
+
+        potential_max_fee = base_fee * multiplier
+        max_fee_per_gas = (
+            (potential_max_fee + estimated_priority_fee)
+            if estimated_priority_fee > potential_max_fee
+            else potential_max_fee
+        )
 
-        if to_eth_unit(max_fee_per_gas) >= max_gas_fast:
+        if (
+            to_eth_unit(max_fee_per_gas) >= max_gas_fast
+            or to_eth_unit(estimated_priority_fee) >= max_gas_fast
+        ):
             return fallback(
                 "The estimated gas price is larger than the `max_gas_fast`. Falling back."
             )

plugins/aea-ledger-ethereum/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-ledger-ethereum",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of Ethereum.",

plugins/aea-ledger-ethereum/tests/test_ethereum.py

@@ -44,6 +44,7 @@
     get_gas_price_strategy_eip1559,
     requests,
     rpc_gas_price_strategy_wrapper,
+    to_eth_unit,
 )
 from aea_ledger_ethereum.ethereum import (
     DEFAULT_EIP1559_STRATEGY,
@@ -529,10 +530,8 @@ def test_gas_price_strategy_eip1559() -> None:
 
     assert all([key in gas_stregy for key in ["maxFeePerGas", "maxPriorityFeePerGas"]])
     assert gas_stregy["maxPriorityFeePerGas"] < max(rewards)
-    assert (
-        gas_stregy["maxFeePerGas"]
-        == base_fee_per_gas_mock + gas_stregy["maxPriorityFeePerGas"]
-    )
+    base_fee_per_gas_mock *= get_base_fee_multiplier(to_eth_unit(base_fee_per_gas_mock))
+    assert gas_stregy["maxFeePerGas"] == base_fee_per_gas_mock
 
 
 def test_gas_price_strategy_eip1559_estimate_none() -> None:

plugins/aea-ledger-fetchai/setup.py

@@ -31,7 +31,7 @@
 
 setup(
     name="open-aea-ledger-fetchai",
-    version="1.63.0",
+    version="1.64.0",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger API of Fetch.AI.",
@@ -44,7 +44,7 @@
             "test_tools/data/*",
         ]
     },
-    install_requires=["open-aea-ledger-cosmos~=1.63.0"],
+    install_requires=["open-aea-ledger-cosmos~=1.64.0"],
     tests_require=["pytest"],
     entry_points={
         "aea.cryptos": ["fetchai = aea_ledger_fetchai:FetchAICrypto"],

plugins/aea-ledger-solana/setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name="open-aea-ledger-solana",
-    version="1.63.0",
+    version="1.64.0",
     author="dassy23",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of solana.",

scripts/install.ps1

@@ -34,7 +34,7 @@ function instal_choco_golang_gcc {
 }
 function install_aea {
 	echo "Install aea"
-    $output=pip install open-aea[all]==1.63.0 --force --no-cache-dir 2>&1 |out-string;
+    $output=pip install open-aea[all]==1.64.0 --force --no-cache-dir 2>&1 |out-string;
     if ($LastExitCode -ne 0) {
         echo $output
         echo "AEA install failed!"

scripts/install.sh

@@ -42,7 +42,7 @@ function is_python_version_ok() {
 
 function install_aea (){
 	echo "Install AEA"
-	output=$(pip3 install --user open-aea[all]==1.63.0 --force --no-cache-dir)
+	output=$(pip3 install --user open-aea[all]==1.64.0 --force --no-cache-dir)
 	if [[  $? -ne 0 ]];
 	then
 		echo "$output"

skaffold.yaml

@@ -5,7 +5,7 @@ metadata:
 build:
   tagPolicy:
     envTemplate:
-      template: "1.63.0"
+      template: "1.64.0"
   artifacts:
   - image: valory/open-aea-develop
     docker:
@@ -24,7 +24,7 @@ profiles:
     build:
       tagPolicy:
         envTemplate:
-          template: "1.63.0"
+          template: "1.64.0"
       artifacts:
       - image: valory/open-aea-docs
         docker:

user-image/Dockerfile

@@ -7,7 +7,7 @@ ENV LANG C.UTF-8
 RUN apt update && apt install -y python3.11-dev python3-pip -y && apt autoremove && apt autoclean
 
 RUN pip3 install --upgrade pip
-RUN pip3 install "open-aea[all]==1.63.0" open-aea-cli-ipfs==1.63.0
+RUN pip3 install "open-aea[all]==1.64.0" open-aea-cli-ipfs==1.64.0
 
 COPY user-image/openssl.cnf /etc/ssl
 

user-image/docker-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=valory/open-aea-user:1.63.0
+DOCKER_IMAGE_TAG=valory/open-aea-user:1.64.0
 # DOCKER_IMAGE_TAG=valory/open-aea-user:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..