Merge pull request #756 from valory-xyz/fix/pricing

Fix pricing

HISTORY.md

@@ -1,5 +1,10 @@
 # Release History - open AEA
 
+## 1.56.0 (2024-09-17)
+
+Plugins:
+- Fixes the pricing logic. #756
+
 ## 1.55.0 (2024-08-05)
 
 Plugins:

SECURITY.md

@@ -8,8 +8,8 @@ The following table shows which versions of `open-aea` are currently being suppo
 
 | Version    | Supported          |
 |------------| ------------------ |
-| `1.55.x`   | :white_check_mark: |
-| `< 1.55.0` | :x:                |
+| `1.56.x`   | :white_check_mark: |
+| `< 1.56.0` | :x:                |
 
 ## Reporting a Vulnerability
 

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.55.0"
+__version__ = "1.56.0"
 __author__ = "Valory AG"
 __license__ = "Apache-2.0"
 __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited"

aea/skills/scaffold/skill.yaml

@@ -32,3 +32,4 @@ models:
     class_name: MyModel
 dependencies: {}
 is_abstract: false
+customs: []

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.55.0 "open-aea-cli-ipfs<2.0.0,>=1.55.0"
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.56.0 "open-aea-cli-ipfs<2.0.0,>=1.56.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.55.0/packages packages
+svn checkout https://github.com/valory-xyz/open-aea/tags/v1.56.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.55.0
+DOCKER_IMAGE_TAG=valory/open-aea-develop:1.56.0
 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..

docs/api/plugins/aea_ledger_ethereum/ethereum.md

@@ -47,7 +47,8 @@ Round WEI to equivalent GWEI
 #### get`_`base`_`fee`_`multiplier
 
 ```python
-def get_base_fee_multiplier(base_fee_gwei: int) -> float
+def get_base_fee_multiplier(
+        base_fee_gwei: Union[int, decimal.Decimal]) -> float
 ```
 
 Returns multiplier value.
@@ -58,9 +59,9 @@ Returns multiplier value.
 
 ```python
 def estimate_priority_fee(
-        web3_object: Web3, base_fee_gwei: int, block_number: int,
-        priority_fee_estimation_trigger: int, default_priority_fee: int,
-        fee_history_blocks: int, fee_history_percentile: int,
+        web3_object: Web3, block_number: int,
+        default_priority_fee: Optional[int], fee_history_blocks: int,
+        fee_history_percentile: int,
         priority_fee_increase_boundary: int) -> Optional[int]
 ```
 
@@ -73,7 +74,7 @@ Estimate priority fee from base fee.
 ```python
 def get_gas_price_strategy_eip1559(
     max_gas_fast: int, fee_history_blocks: int, fee_history_percentile: int,
-    priority_fee_estimation_trigger: int, default_priority_fee: int,
+    default_priority_fee: Optional[int],
     fallback_estimate: Dict[str,
                             Optional[int]], priority_fee_increase_boundary: int
 ) -> Callable[[Web3, TxParams], Dict[str, Wei]]

docs/package_list.md

@@ -14,7 +14,7 @@
 | contract/fetchai/erc1155/0.22.0                               | `bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4` |
 | connection/fetchai/gym/0.19.0                                 | `bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y` |
 | connection/fetchai/stub/0.21.0                                | `bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy` |
-| connection/valory/ledger/0.19.0                               | `bafybeihynkdraqthjtv74qk3nc5r2xubniqx2hhzpxn7bd4qmlf7q4wruq` |
+| connection/valory/ledger/0.19.0                               | `bafybeibigvowo52dw3tqwmxkdxtq52qzm6iqw752gpzpi23kgej4k3sum4` |
 | connection/valory/http_server/0.22.0                          | `bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m` |
 | connection/valory/p2p_libp2p/0.1.0                            | `bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma` |
 | connection/valory/p2p_libp2p_client/0.1.0                     | `bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e` |
@@ -26,12 +26,12 @@
 | skill/fetchai/error_test_skill/0.1.0                          | `bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu` |
 | skill/fetchai/gym/0.20.0                                      | `bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4` |
 | skill/fetchai/http_echo/0.20.0                                | `bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm` |
-| skill/fetchai/erc1155_client/0.28.0                           | `bafybeihwk56assrj5xpu5dvyyajw7dgnk65eq2n3idd5pinxp5vortd6wi` |
-| skill/fetchai/erc1155_deploy/0.30.0                           | `bafybeiewhczeyrrml6shrd5dr556uwqt54aiwrol2fyqtx2n4ymgfbc6mu` |
+| skill/fetchai/erc1155_client/0.28.0                           | `bafybeigeoxvo3dabzbhjphu2n32wn5bomhv7b6ge6ogcte7qa6h42rwn5a` |
+| skill/fetchai/erc1155_deploy/0.30.0                           | `bafybeialn4tcp4vs7nousugfjpin5r37vhd2qcmphi3fs7ob66kcwb5gu4` |
 | skill/fetchai/error/0.17.0                                    | `bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm` |
 | skill/fetchai/fipa_dummy_buyer/0.2.0                          | `bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm` |
-| skill/fetchai/generic_buyer/0.26.0                            | `bafybeif5q4xb45m5l2h6pikgqdieko4iojna5mou7byub5voajcxwxruo4` |
-| skill/fetchai/generic_seller/0.27.0                           | `bafybeie3dhsbasxhtkvpakxml6eyccqqpmog3kynyrl5khyrnw6hjjpdj4` |
+| skill/fetchai/generic_buyer/0.26.0                            | `bafybeienntvkd7blbbc4p624dop7tz4iejtpi36somhohbi4tmxd63ksr4` |
+| skill/fetchai/generic_seller/0.27.0                           | `bafybeid4y4p2xlnkezvtzhgwfdzrowhul34md64shf3jv5nskpggskc3fm` |
 | skill/fetchai/task_test_skill/0.1.0                           | `bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble` |
 | agent/fetchai/error_test/0.1.0                                | `bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq` |
 | agent/fetchai/gym_aea/0.25.0                                  | `bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm` |

docs/upgrading.md

@@ -9,6 +9,13 @@ Below we describe the additional manual steps required to upgrade between differ
 
 ### Upgrade guide
 
+## `v1.55.0` to `v1.56.0`
+
+- The `priority_fee_estimation_trigger` has been removed from the `eip1559` configuration of the ledger.
+- The `default_priority_fee` is now optional. 
+  If it is set to `None`, dynamic pricing will be applied. 
+  Otherwise, the specified value will be used.
+
 ## `v1.54.0` to `v1.55.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.55.0
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.56.0
 
 # directories and aea cli config
 COPY /.aea /home/.aea

packages/fetchai/skills/erc1155_client/skill.yaml

@@ -21,7 +21,7 @@ fingerprint:
   tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeihynkdraqthjtv74qk3nc5r2xubniqx2hhzpxn7bd4qmlf7q4wruq
+- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

packages/fetchai/skills/erc1155_deploy/skill.yaml

@@ -21,7 +21,7 @@ fingerprint:
   tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeihynkdraqthjtv74qk3nc5r2xubniqx2hhzpxn7bd4qmlf7q4wruq
+- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

packages/fetchai/skills/generic_buyer/skill.yaml

@@ -19,7 +19,7 @@ fingerprint:
   tests/test_models.py: bafybeibh72j3n72yseqvmpppucpu5wtidf6ebxbxkfnmrnlh4zv5y5apei
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeihynkdraqthjtv74qk3nc5r2xubniqx2hhzpxn7bd4qmlf7q4wruq
+- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24

packages/fetchai/skills/generic_seller/skill.yaml

@@ -20,7 +20,7 @@ fingerprint:
   tests/test_models.py: bafybeihabrc22zqssit3fmqhxptosy6qz6mx65ukhf5iayvirfv42xrhoq
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeihynkdraqthjtv74qk3nc5r2xubniqx2hhzpxn7bd4qmlf7q4wruq
+- valory/ledger:0.19.0:bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24

packages/packages.json

@@ -14,7 +14,7 @@
         "contract/fetchai/erc1155/0.22.0": "bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4",
         "connection/fetchai/gym/0.19.0": "bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y",
         "connection/fetchai/stub/0.21.0": "bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy",
-        "connection/valory/ledger/0.19.0": "bafybeihynkdraqthjtv74qk3nc5r2xubniqx2hhzpxn7bd4qmlf7q4wruq",
+        "connection/valory/ledger/0.19.0": "bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e",
         "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m",
         "connection/valory/p2p_libp2p/0.1.0": "bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e",
@@ -26,12 +26,12 @@
         "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu",
         "skill/fetchai/gym/0.20.0": "bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4",
         "skill/fetchai/http_echo/0.20.0": "bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm",
-        "skill/fetchai/erc1155_client/0.28.0": "bafybeihwk56assrj5xpu5dvyyajw7dgnk65eq2n3idd5pinxp5vortd6wi",
-        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeiewhczeyrrml6shrd5dr556uwqt54aiwrol2fyqtx2n4ymgfbc6mu",
+        "skill/fetchai/erc1155_client/0.28.0": "bafybeih7q6b2lcqcbh7rln3mgcnbtzlw7cpzjl23znnz6jj74cc4noahvq",
+        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeigoarj6k2czdhhfqzry5w5jn2ux7chszem37zxiqy3232jr2mxs64",
         "skill/fetchai/error/0.17.0": "bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm",
         "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm",
-        "skill/fetchai/generic_buyer/0.26.0": "bafybeif5q4xb45m5l2h6pikgqdieko4iojna5mou7byub5voajcxwxruo4",
-        "skill/fetchai/generic_seller/0.27.0": "bafybeie3dhsbasxhtkvpakxml6eyccqqpmog3kynyrl5khyrnw6hjjpdj4",
+        "skill/fetchai/generic_buyer/0.26.0": "bafybeihzzcbki3p5l4nt5spbddx6nzbejv7b6nruhycwaxfrstjwmrfucq",
+        "skill/fetchai/generic_seller/0.27.0": "bafybeig3ffbcefeandebzepxabztob5sdkumydzla52k7pvztmjfegwflq",
         "skill/fetchai/task_test_skill/0.1.0": "bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble",
         "agent/fetchai/error_test/0.1.0": "bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq",
         "agent/fetchai/gym_aea/0.25.0": "bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm",

packages/valory/connections/ledger/connection.yaml

@@ -16,7 +16,7 @@ fingerprint:
   tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou
   tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq
   tests/test_ledger.py: bafybeigcedfr3yv3jse3xwrerrgwbelgb56uhgrvdus527d3daekh6dx4m
-  tests/test_ledger_api.py: bafybeifw5smawex5m2fm6rt4kmunc22kpabalmshh45qb3xnuap33sfgyi
+  tests/test_ledger_api.py: bafybeihlwfzfffyr3gcrwa74g2ctoeymv76ahnxbxyal3xikgb7ftvpnl4
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
@@ -37,8 +37,7 @@ config:
           max_gas_fast: 1500
           fee_history_blocks: 10
           fee_history_percentile: 5
-          priority_fee_estimation_trigger: 100
-          default_priority_fee: 3
+          default_priority_fee: null
           fallback_estimate:
             maxFeePerGas: 20000000000
             maxPriorityFeePerGas: 3000000000

packages/valory/connections/ledger/tests/test_ledger_api.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2021-2023 Valory AG
+#   Copyright 2021-2024 Valory AG
 #   Copyright 2018-2019 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,7 +36,9 @@
     DEFAULT_GANACHE_CHAIN_ID,
     ganache,
 )
+from eth_typing import BlockNumber
 from web3.eth import Eth
+from web3.types import FeeHistory, Wei
 
 from aea.common import Address
 from aea.configurations.data_types import PublicId
@@ -85,7 +87,7 @@
     ],
 )
 # TODO: uncomment gas station strategy config after the gasstation API start
-gas_strategies = pytest.mark.parametrize(
+gas_strategies_parametrization = pytest.mark.parametrize(
     "gas_strategies",
     [
         {"gas_price_strategy": None},
@@ -98,6 +100,66 @@
     ],
 )
 
+fee_history_mock = patch("web3.eth.Eth.fee_history")
+
+fee_history_parametrization = pytest.mark.parametrize(
+    "fee_history",
+    (
+        FeeHistory(
+            baseFeePerGas=[Wei(0)],
+            gasUsedRatio=[0],
+            oldestBlock=BlockNumber(0),
+            reward=[[Wei(0)]],
+        ),
+        FeeHistory(
+            baseFeePerGas=[
+                Wei(int("0x180b5d502", 16)),
+                Wei(int("0x18f9534de", 16)),
+                Wei(int("0x18367e3a6", 16)),
+                Wei(int("0x17e4519ed", 16)),
+                Wei(int("0x179eb57e1", 16)),
+                Wei(int("0x178ac8e88", 16)),
+                Wei(int("0x177434776", 16)),
+                Wei(int("0x17b4c8c2d", 16)),
+                Wei(int("0x173695e84", 16)),
+                Wei(int("0x1706c1f66", 16)),
+                Wei(int("0x155600bc6", 16)),
+            ],
+            gasUsedRatio=[
+                0.6546364333333333,
+                0.37810266666666664,
+                0.44697146666666665,
+                0.4544759666666667,
+                0.48681983333333334,
+                0.4850136666666667,
+                0.5430227,
+                0.4168211333333333,
+                0.46780666666666665,
+                0.206346,
+            ],
+            oldestBlock=BlockNumber(int("0x13cd298", 16)),
+            reward=[
+                [Wei(int("0xf4240", 16))],
+                [Wei(int("0xf4240", 16))],
+                [Wei(int("0xf4240", 16))],
+                [Wei(int("0x0", 16))],
+                [Wei(int("0xf4240", 16))],
+                [Wei(int("0xf4240", 16))],
+                [Wei(int("0xf4240", 16))],
+                [Wei(int("0x124f80", 16))],
+                [Wei(int("0x919f8", 16))],
+                [Wei(int("0xf4240", 16))],
+            ],
+        ),
+        FeeHistory(
+            baseFeePerGas=[],
+            gasUsedRatio=[],
+            oldestBlock=BlockNumber(0),
+            reward=[],
+        ),
+    ),
+)
+
 
 class LedgerApiDialogues(BaseLedgerApiDialogues):
     """The dialogues class keeps track of all ledger_api dialogues."""
@@ -220,17 +282,23 @@ async def test_get_state(
         )
         assert actual_block == expected_block
 
+    @fee_history_mock
     @pytest.mark.asyncio
-    @gas_strategies
+    @gas_strategies_parametrization
+    @fee_history_parametrization
     async def test_get_raw_transaction(
         self,
+        fee_history_mock_: Mock,
         gas_strategies: Dict,
+        fee_history: FeeHistory,
         ledger_apis_connection: Connection,
         update_default_ethereum_ledger_api: None,
     ) -> None:
         """Test get raw transaction with Ethereum APIs."""
         import aea  # noqa # to load registries
 
+        fee_history_mock_.return_value = fee_history
+
         crypto1 = make_crypto(
             EthereumCrypto.identifier, private_key_path=ETHEREUM_PRIVATE_KEY_PATH
         )
@@ -281,12 +349,19 @@ async def test_get_raw_transaction(
         assert isinstance(response_message.raw_transaction, RawTransaction)
         assert response_message.raw_transaction.ledger_id == request.terms.ledger_id
 
+    @fee_history_mock
     @pytest.mark.asyncio
-    @gas_strategies
+    @gas_strategies_parametrization
+    @fee_history_parametrization
     async def test_send_signed_transaction_ethereum(
-        self, gas_strategies: Dict, ledger_apis_connection: LedgerConnection
+        self,
+        fee_history_mock_: Mock,
+        gas_strategies: Dict,
+        fee_history: FeeHistory,
+        ledger_apis_connection: LedgerConnection,
     ) -> None:
         """Test send signed transaction with Ethereum APIs."""
+        fee_history_mock_.return_value = fee_history
         ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID)
 
         crypto1 = make_crypto(

plugins/aea-cli-benchmark/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-cli-benchmark",
-    version="1.55.0",
+    version="1.56.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.55.0",
+    version="1.56.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.55.0",
+    version="1.56.0",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.",