Merge pull request #55 from valory-xyz/chore/bump

Bump `open-aea` and `open-autonomy` frameworks
valory-xyz · Apr 14, 2023 · 5f722cd · 5f722cd
2 parents 76e0589 + 8d8b4ad
commit 5f722cd
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 218 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,11 @@
 # Release History - `apy-oracle`
 
+## 0.10.1 (2023-04-14)
+
+- Bumps `open-autonomy` and `open-aea` frameworks #55
+- Removes unnecessary demo service #55
+- Adds extra overrides to the agent and the service #55
+
 ## 0.10.0.post2 (2023-04-06)
 
 - Fixes `all-participants` formatting #54

diff --git a/Pipfile b/Pipfile
@@ -16,12 +16,12 @@ hypothesis = "==6.21.6"
 joblib = "==1.1.0"
 # latest supported for Python 3.7
 numpy = "==1.21.6"
-open-aea = {version = "==1.31.0", extras = ["all"]}
-open-aea-ledger-ethereum = "==1.31.0"
-open-aea-ledger-cosmos = "==1.31.0"
-open-aea-test-autonomy = "==0.10.0.post2"
-open-aea-cli-ipfs = "==1.31.0"
-open-autonomy = {version = "==0.10.0.post2", extras = [ "all"]}
+open-aea = {version = "==1.32.0", extras = ["all"]}
+open-aea-ledger-ethereum = "==1.32.0"
+open-aea-ledger-cosmos = "==1.32.0"
+open-aea-test-autonomy = "==0.10.1"
+open-aea-cli-ipfs = "==1.32.0"
+open-autonomy = {version = "==0.10.1", extras = [ "all"]}
 optuna = "==2.10.1"
 pandas = "==1.3.5"
 pandas-stubs = "==1.2.0.62"

diff --git a/SECURITY.md b/SECURITY.md
@@ -8,8 +8,8 @@ The following table shows which versions of `apy` are currently being supported
 
 | Version           | Supported          |
 |-------------------|--------------------|
-| `v0.10.0.post2`   | :white_check_mark: |
-| `< v0.10.0.post2` | :x:                |
+| `v0.10.1`   | :white_check_mark: |
+| `< v0.10.1` | :x:                |
 
 ## Reporting a Vulnerability
 

diff --git a/docs/index.md b/docs/index.md
@@ -16,20 +16,20 @@ In order to run a local demo of the ML APY Prediction Oracle service:
     mkdir your_workspace && cd your_workspace
     touch Pipfile && pipenv --python 3.10 && pipenv shell
 
-    pipenv install open-autonomy[all]==0.10.0.post2
+    pipenv install open-autonomy[all]==0.10.1
     autonomy init --remote --ipfs --reset --author=your_name
     ```
 
 2. Fetch the ML APY Prediction Oracle service.
 
 	```bash
-	autonomy fetch valory/apy_estimation_demo:0.1.0:bafybeibb65aexjskharyxfbks3647ahwgqjiedpcvsmhfyae7qrptzfy74 --service
+	autonomy fetch valory/apy_estimation:0.1.0:bafybeiar7c4gle5b44as6yqdli7fujuwzae3jpdiem7g2mx7kntjtscwii --service
 	```
 
 3. Build the Docker image of the service agents
 
 	```bash
-	cd apy_estimation_demo
+	cd apy_estimation
 	autonomy build-image
 	```
 

diff --git a/packages/packages.json b/packages/packages.json
@@ -1,29 +1,28 @@
 {
     "dev": {
-        "skill/valory/apy_estimation_abci/0.1.0": "bafybeib46ilspcrliuki6c4jlzdga3bypqeluweopalqjpfh4bouji3vou",
-        "skill/valory/apy_estimation_chained_abci/0.1.0": "bafybeibfh5sghvdes5qgdmj4bnrnigvtftwtksabipjbu6xmahqr6g67da",
-        "agent/valory/apy_estimation/0.1.0": "bafybeihddbyxdgnowylnjd4ro4ytwtazuxbvgbp35c466fbtg4agak5noq",
-        "service/valory/apy_estimation/0.1.0": "bafybeib4bug6fgozoexmb4l7vwwqjswqnw43exracdboxk3tbwvnijobly",
-        "service/valory/apy_estimation_demo/0.1.0": "bafybeibb65aexjskharyxfbks3647ahwgqjiedpcvsmhfyae7qrptzfy74"
+        "skill/valory/apy_estimation_abci/0.1.0": "bafybeid5btbdvdwghjesnosmk7t4wscsnizht4kxdmgfdaevhs7npohzga",
+        "skill/valory/apy_estimation_chained_abci/0.1.0": "bafybeibhjq7n7mbwgm72dei7uzqumd4nm3erxt2fp24u5dbcnxmdasjokm",
+        "agent/valory/apy_estimation/0.1.0": "bafybeia4shphutcnwbei4sj5lvs2eyobsgx5zcifhqqt3g5v2zkdpf3ury",
+        "service/valory/apy_estimation/0.1.0": "bafybeiar7c4gle5b44as6yqdli7fujuwzae3jpdiem7g2mx7kntjtscwii"
     },
     "third_party": {
-        "connection/valory/ipfs/0.1.0": "bafybeie46fu7mv64q72dwzoxg77zbiv3pzsigzjk3rehjpm47cf3y77mha",
-        "protocol/valory/ipfs/0.1.0": "bafybeihlgai5pbmkb6mjhvgy4gkql5uvpwvxbpdowczgz4ovxat6vajrq4",
+        "connection/valory/ipfs/0.1.0": "bafybeihubpyw2t3bwncz3l7jt4gf5xvfydwmob463vvgf3ikkhlwxakm3m",
+        "protocol/valory/ipfs/0.1.0": "bafybeic72ncgqbzoz2guj4p4yjqulid7mv6yroeh65hxznloamoveeg7hq",
         "protocol/valory/abci/0.1.0": "bafybeig3dj5jhsowlvg3t73kgobf6xn4nka7rkttakdb2gwsg5bp7rt7q4",
-        "connection/valory/abci/0.1.0": "bafybeidyfpwu7hpanfj74zn6nkzmzoz2qharxfsnxzjr7bfldho2xzualu",
+        "connection/valory/abci/0.1.0": "bafybeihkjtzuv3oaq5olerjwnhf5qg5gsmgdsvg27aaeqeg46ch7mjvggi",
         "protocol/valory/contract_api/1.0.0": "bafybeidv6wxpjyb2sdyibnmmum45et4zcla6tl63bnol6ztyoqvpl4spmy",
         "protocol/valory/http/1.0.0": "bafybeifyoio7nlh5zzyn5yz7krkou56l22to3cwg7gw5v5o3vxwklibhty",
-        "protocol/valory/ledger_api/1.0.0": "bafybeidluywxchkacc7cz65nktqjg3y2vzzp43sw5hdhnvvonozogrmfie",
+        "protocol/valory/ledger_api/1.0.0": "bafybeibo4bdtcrxi2suyzldwoetjar6pqfzm6vt5xal22ravkkcvdmtksi",
         "connection/valory/http_client/0.23.0": "bafybeidykl4elwbcjkqn32wt5h4h7tlpeqovrcq3c5bcplt6nhpznhgczi",
-        "connection/valory/ledger/0.19.0": "bafybeighon6i2qfl2xrg7t3lbdzlkyo4v2a7ayvwso7m5w7pf2hvjfs2ma",
-        "contract/valory/service_registry/0.1.0": "bafybeiem5v2pukaklmhng3cckncdihs4shtwc4trejdrezt53lioejtk4u",
+        "connection/valory/ledger/0.19.0": "bafybeicgfupeudtmvehbwziqfxiz6ztsxr5rxzvalzvsdsspzz73o5fzfi",
+        "contract/valory/service_registry/0.1.0": "bafybeiauproyi7qle35u777xnlajrz5samm7h2cdjdqxlsfkxbtwbqilzm",
         "protocol/open_aea/signing/1.0.0": "bafybeibqlfmikg5hk4phzak6gqzhpkt6akckx7xppbp53mvwt6r73h7tk4",
         "protocol/valory/acn/1.1.0": "bafybeignmc5uh3vgpuckljcj2tgg7hdqyytkm6m5b6v6mxtazdcvubibva",
         "protocol/valory/tendermint/0.1.0": "bafybeicusvezoqlmyt6iqomcbwaz3xkhk2qf3d56q5zprmj3xdxfy64k54",
-        "skill/valory/abstract_abci/0.1.0": "bafybeiai2t36ht3blisjneahv5almyfieqokl4auj2n43rj4k5chun2i44",
+        "skill/valory/abstract_abci/0.1.0": "bafybeicujajnqzbndtndrndj53znohemihludifuyc5dazfbz6fltyj5ci",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeidwcobzb7ut3efegoedad7jfckvt2n6prcmd4g7xnkm6hp6aafrva",
-        "skill/valory/abstract_round_abci/0.1.0": "bafybeib7q4t5jh6gic3i2pzuzlk7q2xmnueyxjpftm4gl56vnnz4vs4f7a",
-        "skill/valory/registration_abci/0.1.0": "bafybeidc6iv54mr2antvrw3r4tldm635othi62bhzeyyid7kejzxw4fwiq",
-        "skill/valory/reset_pause_abci/0.1.0": "bafybeige4ncfhwlqbthmfvdu7aogl2qqsozpz3h5el3xokmq4hcqujgsqy"
+        "skill/valory/abstract_round_abci/0.1.0": "bafybeiar4gy4brpuxekiwjq7osh3fm254jgdoxlgkvqcp5lytu4uzrmbsm",
+        "skill/valory/registration_abci/0.1.0": "bafybeicoi3eczbytx2hporiblyogj73r6oqbwdx3wenuyn7mjdztfsldbi",
+        "skill/valory/reset_pause_abci/0.1.0": "bafybeibayjshwvymeieird2cm6m5jeduqxq7dpdplef2qx4lse64n5j4xq"
     }
 }
diff --git a/packages/valory/agents/apy_estimation/aea-config.yaml b/packages/valory/agents/apy_estimation/aea-config.yaml
@@ -11,27 +11,27 @@ fingerprint:
   tests/test_apy_estimation.py: bafybeigv6wcjilg6ylt7kys574oaxwm3rtyd7rupusbavroiubahap3k5i
 fingerprint_ignore_patterns: []
 connections:
-- valory/abci:0.1.0:bafybeidyfpwu7hpanfj74zn6nkzmzoz2qharxfsnxzjr7bfldho2xzualu
+- valory/abci:0.1.0:bafybeihkjtzuv3oaq5olerjwnhf5qg5gsmgdsvg27aaeqeg46ch7mjvggi
 - valory/http_client:0.23.0:bafybeidykl4elwbcjkqn32wt5h4h7tlpeqovrcq3c5bcplt6nhpznhgczi
-- valory/ledger:0.19.0:bafybeighon6i2qfl2xrg7t3lbdzlkyo4v2a7ayvwso7m5w7pf2hvjfs2ma
+- valory/ledger:0.19.0:bafybeicgfupeudtmvehbwziqfxiz6ztsxr5rxzvalzvsdsspzz73o5fzfi
 - valory/p2p_libp2p_client:0.1.0:bafybeidwcobzb7ut3efegoedad7jfckvt2n6prcmd4g7xnkm6hp6aafrva
 contracts:
-- valory/service_registry:0.1.0:bafybeiem5v2pukaklmhng3cckncdihs4shtwc4trejdrezt53lioejtk4u
+- valory/service_registry:0.1.0:bafybeiauproyi7qle35u777xnlajrz5samm7h2cdjdqxlsfkxbtwbqilzm
 protocols:
 - open_aea/signing:1.0.0:bafybeibqlfmikg5hk4phzak6gqzhpkt6akckx7xppbp53mvwt6r73h7tk4
 - valory/abci:0.1.0:bafybeig3dj5jhsowlvg3t73kgobf6xn4nka7rkttakdb2gwsg5bp7rt7q4
 - valory/acn:1.1.0:bafybeignmc5uh3vgpuckljcj2tgg7hdqyytkm6m5b6v6mxtazdcvubibva
 - valory/contract_api:1.0.0:bafybeidv6wxpjyb2sdyibnmmum45et4zcla6tl63bnol6ztyoqvpl4spmy
 - valory/http:1.0.0:bafybeifyoio7nlh5zzyn5yz7krkou56l22to3cwg7gw5v5o3vxwklibhty
-- valory/ledger_api:1.0.0:bafybeidluywxchkacc7cz65nktqjg3y2vzzp43sw5hdhnvvonozogrmfie
+- valory/ledger_api:1.0.0:bafybeibo4bdtcrxi2suyzldwoetjar6pqfzm6vt5xal22ravkkcvdmtksi
 - valory/tendermint:0.1.0:bafybeicusvezoqlmyt6iqomcbwaz3xkhk2qf3d56q5zprmj3xdxfy64k54
 skills:
-- valory/abstract_abci:0.1.0:bafybeiai2t36ht3blisjneahv5almyfieqokl4auj2n43rj4k5chun2i44
-- valory/abstract_round_abci:0.1.0:bafybeib7q4t5jh6gic3i2pzuzlk7q2xmnueyxjpftm4gl56vnnz4vs4f7a
-- valory/apy_estimation_abci:0.1.0:bafybeib46ilspcrliuki6c4jlzdga3bypqeluweopalqjpfh4bouji3vou
-- valory/apy_estimation_chained_abci:0.1.0:bafybeibfh5sghvdes5qgdmj4bnrnigvtftwtksabipjbu6xmahqr6g67da
-- valory/registration_abci:0.1.0:bafybeidc6iv54mr2antvrw3r4tldm635othi62bhzeyyid7kejzxw4fwiq
-- valory/reset_pause_abci:0.1.0:bafybeige4ncfhwlqbthmfvdu7aogl2qqsozpz3h5el3xokmq4hcqujgsqy
+- valory/abstract_abci:0.1.0:bafybeicujajnqzbndtndrndj53znohemihludifuyc5dazfbz6fltyj5ci
+- valory/abstract_round_abci:0.1.0:bafybeiar4gy4brpuxekiwjq7osh3fm254jgdoxlgkvqcp5lytu4uzrmbsm
+- valory/apy_estimation_abci:0.1.0:bafybeid5btbdvdwghjesnosmk7t4wscsnizht4kxdmgfdaevhs7npohzga
+- valory/apy_estimation_chained_abci:0.1.0:bafybeibhjq7n7mbwgm72dei7uzqumd4nm3erxt2fp24u5dbcnxmdasjokm
+- valory/registration_abci:0.1.0:bafybeicoi3eczbytx2hporiblyogj73r6oqbwdx3wenuyn7mjdztfsldbi
+- valory/reset_pause_abci:0.1.0:bafybeibayjshwvymeieird2cm6m5jeduqxq7dpdplef2qx4lse64n5j4xq
 default_ledger: ethereum
 required_ledgers:
 - ethereum
@@ -63,11 +63,11 @@ logging_config:
       propagate: true
 dependencies:
   open-aea-ledger-cosmos:
-    version: ==1.31.0
+    version: ==1.32.0
   open-aea-ledger-ethereum:
-    version: ==1.31.0
+    version: ==1.32.0
   open-aea-test-autonomy:
-    version: ==0.10.0.post2
+    version: ==0.10.1
 skill_exception_policy: just_log
 connection_exception_policy: just_log
 default_connection: null
@@ -98,6 +98,7 @@ models:
       round_timeout_seconds: ${float:3650.0}
       reset_pause_duration: ${int:3600}
       max_healthcheck: ${int:43200}
+      n_estimations_before_retrain: ${int:60}
       drand_public_key: ${str:868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31}
       estimation:
         steps_forward: ${int:1}
@@ -111,6 +112,7 @@ models:
         show_progress_bar: ${bool:false}
         scoring: ${str:pinball}
         alpha: ${float:0.25}
+        window_size: ${int:null}
       pair_ids: ${dict:{"uniswap_subgraph":["0xae461ca67b15dc8dc81ce7615e0320da1a9ab8d5"],"spooky_subgraph":["0x2a651563c9d3af67ae0388a5c8f89b867038089e"]}}
       service_registry_address: ${str:null}
       share_tm_config_on_startup: ${bool:false}
@@ -146,3 +148,4 @@ config:
       address: ${str:http://host.docker.internal:8545}
       chain_id: ${int:1337}
       default_gas_price_strategy: ${str:eip1559}
+      poa_chain: false
diff --git a/packages/valory/services/apy_estimation/service.yaml b/packages/valory/services/apy_estimation/service.yaml
@@ -7,27 +7,20 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibhbkelnxxvsln677imq65vgbglmlhyxtax4iqtzempjiwcoef3gq
 fingerprint_ignore_patterns: []
-agent: valory/apy_estimation:0.1.0:bafybeihddbyxdgnowylnjd4ro4ytwtazuxbvgbp35c466fbtg4agak5noq
+agent: valory/apy_estimation:0.1.0:bafybeia4shphutcnwbei4sj5lvs2eyobsgx5zcifhqqt3g5v2zkdpf3ury
 number_of_agents: 4
 deployment: {}
 ---
-extra:
-  setup_params:
-    args:
-      setup: &id001
-        all_participants: ${ALL_PARTICIPANTS:list:["0x8d1D7b3cd99a3C35A481F069ec10513183d5d49E","0x2c288d3f6FFC2548EC81808Fccbf7629352C49e4","0xa6DB574Fc218F88508C225733ae9c07AC600B9Ae","0x690f453Ca39ED23D5D8E481AddAea8b18fe0edB1"]}
-        safe_contract_address: ${SAFE_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
-        consensus_threshold: null
-  deposit_endpoint:
-    args: &id002
-      url: ${SERVICE_APY_DEPOSIT_ENDPOINT:str:http://172.17.0.2:9999/apy/deposit}
 public_id: valory/apy_estimation_chained_abci:0.1.0
 type: skill
 0:
   models:
     params:
       args:
-        setup: *id001
+        setup: &id001
+          all_participants: ${ALL_PARTICIPANTS:list:["0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65","0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc","0x976EA74026E726554dB657fA54763abd0C3a0aa9","0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"]}
+          safe_contract_address: ${SAFE_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
+          consensus_threshold: null
         broadcast_to_server: true
         pair_ids:
           uniswap_subgraph:
@@ -42,8 +35,13 @@ type: skill
         share_tm_config_on_startup: ${SHARE_TM_CONFIG_ON_STARTUP:bool:false}
         on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null}
         tendermint_p2p_url: ${TM_P2P_ENDPOINT_NODE_0:str:node0:26656}
-    server_api:
-      args: *id002
+        n_estimations_before_retrain: ${N_ESTIMATIONS_BEFORE_RETRAIN:int:60}
+    server_api: &id002
+      args:
+        url: ${SERVICE_APY_DEPOSIT_ENDPOINT:str:http://172.17.0.2:9999/apy/deposit}
+    benchmark_tool: &id003
+      args:
+        log_dir: /benchmarks
 1:
   models:
     params:
@@ -63,8 +61,9 @@ type: skill
         share_tm_config_on_startup: ${SHARE_TM_CONFIG_ON_STARTUP:bool:false}
         on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null}
         tendermint_p2p_url: ${TM_P2P_ENDPOINT_NODE_1:str:node1:26666}
-    server_api:
-      args: *id002
+        n_estimations_before_retrain: ${N_ESTIMATIONS_BEFORE_RETRAIN:int:60}
+    server_api: *id002
+    benchmark_tool: *id003
 2:
   models:
     params:
@@ -84,8 +83,9 @@ type: skill
         share_tm_config_on_startup: ${SHARE_TM_CONFIG_ON_STARTUP:bool:false}
         on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null}
         tendermint_p2p_url: ${TM_P2P_ENDPOINT_NODE_2:str:node2:26676}
-    server_api:
-      args: *id002
+        n_estimations_before_retrain: ${N_ESTIMATIONS_BEFORE_RETRAIN:int:60}
+    server_api: *id002
+    benchmark_tool: *id003
 3:
   models:
     params:
@@ -105,8 +105,9 @@ type: skill
         share_tm_config_on_startup: ${SHARE_TM_CONFIG_ON_STARTUP:bool:false}
         on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null}
         tendermint_p2p_url: ${TM_P2P_ENDPOINT_NODE_3:str:node3:26686}
-    server_api:
-      args: *id002
+        n_estimations_before_retrain: ${N_ESTIMATIONS_BEFORE_RETRAIN:int:60}
+    server_api: *id002
+    benchmark_tool: *id003
 ---
 public_id: valory/ledger:0.19.0
 type: connection
@@ -116,25 +117,29 @@ type: connection
       ethereum:
         address: ${RPC_0:str:http://host.docker.internal:8545}
         chain_id: ${CHAIN_ID:int:1337}
-        default_gas_price_strategy: eip1559
+        default_gas_price_strategy: ${DEFAULT_GAS_PRICE_STRATEGY:str:eip1559}
+        poa_chain: ${POA_CHAIN:bool:false}
 1:
   config:
     ledger_apis:
       ethereum:
         address: ${RPC_1:str:http://host.docker.internal:8545}
         chain_id: ${CHAIN_ID:int:1337}
-        default_gas_price_strategy: eip1559
+        default_gas_price_strategy: ${DEFAULT_GAS_PRICE_STRATEGY:str:eip1559}
+        poa_chain: ${POA_CHAIN:bool:false}
 2:
   config:
     ledger_apis:
       ethereum:
         address: ${RPC_2:str:http://host.docker.internal:8545}
         chain_id: ${CHAIN_ID:int:1337}
-        default_gas_price_strategy: eip1559
+        default_gas_price_strategy: ${DEFAULT_GAS_PRICE_STRATEGY:str:eip1559}
+        poa_chain: ${POA_CHAIN:bool:false}
 3:
   config:
     ledger_apis:
       ethereum:
         address: ${RPC_3:str:http://host.docker.internal:8545}
         chain_id: ${CHAIN_ID:int:1337}
-        default_gas_price_strategy: eip1559
+        default_gas_price_strategy: ${DEFAULT_GAS_PRICE_STRATEGY:str:eip1559}
+        poa_chain: ${POA_CHAIN:bool:false}
diff --git a/packages/valory/services/apy_estimation_demo/README.md b/packages/valory/services/apy_estimation_demo/README.md