chore: generators

valory-xyz · Nov 21, 2024 · 947aba0 · 947aba0
1 parent ce791ac
commit 947aba0
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 28 deletions.
diff --git a/packages/packages.json b/packages/packages.json
@@ -34,25 +34,25 @@
         "protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe",
         "protocol/valory/tendermint/0.1.0": "bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra",
         "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm",
-        "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeieg57u3z7cdlmdamad5e6lk7kmsli2zurzkg3sl4y7lhekcu4y3au",
-        "contract/valory/gnosis_safe/0.1.0": "bafybeih3ropivth4wn7zbzudisx3qezbht5jyndd4w7az7fq634lpozoge",
-        "contract/valory/mech/0.1.0": "bafybeiejfjfoxqggghcme43sx53q5gruefrws3k2jam2opkxl5uzffoarm",
-        "contract/valory/service_registry/0.1.0": "bafybeiaop64kwdoetxtedoehabmsalojmms7ihuoqcdwxtwb2hk5i6bzye",
+        "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeifr4xpmzeb5hvpgd6h4nxlsu3ef2c3f6l5bgs34vym5ok6vllwhmy",
+        "contract/valory/gnosis_safe/0.1.0": "bafybeihtqcpqthb37msgqabpzcc2xc3l3yzkp5pl2sodeghqyzzzyuevgi",
+        "contract/valory/mech/0.1.0": "bafybeielwbnikog4eqmu6bo537kzp2e7qpmkzt7l5zuuugp2w4r47dbvwu",
+        "contract/valory/service_registry/0.1.0": "bafybeidipx4cmchxdu5i2v67rno7muie7ckjhmasaj64tv2vtj4fveklxi",
         "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y",
-        "contract/valory/erc20/0.1.0": "bafybeid2p2jyvjjlcsqugnawksdzsca6ljghpqbp2kfi3cxuxoy2233dbi",
-        "contract/valory/mech_marketplace/0.1.0": "bafybeiba7kh3wygwtpyf7oo3sili6givzo2gyadhbb66rvwsokswsywvuu",
-        "connection/valory/abci/0.1.0": "bafybeia6etkacvqend7xj6viejkqgo7ozu3yn4yg3qezfthf2xhrjjwse4",
+        "contract/valory/erc20/0.1.0": "bafybeientdgpccdi7prtu4x53m5g3yugh5tuh5hnroylfz3wwzyjniqure",
+        "contract/valory/mech_marketplace/0.1.0": "bafybeicfuigpr65k4l2r5dbazzwh43yc6pfuy5mrkjkagmhmcp6ioktfay",
+        "connection/valory/abci/0.1.0": "bafybeie2bc44r2ddspeg4v7minuievvjykomcukuf5ryevom6fajno25gy",
         "connection/valory/http_client/0.23.0": "bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u",
-        "connection/valory/ledger/0.19.0": "bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu",
+        "connection/valory/ledger/0.19.0": "bafybeigntoericenpzvwejqfuc3kqzo2pscs76qoygg5dbj6f4zxusru5e",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e",
-        "connection/valory/ipfs/0.1.0": "bafybeigcijdbwgdekow5c2ikeltetoteabfp52ewy3xfkd7ygaqbl7j3ke",
+        "connection/valory/ipfs/0.1.0": "bafybeias6633a2337nhq6nn5ikq4jaig47v63nxv2ixkjr6qqrqaywqara",
         "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m",
-        "skill/valory/abstract_abci/0.1.0": "bafybeieeaseuy5rbbw465knz27vccvpkfge43q7isl7fkdlfapwd7bpi24",
-        "skill/valory/reset_pause_abci/0.1.0": "bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba",
-        "skill/valory/registration_abci/0.1.0": "bafybeibc7duasoaw5b4ene5oxfba2dmdzstsrws6ipi57ymgdtoxjadn54",
-        "skill/valory/abstract_round_abci/0.1.0": "bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u",
-        "skill/valory/transaction_settlement_abci/0.1.0": "bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae",
-        "skill/valory/termination_abci/0.1.0": "bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm",
-        "skill/valory/mech_interact_abci/0.1.0": "bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm"
+        "skill/valory/abstract_abci/0.1.0": "bafybeif2naoydlrqkdpnig34uejedwgurjwyvmbpcz53tif7pyukfdophq",
+        "skill/valory/reset_pause_abci/0.1.0": "bafybeiezfedmmseox3ce5aucxsiszdmvskrwwbtpb2a3vw3sbmc5jt7nri",
+        "skill/valory/registration_abci/0.1.0": "bafybeiagi6e2h7kochmlemy5c5yk6hwn37tfxiqvk2en74jhowsdwlmrny",
+        "skill/valory/abstract_round_abci/0.1.0": "bafybeigjddhk7epta7xpnfvv426xedff5abh4xlkwi6cqgp4vkutgkvydm",
+        "skill/valory/transaction_settlement_abci/0.1.0": "bafybeifmgmwdkx4esemxjacjwzqkqymkuklb5nehkwqkx7v335fllgswcq",
+        "skill/valory/termination_abci/0.1.0": "bafybeiea67epwwgngp7b3wavs6hpkaxv6etyaps6g6325bchfnf354mibq",
+        "skill/valory/mech_interact_abci/0.1.0": "bafybeibjydrjtfzaqnniidi2eb5nc2r2vlyu3jk5t4hmzsaloqq5bhcij4"
     }
 }
diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml
@@ -162,6 +162,7 @@ models:
       drand_public_key: ${str:868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31}
       service_registry_address: ${str:null}
       agent_registry_address: ${str:0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA}
+      use_acn_for_delivers: ${bool:false}
       share_tm_config_on_startup: ${bool:false}
       sleep_time: ${int:10}
       tendermint_p2p_url: ${str:localhost:26656}

diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml
@@ -63,6 +63,7 @@ type: skill
         service_id: ${SERVICE_ID:str:trader}
         service_registry_address: ${SERVICE_REGISTRY_ADDRESS:str:0x9338b5153AE39BB89f50468E608eD9d764B755fD}
         agent_registry_address: ${AGENT_REGISTRY_ADDRESS:str:0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA}
+        use_acn_for_delivers: ${USE_ACN_FOR_DELIVERS:bool:false}
         share_tm_config_on_startup: ${USE_ACN:bool:false}
         sleep_time: ${SLEEP_TIME:int:1}
         tendermint_check_sleep_delay: ${TM_CHECK_SLEEP_DELAY:int:3}
@@ -289,6 +290,7 @@ type: skill
         service_id: ${SERVICE_ID:str:trader}
         service_registry_address: ${SERVICE_REGISTRY_ADDRESS:str:0x9338b5153AE39BB89f50468E608eD9d764B755fD}
         agent_registry_address: ${AGENT_REGISTRY_ADDRESS:str:0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA}
+        use_acn_for_delivers: ${USE_ACN_FOR_DELIVERS:bool:false}
         share_tm_config_on_startup: ${USE_ACN:bool:false}
         sleep_time: ${SLEEP_TIME:int:1}
         tendermint_check_sleep_delay: ${TM_CHECK_SLEEP_DELAY:int:3}
@@ -406,6 +408,7 @@ type: skill
         service_id: ${SERVICE_ID:str:trader}
         service_registry_address: ${SERVICE_REGISTRY_ADDRESS:str:0x9338b5153AE39BB89f50468E608eD9d764B755fD}
         agent_registry_address: ${AGENT_REGISTRY_ADDRESS:str:0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA}
+        use_acn_for_delivers: ${USE_ACN_FOR_DELIVERS:bool:false}
         share_tm_config_on_startup: ${USE_ACN:bool:false}
         sleep_time: ${SLEEP_TIME:int:1}
         tendermint_check_sleep_delay: ${TM_CHECK_SLEEP_DELAY:int:3}
@@ -523,6 +526,7 @@ type: skill
         service_id: ${SERVICE_ID:str:trader}
         service_registry_address: ${SERVICE_REGISTRY_ADDRESS:str:0x9338b5153AE39BB89f50468E608eD9d764B755fD}
         agent_registry_address: ${AGENT_REGISTRY_ADDRESS:str:0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA}
+        use_acn_for_delivers: ${USE_ACN_FOR_DELIVERS:bool:false}
         share_tm_config_on_startup: ${USE_ACN:bool:false}
         sleep_time: ${SLEEP_TIME:int:1}
         tendermint_check_sleep_delay: ${TM_CHECK_SLEEP_DELAY:int:3}

diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml
@@ -33,6 +33,7 @@ models:
       service_id: trader
       service_registry_address: '0x9338b5153AE39BB89f50468E608eD9d764B755fD'
       agent_registry_address: '0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA'
+      use_acn_for_delivers: false
       sleep_time: 1
       tendermint_com_url: http://localhost:8080
       tendermint_url: http://localhost:26657

diff --git a/packages/valory/skills/trader_abci/dialogues.py b/packages/valory/skills/trader_abci/dialogues.py
@@ -61,7 +61,12 @@
 from packages.valory.skills.abstract_round_abci.dialogues import (
     TendermintDialogues as BaseTendermintDialogues,
 )
-
+from packages.valory.skills.mech_interact_abci.dialogues import (
+    AcnDialogue as BaseAcnDialogue,
+)
+from packages.valory.skills.mech_interact_abci.dialogues import (
+    AcnDialogues as BaseAcnDialogues,
+)
 
 AbciDialogue = BaseAbciDialogue
 AbciDialogues = BaseAbciDialogues
@@ -88,3 +93,7 @@
 
 IpfsDialogue = BaseIpfsDialogue
 IpfsDialogues = BaseIpfsDialogues
+
+
+AcnDialogue = BaseAcnDialogue
+AcnDialogues = BaseAcnDialogues
diff --git a/packages/valory/skills/trader_abci/handlers.py b/packages/valory/skills/trader_abci/handlers.py
@@ -39,7 +39,9 @@
 from packages.valory.skills.decision_maker_abci.handlers import (
     IpfsHandler as BaseIpfsHandler,
 )
-
+from packages.valory.skills.mech_interact_abci.handlers import (
+    AcnHandler as BaseAcnHandler,
+)
 
 TraderHandler = ABCIRoundHandler
 HttpHandler = BaseHttpHandler
@@ -48,3 +50,4 @@
 ContractApiHandler = BaseContractApiHandler
 TendermintHandler = BaseTendermintHandler
 IpfsHandler = BaseIpfsHandler
+AcnHandler = BaseAcnHandler
diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml
@@ -40,6 +40,9 @@ handlers:
   abci:
     args: {}
     class_name: TraderHandler
+  acn:
+    args: {}
+    class_name: AcnHandler
   contract_api:
     args: {}
     class_name: ContractApiHandler
@@ -62,6 +65,9 @@ models:
   abci_dialogues:
     args: {}
     class_name: AbciDialogues
+  acn_dialogues:
+    args: {}
+    class_name: AcnDialogues
   benchmark_tool:
     args:
       log_dir: /logs
@@ -125,6 +131,7 @@ models:
       service_id: trader
       service_registry_address: null
       agent_registry_address: '0x0000000000000000000000000000000000000000'
+      use_acn_for_delivers: false
       setup:
         all_participants:
         - '0x0000000000000000000000000000000000000000'

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,21 +16,21 @@ include = "packages"
 
 [tool.poetry.dependencies]
 python = "<3.12,>=3.8"
-open-autonomy = "==0.14.14.post1"
+open-autonomy = "==0.18.3"
 requests = "<2.31.2,>=2.28.1"
 py-multibase = "==1.0.3"
 py-multicodec = "==0.2.1"
 py-eth-sig-utils = "*"
 grpcio = "==1.53.0"
 asn1crypto = "<1.5.0,>=1.4.0"
-open-aea-ledger-ethereum = "==1.53.0"
-open-aea-ledger-cosmos = "==1.53.0"
+open-aea-ledger-ethereum = "==1.60.0"
+open-aea-ledger-cosmos = "==1.60.0"
 protobuf = "<4.25.0,>=4.21.6"
 hypothesis = "==6.21.6"
-open-aea-test-autonomy = "==0.14.14.post1"
+open-aea-test-autonomy = "==0.18.3"
 web3 = "<7,>=6.0.0"
 ipfshttpclient = "==0.8.0a2"
-open-aea-cli-ipfs = "==1.53.0"
+open-aea-cli-ipfs = "==1.60.0"
 aiohttp = "<4.0.0,>=3.8.5"
 certifi = "==2021.10.8"
 multidict = "*"

diff --git a/tox.ini b/tox.ini
@@ -18,21 +18,21 @@ deps =
 [deps-packages]
 deps =
     {[deps-tests]deps}
-    open-autonomy==0.14.14.post1
+    open-autonomy==0.18.3
     requests<2.31.2,>=2.28.1
     py-multibase==1.0.3
     py-multicodec==0.2.1
     py-eth-sig-utils
     grpcio==1.53.0
     asn1crypto<1.5.0,>=1.4.0
     open-aea-ledger-ethereum==1.53.0
-    open-aea-ledger-cosmos==1.53.0
+    open-aea-ledger-cosmos==1.60.0
     protobuf<4.25.0,>=4.21.6
     hypothesis==6.21.6
-    open-aea-test-autonomy==0.14.14.post1
+    open-aea-test-autonomy==0.18.3
     web3<7,>=6.0.0
     ipfshttpclient==0.8.0a2
-    open-aea-cli-ipfs==1.53.0
+    open-aea-cli-ipfs==1.60.0
     aiohttp<4.0.0,>=3.8.5
     certifi
     multidict
@@ -216,7 +216,7 @@ commands = isort --check-only --gitignore {env:SERVICE_SPECIFIC_PACKAGES} script
 [testenv:check-hash]
 skipsdist = True
 usedevelop = True
-deps = open-autonomy[all]==0.14.14.post1
+deps = open-autonomy[all]==0.18.3
 commands =
     autonomy init --reset --author ci --remote --ipfs --ipfs-node "/dns/registry.autonolas.tech/tcp/443/https"
     autonomy packages sync