From a1c93b85b08416d3ccfbc483a9b138f3d7bce7f8 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Mon, 11 Nov 2024 10:52:09 +0100 Subject: [PATCH] fix: gas --- ceramic/read_stream.py | 2 +- docs/index.md | 2 +- packages/packages.json | 6 ++-- .../agents/impact_evaluator/aea-config.yaml | 34 +++---------------- .../services/impact_evaluator/service.yaml | 23 +++---------- .../impact_evaluator_local/service.yaml | 2 +- 6 files changed, 15 insertions(+), 54 deletions(-) diff --git a/ceramic/read_stream.py b/ceramic/read_stream.py index aa53c446..d23839c1 100644 --- a/ceramic/read_stream.py +++ b/ceramic/read_stream.py @@ -16,4 +16,4 @@ with open("stream.json", "w", encoding="utf-8") as out_file: json.dump(data, out_file, indent=4) -print("Done reading stream {stream_id}") +print(f"Done reading stream {stream_id}") diff --git a/docs/index.md b/docs/index.md index 081d196f..88aaf46c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeiequa2f4mihs32uuq7izqodnnm22n2eknohhjg3ecjbveq5pm7muu --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeif3pdmv763sgd5ehfl44jbput3xbdpye7xf7ddh4svflep4vvfm5u --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 2cec9cf1..896eaac6 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -28,10 +28,10 @@ "skill/valory/farcaster_write_abci/0.1.0": "bafybeigx2wyujnojer7er7g2eufm5lojon2dckotvsgwb6tn5iyiwdfgsu", "skill/valory/farcaster_test_abci/0.1.0": "bafybeihd3h37ngkxlqo6o3vuvdik54bwmbrjmqcxtgsr5is3tqgbk73yoa", "skill/valory/staking_abci/0.1.0": "bafybeidgmviq6inwwjachktoeddmyuo7iyg7yfyhvhvy3znndkvuuudllq", - "agent/valory/impact_evaluator/0.1.0": "bafybeig4y74umrsll4iahg4xslhfphq33ets4qr72a4kg7savt5mkockem", + "agent/valory/impact_evaluator/0.1.0": "bafybeigvu56ru4j3ivhd6tk34alqnjee4mysdrqsgb6k5vn2qca73zpd2u", "agent/valory/farcaster_test/0.1.0": "bafybeiefui6dnhhy5leqyvfrbkeleb64gap5tzctkrzzggjf4ubbxamjvy", - "service/valory/impact_evaluator/0.1.0": "bafybeiequa2f4mihs32uuq7izqodnnm22n2eknohhjg3ecjbveq5pm7muu", - "service/valory/impact_evaluator_local/0.1.0": "bafybeiafc4eyos4rcfidacg7qqvlnmzqb3uq75tqbtrqq6q2xnat5vhigi" + "service/valory/impact_evaluator/0.1.0": "bafybeif3pdmv763sgd5ehfl44jbput3xbdpye7xf7ddh4svflep4vvfm5u", + "service/valory/impact_evaluator_local/0.1.0": "bafybeig55vp3oefkexjdvdjfkgpyk2ccrdsclbuyen3dqafj44z753cpi4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 574e5452..de2db467 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -133,7 +133,7 @@ config: chain_id: ${int:31337} poa_chain: ${bool:false} default_gas_price_strategy: ${str:eip1559} - gas_price_strategies: + gas_price_strategies: &id001 gas_station: gas_price_api_key: null gas_price_strategy: fast @@ -141,7 +141,7 @@ config: max_gas_fast: 1500 fee_history_blocks: 10 fee_history_percentile: 5 - default_priority_fee: ${int:30000000} + default_priority_fee: ${int:null} fallback_estimate: maxFeePerGas: ${int:20000000000} maxPriorityFeePerGas: ${int:3000000000} @@ -152,39 +152,13 @@ config: chain_id: ${int:100} poa_chain: ${bool:false} default_gas_price_strategy: ${str:eip1559} - gas_price_strategies: - gas_station: - gas_price_api_key: null - gas_price_strategy: fast - eip1559: - max_gas_fast: 1500 - fee_history_blocks: 10 - fee_history_percentile: 5 - default_priority_fee: ${int:30000000} - fallback_estimate: - maxFeePerGas: ${int:20000000000} - maxPriorityFeePerGas: ${int:3000000000} - baseFee: null - priority_fee_increase_boundary: ${int:200} + gas_price_strategies: *id001 base: address: ${str:http://localhost:8545} chain_id: ${int:8453} poa_chain: ${bool:false} default_gas_price_strategy: ${str:eip1559} - gas_price_strategies: - gas_station: - gas_price_api_key: null - gas_price_strategy: fast - eip1559: - max_gas_fast: 1500 - fee_history_blocks: 10 - fee_history_percentile: 5 - default_priority_fee: ${int:30000000} - fallback_estimate: - maxFeePerGas: ${int:20000000000} - maxPriorityFeePerGas: ${int:3000000000} - baseFee: null - priority_fee_increase_boundary: ${int:200} + gas_price_strategies: *id001 --- public_id: valory/p2p_libp2p_client:0.1.0 type: connection diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 0f8e425b..446158d0 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeig4y74umrsll4iahg4xslhfphq33ets4qr72a4kg7savt5mkockem +agent: valory/impact_evaluator:0.1.0:bafybeigvu56ru4j3ivhd6tk34alqnjee4mysdrqsgb6k5vn2qca73zpd2u number_of_agents: 4 deployment: agent: @@ -454,10 +454,10 @@ config: max_gas_fast: 1500 fee_history_blocks: 10 fee_history_percentile: 5 - default_priority_fee: ${DEFAULT_PRIORITY_FEE:int:30000000} + default_priority_fee: ${DEFAULT_PRIORITY_FEE:int:null} fallback_estimate: - maxFeePerGas: 20000000000 - maxPriorityFeePerGas: 3000000000 + maxFeePerGas: ${MAX_FEE_PER_GAS:20000000000} + maxPriorityFeePerGas: ${MAX_PRIORITY_FEE_PER_GAS:3000000000} baseFee: null priority_fee_increase_boundary: 200 gnosis: @@ -465,20 +465,7 @@ config: chain_id: ${GNOSIS_LEDGER_CHAIN_ID:int:100} poa_chain: ${GNOSIS_LEDGER_IS_POA_CHAIN:bool:false} default_gas_price_strategy: ${GNOSIS_LEDGER_PRICING:str:eip1559} - gas_price_strategies: - gas_station: - gas_price_api_key: null - gas_price_strategy: fast - eip1559: - max_gas_fast: 1500 - fee_history_blocks: 10 - fee_history_percentile: 5 - default_priority_fee: ${DEFAULT_PRIORITY_FEE_GNOSIS:int:30000000} - fallback_estimate: - maxFeePerGas: ${MAX_FEE_PER_GAS_GNOSIS:int:20000000000} - maxPriorityFeePerGas: ${MAX_PRIORITY_FEE_PER_GAS_GNOSIS:int:3000000000} - baseFee: null - priority_fee_increase_boundary: ${PRIORITY_FEE_INCREASE_BOUNDARY_GNOSIS:int:200} + gas_price_strategies: *id001 base: address: ${BASE_LEDGER_RPC:str:http://host.docker.internal:8545} chain_id: ${BASE_LEDGER_CHAIN_ID:int:8453} diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index cd3aebbe..9d524569 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeig4y74umrsll4iahg4xslhfphq33ets4qr72a4kg7savt5mkockem +agent: valory/impact_evaluator:0.1.0:bafybeigvu56ru4j3ivhd6tk34alqnjee4mysdrqsgb6k5vn2qca73zpd2u number_of_agents: 1 deployment: agent: