From d4088d1dec963d8a849c06df676d6603094ac3a2 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Wed, 20 Mar 2024 12:42:06 +0000 Subject: [PATCH 01/24] chore: bump - Bumps open-aea to ==1.50.0 - Bumps open-aea-ledger-ethereum to ==1.50.0 - Bumps open-aea-ledger-ethereum-flashbots to ==1.50.0 - Bumps open-aea-ledger-ethereum-hwi to ==1.50.0 - Bumps open-aea-ledger-cosmos to ==1.50.0 - Bumps open-aea-ledger-solana to ==1.50.0 - Bumps open-aea-cli-ipfs to ==1.50.0 - Bumps open-autonomy to ==0.14.9 - Bumps open-aea-test-autonomy to ==0.14.9 --- packages/packages.json | 48 +++++++++--------- packages/valory/agents/trader/aea-config.yaml | 50 +++++++++---------- .../contracts/agent_registry/contract.yaml | 4 +- packages/valory/contracts/erc20/contract.yaml | 4 +- .../contracts/market_maker/contract.yaml | 4 +- packages/valory/contracts/mech/contract.yaml | 2 +- .../service_staking_token/contract.yaml | 4 +- .../transfer_nft_condition/contract.yaml | 4 +- packages/valory/services/trader/service.yaml | 2 +- .../skills/decision_maker_abci/skill.yaml | 18 +++---- .../skills/market_manager_abci/skill.yaml | 2 +- .../valory/skills/staking_abci/skill.yaml | 8 +-- packages/valory/skills/trader_abci/skill.yaml | 18 +++---- .../tx_settlement_multiplexer_abci/skill.yaml | 6 +-- pyproject.toml | 10 ++-- tox.ini | 10 ++-- 16 files changed, 97 insertions(+), 97 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 328c25fdc..f716f0da0 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -4,22 +4,22 @@ "custom/valory/mike_strat/0.1.0": "bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m", "custom/jhehemann/kelly_criterion/0.1.0": "bafybeif55cu7cf6znyma7kxus4wxa2doarhau2xmndo57iegshxorivwmq", "custom/w1kke/always_blue/0.1.0": "bafybeieshu32h3es2fslduuhr7nimuvh2vuibyeqdunzrcggaeohekg3jm", - "contract/valory/market_maker/0.1.0": "bafybeiedlfmqdakxdhqydhhi6uzdwtjxt37mfwi3qjollsfynew3kp5noy", - "contract/valory/erc20/0.1.0": "bafybeibyutc6scd7pmexbonih7txh37knwph7lduzrkkhzjwfin2vuop4i", - "contract/valory/mech/0.1.0": "bafybeifd5shqcbx2fginrb2hliz63mfvpkvpwlyoddrzypy2as7zikru3m", + "contract/valory/market_maker/0.1.0": "bafybeieblarug7skds3u6r24kqehss6vnrtac3hh6ir7mpseb3w4rbrnzq", + "contract/valory/erc20/0.1.0": "bafybeifsag2oyd6pccj2bxkeo7ovgwvhifzw7y6okwdnzcbegmk6hozuyy", + "contract/valory/mech/0.1.0": "bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa", "contract/valory/realitio/0.1.0": "bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq", "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4", "contract/valory/conditional_tokens/0.1.0": "bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu", - "contract/valory/agent_registry/0.1.0": "bafybeig26hz55ogktkchk7hxzjk7lw4au6vwm2jmsoc67yibehz4s7rpzq", - "contract/valory/service_staking_token/0.1.0": "bafybeicv4nfbogieioufevoo2dcpxbafw7vmcfythabvhcrja2qgarbqf4", - "contract/valory/transfer_nft_condition/0.1.0": "bafybeibqsfqao3puhodmvtriyyvbiqtgotdb4z5hul7tvitfacr47fv2pe", - "skill/valory/market_manager_abci/0.1.0": "bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq", - "skill/valory/trader_abci/0.1.0": "bafybeihoc7hy2datndjvr3epi5lml4vcudvrd3qidkwkljhtvrarq4b7lu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiao4cb5e5jvku2sedjejogv7qawrgt6yungt5aiweldfyfjt3ljsi", - "skill/valory/staking_abci/0.1.0": "bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4", - "agent/valory/trader/0.1.0": "bafybeideq5os6xfnvip3ycssba3zm77jbrqaehdcjljiqn3vukskl6l52a", - "service/valory/trader/0.1.0": "bafybeibdpx5qizy4nhdqnlmlvv23rfgbagi73pkkxzhfnryofmmc4nhvdm" + "contract/valory/agent_registry/0.1.0": "bafybeidt3nsgfqgieubz3nmpj6xj54uyjvfdeg5vjryld3kpnc5beelphi", + "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", + "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", + "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", + "skill/valory/decision_maker_abci/0.1.0": "bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy", + "skill/valory/trader_abci/0.1.0": "bafybeigxht752go2ljfpdttnk7hdwf7ocnaop7k4ryizv3cw3w222pbrim", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifwdukb5p7mptdjahao5f5pvfc763n65rkupmiln2bdfpb766wvn4", + "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", + "agent/valory/trader/0.1.0": "bafybeifm2nqm2qzxawhlvlggf6wnncdgndt7ja2jdfz67e4xlvstixtmnu", + "service/valory/trader/0.1.0": "bafybeihwdnilofleyeuuve3mjk2zohc3mbovzm7khz6o72qewfjqfxs4oy" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -30,20 +30,20 @@ "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": "bafybeiegrcfqdqrp23p4u727ic7uybtdvseibzzm3rvyshfdfpqrffut5m", - "contract/valory/gnosis_safe/0.1.0": "bafybeidrguivprxfv3doys4s47uttqnr6m47ah5wbcfbczgp3m6nivclr4", - "contract/valory/service_registry/0.1.0": "bafybeichwywpb7nwxdx7ytqke55fij3fth36ozkceo7kth4szx4ie4pouy", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeig3vqcoxgp56uis3npzgbpfsgu4ku2t74ks6qsabzutacrmbziee4", + "contract/valory/gnosis_safe/0.1.0": "bafybeiafp7bu2ah3zypqyvpzkdvnwbjkr5cqt53zp3vrk6jqlcpntxqdia", + "contract/valory/service_registry/0.1.0": "bafybeidrbrx5np67xc2rm5jvugplopeobawwqongp6meahhzzpzqsgolsu", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", - "connection/valory/abci/0.1.0": "bafybeichtqrs5wafa23zli4365ph74ve345c7qf4hyhwkywvln4ccn2jrm", + "connection/valory/abci/0.1.0": "bafybeibg47tqwbeo5jevjbtkljjv2uc2q5luv77vma3zhwqatt5ya2t2ra", "connection/valory/http_client/0.23.0": "bafybeih5vzo22p2umhqo52nzluaanxx7kejvvpcpdsrdymckkyvmsim6gm", "connection/valory/ledger/0.19.0": "bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", - "connection/valory/ipfs/0.1.0": "bafybeic7zx3tprybs7whs2odzsvqff2ohwaymo7calhki3nsdbokubhqte", - "skill/valory/abstract_abci/0.1.0": "bafybeiap7xqpci6pjlpd2yrmkguuohvsbycz725jpvz3xbgt6e2or5iucu", - "skill/valory/reset_pause_abci/0.1.0": "bafybeienpu6guwbkdzscnovmhizuzlkpalycltzxnwovisbd2coyjim7li", - "skill/valory/registration_abci/0.1.0": "bafybeibfzntdwfzvddh2hzmaun23724y7neq5koowxzjbxsevs3igntfue", - "skill/valory/abstract_round_abci/0.1.0": "bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4", - "skill/valory/termination_abci/0.1.0": "bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze" + "connection/valory/ipfs/0.1.0": "bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii", + "skill/valory/abstract_abci/0.1.0": "bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre", + "skill/valory/reset_pause_abci/0.1.0": "bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu", + "skill/valory/registration_abci/0.1.0": "bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a", + "skill/valory/abstract_round_abci/0.1.0": "bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4", + "skill/valory/termination_abci/0.1.0": "bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index b8dc1ccd0..6953eb029 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -9,25 +9,25 @@ fingerprint: __init__.py: bafybeighcq4pmuzte6vhvvprrvo563vzghkoit2h6qdqxf2ma5bghevkee fingerprint_ignore_patterns: [] connections: -- valory/abci:0.1.0:bafybeichtqrs5wafa23zli4365ph74ve345c7qf4hyhwkywvln4ccn2jrm +- valory/abci:0.1.0:bafybeibg47tqwbeo5jevjbtkljjv2uc2q5luv77vma3zhwqatt5ya2t2ra - valory/http_client:0.23.0:bafybeih5vzo22p2umhqo52nzluaanxx7kejvvpcpdsrdymckkyvmsim6gm -- valory/ipfs:0.1.0:bafybeic7zx3tprybs7whs2odzsvqff2ohwaymo7calhki3nsdbokubhqte +- valory/ipfs:0.1.0:bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii - valory/ledger:0.19.0:bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya - valory/p2p_libp2p_client:0.1.0:bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e contracts: -- valory/gnosis_safe:0.1.0:bafybeidrguivprxfv3doys4s47uttqnr6m47ah5wbcfbczgp3m6nivclr4 -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeiegrcfqdqrp23p4u727ic7uybtdvseibzzm3rvyshfdfpqrffut5m -- valory/service_registry:0.1.0:bafybeichwywpb7nwxdx7ytqke55fij3fth36ozkceo7kth4szx4ie4pouy -- valory/market_maker:0.1.0:bafybeiedlfmqdakxdhqydhhi6uzdwtjxt37mfwi3qjollsfynew3kp5noy -- valory/erc20:0.1.0:bafybeibyutc6scd7pmexbonih7txh37knwph7lduzrkkhzjwfin2vuop4i +- valory/gnosis_safe:0.1.0:bafybeiafp7bu2ah3zypqyvpzkdvnwbjkr5cqt53zp3vrk6jqlcpntxqdia +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeig3vqcoxgp56uis3npzgbpfsgu4ku2t74ks6qsabzutacrmbziee4 +- valory/service_registry:0.1.0:bafybeidrbrx5np67xc2rm5jvugplopeobawwqongp6meahhzzpzqsgolsu +- valory/market_maker:0.1.0:bafybeieblarug7skds3u6r24kqehss6vnrtac3hh6ir7mpseb3w4rbrnzq +- valory/erc20:0.1.0:bafybeifsag2oyd6pccj2bxkeo7ovgwvhifzw7y6okwdnzcbegmk6hozuyy - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeifd5shqcbx2fginrb2hliz63mfvpkvpwlyoddrzypy2as7zikru3m +- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 -- valory/agent_registry:0.1.0:bafybeig26hz55ogktkchk7hxzjk7lw4au6vwm2jmsoc67yibehz4s7rpzq -- valory/service_staking_token:0.1.0:bafybeicv4nfbogieioufevoo2dcpxbafw7vmcfythabvhcrja2qgarbqf4 -- valory/transfer_nft_condition:0.1.0:bafybeibqsfqao3puhodmvtriyyvbiqtgotdb4z5hul7tvitfacr47fv2pe +- valory/agent_registry:0.1.0:bafybeidt3nsgfqgieubz3nmpj6xj54uyjvfdeg5vjryld3kpnc5beelphi +- valory/service_staking_token:0.1.0:bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm +- valory/transfer_nft_condition:0.1.0:bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q protocols: - open_aea/signing:1.0.0:bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi - valory/abci:0.1.0:bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u @@ -38,17 +38,17 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni - valory/tendermint:0.1.0:bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra skills: -- valory/abstract_abci:0.1.0:bafybeiap7xqpci6pjlpd2yrmkguuohvsbycz725jpvz3xbgt6e2or5iucu -- valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm -- valory/registration_abci:0.1.0:bafybeibfzntdwfzvddh2hzmaun23724y7neq5koowxzjbxsevs3igntfue -- valory/reset_pause_abci:0.1.0:bafybeienpu6guwbkdzscnovmhizuzlkpalycltzxnwovisbd2coyjim7li -- valory/termination_abci:0.1.0:bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze -- valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiao4cb5e5jvku2sedjejogv7qawrgt6yungt5aiweldfyfjt3ljsi -- valory/market_manager_abci:0.1.0:bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna -- valory/decision_maker_abci:0.1.0:bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq -- valory/trader_abci:0.1.0:bafybeihoc7hy2datndjvr3epi5lml4vcudvrd3qidkwkljhtvrarq4b7lu -- valory/staking_abci:0.1.0:bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4 +- valory/abstract_abci:0.1.0:bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre +- valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 +- valory/registration_abci:0.1.0:bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a +- valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu +- valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe +- valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifwdukb5p7mptdjahao5f5pvfc763n65rkupmiln2bdfpb766wvn4 +- valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai +- valory/decision_maker_abci:0.1.0:bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy +- valory/trader_abci:0.1.0:bafybeigxht752go2ljfpdttnk7hdwf7ocnaop7k4ryizv3cw3w222pbrim +- valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 @@ -85,11 +85,11 @@ logging_config: propagate: true dependencies: open-aea-ledger-cosmos: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-test-autonomy: - version: ==0.14.7 + version: ==0.14.9 skill_exception_policy: stop_and_exit connection_exception_policy: just_log default_connection: null diff --git a/packages/valory/contracts/agent_registry/contract.yaml b/packages/valory/contracts/agent_registry/contract.yaml index d9a8b17ca..e08330c01 100644 --- a/packages/valory/contracts/agent_registry/contract.yaml +++ b/packages/valory/contracts/agent_registry/contract.yaml @@ -16,8 +16,8 @@ contract_interface_paths: ethereum: build/AgentRegistry.json dependencies: open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-test-autonomy: - version: ==0.14.7 + version: ==0.14.9 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/erc20/contract.yaml b/packages/valory/contracts/erc20/contract.yaml index dcf44a825..982caf11c 100644 --- a/packages/valory/contracts/erc20/contract.yaml +++ b/packages/valory/contracts/erc20/contract.yaml @@ -21,9 +21,9 @@ dependencies: eth_typing: {} hexbytes: {} open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-test-autonomy: - version: ==0.14.7 + version: ==0.14.9 packaging: {} py-eth-sig-utils: {} requests: diff --git a/packages/valory/contracts/market_maker/contract.yaml b/packages/valory/contracts/market_maker/contract.yaml index d87375654..71a95f55d 100644 --- a/packages/valory/contracts/market_maker/contract.yaml +++ b/packages/valory/contracts/market_maker/contract.yaml @@ -21,9 +21,9 @@ dependencies: eth_typing: {} hexbytes: {} open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-test-autonomy: - version: ==0.14.7 + version: ==0.14.9 packaging: {} py-eth-sig-utils: {} requests: diff --git a/packages/valory/contracts/mech/contract.yaml b/packages/valory/contracts/mech/contract.yaml index fea40a949..87aa80717 100644 --- a/packages/valory/contracts/mech/contract.yaml +++ b/packages/valory/contracts/mech/contract.yaml @@ -17,7 +17,7 @@ contract_interface_paths: ethereum: build/mech.json dependencies: open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 web3: version: <7,>=6.0.0 eth_typing: {} diff --git a/packages/valory/contracts/service_staking_token/contract.yaml b/packages/valory/contracts/service_staking_token/contract.yaml index ea103e947..d25d32c3d 100644 --- a/packages/valory/contracts/service_staking_token/contract.yaml +++ b/packages/valory/contracts/service_staking_token/contract.yaml @@ -16,8 +16,8 @@ contract_interface_paths: ethereum: build/ServiceStakingToken.json dependencies: open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-test-autonomy: - version: ==0.14.7 + version: ==0.14.9 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/transfer_nft_condition/contract.yaml b/packages/valory/contracts/transfer_nft_condition/contract.yaml index b6481b1f3..38117d433 100644 --- a/packages/valory/contracts/transfer_nft_condition/contract.yaml +++ b/packages/valory/contracts/transfer_nft_condition/contract.yaml @@ -21,9 +21,9 @@ dependencies: eth_typing: {} hexbytes: {} open-aea-ledger-ethereum: - version: ==1.48.0.post1 + version: ==1.50.0 open-aea-test-autonomy: - version: ==0.14.7 + version: ==0.14.9 packaging: {} py-eth-sig-utils: {} requests: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 6e20ffcc9..e31270cba 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeideq5os6xfnvip3ycssba3zm77jbrqaehdcjljiqn3vukskl6l52a +agent: valory/trader:0.1.0:bafybeifm2nqm2qzxawhlvlggf6wnncdgndt7ja2jdfz67e4xlvstixtmnu number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 9889a6e37..b07500542 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -58,24 +58,24 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/gnosis_safe:0.1.0:bafybeidrguivprxfv3doys4s47uttqnr6m47ah5wbcfbczgp3m6nivclr4 -- valory/market_maker:0.1.0:bafybeiedlfmqdakxdhqydhhi6uzdwtjxt37mfwi3qjollsfynew3kp5noy -- valory/erc20:0.1.0:bafybeibyutc6scd7pmexbonih7txh37knwph7lduzrkkhzjwfin2vuop4i +- valory/gnosis_safe:0.1.0:bafybeiafp7bu2ah3zypqyvpzkdvnwbjkr5cqt53zp3vrk6jqlcpntxqdia +- valory/market_maker:0.1.0:bafybeieblarug7skds3u6r24kqehss6vnrtac3hh6ir7mpseb3w4rbrnzq +- valory/erc20:0.1.0:bafybeifsag2oyd6pccj2bxkeo7ovgwvhifzw7y6okwdnzcbegmk6hozuyy - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeifd5shqcbx2fginrb2hliz63mfvpkvpwlyoddrzypy2as7zikru3m +- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 -- valory/agent_registry:0.1.0:bafybeig26hz55ogktkchk7hxzjk7lw4au6vwm2jmsoc67yibehz4s7rpzq -- valory/transfer_nft_condition:0.1.0:bafybeibqsfqao3puhodmvtriyyvbiqtgotdb4z5hul7tvitfacr47fv2pe +- valory/agent_registry:0.1.0:bafybeidt3nsgfqgieubz3nmpj6xj54uyjvfdeg5vjryld3kpnc5beelphi +- valory/transfer_nft_condition:0.1.0:bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q protocols: - valory/contract_api:1.0.0:bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni - valory/ipfs:0.1.0:bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm skills: -- valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm -- valory/market_manager_abci:0.1.0:bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna -- valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 +- valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 +- valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai +- valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 behaviours: main: args: {} diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index c4b58b2d3..dbc79a8a0 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -30,7 +30,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm +- valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 behaviours: main: args: {} diff --git a/packages/valory/skills/staking_abci/skill.yaml b/packages/valory/skills/staking_abci/skill.yaml index fe000a9c3..83c7ad861 100644 --- a/packages/valory/skills/staking_abci/skill.yaml +++ b/packages/valory/skills/staking_abci/skill.yaml @@ -18,13 +18,13 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/gnosis_safe:0.1.0:bafybeidrguivprxfv3doys4s47uttqnr6m47ah5wbcfbczgp3m6nivclr4 -- valory/service_staking_token:0.1.0:bafybeicv4nfbogieioufevoo2dcpxbafw7vmcfythabvhcrja2qgarbqf4 +- valory/gnosis_safe:0.1.0:bafybeiafp7bu2ah3zypqyvpzkdvnwbjkr5cqt53zp3vrk6jqlcpntxqdia +- valory/service_staking_token:0.1.0:bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm protocols: - valory/contract_api:1.0.0:bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i skills: -- valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm -- valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 +- valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 +- valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 6a6142d19..b686f19c1 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -19,15 +19,15 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm -- valory/registration_abci:0.1.0:bafybeibfzntdwfzvddh2hzmaun23724y7neq5koowxzjbxsevs3igntfue -- valory/reset_pause_abci:0.1.0:bafybeienpu6guwbkdzscnovmhizuzlkpalycltzxnwovisbd2coyjim7li -- valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 -- valory/termination_abci:0.1.0:bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze -- valory/market_manager_abci:0.1.0:bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna -- valory/decision_maker_abci:0.1.0:bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiao4cb5e5jvku2sedjejogv7qawrgt6yungt5aiweldfyfjt3ljsi -- valory/staking_abci:0.1.0:bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4 +- valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 +- valory/registration_abci:0.1.0:bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a +- valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu +- valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 +- valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe +- valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai +- valory/decision_maker_abci:0.1.0:bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifwdukb5p7mptdjahao5f5pvfc763n65rkupmiln2bdfpb766wvn4 +- valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 80ebbcb67..dd522c9b9 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -20,9 +20,9 @@ contracts: [] protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: -- valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm -- valory/decision_maker_abci:0.1.0:bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq -- valory/staking_abci:0.1.0:bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4 +- valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 +- valory/decision_maker_abci:0.1.0:bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy +- valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi behaviours: main: args: {} diff --git a/pyproject.toml b/pyproject.toml index 91c617609..a70d37b74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,21 +16,21 @@ include = "packages" [tool.poetry.dependencies] python = "<3.11,>=3.8" -open-autonomy = "==0.14.7" +open-autonomy = "==0.14.9" requests = "==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.48.0.post1" -open-aea-ledger-cosmos = "==1.48.0.post1" +open-aea-ledger-ethereum = "==1.50.0" +open-aea-ledger-cosmos = "==1.50.0" protobuf = "<4.25.0,>=4.21.6" hypothesis = "==6.21.6" -open-aea-test-autonomy = "==0.14.7" +open-aea-test-autonomy = "==0.14.9" web3 = "<7,>=6.0.0" ipfshttpclient = "==0.8.0a2" -open-aea-cli-ipfs = "==1.48.0.post1" +open-aea-cli-ipfs = "==1.50.0" aiohttp = "<4.0.0,>=3.8.5" certifi = "*" multidict = "*" diff --git a/tox.ini b/tox.ini index 7cad449cb..c92d57450 100644 --- a/tox.ini +++ b/tox.ini @@ -18,21 +18,21 @@ deps = [deps-packages] deps = {[deps-tests]deps} - open-autonomy==0.14.7 + open-autonomy==0.14.9 requests==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.48.0.post1 - open-aea-ledger-cosmos==1.48.0.post1 + open-aea-ledger-ethereum==1.50.0 + open-aea-ledger-cosmos==1.50.0 protobuf<4.25.0,>=4.21.6 hypothesis==6.21.6 - open-aea-test-autonomy==0.14.7 + open-aea-test-autonomy==0.14.9 web3<7,>=6.0.0 ipfshttpclient==0.8.0a2 - open-aea-cli-ipfs==1.48.0.post1 + open-aea-cli-ipfs==1.50.0 aiohttp<4.0.0,>=3.8.5 certifi multidict From beb882adcd3ba381746fc1afcf527b535e7189eb Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 20 Mar 2024 18:40:40 +0100 Subject: [PATCH 02/24] [no ci] chore: update packages.json --- .gitignore | 2 + packages/packages.json | 3 +- packages/valory/contracts/mech/README.md | 1 - packages/valory/contracts/mech/__init__.py | 20 - .../valory/contracts/mech/build/mech.json | 727 ------------------ packages/valory/contracts/mech/contract.py | 352 --------- packages/valory/contracts/mech/contract.yaml | 23 - 7 files changed, 4 insertions(+), 1124 deletions(-) delete mode 100644 packages/valory/contracts/mech/README.md delete mode 100644 packages/valory/contracts/mech/__init__.py delete mode 100644 packages/valory/contracts/mech/build/mech.json delete mode 100644 packages/valory/contracts/mech/contract.py delete mode 100644 packages/valory/contracts/mech/contract.yaml diff --git a/.gitignore b/.gitignore index f2695e299..dab8d401b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,11 +10,13 @@ packages/valory/connections/p2p_libp2p_client/ packages/valory/skills/abstract_abci/ packages/valory/skills/abstract_round_abci/ +packages/valory/skills/mech_interact_abci/ packages/valory/skills/registration_abci/ packages/valory/skills/reset_pause_abci/ packages/valory/skills/transaction_settlement_abci/ packages/valory/skills/termination_abci/ +packages/valory/contracts/mech/ packages/valory/contracts/gnosis_safe_proxy_factory/ packages/valory/contracts/multisend/ packages/valory/contracts/service_registry/ diff --git a/packages/packages.json b/packages/packages.json index 328c25fdc..5fa8592a5 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -6,7 +6,6 @@ "custom/w1kke/always_blue/0.1.0": "bafybeieshu32h3es2fslduuhr7nimuvh2vuibyeqdunzrcggaeohekg3jm", "contract/valory/market_maker/0.1.0": "bafybeiedlfmqdakxdhqydhhi6uzdwtjxt37mfwi3qjollsfynew3kp5noy", "contract/valory/erc20/0.1.0": "bafybeibyutc6scd7pmexbonih7txh37knwph7lduzrkkhzjwfin2vuop4i", - "contract/valory/mech/0.1.0": "bafybeifd5shqcbx2fginrb2hliz63mfvpkvpwlyoddrzypy2as7zikru3m", "contract/valory/realitio/0.1.0": "bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq", "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4", "contract/valory/conditional_tokens/0.1.0": "bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu", @@ -33,6 +32,7 @@ "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeiegrcfqdqrp23p4u727ic7uybtdvseibzzm3rvyshfdfpqrffut5m", "contract/valory/gnosis_safe/0.1.0": "bafybeidrguivprxfv3doys4s47uttqnr6m47ah5wbcfbczgp3m6nivclr4", "contract/valory/service_registry/0.1.0": "bafybeichwywpb7nwxdx7ytqke55fij3fth36ozkceo7kth4szx4ie4pouy", + "contract/valory/mech/0.1.0": "bafybeihahwhu7mxk3bu4ruvvohqdgfrctaaelnbfrbavfzc6qzvdfgdhau", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "connection/valory/abci/0.1.0": "bafybeichtqrs5wafa23zli4365ph74ve345c7qf4hyhwkywvln4ccn2jrm", "connection/valory/http_client/0.23.0": "bafybeih5vzo22p2umhqo52nzluaanxx7kejvvpcpdsrdymckkyvmsim6gm", @@ -43,6 +43,7 @@ "skill/valory/reset_pause_abci/0.1.0": "bafybeienpu6guwbkdzscnovmhizuzlkpalycltzxnwovisbd2coyjim7li", "skill/valory/registration_abci/0.1.0": "bafybeibfzntdwfzvddh2hzmaun23724y7neq5koowxzjbxsevs3igntfue", "skill/valory/abstract_round_abci/0.1.0": "bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm", + "skill/valory/mech_interact_abci/0.1.0": "bafybeihp5etowwbidpdegl2npv4qpmdksy3x22fly67xe353napznmp6p4", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4", "skill/valory/termination_abci/0.1.0": "bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze" } diff --git a/packages/valory/contracts/mech/README.md b/packages/valory/contracts/mech/README.md deleted file mode 100644 index c321ae231..000000000 --- a/packages/valory/contracts/mech/README.md +++ /dev/null @@ -1 +0,0 @@ -# Agent Mech contract diff --git a/packages/valory/contracts/mech/__init__.py b/packages/valory/contracts/mech/__init__.py deleted file mode 100644 index e34c6e4ef..000000000 --- a/packages/valory/contracts/mech/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the support resources for an agent Mech.""" diff --git a/packages/valory/contracts/mech/build/mech.json b/packages/valory/contracts/mech/build/mech.json deleted file mode 100644 index 0f25468df..000000000 --- a/packages/valory/contracts/mech/build/mech.json +++ /dev/null @@ -1,727 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "AgentMech", - "sourceName": "contracts/AgentMech.sol", - "abi": [ - { - "inputs": [ - { - "internalType": "address", - "name": "_token", - "type": "address" - }, - { - "internalType": "uint256", - "name": "_tokenId", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_price", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "agentId", - "type": "uint256" - } - ], - "name": "AgentNotFound", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "provided", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "expected", - "type": "uint256" - } - ], - "name": "NotEnoughPaid", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "provided", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "max", - "type": "uint256" - } - ], - "name": "Overflow", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "requestId", - "type": "uint256" - } - ], - "name": "RequestIdNotFound", - "type": "error" - }, - { - "inputs": [], - "name": "ZeroAddress", - "type": "error" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "requestId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "Deliver", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "price", - "type": "uint256" - } - ], - "name": "PriceUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "requestId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "Request", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "requestId", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "deliver", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "entryPoint", - "outputs": [ - { - "internalType": "contract IEntryPoint", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - }, - { - "internalType": "enum Enum.Operation", - "name": "operation", - "type": "uint8" - }, - { - "internalType": "uint256", - "name": "txGas", - "type": "uint256" - } - ], - "name": "exec", - "outputs": [ - { - "internalType": "bytes", - "name": "returnData", - "type": "bytes" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "getRequestId", - "outputs": [ - { - "internalType": "uint256", - "name": "requestId", - "type": "uint256" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "getRequestsCount", - "outputs": [ - { - "internalType": "uint256", - "name": "requestsCount", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "size", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "offset", - "type": "uint256" - } - ], - "name": "getUndeliveredRequestIds", - "outputs": [ - { - "internalType": "uint256[]", - "name": "requestIds", - "type": "uint256[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "signer", - "type": "address" - } - ], - "name": "isOperator", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "hash", - "type": "bytes32" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "name": "isValidSignature", - "outputs": [ - { - "internalType": "bytes4", - "name": "magicValue", - "type": "bytes4" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "mapRequestIds", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "mapRequestsCounts", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "nonce", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "numUndeliveredRequests", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint256[]", - "name": "", - "type": "uint256[]" - }, - { - "internalType": "uint256[]", - "name": "", - "type": "uint256[]" - }, - { - "internalType": "bytes", - "name": "", - "type": "bytes" - } - ], - "name": "onERC1155BatchReceived", - "outputs": [ - { - "internalType": "bytes4", - "name": "", - "type": "bytes4" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "", - "type": "bytes" - } - ], - "name": "onERC1155Received", - "outputs": [ - { - "internalType": "bytes4", - "name": "", - "type": "bytes4" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "", - "type": "bytes" - } - ], - "name": "onERC721Received", - "outputs": [ - { - "internalType": "bytes4", - "name": "", - "type": "bytes4" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [], - "name": "price", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "request", - "outputs": [ - { - "internalType": "uint256", - "name": "requestId", - "type": "uint256" - } - ], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "newPrice", - "type": "uint256" - } - ], - "name": "setPrice", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes", - "name": "initParams", - "type": "bytes" - } - ], - "name": "setUp", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "token", - "outputs": [ - { - "internalType": "contract IERC721", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "tokenId", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "address", - "name": "", - "type": "address" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "", - "type": "bytes" - } - ], - "name": "tokensReceived", - "outputs": [], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "nonce", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "initCode", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "callData", - "type": "bytes" - }, - { - "internalType": "uint256", - "name": "callGasLimit", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "verificationGasLimit", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "preVerificationGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxFeePerGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxPriorityFeePerGas", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "paymasterAndData", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - } - ], - "internalType": "struct UserOperation", - "name": "userOp", - "type": "tuple" - }, - { - "internalType": "bytes32", - "name": "userOpHash", - "type": "bytes32" - }, - { - "internalType": "uint256", - "name": "missingAccountFunds", - "type": "uint256" - } - ], - "name": "validateUserOp", - "outputs": [ - { - "internalType": "uint256", - "name": "validationData", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "stateMutability": "payable", - "type": "receive" - } - ], - "bytecode": "0x60806040525f805534801562000013575f80fd5b50604051620026cc380380620026cc833981016040819052620000369162000391565b604080516001600160a01b03851660208201528082018490528151808203830181526060909101909152839083906200006f8162000145565b5050506001600160a01b0383166200009a5760405163d92e233d60e01b815260040160405180910390fd5b6040516331a9108f60e11b8152600481018390525f906001600160a01b03851690636352211e90602401602060405180830381865afa158015620000e0573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190620001069190620003c6565b90506001600160a01b0381166200013857604051630ede975960e01b8152600481018490526024015b60405180910390fd5b50600155506200049a9050565b6200014f620001ad565b51156200019f5760405162461bcd60e51b815260206004820152601360248201527f416c726561647920696e697469616c697a65640000000000000000000000000060448201526064016200012f565b620001aa8162000218565b50565b6060620002136200020d604051606b60f91b6020820152602560fa1b60218201526001600160601b03193060601b166022820152600160f81b60368201525f90603701604051602081830303815290604052805190602001205f1c905090565b620002e1565b905090565b5f620002248262000339565b90505f8151602083015ff090506200028b604051606b60f91b6020820152602560fa1b60218201526001600160601b03193060601b166022820152600160f81b60368201525f90603701604051602081830303815290604052805190602001205f1c905090565b6001600160a01b0316816001600160a01b031614620002dc5760405162461bcd60e51b815260206004820152600c60248201526b15dc9a5d194819985a5b195960a21b60448201526064016200012f565b505050565b6060813b600181116200030357505060408051602081019091525f8152919050565b806200030f81620003fd565b9150506040519150601f19601f602083010116820160405280825280600160208401853c50919050565b6060815160016200034b919062000415565b826040516020016200035f92919062000431565b6040516020818303038152906040529050919050565b80516001600160a01b03811681146200038c575f80fd5b919050565b5f805f60608486031215620003a4575f80fd5b620003af8462000375565b925060208401519150604084015190509250925092565b5f60208284031215620003d7575f80fd5b620003e28262000375565b9392505050565b634e487b7160e01b5f52601160045260245ffd5b5f816200040e576200040e620003e9565b505f190190565b808201808211156200042b576200042b620003e9565b92915050565b606360f81b815260e083901b6001600160e01b03191660018201526880600e6000396000f360b81b60058201525f600e82018190528251815b8181101562000489576020818601810151600f8684010152016200046a565b505f9201600f019182525092915050565b61222480620004a85f395ff3fe60806040526004361061017a575f3560e01c8063a035b1fe116100d1578063bdf863171161007c578063f23a6e6111610057578063f23a6e61146104d2578063f6171e4414610517578063fc0c546a14610536575f80fd5b8063bdf8631714610472578063c7dec3fc14610487578063e00b9118146104b3575f80fd5b8063b0d691fe116100ac578063b0d691fe146103d1578063b94207d314610418578063bc197c811461042b575f80fd5b8063a035b1fe1461038a578063a4f9edbf1461039f578063affed0e0146103be575f80fd5b80633a871cdd116101315780636d70f7ae1161010c5780636d70f7ae146102fb5780637af734731461032a57806391b7f5ed1461036b575f80fd5b80633a871cdd1461028557806358ce0909146102a45780635fee6085146102d0575f80fd5b8063157305fe11610161578063157305fe146102255780631626ba7e1461024457806317d70f7c14610263575f80fd5b806223de2914610185578063150b7a02146101ab575f80fd5b3661018157005b5f80fd5b348015610190575f80fd5b506101a961019f366004611943565b5050505050505050565b005b3480156101b6575f80fd5b506101ef6101c53660046119ed565b7f150b7a020000000000000000000000000000000000000000000000000000000095945050505050565b6040517fffffffff0000000000000000000000000000000000000000000000000000000090911681526020015b60405180910390f35b348015610230575f80fd5b506101a961023f366004611b2f565b61054a565b34801561024f575f80fd5b506101ef61025e366004611b2f565b610771565b34801561026e575f80fd5b50610277610914565b60405190815260200161021c565b348015610290575f80fd5b5061027761029f366004611b73565b610938565b3480156102af575f80fd5b506102c36102be366004611bc2565b610974565b60405161021c9190611be2565b3480156102db575f80fd5b506102776102ea366004611c25565b60036020525f908152604090205481565b348015610306575f80fd5b5061031a610315366004611c25565b610ada565b604051901515815260200161021c565b348015610335575f80fd5b50610277610344366004611c25565b73ffffffffffffffffffffffffffffffffffffffff165f9081526003602052604090205490565b348015610376575f80fd5b506101a9610385366004611c40565b610bac565b348015610395575f80fd5b5061027760015481565b3480156103aa575f80fd5b506101a96103b9366004611c57565b610c9a565b3480156103c9575f80fd5b505f54610277565b3480156103dc575f80fd5b50730576a174d229e3cfa37253523e645a78a0c91b575b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161021c565b610277610426366004611c57565b610d16565b348015610436575f80fd5b506101ef610445366004611cd2565b7fbc197c810000000000000000000000000000000000000000000000000000000098975050505050505050565b34801561047d575f80fd5b5061027760025481565b348015610492575f80fd5b506104a66104a1366004611d68565b610e63565b60405161021c9190611e45565b3480156104be575f80fd5b506102776104cd366004611e57565b610f4d565b3480156104dd575f80fd5b506101ef6104ec366004611e8e565b7ff23a6e61000000000000000000000000000000000000000000000000000000009695505050505050565b348015610522575f80fd5b50610277610531366004611bc2565b610f9e565b348015610541575f80fd5b506103f3610fc0565b61055333610ada565b80610571575033730576a174d229e3cfa37253523e645a78a0c91b57145b610602576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4f6e6c792063616c6c61626c6520627920746865206d656368206f706572617460448201527f6f72206f722074686520656e74727920706f696e7420636f6e7472616374000060648201526084015b60405180910390fd5b5f828152600460205260408082208151808301928390529160029082845b8154815260200190600101908083116106205750505050509050805f6002811061064c5761064c611f05565b602002015115801561066057506020810151155b801561069557505f805260046020527f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ed548314155b156106cf576040517ffe239804000000000000000000000000000000000000000000000000000000008152600481018490526024016105f9565b6020818101805183515f908152600490935260408084206001908101929092558451925184528084209290925585835290822082815501819055600280549161071783611f5f565b91905055503373ffffffffffffffffffffffffffffffffffffffff167f0cd979445339c62199996f208428d987b1cea24d18e62b79ec24d94b636e8b708484604051610764929190611f93565b60405180910390a2505050565b5f805f8061079185602081015160408201516060909201515f1a92909190565b9094509250905060ff81165f036108a757828583016020016107b282610ada565b1580156107d5575073ffffffffffffffffffffffffffffffffffffffff82163014155b1561080857507fffffffff00000000000000000000000000000000000000000000000000000000945061090e9350505050565b6040517f1626ba7e00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff831690631626ba7e9061085c908b908590600401611f93565b602060405180830381865afa158015610877573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061089b9190611fab565b9550505050505061090e565b6108b661031587838686610fdd565b156108e757507f1626ba7e00000000000000000000000000000000000000000000000000000000925061090e915050565b507fffffffff00000000000000000000000000000000000000000000000000000000925050505b92915050565b5f8061091e610ff9565b8060200190518101906109319190611fea565b9392505050565b5f6109416110cd565b61094b848461114c565b905061095a6040850185612016565b90505f0361096b5761096b8461124c565b610931826112ca565b6002546060905f849003610986578093505b806109918486612077565b11156109de576109a18385612077565b6040517f7ae596850000000000000000000000000000000000000000000000000000000081526004810191909152602481018290526044016105f9565b8315610ad3578367ffffffffffffffff8111156109fd576109fd611a5b565b604051908082528060200260200182016040528015610a26578160200160208202803683370190505b505f80805260046020527f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ed549193505b84811015610a81575f828152600460205260409020600101549150610a7a8161208a565b9050610a56565b505f5b85811015610ad05781848281518110610a9f57610a9f611f05565b6020908102919091018101919091525f9283526004905260409091206001015490610ac98161208a565b9050610a84565b50505b5092915050565b5f805f610ae5610ff9565b806020019051810190610af89190611fea565b915091508373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16636352211e836040518263ffffffff1660e01b8152600401610b4e91815260200190565b602060405180830381865afa158015610b69573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b8d91906120c1565b73ffffffffffffffffffffffffffffffffffffffff1614949350505050565b610bb533610ada565b80610bd3575033730576a174d229e3cfa37253523e645a78a0c91b57145b610c5f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4f6e6c792063616c6c61626c6520627920746865206d656368206f706572617460448201527f6f72206f722074686520656e74727920706f696e7420636f6e7472616374000060648201526084016105f9565b60018190556040518181527f66cbca4f3c64fecf1dcb9ce094abcf7f68c3450a1d4e3a8e917dd621edb4ebe09060200160405180910390a150565b610ca2610ff9565b5115610d0a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f416c726561647920696e697469616c697a65640000000000000000000000000060448201526064016105f9565b610d138161133e565b50565b5f600154341015610d60576001546040517fb489782800000000000000000000000000000000000000000000000000000000815234600482015260248101919091526044016105f9565b610d6a3383610f4d565b335f908152600360205260408120805492935090610d878361208a565b909155505060046020525f81815260408082207f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ed80546001830181905590859055808452918320849055600280547f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ec94929392909190610e068361208a565b91905055503373ffffffffffffffffffffffffffffffffffffffff167f4bda649efe6b98b0f9c1d5e859c29e20910f45c66dabfe6fad4a4881f7faf9cc8587604051610e53929190611f93565b60405180910390a2505050919050565b6060610e6e33610ada565b80610e8c575033730576a174d229e3cfa37253523e645a78a0c91b57145b610f18576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4f6e6c792063616c6c61626c6520627920746865206d656368206f706572617460448201527f6f72206f722074686520656e74727920706f696e7420636f6e7472616374000060648201526084016105f9565b5f610f32878787878715610f2c57876114b3565b5a6114b3565b9250905080610f4357815160208301fd5b5095945050505050565b5f8282604051602001610f619291906120dc565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101209392505050565b6004602052815f5260405f208160028110610fb7575f80fd5b01549150829050565b5f80610fca610ff9565b80602001905181019061090e91906120c1565b5f805f610fec878787876115b6565b91509150610f438161169e565b60606110c86110c36040517fd60000000000000000000000000000000000000000000000000000000000000060208201527f940000000000000000000000000000000000000000000000000000000000000060218201527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003060601b1660228201527f010000000000000000000000000000000000000000000000000000000000000060368201525f90603701604051602081830303815290604052805190602001205f1c905090565b611850565b905090565b33730576a174d229e3cfa37253523e645a78a0c91b571461114a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f6163636f756e743a206e6f742066726f6d20456e747279506f696e740000000060448201526064016105f9565b565b5f806111a4836040517f19457468657265756d205369676e6564204d6573736167653a0a3332000000006020820152603c81018290525f90605c01604051602081830303815290604052805190602001209050919050565b90507f1626ba7e00000000000000000000000000000000000000000000000000000000611212826111d9610140880188612016565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284375f9201919091525061077192505050565b7fffffffff00000000000000000000000000000000000000000000000000000000161461124357600191505061090e565b505f9392505050565b5f80546020830135918061125f8361208a565b9190505514610d13576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f496e76616c6964206e6f6e63650000000000000000000000000000000000000060448201526064016105f9565b8015610d13576040515f9033907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90849084818181858888f193505050503d805f8114611332576040519150601f19603f3d011682016040523d82523d5f602084013e611337565b606091505b5050505050565b5f611348826118a5565b90505f8151602083015ff0905061141a6040517fd60000000000000000000000000000000000000000000000000000000000000060208201527f940000000000000000000000000000000000000000000000000000000000000060218201527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003060601b1660228201527f010000000000000000000000000000000000000000000000000000000000000060368201525f90603701604051602081830303815290604052805190602001205f1c905090565b73ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16146114ae576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f5772697465206661696c6564000000000000000000000000000000000000000060448201526064016105f9565b505050565b5f606060018460018111156114ca576114ca61210a565b0361153e578673ffffffffffffffffffffffffffffffffffffffff1683866040516114f59190612137565b5f604051808303818686f4925050503d805f811461152e576040519150601f19603f3d011682016040523d82523d5f602084013e611533565b606091505b5090925090506115ac565b8673ffffffffffffffffffffffffffffffffffffffff168387876040516115659190612137565b5f60405180830381858888f193505050503d805f81146115a0576040519150601f19603f3d011682016040523d82523d5f602084013e6115a5565b606091505b5090925090505b9550959350505050565b5f807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08311156115eb57505f90506003611695565b604080515f8082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa15801561163c573d5f803e3d5ffd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0015191505073ffffffffffffffffffffffffffffffffffffffff811661168f575f60019250925050611695565b91505f90505b94509492505050565b5f8160048111156116b1576116b161210a565b036116b95750565b60018160048111156116cd576116cd61210a565b03611734576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f45434453413a20696e76616c6964207369676e6174757265000000000000000060448201526064016105f9565b60028160048111156117485761174861210a565b036117af576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e6774680060448201526064016105f9565b60038160048111156117c3576117c361210a565b03610d13576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c60448201527f756500000000000000000000000000000000000000000000000000000000000060648201526084016105f9565b6060813b6001811161187157505060408051602081019091525f8152919050565b8061187b81611f5f565b9150506040519150601f19601f602083010116820160405280825280600160208401853c50919050565b6060815160016118b59190612077565b826040516020016118c7929190612152565b6040516020818303038152906040529050919050565b73ffffffffffffffffffffffffffffffffffffffff81168114610d13575f80fd5b5f8083601f84011261190e575f80fd5b50813567ffffffffffffffff811115611925575f80fd5b60208301915083602082850101111561193c575f80fd5b9250929050565b5f805f805f805f8060c0898b03121561195a575f80fd5b8835611965816118dd565b97506020890135611975816118dd565b96506040890135611985816118dd565b955060608901359450608089013567ffffffffffffffff808211156119a8575f80fd5b6119b48c838d016118fe565b909650945060a08b01359150808211156119cc575f80fd5b506119d98b828c016118fe565b999c989b5096995094979396929594505050565b5f805f805f60808688031215611a01575f80fd5b8535611a0c816118dd565b94506020860135611a1c816118dd565b935060408601359250606086013567ffffffffffffffff811115611a3e575f80fd5b611a4a888289016118fe565b969995985093965092949392505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f82601f830112611a97575f80fd5b813567ffffffffffffffff80821115611ab257611ab2611a5b565b604051601f83017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908282118183101715611af857611af8611a5b565b81604052838152866020858801011115611b10575f80fd5b836020870160208301375f602085830101528094505050505092915050565b5f8060408385031215611b40575f80fd5b82359150602083013567ffffffffffffffff811115611b5d575f80fd5b611b6985828601611a88565b9150509250929050565b5f805f60608486031215611b85575f80fd5b833567ffffffffffffffff811115611b9b575f80fd5b84016101608187031215611bad575f80fd5b95602085013595506040909401359392505050565b5f8060408385031215611bd3575f80fd5b50508035926020909101359150565b602080825282518282018190525f9190848201906040850190845b81811015611c1957835183529284019291840191600101611bfd565b50909695505050505050565b5f60208284031215611c35575f80fd5b8135610931816118dd565b5f60208284031215611c50575f80fd5b5035919050565b5f60208284031215611c67575f80fd5b813567ffffffffffffffff811115611c7d575f80fd5b611c8984828501611a88565b949350505050565b5f8083601f840112611ca1575f80fd5b50813567ffffffffffffffff811115611cb8575f80fd5b6020830191508360208260051b850101111561193c575f80fd5b5f805f805f805f8060a0898b031215611ce9575f80fd5b8835611cf4816118dd565b97506020890135611d04816118dd565b9650604089013567ffffffffffffffff80821115611d20575f80fd5b611d2c8c838d01611c91565b909850965060608b0135915080821115611d44575f80fd5b611d508c838d01611c91565b909650945060808b01359150808211156119cc575f80fd5b5f805f805f60a08688031215611d7c575f80fd5b8535611d87816118dd565b945060208601359350604086013567ffffffffffffffff811115611da9575f80fd5b611db588828901611a88565b935050606086013560028110611dc9575f80fd5b949793965091946080013592915050565b5f5b83811015611df4578181015183820152602001611ddc565b50505f910152565b5f8151808452611e13816020860160208601611dda565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b602081525f6109316020830184611dfc565b5f8060408385031215611e68575f80fd5b8235611e73816118dd565b9150602083013567ffffffffffffffff811115611b5d575f80fd5b5f805f805f8060a08789031215611ea3575f80fd5b8635611eae816118dd565b95506020870135611ebe816118dd565b94506040870135935060608701359250608087013567ffffffffffffffff811115611ee7575f80fd5b611ef389828a016118fe565b979a9699509497509295939492505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f81611f6d57611f6d611f32565b507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190565b828152604060208201525f611c896040830184611dfc565b5f60208284031215611fbb575f80fd5b81517fffffffff0000000000000000000000000000000000000000000000000000000081168114610931575f80fd5b5f8060408385031215611ffb575f80fd5b8251612006816118dd565b6020939093015192949293505050565b5f8083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112612049575f80fd5b83018035915067ffffffffffffffff821115612063575f80fd5b60200191503681900382131561193c575f80fd5b8082018082111561090e5761090e611f32565b5f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036120ba576120ba611f32565b5060010190565b5f602082840312156120d1575f80fd5b8151610931816118dd565b73ffffffffffffffffffffffffffffffffffffffff83168152604060208201525f611c896040830184611dfc565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602160045260245ffd5b5f8251612148818460208701611dda565b9190910192915050565b7f630000000000000000000000000000000000000000000000000000000000000081527fffffffff000000000000000000000000000000000000000000000000000000008360e01b1660018201527f80600e6000396000f3000000000000000000000000000000000000000000000060058201525f600e8201525f82516121e081600f850160208701611dda565b91909101600f01939250505056fea2646970667358221220c1913351e275e1fecd00c79cd676ed135b575df5d3a88ccc57419dc3081980a264736f6c63430008150033", - "deployedBytecode": "0x60806040526004361061017a575f3560e01c8063a035b1fe116100d1578063bdf863171161007c578063f23a6e6111610057578063f23a6e61146104d2578063f6171e4414610517578063fc0c546a14610536575f80fd5b8063bdf8631714610472578063c7dec3fc14610487578063e00b9118146104b3575f80fd5b8063b0d691fe116100ac578063b0d691fe146103d1578063b94207d314610418578063bc197c811461042b575f80fd5b8063a035b1fe1461038a578063a4f9edbf1461039f578063affed0e0146103be575f80fd5b80633a871cdd116101315780636d70f7ae1161010c5780636d70f7ae146102fb5780637af734731461032a57806391b7f5ed1461036b575f80fd5b80633a871cdd1461028557806358ce0909146102a45780635fee6085146102d0575f80fd5b8063157305fe11610161578063157305fe146102255780631626ba7e1461024457806317d70f7c14610263575f80fd5b806223de2914610185578063150b7a02146101ab575f80fd5b3661018157005b5f80fd5b348015610190575f80fd5b506101a961019f366004611943565b5050505050505050565b005b3480156101b6575f80fd5b506101ef6101c53660046119ed565b7f150b7a020000000000000000000000000000000000000000000000000000000095945050505050565b6040517fffffffff0000000000000000000000000000000000000000000000000000000090911681526020015b60405180910390f35b348015610230575f80fd5b506101a961023f366004611b2f565b61054a565b34801561024f575f80fd5b506101ef61025e366004611b2f565b610771565b34801561026e575f80fd5b50610277610914565b60405190815260200161021c565b348015610290575f80fd5b5061027761029f366004611b73565b610938565b3480156102af575f80fd5b506102c36102be366004611bc2565b610974565b60405161021c9190611be2565b3480156102db575f80fd5b506102776102ea366004611c25565b60036020525f908152604090205481565b348015610306575f80fd5b5061031a610315366004611c25565b610ada565b604051901515815260200161021c565b348015610335575f80fd5b50610277610344366004611c25565b73ffffffffffffffffffffffffffffffffffffffff165f9081526003602052604090205490565b348015610376575f80fd5b506101a9610385366004611c40565b610bac565b348015610395575f80fd5b5061027760015481565b3480156103aa575f80fd5b506101a96103b9366004611c57565b610c9a565b3480156103c9575f80fd5b505f54610277565b3480156103dc575f80fd5b50730576a174d229e3cfa37253523e645a78a0c91b575b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161021c565b610277610426366004611c57565b610d16565b348015610436575f80fd5b506101ef610445366004611cd2565b7fbc197c810000000000000000000000000000000000000000000000000000000098975050505050505050565b34801561047d575f80fd5b5061027760025481565b348015610492575f80fd5b506104a66104a1366004611d68565b610e63565b60405161021c9190611e45565b3480156104be575f80fd5b506102776104cd366004611e57565b610f4d565b3480156104dd575f80fd5b506101ef6104ec366004611e8e565b7ff23a6e61000000000000000000000000000000000000000000000000000000009695505050505050565b348015610522575f80fd5b50610277610531366004611bc2565b610f9e565b348015610541575f80fd5b506103f3610fc0565b61055333610ada565b80610571575033730576a174d229e3cfa37253523e645a78a0c91b57145b610602576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4f6e6c792063616c6c61626c6520627920746865206d656368206f706572617460448201527f6f72206f722074686520656e74727920706f696e7420636f6e7472616374000060648201526084015b60405180910390fd5b5f828152600460205260408082208151808301928390529160029082845b8154815260200190600101908083116106205750505050509050805f6002811061064c5761064c611f05565b602002015115801561066057506020810151155b801561069557505f805260046020527f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ed548314155b156106cf576040517ffe239804000000000000000000000000000000000000000000000000000000008152600481018490526024016105f9565b6020818101805183515f908152600490935260408084206001908101929092558451925184528084209290925585835290822082815501819055600280549161071783611f5f565b91905055503373ffffffffffffffffffffffffffffffffffffffff167f0cd979445339c62199996f208428d987b1cea24d18e62b79ec24d94b636e8b708484604051610764929190611f93565b60405180910390a2505050565b5f805f8061079185602081015160408201516060909201515f1a92909190565b9094509250905060ff81165f036108a757828583016020016107b282610ada565b1580156107d5575073ffffffffffffffffffffffffffffffffffffffff82163014155b1561080857507fffffffff00000000000000000000000000000000000000000000000000000000945061090e9350505050565b6040517f1626ba7e00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff831690631626ba7e9061085c908b908590600401611f93565b602060405180830381865afa158015610877573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061089b9190611fab565b9550505050505061090e565b6108b661031587838686610fdd565b156108e757507f1626ba7e00000000000000000000000000000000000000000000000000000000925061090e915050565b507fffffffff00000000000000000000000000000000000000000000000000000000925050505b92915050565b5f8061091e610ff9565b8060200190518101906109319190611fea565b9392505050565b5f6109416110cd565b61094b848461114c565b905061095a6040850185612016565b90505f0361096b5761096b8461124c565b610931826112ca565b6002546060905f849003610986578093505b806109918486612077565b11156109de576109a18385612077565b6040517f7ae596850000000000000000000000000000000000000000000000000000000081526004810191909152602481018290526044016105f9565b8315610ad3578367ffffffffffffffff8111156109fd576109fd611a5b565b604051908082528060200260200182016040528015610a26578160200160208202803683370190505b505f80805260046020527f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ed549193505b84811015610a81575f828152600460205260409020600101549150610a7a8161208a565b9050610a56565b505f5b85811015610ad05781848281518110610a9f57610a9f611f05565b6020908102919091018101919091525f9283526004905260409091206001015490610ac98161208a565b9050610a84565b50505b5092915050565b5f805f610ae5610ff9565b806020019051810190610af89190611fea565b915091508373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16636352211e836040518263ffffffff1660e01b8152600401610b4e91815260200190565b602060405180830381865afa158015610b69573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b8d91906120c1565b73ffffffffffffffffffffffffffffffffffffffff1614949350505050565b610bb533610ada565b80610bd3575033730576a174d229e3cfa37253523e645a78a0c91b57145b610c5f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4f6e6c792063616c6c61626c6520627920746865206d656368206f706572617460448201527f6f72206f722074686520656e74727920706f696e7420636f6e7472616374000060648201526084016105f9565b60018190556040518181527f66cbca4f3c64fecf1dcb9ce094abcf7f68c3450a1d4e3a8e917dd621edb4ebe09060200160405180910390a150565b610ca2610ff9565b5115610d0a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f416c726561647920696e697469616c697a65640000000000000000000000000060448201526064016105f9565b610d138161133e565b50565b5f600154341015610d60576001546040517fb489782800000000000000000000000000000000000000000000000000000000815234600482015260248101919091526044016105f9565b610d6a3383610f4d565b335f908152600360205260408120805492935090610d878361208a565b909155505060046020525f81815260408082207f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ed80546001830181905590859055808452918320849055600280547f17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ec94929392909190610e068361208a565b91905055503373ffffffffffffffffffffffffffffffffffffffff167f4bda649efe6b98b0f9c1d5e859c29e20910f45c66dabfe6fad4a4881f7faf9cc8587604051610e53929190611f93565b60405180910390a2505050919050565b6060610e6e33610ada565b80610e8c575033730576a174d229e3cfa37253523e645a78a0c91b57145b610f18576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603e60248201527f4f6e6c792063616c6c61626c6520627920746865206d656368206f706572617460448201527f6f72206f722074686520656e74727920706f696e7420636f6e7472616374000060648201526084016105f9565b5f610f32878787878715610f2c57876114b3565b5a6114b3565b9250905080610f4357815160208301fd5b5095945050505050565b5f8282604051602001610f619291906120dc565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101209392505050565b6004602052815f5260405f208160028110610fb7575f80fd5b01549150829050565b5f80610fca610ff9565b80602001905181019061090e91906120c1565b5f805f610fec878787876115b6565b91509150610f438161169e565b60606110c86110c36040517fd60000000000000000000000000000000000000000000000000000000000000060208201527f940000000000000000000000000000000000000000000000000000000000000060218201527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003060601b1660228201527f010000000000000000000000000000000000000000000000000000000000000060368201525f90603701604051602081830303815290604052805190602001205f1c905090565b611850565b905090565b33730576a174d229e3cfa37253523e645a78a0c91b571461114a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f6163636f756e743a206e6f742066726f6d20456e747279506f696e740000000060448201526064016105f9565b565b5f806111a4836040517f19457468657265756d205369676e6564204d6573736167653a0a3332000000006020820152603c81018290525f90605c01604051602081830303815290604052805190602001209050919050565b90507f1626ba7e00000000000000000000000000000000000000000000000000000000611212826111d9610140880188612016565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284375f9201919091525061077192505050565b7fffffffff00000000000000000000000000000000000000000000000000000000161461124357600191505061090e565b505f9392505050565b5f80546020830135918061125f8361208a565b9190505514610d13576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f496e76616c6964206e6f6e63650000000000000000000000000000000000000060448201526064016105f9565b8015610d13576040515f9033907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90849084818181858888f193505050503d805f8114611332576040519150601f19603f3d011682016040523d82523d5f602084013e611337565b606091505b5050505050565b5f611348826118a5565b90505f8151602083015ff0905061141a6040517fd60000000000000000000000000000000000000000000000000000000000000060208201527f940000000000000000000000000000000000000000000000000000000000000060218201527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003060601b1660228201527f010000000000000000000000000000000000000000000000000000000000000060368201525f90603701604051602081830303815290604052805190602001205f1c905090565b73ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16146114ae576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f5772697465206661696c6564000000000000000000000000000000000000000060448201526064016105f9565b505050565b5f606060018460018111156114ca576114ca61210a565b0361153e578673ffffffffffffffffffffffffffffffffffffffff1683866040516114f59190612137565b5f604051808303818686f4925050503d805f811461152e576040519150601f19603f3d011682016040523d82523d5f602084013e611533565b606091505b5090925090506115ac565b8673ffffffffffffffffffffffffffffffffffffffff168387876040516115659190612137565b5f60405180830381858888f193505050503d805f81146115a0576040519150601f19603f3d011682016040523d82523d5f602084013e6115a5565b606091505b5090925090505b9550959350505050565b5f807f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08311156115eb57505f90506003611695565b604080515f8082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa15801561163c573d5f803e3d5ffd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0015191505073ffffffffffffffffffffffffffffffffffffffff811661168f575f60019250925050611695565b91505f90505b94509492505050565b5f8160048111156116b1576116b161210a565b036116b95750565b60018160048111156116cd576116cd61210a565b03611734576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f45434453413a20696e76616c6964207369676e6174757265000000000000000060448201526064016105f9565b60028160048111156117485761174861210a565b036117af576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e6774680060448201526064016105f9565b60038160048111156117c3576117c361210a565b03610d13576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c60448201527f756500000000000000000000000000000000000000000000000000000000000060648201526084016105f9565b6060813b6001811161187157505060408051602081019091525f8152919050565b8061187b81611f5f565b9150506040519150601f19601f602083010116820160405280825280600160208401853c50919050565b6060815160016118b59190612077565b826040516020016118c7929190612152565b6040516020818303038152906040529050919050565b73ffffffffffffffffffffffffffffffffffffffff81168114610d13575f80fd5b5f8083601f84011261190e575f80fd5b50813567ffffffffffffffff811115611925575f80fd5b60208301915083602082850101111561193c575f80fd5b9250929050565b5f805f805f805f8060c0898b03121561195a575f80fd5b8835611965816118dd565b97506020890135611975816118dd565b96506040890135611985816118dd565b955060608901359450608089013567ffffffffffffffff808211156119a8575f80fd5b6119b48c838d016118fe565b909650945060a08b01359150808211156119cc575f80fd5b506119d98b828c016118fe565b999c989b5096995094979396929594505050565b5f805f805f60808688031215611a01575f80fd5b8535611a0c816118dd565b94506020860135611a1c816118dd565b935060408601359250606086013567ffffffffffffffff811115611a3e575f80fd5b611a4a888289016118fe565b969995985093965092949392505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f82601f830112611a97575f80fd5b813567ffffffffffffffff80821115611ab257611ab2611a5b565b604051601f83017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908282118183101715611af857611af8611a5b565b81604052838152866020858801011115611b10575f80fd5b836020870160208301375f602085830101528094505050505092915050565b5f8060408385031215611b40575f80fd5b82359150602083013567ffffffffffffffff811115611b5d575f80fd5b611b6985828601611a88565b9150509250929050565b5f805f60608486031215611b85575f80fd5b833567ffffffffffffffff811115611b9b575f80fd5b84016101608187031215611bad575f80fd5b95602085013595506040909401359392505050565b5f8060408385031215611bd3575f80fd5b50508035926020909101359150565b602080825282518282018190525f9190848201906040850190845b81811015611c1957835183529284019291840191600101611bfd565b50909695505050505050565b5f60208284031215611c35575f80fd5b8135610931816118dd565b5f60208284031215611c50575f80fd5b5035919050565b5f60208284031215611c67575f80fd5b813567ffffffffffffffff811115611c7d575f80fd5b611c8984828501611a88565b949350505050565b5f8083601f840112611ca1575f80fd5b50813567ffffffffffffffff811115611cb8575f80fd5b6020830191508360208260051b850101111561193c575f80fd5b5f805f805f805f8060a0898b031215611ce9575f80fd5b8835611cf4816118dd565b97506020890135611d04816118dd565b9650604089013567ffffffffffffffff80821115611d20575f80fd5b611d2c8c838d01611c91565b909850965060608b0135915080821115611d44575f80fd5b611d508c838d01611c91565b909650945060808b01359150808211156119cc575f80fd5b5f805f805f60a08688031215611d7c575f80fd5b8535611d87816118dd565b945060208601359350604086013567ffffffffffffffff811115611da9575f80fd5b611db588828901611a88565b935050606086013560028110611dc9575f80fd5b949793965091946080013592915050565b5f5b83811015611df4578181015183820152602001611ddc565b50505f910152565b5f8151808452611e13816020860160208601611dda565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b602081525f6109316020830184611dfc565b5f8060408385031215611e68575f80fd5b8235611e73816118dd565b9150602083013567ffffffffffffffff811115611b5d575f80fd5b5f805f805f8060a08789031215611ea3575f80fd5b8635611eae816118dd565b95506020870135611ebe816118dd565b94506040870135935060608701359250608087013567ffffffffffffffff811115611ee7575f80fd5b611ef389828a016118fe565b979a9699509497509295939492505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f81611f6d57611f6d611f32565b507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190565b828152604060208201525f611c896040830184611dfc565b5f60208284031215611fbb575f80fd5b81517fffffffff0000000000000000000000000000000000000000000000000000000081168114610931575f80fd5b5f8060408385031215611ffb575f80fd5b8251612006816118dd565b6020939093015192949293505050565b5f8083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112612049575f80fd5b83018035915067ffffffffffffffff821115612063575f80fd5b60200191503681900382131561193c575f80fd5b8082018082111561090e5761090e611f32565b5f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036120ba576120ba611f32565b5060010190565b5f602082840312156120d1575f80fd5b8151610931816118dd565b73ffffffffffffffffffffffffffffffffffffffff83168152604060208201525f611c896040830184611dfc565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52602160045260245ffd5b5f8251612148818460208701611dda565b9190910192915050565b7f630000000000000000000000000000000000000000000000000000000000000081527fffffffff000000000000000000000000000000000000000000000000000000008360e01b1660018201527f80600e6000396000f3000000000000000000000000000000000000000000000060058201525f600e8201525f82516121e081600f850160208701611dda565b91909101600f01939250505056fea2646970667358221220c1913351e275e1fecd00c79cd676ed135b575df5d3a88ccc57419dc3081980a264736f6c63430008150033", - "linkReferences": {}, - "deployedLinkReferences": {} -} \ No newline at end of file diff --git a/packages/valory/contracts/mech/contract.py b/packages/valory/contracts/mech/contract.py deleted file mode 100644 index 83929a02f..000000000 --- a/packages/valory/contracts/mech/contract.py +++ /dev/null @@ -1,352 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2023-2024 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the class to connect to a Mech contract.""" -import concurrent.futures -from typing import Dict, Optional, cast, List, Any, Callable - -from aea.common import JSONLike -from aea.configurations.base import PublicId -from aea.contracts.base import Contract -from aea.crypto.base import LedgerApi -from aea_ledger_ethereum import EthereumApi -from eth_typing import HexStr -from web3.types import TxReceipt, EventData, BlockIdentifier, BlockData - -PUBLIC_ID = PublicId.from_str("valory/mech:0.1.0") -FIVE_MINUTES = 300.0 - - -partial_abis = [ - [ - { - "anonymous": False, - "inputs": [ - { - "indexed": False, - "internalType": "uint256", - "name": "requestId", - "type": "uint256", - }, - { - "indexed": False, - "internalType": "bytes", - "name": "data", - "type": "bytes", - }, - ], - "name": "Deliver", - "type": "event", - }, - { - "anonymous": False, - "inputs": [ - { - "indexed": True, - "internalType": "address", - "name": "sender", - "type": "address", - }, - { - "indexed": False, - "internalType": "uint256", - "name": "requestId", - "type": "uint256", - }, - { - "indexed": False, - "internalType": "bytes", - "name": "data", - "type": "bytes", - }, - ], - "name": "Request", - "type": "event", - }, - ], - [ - { - "anonymous": False, - "inputs": [ - { - "indexed": True, - "internalType": "address", - "name": "sender", - "type": "address", - }, - { - "indexed": False, - "internalType": "uint256", - "name": "requestId", - "type": "uint256", - }, - { - "indexed": False, - "internalType": "uint256", - "name": "requestIdWithNonce", - "type": "uint256", - }, - { - "indexed": False, - "internalType": "bytes", - "name": "data", - "type": "bytes", - }, - ], - "name": "Request", - "type": "event", - }, - { - "anonymous": False, - "inputs": [ - { - "indexed": True, - "internalType": "address", - "name": "sender", - "type": "address", - }, - { - "indexed": False, - "internalType": "uint256", - "name": "requestId", - "type": "uint256", - }, - { - "indexed": False, - "internalType": "bytes", - "name": "data", - "type": "bytes", - }, - ], - "name": "Deliver", - "type": "event", - }, - ], -] - - -class Mech(Contract): - """The Mech contract.""" - - contract_id = PUBLIC_ID - - @staticmethod - def execute_with_timeout(func: Callable, timeout: float) -> Any: - """Execute a function with a timeout.""" - - # Create a ProcessPoolExecutor with a maximum of 1 worker (process) - with concurrent.futures.ThreadPoolExecutor(max_workers=1) as executor: - # Submit the function to the executor - future = executor.submit( - func, - ) - - try: - # Wait for the result with a 5-minute timeout - data = future.result(timeout=timeout) - except TimeoutError: - # Handle the case where the execution times out - err = f"The RPC didn't respond in {timeout}." - return None, err - - # Check if an error occurred - if isinstance(data, str): - # Handle the case where the execution failed - return None, data - - return data, None - - @classmethod - def get_price( - cls, - ledger_api: EthereumApi, - contract_address: str, - ) -> JSONLike: - """Get the price of a request.""" - contract_instance = cls.get_instance(ledger_api, contract_address) - price = ledger_api.contract_method_call(contract_instance, "price") - return dict(price=price) - - @classmethod - def get_request_data( - cls, - ledger_api: LedgerApi, - contract_address: str, - request_data: bytes, - ) -> Dict[str, bytes]: - """Gets the encoded arguments for a request tx, which should only be called via the multisig. - - :param ledger_api: the ledger API object - :param contract_address: the contract's address - :param request_data: the request data - """ - contract_instance = cls.get_instance(ledger_api, contract_address) - encoded_data = contract_instance.encodeABI("request", args=(request_data,)) - return {"data": bytes.fromhex(encoded_data[2:])} - - @classmethod - def _process_event( - cls, - ledger_api: LedgerApi, - contract: Any, - tx_hash: HexStr, - event_name: str, - *args: Any, - ) -> Optional[JSONLike]: - """Process the logs of the given event.""" - ledger_api = cast(EthereumApi, ledger_api) - receipt: TxReceipt = ledger_api.api.eth.get_transaction_receipt(tx_hash) - event_method = getattr(contract.events, event_name) - logs: List[EventData] = list(event_method().process_receipt(receipt)) - - n_logs = len(logs) - if n_logs != 1: - error = f"A single {event_name!r} event was expected. tx {tx_hash} emitted {n_logs} instead." - return {"error": error} - - log = logs.pop() - event_args = log.get("args", None) - if event_args is None or any( - expected_key not in event_args for expected_key in args - ): - error = f"The emitted event's ({event_name!r}) log for tx {tx_hash} do not match the expected format: {log}" - return {"error": error} - - return {arg_name: event_args[arg_name] for arg_name in args} - - @classmethod - def process_request_event( - cls, - ledger_api: LedgerApi, - contract_address: str, - tx_hash: HexStr, - ) -> Optional[JSONLike]: - """ - Process the request receipt to get the requestId and the given data from the `Request` event's logs. - - :param ledger_api: the ledger apis. - :param contract_address: the contract address. - :param tx_hash: the hash of a request tx to be processed. - :return: a dictionary with the request id. - """ - res = {} - for abi in partial_abis: - contract_instance = ledger_api.api.eth.contract(contract_address, abi=abi) - res = cls._process_event( - ledger_api, contract_instance, tx_hash, "Request", "requestId", "data" - ) - if "error" not in res: - return res - - return res - - @classmethod - def process_deliver_event( - cls, - ledger_api: LedgerApi, - contract_address: str, - tx_hash: HexStr, - ) -> Optional[JSONLike]: - """ - Process the request receipt to get the requestId and the delivered data if the `Deliver` event has been emitted. - - :param ledger_api: the ledger apis. - :param contract_address: the contract address. - :param tx_hash: the hash of a request tx to be processed. - :return: a dictionary with the request id and the data. - """ - res = {} - for abi in partial_abis: - contract_instance = ledger_api.api.eth.contract(contract_address, abi=abi) - res = cls._process_event( - ledger_api, contract_instance, tx_hash, "Deliver", "requestId", "data" - ) - if "error" not in res: - return res - - return res - - @classmethod - def get_block_number( - cls, - ledger_api: EthereumApi, - contract_address: str, - tx_hash: HexStr, - ) -> JSONLike: - """Get the number of the block in which the tx of the given hash was settled.""" - receipt: TxReceipt = ledger_api.api.eth.get_transaction_receipt(tx_hash) - block: BlockData = ledger_api.api.eth.get_block(receipt["blockNumber"]) - return dict(number=block["number"]) - - @classmethod - def get_response( - cls, - ledger_api: LedgerApi, - contract_address: str, - request_id: int, - from_block: BlockIdentifier = "earliest", - to_block: BlockIdentifier = "latest", - timeout: float = FIVE_MINUTES, - ) -> JSONLike: - """Filter the `Deliver` events emitted by the contract and get the data of the given `request_id`.""" - def get_responses() -> Any: - """Get the responses from the contract.""" - contract_instance = cls.get_instance(ledger_api, contract_address) - deliver_filter = contract_instance.events.Deliver.build_filter() - deliver_filter.fromBlock = from_block - deliver_filter.toBlock = to_block - deliver_filter.args.requestId.match_single(request_id) - delivered = list(deliver_filter.deploy(ledger_api.api).get_all_entries()) - n_delivered = len(delivered) - - if n_delivered == 0: - info = f"The mech ({contract_address}) has not delivered a response yet for request with id {request_id}." - return {"info": info} - - if n_delivered != 1: - error = ( - f"A single response was expected by the mech ({contract_address}) for request with id {request_id}. " - f"Received {n_delivered} responses: {delivered}." - ) - return error - - delivered_event = delivered.pop() - deliver_args = delivered_event.get("args", None) - if deliver_args is None or "data" not in deliver_args: - error = f"The mech's response does not match the expected format: {delivered_event}" - return error - - return {"data": deliver_args["data"]} - - data, err = cls.execute_with_timeout(get_responses, timeout=timeout) - if err is not None: - return {"error": err} - - return data - - @classmethod - def get_mech_id( - cls, - ledger_api: EthereumApi, - contract_address: str, - ) -> JSONLike: - """Get the price of a request.""" - contract_instance = cls.get_instance(ledger_api, contract_address) - mech_id = ledger_api.contract_method_call(contract_instance, "tokenId") - return dict(id=mech_id) diff --git a/packages/valory/contracts/mech/contract.yaml b/packages/valory/contracts/mech/contract.yaml deleted file mode 100644 index fea40a949..000000000 --- a/packages/valory/contracts/mech/contract.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: mech -author: valory -version: 0.1.0 -type: contract -description: Agent mech contract -license: Apache-2.0 -aea_version: '>=1.0.0, <2.0.0' -fingerprint: - README.md: bafybeibl4uw7rs6mwh7zuvdnqmj2o2xyr7nx5qk3w7torwx3jg6farn6ca - __init__.py: bafybeicx5pxh3cxnml2biuuoebvafvu5tvy6mgkzyjzuubuoeebb5yzjsm - build/mech.json: bafybeia3zf47nhljgahe4ijvw6mfcswhn6r5ntw572y63hbse7bvgsydaq - contract.py: bafybeiexgja3hf2b3zyqjtelzzhv2vvtj655ivrzszkwqarhrapl6gfxim -fingerprint_ignore_patterns: [] -contracts: [] -class_name: Mech -contract_interface_paths: - ethereum: build/mech.json -dependencies: - open-aea-ledger-ethereum: - version: ==1.48.0.post1 - web3: - version: <7,>=6.0.0 - eth_typing: {} From 1c878e7fed0143965f0cbcf1fa13e701fc3d0d50 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 20 Mar 2024 19:27:12 +0100 Subject: [PATCH 03/24] [no ci] chore: add required parameters --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 18 +++++++++++++----- packages/valory/services/trader/service.yaml | 12 +++++++----- .../decision_maker_abci/behaviours/base.py | 2 +- .../behaviours/decision_request.py | 10 +++++----- .../skills/decision_maker_abci/models.py | 4 +++- .../skills/decision_maker_abci/skill.yaml | 16 ++++++++++------ packages/valory/skills/trader_abci/skill.yaml | 11 +++++++---- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 9 files changed, 53 insertions(+), 34 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 5fa8592a5..7874cd5be 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeicv4nfbogieioufevoo2dcpxbafw7vmcfythabvhcrja2qgarbqf4", "contract/valory/transfer_nft_condition/0.1.0": "bafybeibqsfqao3puhodmvtriyyvbiqtgotdb4z5hul7tvitfacr47fv2pe", "skill/valory/market_manager_abci/0.1.0": "bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq", - "skill/valory/trader_abci/0.1.0": "bafybeihoc7hy2datndjvr3epi5lml4vcudvrd3qidkwkljhtvrarq4b7lu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiao4cb5e5jvku2sedjejogv7qawrgt6yungt5aiweldfyfjt3ljsi", + "skill/valory/decision_maker_abci/0.1.0": "bafybeibxn5kmkz3hizl5y4exy2h4yhsuum2d6apbnrur65f5fuomn5szzm", + "skill/valory/trader_abci/0.1.0": "bafybeig24uwyz4ekdt424eb5w4pmd6bkyblypj2s6uxa5znvwv3o3gbbw4", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiainw4dgflf3pggnwjacoey3u7tvsravojzfc4autaiuz7sf6zhvy", "skill/valory/staking_abci/0.1.0": "bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4", - "agent/valory/trader/0.1.0": "bafybeideq5os6xfnvip3ycssba3zm77jbrqaehdcjljiqn3vukskl6l52a", - "service/valory/trader/0.1.0": "bafybeibdpx5qizy4nhdqnlmlvv23rfgbagi73pkkxzhfnryofmmc4nhvdm" + "agent/valory/trader/0.1.0": "bafybeiffkddk6hw7we3auhwrjsm3kvixehbil5a3clkubdwriqdetxyzi4", + "service/valory/trader/0.1.0": "bafybeihr7eqmbagr3gbd2ogeqllpp2hepjlxplotiki6sdbcdvxubmnjeq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -43,7 +43,7 @@ "skill/valory/reset_pause_abci/0.1.0": "bafybeienpu6guwbkdzscnovmhizuzlkpalycltzxnwovisbd2coyjim7li", "skill/valory/registration_abci/0.1.0": "bafybeibfzntdwfzvddh2hzmaun23724y7neq5koowxzjbxsevs3igntfue", "skill/valory/abstract_round_abci/0.1.0": "bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm", - "skill/valory/mech_interact_abci/0.1.0": "bafybeihp5etowwbidpdegl2npv4qpmdksy3x22fly67xe353napznmp6p4", + "skill/valory/mech_interact_abci/0.1.0": "bafybeigkdst5bpgkeo6747nnbhg7zmeqwtj6xck3j3bzdv572rklncoaua", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4", "skill/valory/termination_abci/0.1.0": "bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze" } diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index b8dc1ccd0..bc4a0dc08 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -21,7 +21,7 @@ contracts: - valory/market_maker:0.1.0:bafybeiedlfmqdakxdhqydhhi6uzdwtjxt37mfwi3qjollsfynew3kp5noy - valory/erc20:0.1.0:bafybeibyutc6scd7pmexbonih7txh37knwph7lduzrkkhzjwfin2vuop4i - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeifd5shqcbx2fginrb2hliz63mfvpkvpwlyoddrzypy2as7zikru3m +- valory/mech:0.1.0:bafybeihahwhu7mxk3bu4ruvvohqdgfrctaaelnbfrbavfzc6qzvdfgdhau - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -44,11 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeienpu6guwbkdzscnovmhizuzlkpalycltzxnwovisbd2coyjim7li - valory/termination_abci:0.1.0:bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze - valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiao4cb5e5jvku2sedjejogv7qawrgt6yungt5aiweldfyfjt3ljsi +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiainw4dgflf3pggnwjacoey3u7tvsravojzfc4autaiuz7sf6zhvy - valory/market_manager_abci:0.1.0:bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna -- valory/decision_maker_abci:0.1.0:bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq -- valory/trader_abci:0.1.0:bafybeihoc7hy2datndjvr3epi5lml4vcudvrd3qidkwkljhtvrarq4b7lu +- valory/decision_maker_abci:0.1.0:bafybeibxn5kmkz3hizl5y4exy2h4yhsuum2d6apbnrur65f5fuomn5szzm +- valory/trader_abci:0.1.0:bafybeig24uwyz4ekdt424eb5w4pmd6bkyblypj2s6uxa5znvwv3o3gbbw4 - valory/staking_abci:0.1.0:bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4 +- valory/mech_interact_abci:0.1.0:bafybeigkdst5bpgkeo6747nnbhg7zmeqwtj6xck3j3bzdv572rklncoaua customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 @@ -154,6 +155,7 @@ models: reset_pause_duration: ${int:30} max_healthcheck: ${int:43200} multisend_address: ${str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} + multisend_batch_size: ${int:5} drand_public_key: ${str:868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31} service_registry_address: ${str:null} agent_registry_address: ${str:null} @@ -171,7 +173,8 @@ models: languages: ${list:["en_US"]} average_block_time: ${int:5} abt_error_mult: ${int:5} - mech_agent_address: ${str:0x77af31De935740567Cf4fF1986D04B2c964A786a} + mech_contract_address: ${str:0x77af31De935740567Cf4fF1986D04B2c964A786a} + request_price: ${int:null} sample_bets_closing_days: ${int:10} trading_strategy: ${str:kelly_criterion} use_fallback_strategy: ${bool:true} @@ -241,3 +244,8 @@ config: chain_id: ${int:1337} default_gas_price_strategy: ${str:eip1559} poa_chain: ${bool:false} + gnosis: + address: ${str:https://rpc.gnosischain.com} + chain_id: ${int:100} + poa_chain: ${bool:false} + default_gas_price_strategy: ${str:eip1559} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 6e20ffcc9..104e765c8 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeideq5os6xfnvip3ycssba3zm77jbrqaehdcjljiqn3vukskl6l52a +agent: valory/trader:0.1.0:bafybeiffkddk6hw7we3auhwrjsm3kvixehbil5a3clkubdwriqdetxyzi4 number_of_agents: 4 deployment: {} --- @@ -78,7 +78,7 @@ type: skill languages: ${LANGUAGES:list:["en_US"]} average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} - mech_agent_address: ${MECH_AGENT_ADDRESS:str:0xff82123dfb52ab75c417195c5fdb87630145ae81} + mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -143,6 +143,7 @@ type: skill max_attempts: ${MAX_ATTEMPTS:int:10} max_healthcheck: ${MAX_HEALTHCHECK:int:120} multisend_address: ${MULTISEND_ADDRESS:str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} + multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:5} on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null} reset_tendermint_after: ${RESET_TM_AFTER:int:2} retry_attempts: ${RETRY_ATTEMPTS:int:400} @@ -173,7 +174,8 @@ type: skill languages: ${LANGUAGES:list:["en_US"]} average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} - mech_agent_address: ${MECH_AGENT_ADDRESS:str:0xff82123dfb52ab75c417195c5fdb87630145ae81} + mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} + request_price: ${REQUEST_PRICE:int:null} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -266,7 +268,7 @@ type: skill languages: ${LANGUAGES:list:["en_US"]} average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} - mech_agent_address: ${MECH_AGENT_ADDRESS:str:0xff82123dfb52ab75c417195c5fdb87630145ae81} + mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -359,7 +361,7 @@ type: skill languages: ${LANGUAGES:list:["en_US"]} average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} - mech_agent_address: ${MECH_AGENT_ADDRESS:str:0xff82123dfb52ab75c417195c5fdb87630145ae81} + mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} diff --git a/packages/valory/skills/decision_maker_abci/behaviours/base.py b/packages/valory/skills/decision_maker_abci/behaviours/base.py index d46268aed..36784a714 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/base.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/base.py @@ -468,7 +468,7 @@ def _mech_contract_interact( """Interact with the mech contract.""" status = yield from self.contract_interact( performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION, # type: ignore - contract_address=self.params.mech_agent_address, + contract_address=self.params.mech_contract_address, contract_public_id=Mech.contract_id, contract_callable=contract_callable, data_key=data_key, diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py index 30cf628b7..d0ed062af 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py @@ -180,7 +180,7 @@ def _is_approved_for_all(self) -> Generator[None, None, Optional[bool]]: contract_id=str(TransferNftCondition.contract_id), contract_callable="is_approved_for_all", account=self.synchronized_data.safe_contract_address, - operator=self.params.mech_agent_address, + operator=self.params.mech_contract_address, ) if response_msg.performative != ContractApiMessage.Performative.STATE: self.context.logger.info( @@ -212,7 +212,7 @@ def _check_nevermined_subscription(self) -> WaitableConditionType: contract_address=self.token_address, contract_id=str(TransferNftCondition.contract_id), contract_callable="build_set_approval_for_all_tx", - operator=self.params.mech_agent_address, + operator=self.params.mech_contract_address, approved=APPROVE_MECH, ) @@ -301,7 +301,7 @@ def _build_request_data(self) -> Generator[None, None, bool]: return True batch = MultisendBatch( - to=self.params.mech_agent_address, + to=self.params.mech_contract_address, data=HexBytes(self.request_data), value=self.price, ) @@ -315,7 +315,7 @@ def _get_safe_tx_hash(self) -> Generator[None, None, bool]: contract_address=self.synchronized_data.safe_contract_address, contract_public_id=GnosisSafeContract.contract_id, contract_callable="get_raw_safe_transaction_hash", - to_address=self.params.mech_agent_address, + to_address=self.params.mech_contract_address, value=self.price, data=self.request_data, data_key="tx_hash", @@ -330,7 +330,7 @@ def _single_tx(self) -> Generator[None, None, str]: self.safe_tx_hash, self.price, SAFE_GAS, - self.params.mech_agent_address, + self.params.mech_contract_address, self.request_data, ) diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index 8d72d6152..9b7fe9743 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -231,7 +231,9 @@ class DecisionMakerParams(MarketManagerParams): def __init__(self, *args: Any, **kwargs: Any) -> None: """Initialize the parameters' object.""" - self.mech_agent_address: str = self._ensure("mech_agent_address", kwargs, str) + self.mech_contract_address: str = self._ensure( + "mech_contract_address", kwargs, str + ) # the number of days to sample bets from self.sample_bets_closing_days: int = self._ensure( "sample_bets_closing_days", kwargs, int diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 9889a6e37..2e16004f6 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,12 +12,12 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeigoxverx6e75jdzj54hsfyzgunofuy5nll5lbn52gxeyzo7jw6vyy + behaviours/base.py: bafybeicg37b76cic7zuy2uvskhl7ohgv74o74w2fjbojwydhvh3hrywoz4 behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca behaviours/decision_receive.py: bafybeiapkbvoqtlsisntdmmbw64zjuembaphsktn45smij5uocm3yxvml4 - behaviours/decision_request.py: bafybeiesxnu3outdldwrd2rhbokryvik5uzp6wr6dqhwypy66txev322um + behaviours/decision_request.py: bafybeicoyoclqbvyzwdoiw3x2tktammizwsohux7nl2x7g4ae5j5lyiley behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeifygejified3yoza3gy4g7ina6m4lmz4pp2abtwfuwrmiwznnvrua behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q @@ -30,7 +30,7 @@ fingerprint: handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeihzxf3dhx73lk7d56ir7zhmz2x6u5x6aga6f7rfms37zkvaqhfelm + models.py: bafybeiezzu5by7vrr2ekcsqc5q6bb4qf5pl6svj34dxuu73mq5iphbz7lu payloads.py: bafybeibmjrckgsflqulviynadl6bx3keuabvhfolkiib7cmjhfsov2vuty policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeiedlfmqdakxdhqydhhi6uzdwtjxt37mfwi3qjollsfynew3kp5noy - valory/erc20:0.1.0:bafybeibyutc6scd7pmexbonih7txh37knwph7lduzrkkhzjwfin2vuop4i - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeifd5shqcbx2fginrb2hliz63mfvpkvpwlyoddrzypy2as7zikru3m +- valory/mech:0.1.0:bafybeihahwhu7mxk3bu4ruvvohqdgfrctaaelnbfrbavfzc6qzvdfgdhau - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -76,6 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm - valory/market_manager_abci:0.1.0:bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna - valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 +- valory/mech_interact_abci:0.1.0:bafybeigkdst5bpgkeo6747nnbhg7zmeqwtj6xck3j3bzdv572rklncoaua behaviours: main: args: {} @@ -147,6 +148,8 @@ models: keeper_timeout: 30.0 max_attempts: 10 max_healthcheck: 120 + multisend_address: '0x0000000000000000000000000000000000000000' + multisend_batch_size: 5 on_chain_service_id: null request_retry_delay: 1.0 request_timeout: 10.0 @@ -177,7 +180,8 @@ models: tendermint_url: http://localhost:26657 tx_timeout: 10.0 use_termination: false - mech_agent_address: '0xff82123dfb52ab75c417195c5fdb87630145ae81' + mech_contract_address: '0x77af31de935740567cf4ff1986d04b2c964a786a' + request_price: null sample_bets_closing_days: 10 trading_strategy: strategy_name use_fallback_strategy: true @@ -264,7 +268,7 @@ models: Content-Type: application/json method: GET parameters: {} - response_key: null + response_key: result response_type: dict retries: 5 url: '' diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 6a6142d19..d1f8a216a 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,9 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihcfbjnty6j4aluaajgfdrc4ctg76ebb3gfub5pwqtooait7x76r4 - valory/termination_abci:0.1.0:bafybeicklx5s3mjl4pgkcz36bw2vuuqj6w73qyh455vkoncyanxqlns6ze - valory/market_manager_abci:0.1.0:bafybeigcboyrmlmuwtzuvkxi4uiklromiyuaund4xgtfjbxwsuemndidna -- valory/decision_maker_abci:0.1.0:bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiao4cb5e5jvku2sedjejogv7qawrgt6yungt5aiweldfyfjt3ljsi +- valory/decision_maker_abci:0.1.0:bafybeibxn5kmkz3hizl5y4exy2h4yhsuum2d6apbnrur65f5fuomn5szzm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiainw4dgflf3pggnwjacoey3u7tvsravojzfc4autaiuz7sf6zhvy - valory/staking_abci:0.1.0:bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4 +- valory/mech_interact_abci:0.1.0:bafybeigkdst5bpgkeo6747nnbhg7zmeqwtj6xck3j3bzdv572rklncoaua behaviours: main: args: {} @@ -104,6 +105,7 @@ models: max_attempts: 10 max_healthcheck: 120 multisend_address: '0x0000000000000000000000000000000000000000' + multisend_batch_size: 5 on_chain_service_id: null request_retry_delay: 1.0 request_timeout: 10.0 @@ -145,7 +147,8 @@ models: - en_US average_block_time: 5 abt_error_mult: 5 - mech_agent_address: '0xff82123dfb52ab75c417195c5fdb87630145ae81' + mech_contract_address: '0x77af31de935740567cf4ff1986d04b2c964a786a' + request_price: null sample_bets_closing_days: 10 trading_strategy: strategy_name use_fallback_strategy: true @@ -271,7 +274,7 @@ models: Content-Type: application/json method: GET parameters: {} - response_key: null + response_key: result response_type: dict retries: 5 url: '' diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 80ebbcb67..2b3a9c16b 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeifrsatxr4syaccaxnirpvm2zetttlmrp3vr3fmqm7vc7lazy4i2bm -- valory/decision_maker_abci:0.1.0:bafybeiga5zwee3w6qrdc3csabkm2si6g4iu7ok34dtbh4lrkvcv2eioteq +- valory/decision_maker_abci:0.1.0:bafybeibxn5kmkz3hizl5y4exy2h4yhsuum2d6apbnrur65f5fuomn5szzm - valory/staking_abci:0.1.0:bafybeiafgwdxmnyme675pcdagrgtu34riizw5aig65hvku355sd7rharj4 behaviours: main: From 08322a7c4cd2768a96ccb9c25d369cfd29d3efab Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Thu, 21 Mar 2024 21:27:29 +0100 Subject: [PATCH 04/24] [no ci] feat: rewired --- packages/packages.json | 13 ++++++----- packages/valory/agents/trader/aea-config.yaml | 8 +++---- packages/valory/services/trader/service.yaml | 2 +- .../skills/decision_maker_abci/rounds.py | 6 ++++- .../skills/decision_maker_abci/skill.yaml | 6 ++--- .../states/final_states.py | 4 ++++ .../valory/skills/trader_abci/composition.py | 22 +++++++++++++++++-- packages/valory/skills/trader_abci/skill.yaml | 6 ++--- .../tx_settlement_multiplexer_abci/rounds.py | 22 +++++++++---------- .../tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 10 files changed, 59 insertions(+), 34 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index f716f0da0..7720904d9 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -6,7 +6,6 @@ "custom/w1kke/always_blue/0.1.0": "bafybeieshu32h3es2fslduuhr7nimuvh2vuibyeqdunzrcggaeohekg3jm", "contract/valory/market_maker/0.1.0": "bafybeieblarug7skds3u6r24kqehss6vnrtac3hh6ir7mpseb3w4rbrnzq", "contract/valory/erc20/0.1.0": "bafybeifsag2oyd6pccj2bxkeo7ovgwvhifzw7y6okwdnzcbegmk6hozuyy", - "contract/valory/mech/0.1.0": "bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa", "contract/valory/realitio/0.1.0": "bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq", "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4", "contract/valory/conditional_tokens/0.1.0": "bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu", @@ -14,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy", - "skill/valory/trader_abci/0.1.0": "bafybeigxht752go2ljfpdttnk7hdwf7ocnaop7k4ryizv3cw3w222pbrim", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifwdukb5p7mptdjahao5f5pvfc763n65rkupmiln2bdfpb766wvn4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray", + "skill/valory/trader_abci/0.1.0": "bafybeibivuckiaxvg7pgkm4eeqb4d25qlex3a32xbzxeffiohem7o5s5ca", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeifm2nqm2qzxawhlvlggf6wnncdgndt7ja2jdfz67e4xlvstixtmnu", - "service/valory/trader/0.1.0": "bafybeihwdnilofleyeuuve3mjk2zohc3mbovzm7khz6o72qewfjqfxs4oy" + "agent/valory/trader/0.1.0": "bafybeiex4qauyjtzfkgq3ofrpfouj2mkm46bfvbkild73wbocg5zjp6e7e", + "service/valory/trader/0.1.0": "bafybeigmunwhmjxsjwjuwbu7nynj44tp6vjirol25noxwazoaem7mr3vae" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -34,11 +33,13 @@ "contract/valory/gnosis_safe/0.1.0": "bafybeiafp7bu2ah3zypqyvpzkdvnwbjkr5cqt53zp3vrk6jqlcpntxqdia", "contract/valory/service_registry/0.1.0": "bafybeidrbrx5np67xc2rm5jvugplopeobawwqongp6meahhzzpzqsgolsu", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", + "contract/valory/mech/0.1.0": "bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy", "connection/valory/abci/0.1.0": "bafybeibg47tqwbeo5jevjbtkljjv2uc2q5luv77vma3zhwqatt5ya2t2ra", "connection/valory/http_client/0.23.0": "bafybeih5vzo22p2umhqo52nzluaanxx7kejvvpcpdsrdymckkyvmsim6gm", "connection/valory/ledger/0.19.0": "bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", "connection/valory/ipfs/0.1.0": "bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii", + "skill/valory/mech_interact_abci/0.1.0": "bafybeih6j3mzzaejy77dut2omoyojgvlayyqjwgm4ihe4afwu2hs3wptje", "skill/valory/abstract_abci/0.1.0": "bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre", "skill/valory/reset_pause_abci/0.1.0": "bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu", "skill/valory/registration_abci/0.1.0": "bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 12cbf60d8..200e002fa 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -21,7 +21,7 @@ contracts: - valory/market_maker:0.1.0:bafybeieblarug7skds3u6r24kqehss6vnrtac3hh6ir7mpseb3w4rbrnzq - valory/erc20:0.1.0:bafybeifsag2oyd6pccj2bxkeo7ovgwvhifzw7y6okwdnzcbegmk6hozuyy - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa +- valory/mech:0.1.0:bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifwdukb5p7mptdjahao5f5pvfc763n65rkupmiln2bdfpb766wvn4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy -- valory/trader_abci:0.1.0:bafybeigxht752go2ljfpdttnk7hdwf7ocnaop7k4ryizv3cw3w222pbrim +- valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray +- valory/trader_abci:0.1.0:bafybeibivuckiaxvg7pgkm4eeqb4d25qlex3a32xbzxeffiohem7o5s5ca - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index a2f069f7a..ab5585803 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeifm2nqm2qzxawhlvlggf6wnncdgndt7ja2jdfz67e4xlvstixtmnu +agent: valory/trader:0.1.0:bafybeiex4qauyjtzfkgq3ofrpfouj2mkm46bfvbkild73wbocg5zjp6e7e number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index 6b4df9e4e..65261c5d3 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -48,6 +48,7 @@ ) from packages.valory.skills.decision_maker_abci.states.final_states import ( FinishedDecisionMakerRound, + FinishedDecisionRequestRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, FinishedWithoutRedeemingRound, @@ -198,7 +199,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): Event.ROUND_TIMEOUT: ToolSelectionRound, }, DecisionRequestRound: { - Event.DONE: FinishedDecisionMakerRound, + Event.DONE: FinishedDecisionRequestRound, Event.SLOTS_UNSUPPORTED_ERROR: BlacklistingRound, Event.NO_MAJORITY: DecisionRequestRound, Event.ROUND_TIMEOUT: DecisionRequestRound, @@ -245,6 +246,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): Event.NO_MAJORITY: HandleFailedTxRound, }, FinishedDecisionMakerRound: {}, + FinishedDecisionRequestRound: {}, FinishedWithoutDecisionRound: {}, FinishedWithoutRedeemingRound: {}, FinishedSubscriptionRound: {}, @@ -263,6 +265,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): ) final_states: Set[AppState] = { FinishedDecisionMakerRound, + FinishedDecisionRequestRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, FinishedWithoutRedeemingRound, @@ -290,6 +293,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): get_name(SynchronizedData.tx_submitter), get_name(SynchronizedData.most_voted_tx_hash), }, + FinishedDecisionRequestRound: set(), FinishedSubscriptionRound: { get_name(SynchronizedData.tx_submitter), get_name(SynchronizedData.most_voted_tx_hash), diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index e0cacd6d1..7e452ac06 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -34,7 +34,7 @@ fingerprint: payloads.py: bafybeibmjrckgsflqulviynadl6bx3keuabvhfolkiib7cmjhfsov2vuty policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeih6bo7nnc7hvg67svio3f6cwob55qp4bgxjcejsmj6el3zhltz7bq + rounds.py: bafybeielsnwnvnrofn7vfm6t4y2pocbav7za6shia5w5icapzgh3lkimo4 states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeid4khumtvfw5n37avkf3kujfxdwhfjcsnzpmyjeljkpcako5f2duy states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda @@ -42,7 +42,7 @@ fingerprint: states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne states/decision_receive.py: bafybeib3roo27nccj4eylaqwwzztzzzwsi6px5atjrch5wbqmpln2kyy6y states/decision_request.py: bafybeic7otc3hjb753svbmur3yyk6szahc25yii3x4w4vcnpfz6jwvacuu - states/final_states.py: bafybeidmlhpjvsdogejrvaczk3tfcbh7f7ijectshh23qi5yzktozzunee + states/final_states.py: bafybeiantsmq3yuzg7qzk6hlyngj74jsx43rphghfwsvseakcxmu3n4kqm states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm states/order_subscription.py: bafybeiaoemltuh3zkch7hvaxzxxsofe3pomlgifj5hamkqqon5mg5eaoqq states/randomness.py: bafybeifgsyipvvu2e6caggyoo5vsmd64uexuho5ybyf3ry424r7kldcfre @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeieblarug7skds3u6r24kqehss6vnrtac3hh6ir7mpseb3w4rbrnzq - valory/erc20:0.1.0:bafybeifsag2oyd6pccj2bxkeo7ovgwvhifzw7y6okwdnzcbegmk6hozuyy - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa +- valory/mech:0.1.0:bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 diff --git a/packages/valory/skills/decision_maker_abci/states/final_states.py b/packages/valory/skills/decision_maker_abci/states/final_states.py index 4339bc69d..d522ba24e 100644 --- a/packages/valory/skills/decision_maker_abci/states/final_states.py +++ b/packages/valory/skills/decision_maker_abci/states/final_states.py @@ -26,6 +26,10 @@ class FinishedDecisionMakerRound(DegenerateRound): """A round representing that decision-making has finished.""" +class FinishedDecisionRequestRound(DegenerateRound): + """A round representing that decision request has finished.""" + + class FinishedSubscriptionRound(DegenerateRound): """A round representing that subscription has finished.""" diff --git a/packages/valory/skills/trader_abci/composition.py b/packages/valory/skills/trader_abci/composition.py index 1d4a1f10f..9026832c2 100644 --- a/packages/valory/skills/trader_abci/composition.py +++ b/packages/valory/skills/trader_abci/composition.py @@ -33,6 +33,7 @@ ) from packages.valory.skills.decision_maker_abci.states.final_states import ( FinishedDecisionMakerRound, + FinishedDecisionRequestRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, FinishedWithoutRedeemingRound, @@ -81,7 +82,7 @@ from packages.valory.skills.tx_settlement_multiplexer_abci.rounds import ( ChecksPassedRound, FinishedBetPlacementTxRound, - FinishedDecisionRequestTxRound, + FinishedMechRequestTxRound, FinishedRedeemingTxRound, FinishedStakingTxRound, FinishedSubscriptionTxRound, @@ -90,6 +91,18 @@ TxSettlementMultiplexerAbciApp, ) +from packages.valory.skills.mech_interact_abci.states.final_states import ( + FinishedMechRequestRound, + FinishedMechResponseRound, + FinishedMechRequestSkipRound, + FinishedMechResponseTimeoutRound, +) +from packages.valory.skills.mech_interact_abci.states.request import ( + MechRequestRound, +) +from packages.valory.skills.mech_interact_abci.states.response import ( + MechResponseRound, +) abci_app_transition_mapping: AbciAppTransitionMapping = { FinishedRegistrationRound: UpdateBetsRound, @@ -101,7 +114,12 @@ FinishedTransactionSubmissionRound: PostTxSettlementRound, FinishedSubscriptionTxRound: ClaimRound, FailedTransactionSubmissionRound: HandleFailedTxRound, - FinishedDecisionRequestTxRound: DecisionReceiveRound, + FinishedDecisionRequestRound: MechRequestRound, + FinishedMechRequestRound: PreTxSettlementRound, + FinishedMechRequestTxRound: MechResponseRound, + FinishedMechResponseRound: DecisionReceiveRound, + FinishedMechResponseTimeoutRound: MechResponseRound, + FinishedMechRequestSkipRound: RedeemRound, FinishedSubscriptionRound: PreTxSettlementRound, FinishedBetPlacementTxRound: RedeemRound, FinishedRedeemingTxRound: CallCheckpointRound, diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 5659109ab..b48ae20ff 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiab4xgadptz4mhvno4p6xvkh7p4peg7iuhotabydriu74dmj6ljga __init__.py: bafybeido7wa33h4dtleap57vzgyb4fsofk4vindsqcekyfo5i56i2rll2a behaviours.py: bafybeieesrefrpo5c5upzztgm5fwfrmxeagilacuau5nacobhsfvgpbzby - composition.py: bafybeif75v3swf2pmxi3rdd5kqdfv4ap5uapcbszkiohhur67oemrgotay + composition.py: bafybeia5owijnwulgo7oao5aeosukwzprh5tlbdsjwlqkdjo7vl5jn7mom dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeibi3t63vwfrx5sbkfhji3rb62dtwczpajuijqgul6bpcn3altcziq handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifwdukb5p7mptdjahao5f5pvfc763n65rkupmiln2bdfpb766wvn4 +- valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi behaviours: main: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py b/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py index 2dff503c2..82707d569 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py @@ -38,13 +38,11 @@ from packages.valory.skills.decision_maker_abci.states.bet_placement import ( BetPlacementRound, ) -from packages.valory.skills.decision_maker_abci.states.decision_request import ( - DecisionRequestRound, -) from packages.valory.skills.decision_maker_abci.states.order_subscription import ( SubscriptionRound, ) from packages.valory.skills.decision_maker_abci.states.redeem import RedeemRound +from packages.valory.skills.mech_interact_abci.states.request import MechRequestRound from packages.valory.skills.staking_abci.rounds import CallCheckpointRound @@ -53,7 +51,7 @@ class Event(Enum): CHECKS_PASSED = "checks_passed" REFILL_REQUIRED = "refill_required" - DECISION_REQUESTING_DONE = "decision_requesting_done" + MECH_REQUESTING_DONE = "mech_requesting_done" BET_PLACEMENT_DONE = "bet_placement_done" REDEEMING_DONE = "redeeming_done" STAKING_DONE = "staking_done" @@ -92,7 +90,7 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: :return: the synchronized data and the event, otherwise `None` if the round is still running. """ submitter_to_event: Dict[str, Event] = { - DecisionRequestRound.auto_round_id(): Event.DECISION_REQUESTING_DONE, + MechRequestRound.auto_round_id(): Event.MECH_REQUESTING_DONE, BetPlacementRound.auto_round_id(): Event.BET_PLACEMENT_DONE, RedeemRound.auto_round_id(): Event.REDEEMING_DONE, CallCheckpointRound.auto_round_id(): Event.STAKING_DONE, @@ -103,7 +101,7 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: event = submitter_to_event.get(synced_data.tx_submitter, Event.UNRECOGNIZED) # if a mech request was just performed, increase the utilized tool's counter - if event == Event.DECISION_REQUESTING_DONE: + if event == Event.MECH_REQUESTING_DONE: policy = synced_data.policy policy.tool_used(synced_data.mech_tool_idx) policy_update = policy.serialize() @@ -123,8 +121,8 @@ class ChecksPassedRound(DegenerateRound): """Round that represents all the pre tx settlement checks have passed.""" -class FinishedDecisionRequestTxRound(DegenerateRound): - """Finished decision requesting round.""" +class FinishedMechRequestTxRound(DegenerateRound): + """Finished mech requesting round.""" class FinishedBetPlacementTxRound(DegenerateRound): @@ -192,7 +190,7 @@ class TxSettlementMultiplexerAbciApp(AbciApp[Event]): Event.ROUND_TIMEOUT: PreTxSettlementRound, }, PostTxSettlementRound: { - Event.DECISION_REQUESTING_DONE: FinishedDecisionRequestTxRound, + Event.MECH_REQUESTING_DONE: FinishedMechRequestTxRound, Event.BET_PLACEMENT_DONE: FinishedBetPlacementTxRound, Event.REDEEMING_DONE: FinishedRedeemingTxRound, Event.STAKING_DONE: FinishedStakingTxRound, @@ -201,7 +199,7 @@ class TxSettlementMultiplexerAbciApp(AbciApp[Event]): Event.UNRECOGNIZED: FailedMultiplexerRound, }, ChecksPassedRound: {}, - FinishedDecisionRequestTxRound: {}, + FinishedMechRequestTxRound: {}, FinishedBetPlacementTxRound: {}, FinishedSubscriptionTxRound: {}, FinishedRedeemingTxRound: {}, @@ -213,7 +211,7 @@ class TxSettlementMultiplexerAbciApp(AbciApp[Event]): } final_states: Set[AppState] = { ChecksPassedRound, - FinishedDecisionRequestTxRound, + FinishedMechRequestTxRound, FinishedBetPlacementTxRound, FinishedRedeemingTxRound, FinishedStakingTxRound, @@ -226,7 +224,7 @@ class TxSettlementMultiplexerAbciApp(AbciApp[Event]): } db_post_conditions: Dict[AppState, Set[str]] = { ChecksPassedRound: set(), - FinishedDecisionRequestTxRound: set(), + FinishedMechRequestTxRound: set(), FinishedBetPlacementTxRound: set(), FinishedRedeemingTxRound: set(), FinishedStakingTxRound: set(), diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index dd522c9b9..313e4db29 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -13,7 +13,7 @@ fingerprint: fsm_specification.yaml: bafybeib7nmznbbug6icxyahy34r6ory7ujkwnlakv3bgmnlecysr46l5v4 handlers.py: bafybeiafbqr7ojfcbwohvee7x4zzswad3ymfrrbjlfz7uuuttmn3qdfs6q models.py: bafybeigtmxoecoow663hgqnyinxarlrttyyt5ghpbdamdv4tc4kikcfx3a - rounds.py: bafybeifzdrrx73azctfpdbhiha7ie7pu6mxzmfjfjzq5umdlfyt6j4g2tq + rounds.py: bafybeiggq4tlyuuf2poxxtf2umzaolrmdgp2t6ceumqm2rsqu63hxq2hqu fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeictuvoihmihrcyt5egvy6ukvsg7e3pwwugk5okuv7d2ocwfy34ujy +- valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi behaviours: main: From aff2e3a6e19a3b364c8cf8d0b660658caffcdbae Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Thu, 21 Mar 2024 23:13:27 +0100 Subject: [PATCH 05/24] [no ci] chore: update --- .../behaviours/decision_receive.py | 3 +- .../behaviours/decision_request.py | 84 +++---------------- .../skills/decision_maker_abci/models.py | 29 ------- .../skills/decision_maker_abci/payloads.py | 6 +- .../skills/decision_maker_abci/states/base.py | 23 +++-- .../valory/skills/trader_abci/behaviours.py | 6 +- packages/valory/skills/trader_abci/models.py | 15 ++-- packages/valory/skills/trader_abci/skill.yaml | 1 + 8 files changed, 48 insertions(+), 119 deletions(-) diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index e363d5f5a..f970ec609 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -32,9 +32,8 @@ remove_fraction_wei, ) from packages.valory.skills.decision_maker_abci.io_.loader import ComponentPackageLoader -from packages.valory.skills.decision_maker_abci.models import ( +from packages.valory.skills.mech_interact_abci.states.base import ( MechInteractionResponse, - MechResponseSpecs, ) from packages.valory.skills.decision_maker_abci.payloads import DecisionReceivePayload from packages.valory.skills.decision_maker_abci.states.decision_receive import ( diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py index d0ed062af..a3278910b 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py @@ -35,6 +35,9 @@ from packages.valory.contracts.transfer_nft_condition.contract import ( TransferNftCondition, ) +from packages.valory.skills.mech_interact_abci.states.base import ( + MechMetadata, +) from packages.valory.protocols.contract_api import ContractApiMessage from packages.valory.skills.abstract_round_abci.base import get_name from packages.valory.skills.abstract_round_abci.io_.store import SupportedFiletype @@ -45,7 +48,7 @@ WaitableConditionType, ) from packages.valory.skills.decision_maker_abci.models import MultisendBatch -from packages.valory.skills.decision_maker_abci.payloads import RequestPayload +from packages.valory.skills.decision_maker_abci.payloads import MechRequestsPayload from packages.valory.skills.decision_maker_abci.states.decision_request import ( DecisionRequestRound, ) @@ -55,19 +58,17 @@ ) -METADATA_FILENAME = "metadata.json" -V1_HEX_PREFIX = "f01" Ox = "0x" APPROVE_MECH = True -@dataclass -class MechMetadata: - """A Mech's metadata.""" +# @dataclass +# class MechMetadata: +# """A Mech's metadata.""" - prompt: str - tool: str - nonce: str = field(default_factory=lambda: str(uuid4())) +# prompt: str +# tool: str +# nonce: str = field(default_factory=lambda: str(uuid4())) class DecisionRequestBehaviour(DecisionMakerBaseBehaviour): @@ -79,7 +80,6 @@ def __init__(self, **kwargs: Any) -> None: """Initialize Behaviour.""" super().__init__(**kwargs) self._metadata: Optional[MechMetadata] = None - self._v1_hex_truncated: str = "" self._request_data: bytes = b"" self._price: int = 0 @@ -143,25 +143,6 @@ def setup(self) -> None: msg = f"Prepared metadata {self.metadata!r} for the request." self.context.logger.info(msg) - def _send_metadata_to_ipfs( - self, - ) -> WaitableConditionType: - """Send Mech metadata to IPFS.""" - metadata_hash = yield from self.send_to_ipfs( - self.metadata_filepath, self.metadata, filetype=SupportedFiletype.JSON - ) - if metadata_hash is None: - return False - - v1_file_hash = to_v1(metadata_hash) - cid_bytes = cast(bytes, multibase.decode(v1_file_hash)) - multihash_bytes = multicodec.remove_prefix(cid_bytes) - v1_file_hash_hex = V1_HEX_PREFIX + multihash_bytes.hex() - ipfs_link = self.params.ipfs_address + v1_file_hash_hex - self.context.logger.info(f"Prompt uploaded: {ipfs_link}") - self._v1_hex_truncated = Ox + v1_file_hash_hex[9:] - return True - def _get_price(self) -> WaitableConditionType: """Get the price of the mech request.""" if self.params.use_nevermined: @@ -190,48 +171,6 @@ def _is_approved_for_all(self) -> Generator[None, None, Optional[bool]]: return response_msg.state.body.get("data") - def _check_nevermined_subscription(self) -> WaitableConditionType: - """Approve the mech to spend the mech subscription.""" - if not self.params.use_nevermined: - # do nothing if we don't use nevermined - return True - - is_approved_for_all = yield from self._is_approved_for_all() - if is_approved_for_all is None: - # something went wrong when checking the mech approval - return False - if is_approved_for_all: - # the mech is already approved to spend the mech subscription - self.context.logger.info( - "The mech is already approved to spend the mech subscription." - ) - return True - - response_msg = yield from self.get_contract_api_response( - performative=ContractApiMessage.Performative.GET_STATE, # type: ignore - contract_address=self.token_address, - contract_id=str(TransferNftCondition.contract_id), - contract_callable="build_set_approval_for_all_tx", - operator=self.params.mech_contract_address, - approved=APPROVE_MECH, - ) - - if response_msg.performative != ContractApiMessage.Performative.STATE: - self.context.logger.info(f"Could not build withdraw tx: {response_msg}") - return False - - data = response_msg.state.body.get("data") - if data is None: - self.context.logger.info(f"Could not build withdraw tx: {response_msg}") - return False - - batch = MultisendBatch( - to=self.token_address, - data=HexBytes(data), - ) - self.multisend_batches.append(batch) - return True - def _build_unwrap_tx(self) -> WaitableConditionType: """Exchange wxDAI to xDAI.""" response_msg = yield from self.get_contract_api_response( @@ -372,7 +311,6 @@ def async_act(self) -> Generator: if self.n_slots_supported: tx_submitter = self.matching_round.auto_round_id() mech_tx_hex = yield from self._prepare_safe_tx() - price = self.price agent = self.context.agent_address - payload = RequestPayload(agent, tx_submitter, mech_tx_hex, price) + payload = MechRequestsPayload(agent, mech_requests) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index 9b7fe9743..f0efa0484 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -369,10 +369,6 @@ def get_policy_store_path(self, kwargs: Dict) -> Path: return Path(path) -class MechResponseSpecs(ApiSpecs): - """A model that wraps ApiSpecs for the Mech's response specifications.""" - - class AgentToolsSpecs(ApiSpecs): """A model that wraps ApiSpecs for the Mech agent's tools specifications.""" @@ -424,31 +420,6 @@ def win_probability(self) -> Optional[float]: return max(self.p_no, self.p_yes) -@dataclass(init=False) -class MechInteractionResponse: - """A structure for the response of a mech interaction task.""" - - request_id: int - result: Optional[PredictionResponse] - error: str - - def __init__(self, **kwargs: Any) -> None: - """Initialize the mech's response ignoring extra keys.""" - self.request_id = kwargs.pop("requestId", 0) - self.error = kwargs.pop("error", "Unknown") - self.result = kwargs.pop("result", None) - - if isinstance(self.result, str): - self.result = PredictionResponse(**json.loads(self.result)) - - @classmethod - def incorrect_format(cls, res: Any) -> "MechInteractionResponse": - """Return an incorrect format response.""" - response = cls() - response.error = f"The response's format was unexpected: {res}" - return response - - class TradesSubgraph(ApiSpecs): """A model that wraps ApiSpecs for the OMEN's subgraph specifications for trades.""" diff --git a/packages/valory/skills/decision_maker_abci/payloads.py b/packages/valory/skills/decision_maker_abci/payloads.py index 3790df766..41d61e44f 100644 --- a/packages/valory/skills/decision_maker_abci/payloads.py +++ b/packages/valory/skills/decision_maker_abci/payloads.py @@ -62,10 +62,10 @@ class RedeemPayload(MultisigTxPayload): @dataclass(frozen=True) -class RequestPayload(MultisigTxPayload): - """Represents a transaction payload for preparing an on-chain transaction for a mech request.""" +class MechRequestsPayload(BaseTxPayload): + """Represents a transaction payload for preparing mech requests.""" - price: Optional[int] = None + mech_requests: Optional[str] = None @dataclass(frozen=True) diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index 95c9a0638..3af014108 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -74,11 +74,6 @@ def is_mech_price_set(self) -> bool: """Get whether mech's price is known.""" return bool(self.db.get("mech_price", False)) - @property - def mech_price(self) -> int: - """Get the mech's request price.""" - return int(self.db.get_strict("mech_price")) - @property def available_mech_tools(self) -> List[str]: """Get all the available mech tools.""" @@ -173,6 +168,24 @@ def claim(self) -> bool: """Get the claim.""" return bool(self.db.get_strict("claim")) + @property + def mech_requests(self) -> List[MechMetadata]: + """Get the mech requests.""" + serialized = self.db.get("mech_requests", "[]") + if serialized is None: + serialized = "[]" + requests = json.loads(serialized) + return [MechMetadata(**metadata_item) for metadata_item in requests] + + @property + def mech_responses(self) -> List[MechInteractionResponse]: + """Get the mech responses.""" + serialized = self.db.get("mech_responses", "[]") + if serialized is None: + serialized = "[]" + responses = json.loads(serialized) + return [MechInteractionResponse(**response_item) for response_item in responses] + class TxPreparationRound(CollectSameUntilThresholdRound): """A round for preparing a transaction.""" diff --git a/packages/valory/skills/trader_abci/behaviours.py b/packages/valory/skills/trader_abci/behaviours.py index 1a7849320..104598227 100644 --- a/packages/valory/skills/trader_abci/behaviours.py +++ b/packages/valory/skills/trader_abci/behaviours.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023 Valory AG +# Copyright 2023-2024 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,6 +31,9 @@ from packages.valory.skills.market_manager_abci.behaviours import ( MarketManagerRoundBehaviour, ) +from packages.valory.skills.mech_interact_abci.behaviours.round_behaviour import ( + MechInteractRoundBehaviour, +) from packages.valory.skills.registration_abci.behaviours import ( AgentRegistrationRoundBehaviour, RegistrationStartupBehaviour, @@ -62,6 +65,7 @@ class TraderConsensusBehaviour(AbstractRoundBehaviour): *AgentRegistrationRoundBehaviour.behaviours, *AgentDecisionMakerRoundBehaviour.behaviours, *MarketManagerRoundBehaviour.behaviours, + *MechInteractRoundBehaviour.behaviours, *ResetPauseABCIConsensusBehaviour.behaviours, *TerminationAbciBehaviours.behaviours, *TransactionSettlementRoundBehaviour.behaviours, diff --git a/packages/valory/skills/trader_abci/models.py b/packages/valory/skills/trader_abci/models.py index 45188a781..9676d32e0 100644 --- a/packages/valory/skills/trader_abci/models.py +++ b/packages/valory/skills/trader_abci/models.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023 Valory AG +# Copyright 2023-2024 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -33,9 +33,6 @@ ConditionalTokensSubgraph as DecisionMakerConditionalTokensSubgraph, ) from packages.valory.skills.decision_maker_abci.models import DecisionMakerParams -from packages.valory.skills.decision_maker_abci.models import ( - MechResponseSpecs as DecisionMakerMechResponseSpecs, -) from packages.valory.skills.decision_maker_abci.models import ( RealitioSubgraph as DecisionMakerRealitioSubgraph, ) @@ -48,6 +45,12 @@ from packages.valory.skills.decision_maker_abci.rounds import ( Event as DecisionMakerEvent, ) +from packages.valory.skills.mech_interact_abci.models import ( + MechResponseSpecs as BaseMechResponseSpecs, +) +from packages.valory.skills.mech_interact_abci.models import ( + Params as MechInteractParams, +) from packages.valory.skills.market_manager_abci.models import ( NetworkSubgraph as MarketManagerNetworkSubgraph, ) @@ -83,7 +86,7 @@ BenchmarkTool = BaseBenchmarkTool OmenSubgraph = MarketManagerOmenSubgraph NetworkSubgraph = MarketManagerNetworkSubgraph -MechResponseSpecs = DecisionMakerMechResponseSpecs +MechResponseSpecs = BaseMechResponseSpecs AgentToolsSpecs = DecisionMakerAgentToolsSpecs TradesSubgraph = DecisionMakerTradesSubgraph ConditionalTokensSubgraph = DecisionMakerConditionalTokensSubgraph @@ -98,7 +101,7 @@ class RandomnessApi(ApiSpecs): class TraderParams( - DecisionMakerParams, TerminationParams, StakingParams, TxSettlementMultiplexerParams + DecisionMakerParams, MechInteractParams, TerminationParams, StakingParams, TxSettlementMultiplexerParams ): """A model to represent the trader params.""" diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index b48ae20ff..12c7d81cb 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -28,6 +28,7 @@ skills: - valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray - valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi +- valory/mech_interact_abci:0.1.0:bafybeicjunamybs27vwz2jz5hdrtkrtr2xwy2a5dyhbqksjrgh266qpnha behaviours: main: args: {} From 5921fe0cde89718dc5573bfc1e69d24b2b6c8b08 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 22 Mar 2024 16:19:59 +0100 Subject: [PATCH 06/24] [no ci] chore: update decision receive, request --- packages/packages.json | 10 +- packages/valory/agents/trader/aea-config.yaml | 6 +- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/decision_receive.py | 156 +---------- .../behaviours/decision_request.py | 254 +----------------- .../skills/decision_maker_abci/payloads.py | 2 +- .../skills/decision_maker_abci/rounds.py | 1 - .../skills/decision_maker_abci/skill.yaml | 14 +- .../skills/decision_maker_abci/states/base.py | 4 + .../states/decision_request.py | 23 +- packages/valory/skills/trader_abci/skill.yaml | 10 +- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 12 files changed, 64 insertions(+), 420 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 7720904d9..48b99a814 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray", - "skill/valory/trader_abci/0.1.0": "bafybeibivuckiaxvg7pgkm4eeqb4d25qlex3a32xbzxeffiohem7o5s5ca", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e", + "skill/valory/decision_maker_abci/0.1.0": "bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4", + "skill/valory/trader_abci/0.1.0": "bafybeibkhcsrn2sronqp7hzbd2y4enkqzplcjskc3awuurbdyuojps7wii", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigfzirazi34reprttloqmgeoh3pb7rfy2vj22tkbnddyjpuj2chia", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeiex4qauyjtzfkgq3ofrpfouj2mkm46bfvbkild73wbocg5zjp6e7e", - "service/valory/trader/0.1.0": "bafybeigmunwhmjxsjwjuwbu7nynj44tp6vjirol25noxwazoaem7mr3vae" + "agent/valory/trader/0.1.0": "bafybeidfdxvdvprh5mucckfu7o5klbwwjcob74beyjwss2tcxacl53g57a", + "service/valory/trader/0.1.0": "bafybeiai4fksud7ww352hptgj6csxwqsag4m7qka54nnatcwlwtt2zdari" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 200e002fa..ecccb4c75 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfzirazi34reprttloqmgeoh3pb7rfy2vj22tkbnddyjpuj2chia - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray -- valory/trader_abci:0.1.0:bafybeibivuckiaxvg7pgkm4eeqb4d25qlex3a32xbzxeffiohem7o5s5ca +- valory/decision_maker_abci:0.1.0:bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4 +- valory/trader_abci:0.1.0:bafybeibkhcsrn2sronqp7hzbd2y4enkqzplcjskc3awuurbdyuojps7wii - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index ab5585803..539110609 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeiex4qauyjtzfkgq3ofrpfouj2mkm46bfvbkild73wbocg5zjp6e7e +agent: valory/trader:0.1.0:bafybeidfdxvdvprh5mucckfu7o5klbwwjcob74beyjwss2tcxacl53g57a number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index f970ec609..2c6076e65 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -19,16 +19,12 @@ """This module contains the behaviour for the decision-making of the skill.""" +import json from math import prod from typing import Any, Generator, Optional, Tuple, Union -from packages.valory.contracts.mech.contract import Mech -from packages.valory.protocols.contract_api import ContractApiMessage -from packages.valory.skills.abstract_round_abci.base import get_name from packages.valory.skills.decision_maker_abci.behaviours.base import ( - CID_PREFIX, DecisionMakerBaseBehaviour, - WaitableConditionType, remove_fraction_wei, ) from packages.valory.skills.decision_maker_abci.io_.loader import ComponentPackageLoader @@ -42,7 +38,6 @@ from packages.valory.skills.market_manager_abci.bets import BINARY_N_SLOTS, Bet -ZERO_ADDRESS = "0x0000000000000000000000000000000000000000" SLIPPAGE = 1.05 @@ -54,21 +49,9 @@ class DecisionReceiveBehaviour(DecisionMakerBaseBehaviour): def __init__(self, **kwargs: Any) -> None: """Initialize Behaviour.""" super().__init__(**kwargs, loader_cls=ComponentPackageLoader) - self._from_block: int = 0 self._request_id: int = 0 - self._response_hex: str = "" self._mech_response: Optional[MechInteractionResponse] = None - @property - def from_block(self) -> int: - """Get the block number in which the request to the mech was settled.""" - return self._from_block - - @from_block.setter - def from_block(self, from_block: int) -> None: - """Set the block number in which the request to the mech was settled.""" - self._from_block = from_block - @property def request_id(self) -> int: """Get the request id.""" @@ -83,34 +66,6 @@ def request_id(self, request_id: Union[str, int]) -> None: msg = f"Request id {request_id} is not a valid integer!" self.context.logger.error(msg) - @property - def response_hex(self) -> str: - """Get the hash of the response data.""" - return self._response_hex - - @response_hex.setter - def response_hex(self, response_hash: bytes) -> None: - """Set the hash of the response data.""" - try: - self._response_hex = response_hash.hex() - except AttributeError: - msg = f"Response hash {response_hash!r} is not valid hex bytes!" - self.context.logger.error(msg) - - @property - def mech_response_api(self) -> MechResponseSpecs: - """Get the mech response api specs.""" - return self.context.mech_response - - def set_mech_response_specs(self) -> None: - """Set the mech's response specs.""" - full_ipfs_hash = CID_PREFIX + self.response_hex - ipfs_link = self.params.ipfs_address + full_ipfs_hash + f"/{self.request_id}" - # The url must be dynamically generated as it depends on the ipfs hash - self.mech_response_api.__dict__["_frozen"] = False - self.mech_response_api.url = ipfs_link - self.mech_response_api.__dict__["_frozen"] = True - @property def mech_response(self) -> MechInteractionResponse: """Get the mech's response.""" @@ -119,104 +74,20 @@ def mech_response(self) -> MechInteractionResponse: return MechInteractionResponse(error=error) return self._mech_response - def _get_block_number(self) -> WaitableConditionType: - """Get the block number in which the request to the mech was settled.""" - result = yield from self.contract_interact( - performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION, # type: ignore - # we do not need the address to get the block number, but the base method does - contract_address=ZERO_ADDRESS, - contract_public_id=Mech.contract_id, - contract_callable="get_block_number", - data_key="number", - placeholder=get_name(DecisionReceiveBehaviour.from_block), - tx_hash=self.synchronized_data.final_tx_hash, - ) - - return result - - def _get_request_id(self) -> WaitableConditionType: - """Get the request id.""" - result = yield from self._mech_contract_interact( - contract_callable="process_request_event", - data_key="requestId", - placeholder=get_name(DecisionReceiveBehaviour.request_id), - tx_hash=self.synchronized_data.final_tx_hash, - ) - return result - - def _get_response_hash(self) -> WaitableConditionType: - """Get the hash of the response data.""" - self.context.logger.info( - f"Filtering the mech's events from block {self.from_block} " - f"for a response to our request with id {self.request_id!r}." - ) - result = yield from self._mech_contract_interact( - contract_callable="get_response", - data_key="data", - placeholder=get_name(DecisionReceiveBehaviour.response_hex), - request_id=self.request_id, - from_block=self.from_block, - timeout=self.params.contract_timeout, - ) - - if result: - self.set_mech_response_specs() - - return result - - def _handle_response( - self, - res: Optional[str], - ) -> Optional[Any]: - """Handle the response from the IPFS. - - :param res: the response to handle. - :return: the response's result, using the given keys. `None` if response is `None` (has failed). - """ - if res is None: - msg = f"Could not get the mech's response from {self.mech_response_api.api_id}" - self.context.logger.error(msg) - self.mech_response_api.increment_retries() - return None - - self.context.logger.info(f"Retrieved the mech's response: {res}.") - self.mech_response_api.reset_retries() - return res - - def _get_response(self) -> WaitableConditionType: - """Get the response data from IPFS.""" - specs = self.mech_response_api.get_spec() - res_raw = yield from self.get_http_response(**specs) - res = self.mech_response_api.process_response(res_raw) - res = self._handle_response(res) - - if self.mech_response_api.is_retries_exceeded(): - error = "Retries were exceeded while trying to get the mech's response." + def _get_response(self) -> None: + """Get the response data.""" + mech_responses = self.synchronized_data.mech_responses + if not mech_responses: + error = "No Mech responses in synchronized_data." self._mech_response = MechInteractionResponse(error=error) - return True - if res is None: - return False - - try: - self._mech_response = MechInteractionResponse(**res) - except (ValueError, TypeError, KeyError): - self._mech_response = MechInteractionResponse.incorrect_format(res) - - return True + self._mech_response = mech_responses[0] def _get_decision( self, - ) -> Generator[None, None, Tuple[Optional[int], Optional[float], Optional[float]]]: + ) -> Tuple[Optional[int], Optional[float], Optional[float]]: """Get vote, win probability and confidence.""" - for step in ( - self._get_block_number, - self._get_request_id, - self._get_response_hash, - self._get_response, - ): - yield from self.wait_for_condition_with_sleep(step) - + self._get_response() self.context.logger.info(f"Decision has been received:\n{self.mech_response}") if self.mech_response.result is None: self.context.logger.error( @@ -224,10 +95,11 @@ def _get_decision( ) return None, None, None + result = json.loads(self.mech_response.result) return ( - self.mech_response.result.vote, - self.mech_response.result.win_probability, - self.mech_response.result.confidence, + result.vote, + result.win_probability, + result.confidence, ) @staticmethod @@ -361,7 +233,7 @@ def async_act(self) -> Generator: """Do the action.""" with self.context.benchmark_tool.measure(self.behaviour_id).local(): - vote, win_probability, confidence = yield from self._get_decision() + vote, win_probability, confidence = self._get_decision() is_profitable = None bet_amount = None if ( diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py index a3278910b..1a9164e9b 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py @@ -19,56 +19,21 @@ """This module contains the behaviour of the skill which is responsible for requesting a decision from the mech.""" -from dataclasses import asdict, dataclass, field -from pathlib import Path -from tempfile import mkdtemp -from typing import Any, Dict, Generator, Optional, cast +from dataclasses import asdict +from typing import Any, Dict, Generator, Optional from uuid import uuid4 -import multibase -import multicodec -from aea.helpers.cid import to_v1 -from hexbytes import HexBytes +import json -from packages.valory.contracts.erc20.contract import ERC20 -from packages.valory.contracts.gnosis_safe.contract import GnosisSafeContract -from packages.valory.contracts.transfer_nft_condition.contract import ( - TransferNftCondition, -) from packages.valory.skills.mech_interact_abci.states.base import ( MechMetadata, ) -from packages.valory.protocols.contract_api import ContractApiMessage -from packages.valory.skills.abstract_round_abci.base import get_name -from packages.valory.skills.abstract_round_abci.io_.store import SupportedFiletype -from packages.valory.skills.decision_maker_abci.behaviours.base import ( - DecisionMakerBaseBehaviour, - SAFE_GAS, - WXDAI, - WaitableConditionType, -) -from packages.valory.skills.decision_maker_abci.models import MultisendBatch -from packages.valory.skills.decision_maker_abci.payloads import MechRequestsPayload +from packages.valory.skills.decision_maker_abci.behaviours.base import DecisionMakerBaseBehaviour +from packages.valory.skills.decision_maker_abci.payloads import DecisionRequestPayload from packages.valory.skills.decision_maker_abci.states.decision_request import ( DecisionRequestRound, ) from packages.valory.skills.market_manager_abci.bets import BINARY_N_SLOTS -from packages.valory.skills.transaction_settlement_abci.payload_tools import ( - hash_payload_to_hex, -) - - -Ox = "0x" -APPROVE_MECH = True - - -# @dataclass -# class MechMetadata: -# """A Mech's metadata.""" - -# prompt: str -# tool: str -# nonce: str = field(default_factory=lambda: str(uuid4())) class DecisionRequestBehaviour(DecisionMakerBaseBehaviour): @@ -80,54 +45,17 @@ def __init__(self, **kwargs: Any) -> None: """Initialize Behaviour.""" super().__init__(**kwargs) self._metadata: Optional[MechMetadata] = None - self._request_data: bytes = b"" - self._price: int = 0 - - @property - def metadata_filepath(self) -> str: - """Get the filepath to the metadata.""" - return str(Path(mkdtemp()) / METADATA_FILENAME) @property def metadata(self) -> Dict[str, str]: """Get the metadata as a dictionary.""" return asdict(self._metadata) - @property - def request_data(self) -> bytes: - """Get the request data.""" - return self._request_data - - @request_data.setter - def request_data(self, data: bytes) -> None: - """Set the request data.""" - self._request_data = data - - @property - def price(self) -> int: - """Get the price.""" - return self._price - - @price.setter - def price(self, price: int) -> None: - """Set the price.""" - self._price = price - @property def n_slots_supported(self) -> bool: """Whether the behaviour supports the current number of slots as it currently only supports binary decisions.""" return self.params.slot_count == BINARY_N_SLOTS - @property - def xdai_deficit(self) -> int: - """Get the amount of missing xDAI for sending the request.""" - return self.price - self.wallet_balance - - @property - def multisend_optional(self) -> bool: - """Whether a multisend transaction does not need to be prepared.""" - return len(self.multisend_batches) == 0 - def setup(self) -> None: """Setup behaviour.""" if not self.n_slots_supported: @@ -139,178 +67,18 @@ def setup(self) -> None: ) prompt = self.params.prompt_template.substitute(prompt_params) tool = self.synchronized_data.mech_tool - self._metadata = MechMetadata(prompt, tool) + nonce = str(uuid4()) + self._metadata = MechMetadata(prompt, tool, nonce) msg = f"Prepared metadata {self.metadata!r} for the request." self.context.logger.info(msg) - def _get_price(self) -> WaitableConditionType: - """Get the price of the mech request.""" - if self.params.use_nevermined: - # when we use nevermined, we don't need to pay for the mech request - return True - result = yield from self._mech_contract_interact( - "get_price", "price", get_name(DecisionRequestBehaviour.price) - ) - return result - - def _is_approved_for_all(self) -> Generator[None, None, Optional[bool]]: - """Check whether the mech is approved to spend the mech subscription.""" - response_msg = yield from self.get_contract_api_response( - performative=ContractApiMessage.Performative.GET_STATE, # type: ignore - contract_address=self.token_address, - contract_id=str(TransferNftCondition.contract_id), - contract_callable="is_approved_for_all", - account=self.synchronized_data.safe_contract_address, - operator=self.params.mech_contract_address, - ) - if response_msg.performative != ContractApiMessage.Performative.STATE: - self.context.logger.info( - f"Could not get `TransferNftCondition.is_approved_for_all`: {response_msg}" - ) - return None - - return response_msg.state.body.get("data") - - def _build_unwrap_tx(self) -> WaitableConditionType: - """Exchange wxDAI to xDAI.""" - response_msg = yield from self.get_contract_api_response( - performative=ContractApiMessage.Performative.GET_STATE, # type: ignore - contract_address=WXDAI, - contract_id=str(ERC20.contract_id), - contract_callable="build_withdraw_tx", - amount=self.xdai_deficit, - ) - - if response_msg.performative != ContractApiMessage.Performative.STATE: - self.context.logger.info(f"Could not build withdraw tx: {response_msg}") - return False - - withdraw_data = response_msg.state.body.get("data") - if withdraw_data is None: - self.context.logger.info(f"Could not build withdraw tx: {response_msg}") - return False - - batch = MultisendBatch( - to=self.collateral_token, - data=HexBytes(withdraw_data), - ) - self.multisend_batches.append(batch) - return True - - def _check_unwrap(self) -> WaitableConditionType: - """Check whether the payment for the mech request is possible and unwrap some wxDAI if needed.""" - yield from self.wait_for_condition_with_sleep(self.check_balance) - missing = self.xdai_deficit - if missing <= 0: - return True - - # if the collateral token is wxDAI, subtract the wxDAI balance from the xDAI that is missing for paying the mech - if self.is_wxdai: - missing -= self.token_balance - - # if we can cover the required amount by unwrapping some wxDAI, proceed to add this to a multisend tx - if missing <= 0: - yield from self.wait_for_condition_with_sleep(self._build_unwrap_tx) - return True - - balance_info = "The balance is not enough to pay for the mech's price" - refill_info = f". Please refill the safe with at least {self.wei_to_native(missing)} xDAI or wxDAI." - if not self.params.using_kelly: - balance_info += " and place the maximum bet amount" - refill_info += ( - " Alternatively, you could decrease the configured bet amounts." - ) - self.context.logger.warning(balance_info + refill_info) - self.sleep(self.params.sleep_time) - return False - - def _build_request_data(self) -> Generator[None, None, bool]: - """Get the request tx data encoded.""" - result = yield from self._mech_contract_interact( - "get_request_data", - "data", - get_name(DecisionRequestBehaviour.request_data), - request_data=self._v1_hex_truncated, - ) - - if not result: - return False - - if self.multisend_optional: - return True - - batch = MultisendBatch( - to=self.params.mech_contract_address, - data=HexBytes(self.request_data), - value=self.price, - ) - self.multisend_batches.append(batch) - return True - - def _get_safe_tx_hash(self) -> Generator[None, None, bool]: - """Prepares and returns the safe tx hash.""" - status = yield from self.contract_interact( - performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION, # type: ignore - contract_address=self.synchronized_data.safe_contract_address, - contract_public_id=GnosisSafeContract.contract_id, - contract_callable="get_raw_safe_transaction_hash", - to_address=self.params.mech_contract_address, - value=self.price, - data=self.request_data, - data_key="tx_hash", - placeholder=get_name(DecisionRequestBehaviour.safe_tx_hash), - ) - return status - - def _single_tx(self) -> Generator[None, None, str]: - """Prepare a hex for a single transaction.""" - yield from self.wait_for_condition_with_sleep(self._get_safe_tx_hash) - return hash_payload_to_hex( - self.safe_tx_hash, - self.price, - SAFE_GAS, - self.params.mech_contract_address, - self.request_data, - ) - - def _multisend_tx(self) -> Generator[None, None, str]: - """Prepare a hex for a multisend transaction.""" - for step in ( - self._build_multisend_data, - self._build_multisend_safe_tx_hash, - ): - yield from self.wait_for_condition_with_sleep(step) - - tx_hex = self.tx_hex - if tx_hex is None: - raise ValueError("The multisend transaction was not prepared properly.") - return tx_hex - - def _prepare_safe_tx(self) -> Generator[None, None, str]: - """Prepare the safe transaction for sending a request to mech and return the hex for the tx settlement skill.""" - for step in ( - self._send_metadata_to_ipfs, - self._get_price, - self._check_unwrap, - self._check_nevermined_subscription, - self._build_request_data, - ): - yield from self.wait_for_condition_with_sleep(step) - - if self.multisend_optional: - tx_hex = yield from self._single_tx() - else: - tx_hex = yield from self._multisend_tx() - - return tx_hex - def async_act(self) -> Generator: """Do the action.""" with self.context.benchmark_tool.measure(self.behaviour_id).local(): - tx_submitter = mech_tx_hex = price = None + mech_requests = [] if self.n_slots_supported: - tx_submitter = self.matching_round.auto_round_id() - mech_tx_hex = yield from self._prepare_safe_tx() + mech_requests.append(self.metadata) + serialized_mech_requests = json.dumps(mech_requests, sort_keys=True) agent = self.context.agent_address - payload = MechRequestsPayload(agent, mech_requests) + payload = DecisionRequestPayload(agent, serialized_mech_requests) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/payloads.py b/packages/valory/skills/decision_maker_abci/payloads.py index 41d61e44f..519a3adc0 100644 --- a/packages/valory/skills/decision_maker_abci/payloads.py +++ b/packages/valory/skills/decision_maker_abci/payloads.py @@ -62,7 +62,7 @@ class RedeemPayload(MultisigTxPayload): @dataclass(frozen=True) -class MechRequestsPayload(BaseTxPayload): +class DecisionRequestPayload(BaseTxPayload): """Represents a transaction payload for preparing mech requests.""" mech_requests: Optional[str] = None diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index 65261c5d3..fc0e01eff 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -200,7 +200,6 @@ class DecisionMakerAbciApp(AbciApp[Event]): }, DecisionRequestRound: { Event.DONE: FinishedDecisionRequestRound, - Event.SLOTS_UNSUPPORTED_ERROR: BlacklistingRound, Event.NO_MAJORITY: DecisionRequestRound, Event.ROUND_TIMEOUT: DecisionRequestRound, # this is here because of `autonomy analyse fsm-specs` falsely reporting it as missing from the transition diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 7e452ac06..2414de0af 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -16,8 +16,8 @@ fingerprint: behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca - behaviours/decision_receive.py: bafybeiapkbvoqtlsisntdmmbw64zjuembaphsktn45smij5uocm3yxvml4 - behaviours/decision_request.py: bafybeicoyoclqbvyzwdoiw3x2tktammizwsohux7nl2x7g4ae5j5lyiley + behaviours/decision_receive.py: bafybeifomfppscmfnyttp4c3cegvdqb6nnupvsaeo2kgov7s4zxc72zfze + behaviours/decision_request.py: bafybeibbbhl4zqswg4pnnd5bwr2hzyk4luzx3cvgbr753ipvhe67zoyxty behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeifygejified3yoza3gy4g7ina6m4lmz4pp2abtwfuwrmiwznnvrua behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q @@ -30,18 +30,18 @@ fingerprint: handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeiezzu5by7vrr2ekcsqc5q6bb4qf5pl6svj34dxuu73mq5iphbz7lu - payloads.py: bafybeibmjrckgsflqulviynadl6bx3keuabvhfolkiib7cmjhfsov2vuty + models.py: bafybeiemsd445cbcvegbo7dy7wec6mdkdqpohx55z57cnds4y2zdoygram + payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeielsnwnvnrofn7vfm6t4y2pocbav7za6shia5w5icapzgh3lkimo4 + rounds.py: bafybeibprqfkjh46faywklo3oxyqsnus7obqdctgzctokqfbybyg6pgle4 states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeid4khumtvfw5n37avkf3kujfxdwhfjcsnzpmyjeljkpcako5f2duy + states/base.py: bafybeib57mslt7fh5ajdcnzjlq6xojyuruokrpkiaxbngp72ctxlf2bowe states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda states/blacklisting.py: bafybeifruvxwwltndwazkzzbpc5nnnad3z5t5ofy6d3i7nssljbxl6gvxu states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne states/decision_receive.py: bafybeib3roo27nccj4eylaqwwzztzzzwsi6px5atjrch5wbqmpln2kyy6y - states/decision_request.py: bafybeic7otc3hjb753svbmur3yyk6szahc25yii3x4w4vcnpfz6jwvacuu + states/decision_request.py: bafybeiakx6o6pjms5swjefq2fqpub7j2kz4rjzmecm6x7qf5lhsqh4o2uq states/final_states.py: bafybeiantsmq3yuzg7qzk6hlyngj74jsx43rphghfwsvseakcxmu3n4kqm states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm states/order_subscription.py: bafybeiaoemltuh3zkch7hvaxzxxsofe3pomlgifj5hamkqqon5mg5eaoqq diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index 3af014108..c5d259ae1 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -30,6 +30,10 @@ ) from packages.valory.skills.decision_maker_abci.payloads import MultisigTxPayload from packages.valory.skills.decision_maker_abci.policy import EGreedyPolicy +from packages.valory.skills.mech_interact_abci.states.base import ( + MechInteractionResponse, + MechMetadata, +) from packages.valory.skills.market_manager_abci.rounds import ( SynchronizedData as MarketManagerSyncedData, ) diff --git a/packages/valory/skills/decision_maker_abci/states/decision_request.py b/packages/valory/skills/decision_maker_abci/states/decision_request.py index fb11239b2..c7c49131e 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_request.py @@ -19,25 +19,26 @@ """This module contains the decision requesting state of the decision-making abci app.""" -from typing import Type - -from packages.valory.skills.abstract_round_abci.base import get_name +from packages.valory.skills.abstract_round_abci.base import ( + CollectSameUntilThresholdRound, + get_name, +) from packages.valory.skills.decision_maker_abci.payloads import ( - MultisigTxPayload, - RequestPayload, + DecisionRequestPayload, ) from packages.valory.skills.decision_maker_abci.states.base import ( Event, SynchronizedData, - TxPreparationRound, ) -class DecisionRequestRound(TxPreparationRound): +class DecisionRequestRound(CollectSameUntilThresholdRound): """A round in which the agents prepare a tx to initiate a request to a mech to determine the answer to a bet.""" - payload_class: Type[MultisigTxPayload] = RequestPayload - selection_key = TxPreparationRound.selection_key + ( - get_name(SynchronizedData.mech_price), - ) + payload_class: DecisionRequestPayload + synchronized_data_class = SynchronizedData + done_event = Event.DONE + none_event = Event.NONE + no_majority_event = Event.NO_MAJORITY + selection_key = get_name(SynchronizedData.mech_requests) none_event = Event.SLOTS_UNSUPPORTED_ERROR diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 12c7d81cb..6a98404af 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -8,12 +8,12 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiab4xgadptz4mhvno4p6xvkh7p4peg7iuhotabydriu74dmj6ljga __init__.py: bafybeido7wa33h4dtleap57vzgyb4fsofk4vindsqcekyfo5i56i2rll2a - behaviours.py: bafybeieesrefrpo5c5upzztgm5fwfrmxeagilacuau5nacobhsfvgpbzby + behaviours.py: bafybeigx2uevbnytt6hpwfsrk32u6pyv5scyqvyyzm2a25xaufrxvkldxi composition.py: bafybeia5owijnwulgo7oao5aeosukwzprh5tlbdsjwlqkdjo7vl5jn7mom dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeibi3t63vwfrx5sbkfhji3rb62dtwczpajuijqgul6bpcn3altcziq handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a - models.py: bafybeibrxivgpzamfmrl6bdngi67g72i32lmu5vgdn3jbwka265blk7ire + models.py: bafybeihkk65y7iqldhng3bkdlpczt433mgjub4ovag3nbypmvne75e4eya fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighu2olwydxzpdcffe2yxegkluraaquf4ez6ilmprgrppkhgxrd7e +- valory/decision_maker_abci:0.1.0:bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfzirazi34reprttloqmgeoh3pb7rfy2vj22tkbnddyjpuj2chia - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeicjunamybs27vwz2jz5hdrtkrtr2xwy2a5dyhbqksjrgh266qpnha +- valory/mech_interact_abci:0.1.0:bafybeih6j3mzzaejy77dut2omoyojgvlayyqjwgm4ihe4afwu2hs3wptje behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 313e4db29..d1c2f35c4 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeie62omqel7csugckypp6inkongof4e5zbidjvacdrpfrqicbrbray +- valory/decision_maker_abci:0.1.0:bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4 - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi behaviours: main: From a4e0496314a142f0da9e2c62faeb49f6ed79d546 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 22 Mar 2024 17:42:22 +0100 Subject: [PATCH 07/24] [no ci] chore: fixes --- packages/packages.json | 12 +- packages/valory/agents/trader/aea-config.yaml | 7 +- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/decision_receive.py | 6 +- .../behaviours/decision_request.py | 9 +- .../skills/decision_maker_abci/rounds.py | 1 - .../skills/decision_maker_abci/skill.yaml | 11 +- .../skills/decision_maker_abci/states/base.py | 6 +- .../states/decision_request.py | 6 +- .../valory/skills/trader_abci/composition.py | 22 +- packages/valory/skills/trader_abci/models.py | 18 +- packages/valory/skills/trader_abci/skill.yaml | 10 +- .../tx_settlement_multiplexer_abci/skill.yaml | 3 +- poetry.lock | 227 +++++++++--------- 14 files changed, 171 insertions(+), 169 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 48b99a814..5557e549b 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4", - "skill/valory/trader_abci/0.1.0": "bafybeibkhcsrn2sronqp7hzbd2y4enkqzplcjskc3awuurbdyuojps7wii", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigfzirazi34reprttloqmgeoh3pb7rfy2vj22tkbnddyjpuj2chia", + "skill/valory/decision_maker_abci/0.1.0": "bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm", + "skill/valory/trader_abci/0.1.0": "bafybeiejondt4zdaiazwrfs3r36m2vvrdrljg2vx7owxtugazs7uo43uxu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeidfdxvdvprh5mucckfu7o5klbwwjcob74beyjwss2tcxacl53g57a", - "service/valory/trader/0.1.0": "bafybeiai4fksud7ww352hptgj6csxwqsag4m7qka54nnatcwlwtt2zdari" + "agent/valory/trader/0.1.0": "bafybeic6fkjcjzxn5mtzmmz44df6zlv4slycwvzn33bmfa3mowdq24ihny", + "service/valory/trader/0.1.0": "bafybeibaqgtyoxxj4vyqhpjv7ragfpblnq6qyeazwqq6gbupqrqoguejj4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -39,7 +39,7 @@ "connection/valory/ledger/0.19.0": "bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", "connection/valory/ipfs/0.1.0": "bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii", - "skill/valory/mech_interact_abci/0.1.0": "bafybeih6j3mzzaejy77dut2omoyojgvlayyqjwgm4ihe4afwu2hs3wptje", + "skill/valory/mech_interact_abci/0.1.0": "bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury", "skill/valory/abstract_abci/0.1.0": "bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre", "skill/valory/reset_pause_abci/0.1.0": "bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu", "skill/valory/registration_abci/0.1.0": "bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index ecccb4c75..544fa0e68 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,11 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfzirazi34reprttloqmgeoh3pb7rfy2vj22tkbnddyjpuj2chia +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4 -- valory/trader_abci:0.1.0:bafybeibkhcsrn2sronqp7hzbd2y4enkqzplcjskc3awuurbdyuojps7wii +- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm +- valory/trader_abci:0.1.0:bafybeiejondt4zdaiazwrfs3r36m2vvrdrljg2vx7owxtugazs7uo43uxu - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi +- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 539110609..6113a0e04 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeidfdxvdvprh5mucckfu7o5klbwwjcob74beyjwss2tcxacl53g57a +agent: valory/trader:0.1.0:bafybeic6fkjcjzxn5mtzmmz44df6zlv4slycwvzn33bmfa3mowdq24ihny number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index 2c6076e65..10e948a18 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -28,14 +28,14 @@ remove_fraction_wei, ) from packages.valory.skills.decision_maker_abci.io_.loader import ComponentPackageLoader -from packages.valory.skills.mech_interact_abci.states.base import ( - MechInteractionResponse, -) from packages.valory.skills.decision_maker_abci.payloads import DecisionReceivePayload from packages.valory.skills.decision_maker_abci.states.decision_receive import ( DecisionReceiveRound, ) from packages.valory.skills.market_manager_abci.bets import BINARY_N_SLOTS, Bet +from packages.valory.skills.mech_interact_abci.states.base import ( + MechInteractionResponse, +) SLIPPAGE = 1.05 diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py index 1a9164e9b..2a485e143 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py @@ -19,21 +19,20 @@ """This module contains the behaviour of the skill which is responsible for requesting a decision from the mech.""" +import json from dataclasses import asdict from typing import Any, Dict, Generator, Optional from uuid import uuid4 -import json - -from packages.valory.skills.mech_interact_abci.states.base import ( - MechMetadata, +from packages.valory.skills.decision_maker_abci.behaviours.base import ( + DecisionMakerBaseBehaviour, ) -from packages.valory.skills.decision_maker_abci.behaviours.base import DecisionMakerBaseBehaviour from packages.valory.skills.decision_maker_abci.payloads import DecisionRequestPayload from packages.valory.skills.decision_maker_abci.states.decision_request import ( DecisionRequestRound, ) from packages.valory.skills.market_manager_abci.bets import BINARY_N_SLOTS +from packages.valory.skills.mech_interact_abci.states.base import MechMetadata class DecisionRequestBehaviour(DecisionMakerBaseBehaviour): diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index fc0e01eff..05609c45a 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -259,7 +259,6 @@ class DecisionMakerAbciApp(AbciApp[Event]): get_name(SynchronizedData.utilized_tools), get_name(SynchronizedData.redeemed_condition_ids), get_name(SynchronizedData.payout_so_far), - get_name(SynchronizedData.mech_price), } ) final_states: Set[AppState] = { diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 2414de0af..0a42dc82c 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -16,8 +16,8 @@ fingerprint: behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca - behaviours/decision_receive.py: bafybeifomfppscmfnyttp4c3cegvdqb6nnupvsaeo2kgov7s4zxc72zfze - behaviours/decision_request.py: bafybeibbbhl4zqswg4pnnd5bwr2hzyk4luzx3cvgbr753ipvhe67zoyxty + behaviours/decision_receive.py: bafybeidgka77mwaadjjomov53z7jd2dr3a3szhcxulglogzyfgzqip3qlm + behaviours/decision_request.py: bafybeicv2c5nwipgn6juhgohl7sol3bwkfknsvcrfcswbulukxkczi444i behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeifygejified3yoza3gy4g7ina6m4lmz4pp2abtwfuwrmiwznnvrua behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q @@ -34,14 +34,14 @@ fingerprint: payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeibprqfkjh46faywklo3oxyqsnus7obqdctgzctokqfbybyg6pgle4 + rounds.py: bafybeifz6kdjusm5ovcetjjuzfgthgbxfuyrbphwlm6qmzxp2dik3j6s6e states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeib57mslt7fh5ajdcnzjlq6xojyuruokrpkiaxbngp72ctxlf2bowe + states/base.py: bafybeieyo3oqktvklpofcyyzqa3hsfv4rhon6cahjd5euq32rdtuxvft74 states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda states/blacklisting.py: bafybeifruvxwwltndwazkzzbpc5nnnad3z5t5ofy6d3i7nssljbxl6gvxu states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne states/decision_receive.py: bafybeib3roo27nccj4eylaqwwzztzzzwsi6px5atjrch5wbqmpln2kyy6y - states/decision_request.py: bafybeiakx6o6pjms5swjefq2fqpub7j2kz4rjzmecm6x7qf5lhsqh4o2uq + states/decision_request.py: bafybeia2ngyq4jbxjxaft4pobndrzm4kvxltcvrnzvr7ed6gyuqhst3sta states/final_states.py: bafybeiantsmq3yuzg7qzk6hlyngj74jsx43rphghfwsvseakcxmu3n4kqm states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm states/order_subscription.py: bafybeiaoemltuh3zkch7hvaxzxxsofe3pomlgifj5hamkqqon5mg5eaoqq @@ -76,6 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 +- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: main: args: {} diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index c5d259ae1..2be21dcc5 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -30,13 +30,13 @@ ) from packages.valory.skills.decision_maker_abci.payloads import MultisigTxPayload from packages.valory.skills.decision_maker_abci.policy import EGreedyPolicy +from packages.valory.skills.market_manager_abci.rounds import ( + SynchronizedData as MarketManagerSyncedData, +) from packages.valory.skills.mech_interact_abci.states.base import ( MechInteractionResponse, MechMetadata, ) -from packages.valory.skills.market_manager_abci.rounds import ( - SynchronizedData as MarketManagerSyncedData, -) from packages.valory.skills.transaction_settlement_abci.rounds import ( SynchronizedData as TxSettlementSyncedData, ) diff --git a/packages/valory/skills/decision_maker_abci/states/decision_request.py b/packages/valory/skills/decision_maker_abci/states/decision_request.py index c7c49131e..213e1a481 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_request.py @@ -23,9 +23,7 @@ CollectSameUntilThresholdRound, get_name, ) -from packages.valory.skills.decision_maker_abci.payloads import ( - DecisionRequestPayload, -) +from packages.valory.skills.decision_maker_abci.payloads import DecisionRequestPayload from packages.valory.skills.decision_maker_abci.states.base import ( Event, SynchronizedData, @@ -35,7 +33,7 @@ class DecisionRequestRound(CollectSameUntilThresholdRound): """A round in which the agents prepare a tx to initiate a request to a mech to determine the answer to a bet.""" - payload_class: DecisionRequestPayload + payload_class = DecisionRequestPayload synchronized_data_class = SynchronizedData done_event = Event.DONE none_event = Event.NONE diff --git a/packages/valory/skills/trader_abci/composition.py b/packages/valory/skills/trader_abci/composition.py index 9026832c2..eadee3f53 100644 --- a/packages/valory/skills/trader_abci/composition.py +++ b/packages/valory/skills/trader_abci/composition.py @@ -50,6 +50,15 @@ MarketManagerAbciApp, UpdateBetsRound, ) +from packages.valory.skills.mech_interact_abci.rounds import MechInteractAbciApp +from packages.valory.skills.mech_interact_abci.states.final_states import ( + FinishedMechRequestRound, + FinishedMechRequestSkipRound, + FinishedMechResponseRound, + FinishedMechResponseTimeoutRound, +) +from packages.valory.skills.mech_interact_abci.states.request import MechRequestRound +from packages.valory.skills.mech_interact_abci.states.response import MechResponseRound from packages.valory.skills.registration_abci.rounds import ( AgentRegistrationAbciApp, FinishedRegistrationRound, @@ -91,18 +100,6 @@ TxSettlementMultiplexerAbciApp, ) -from packages.valory.skills.mech_interact_abci.states.final_states import ( - FinishedMechRequestRound, - FinishedMechResponseRound, - FinishedMechRequestSkipRound, - FinishedMechResponseTimeoutRound, -) -from packages.valory.skills.mech_interact_abci.states.request import ( - MechRequestRound, -) -from packages.valory.skills.mech_interact_abci.states.response import ( - MechResponseRound, -) abci_app_transition_mapping: AbciAppTransitionMapping = { FinishedRegistrationRound: UpdateBetsRound, @@ -144,6 +141,7 @@ AgentRegistrationAbciApp, DecisionMakerAbciApp, MarketManagerAbciApp, + MechInteractAbciApp, TransactionSubmissionAbciApp, TxSettlementMultiplexerAbciApp, ResetPauseAbciApp, diff --git a/packages/valory/skills/trader_abci/models.py b/packages/valory/skills/trader_abci/models.py index 9676d32e0..07710137e 100644 --- a/packages/valory/skills/trader_abci/models.py +++ b/packages/valory/skills/trader_abci/models.py @@ -45,12 +45,6 @@ from packages.valory.skills.decision_maker_abci.rounds import ( Event as DecisionMakerEvent, ) -from packages.valory.skills.mech_interact_abci.models import ( - MechResponseSpecs as BaseMechResponseSpecs, -) -from packages.valory.skills.mech_interact_abci.models import ( - Params as MechInteractParams, -) from packages.valory.skills.market_manager_abci.models import ( NetworkSubgraph as MarketManagerNetworkSubgraph, ) @@ -60,6 +54,12 @@ from packages.valory.skills.market_manager_abci.rounds import ( Event as MarketManagerEvent, ) +from packages.valory.skills.mech_interact_abci.models import ( + MechResponseSpecs as BaseMechResponseSpecs, +) +from packages.valory.skills.mech_interact_abci.models import ( + Params as MechInteractParams, +) from packages.valory.skills.reset_pause_abci.rounds import Event as ResetPauseEvent from packages.valory.skills.staking_abci.models import StakingParams from packages.valory.skills.termination_abci.models import TerminationParams @@ -101,7 +101,11 @@ class RandomnessApi(ApiSpecs): class TraderParams( - DecisionMakerParams, MechInteractParams, TerminationParams, StakingParams, TxSettlementMultiplexerParams + DecisionMakerParams, + MechInteractParams, + TerminationParams, + StakingParams, + TxSettlementMultiplexerParams, ): """A model to represent the trader params.""" diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 6a98404af..7b083164f 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -9,11 +9,11 @@ fingerprint: README.md: bafybeiab4xgadptz4mhvno4p6xvkh7p4peg7iuhotabydriu74dmj6ljga __init__.py: bafybeido7wa33h4dtleap57vzgyb4fsofk4vindsqcekyfo5i56i2rll2a behaviours.py: bafybeigx2uevbnytt6hpwfsrk32u6pyv5scyqvyyzm2a25xaufrxvkldxi - composition.py: bafybeia5owijnwulgo7oao5aeosukwzprh5tlbdsjwlqkdjo7vl5jn7mom + composition.py: bafybeidvxtqoghju4tkesiwi6qfzxe3zf2nbqmehimwvp5skmohkeozmei dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeibi3t63vwfrx5sbkfhji3rb62dtwczpajuijqgul6bpcn3altcziq handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a - models.py: bafybeihkk65y7iqldhng3bkdlpczt433mgjub4ovag3nbypmvne75e4eya + models.py: bafybeifci6cpttw33v77vszo7zncxityjjbviyv5glt76byrv7fu3cpcye fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfzirazi34reprttloqmgeoh3pb7rfy2vj22tkbnddyjpuj2chia +- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeih6j3mzzaejy77dut2omoyojgvlayyqjwgm4ihe4afwu2hs3wptje +- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index d1c2f35c4..5a7e658bb 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,8 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeigskdplh3ulkb75xzne2o2vtby5b5f5uw74qcoqygrg4xhpiinvt4 +- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi +- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: main: args: {} diff --git a/poetry.lock b/poetry.lock index ca0c66df2..e92136bda 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.4.0 and should not be changed by hand. +# This file is automatically @generated by Poetry and should not be changed by hand. [[package]] name = "aiohttp" @@ -547,64 +547,64 @@ requests = "*" [[package]] name = "coverage" -version = "7.4.3" +version = "7.4.4" description = "Code coverage measurement for Python" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.4.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8580b827d4746d47294c0e0b92854c85a92c2227927433998f0d3320ae8a71b6"}, - {file = "coverage-7.4.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:718187eeb9849fc6cc23e0d9b092bc2348821c5e1a901c9f8975df0bc785bfd4"}, - {file = "coverage-7.4.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:767b35c3a246bcb55b8044fd3a43b8cd553dd1f9f2c1eeb87a302b1f8daa0524"}, - {file = "coverage-7.4.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae7f19afe0cce50039e2c782bff379c7e347cba335429678450b8fe81c4ef96d"}, - {file = "coverage-7.4.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba3a8aaed13770e970b3df46980cb068d1c24af1a1968b7818b69af8c4347efb"}, - {file = "coverage-7.4.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ee866acc0861caebb4f2ab79f0b94dbfbdbfadc19f82e6e9c93930f74e11d7a0"}, - {file = "coverage-7.4.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:506edb1dd49e13a2d4cac6a5173317b82a23c9d6e8df63efb4f0380de0fbccbc"}, - {file = "coverage-7.4.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd6545d97c98a192c5ac995d21c894b581f1fd14cf389be90724d21808b657e2"}, - {file = "coverage-7.4.3-cp310-cp310-win32.whl", hash = "sha256:f6a09b360d67e589236a44f0c39218a8efba2593b6abdccc300a8862cffc2f94"}, - {file = "coverage-7.4.3-cp310-cp310-win_amd64.whl", hash = "sha256:18d90523ce7553dd0b7e23cbb28865db23cddfd683a38fb224115f7826de78d0"}, - {file = "coverage-7.4.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cbbe5e739d45a52f3200a771c6d2c7acf89eb2524890a4a3aa1a7fa0695d2a47"}, - {file = "coverage-7.4.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:489763b2d037b164846ebac0cbd368b8a4ca56385c4090807ff9fad817de4113"}, - {file = "coverage-7.4.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:451f433ad901b3bb00184d83fd83d135fb682d780b38af7944c9faeecb1e0bfe"}, - {file = "coverage-7.4.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fcc66e222cf4c719fe7722a403888b1f5e1682d1679bd780e2b26c18bb648cdc"}, - {file = "coverage-7.4.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3ec74cfef2d985e145baae90d9b1b32f85e1741b04cd967aaf9cfa84c1334f3"}, - {file = "coverage-7.4.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:abbbd8093c5229c72d4c2926afaee0e6e3140de69d5dcd918b2921f2f0c8baba"}, - {file = "coverage-7.4.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:35eb581efdacf7b7422af677b92170da4ef34500467381e805944a3201df2079"}, - {file = "coverage-7.4.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8249b1c7334be8f8c3abcaaa996e1e4927b0e5a23b65f5bf6cfe3180d8ca7840"}, - {file = "coverage-7.4.3-cp311-cp311-win32.whl", hash = "sha256:cf30900aa1ba595312ae41978b95e256e419d8a823af79ce670835409fc02ad3"}, - {file = "coverage-7.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:18c7320695c949de11a351742ee001849912fd57e62a706d83dfc1581897fa2e"}, - {file = "coverage-7.4.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b51bfc348925e92a9bd9b2e48dad13431b57011fd1038f08316e6bf1df107d10"}, - {file = "coverage-7.4.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d6cdecaedea1ea9e033d8adf6a0ab11107b49571bbb9737175444cea6eb72328"}, - {file = "coverage-7.4.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b2eccb883368f9e972e216c7b4c7c06cabda925b5f06dde0650281cb7666a30"}, - {file = "coverage-7.4.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c00cdc8fa4e50e1cc1f941a7f2e3e0f26cb2a1233c9696f26963ff58445bac7"}, - {file = "coverage-7.4.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9a4a8dd3dcf4cbd3165737358e4d7dfbd9d59902ad11e3b15eebb6393b0446e"}, - {file = "coverage-7.4.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:062b0a75d9261e2f9c6d071753f7eef0fc9caf3a2c82d36d76667ba7b6470003"}, - {file = "coverage-7.4.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:ebe7c9e67a2d15fa97b77ea6571ce5e1e1f6b0db71d1d5e96f8d2bf134303c1d"}, - {file = "coverage-7.4.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:c0a120238dd71c68484f02562f6d446d736adcc6ca0993712289b102705a9a3a"}, - {file = "coverage-7.4.3-cp312-cp312-win32.whl", hash = "sha256:37389611ba54fd6d278fde86eb2c013c8e50232e38f5c68235d09d0a3f8aa352"}, - {file = "coverage-7.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:d25b937a5d9ffa857d41be042b4238dd61db888533b53bc76dc082cb5a15e914"}, - {file = "coverage-7.4.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:28ca2098939eabab044ad68850aac8f8db6bf0b29bc7f2887d05889b17346454"}, - {file = "coverage-7.4.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:280459f0a03cecbe8800786cdc23067a8fc64c0bd51dc614008d9c36e1659d7e"}, - {file = "coverage-7.4.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c0cdedd3500e0511eac1517bf560149764b7d8e65cb800d8bf1c63ebf39edd2"}, - {file = "coverage-7.4.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a9babb9466fe1da12417a4aed923e90124a534736de6201794a3aea9d98484e"}, - {file = "coverage-7.4.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dec9de46a33cf2dd87a5254af095a409ea3bf952d85ad339751e7de6d962cde6"}, - {file = "coverage-7.4.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:16bae383a9cc5abab9bb05c10a3e5a52e0a788325dc9ba8499e821885928968c"}, - {file = "coverage-7.4.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2c854ce44e1ee31bda4e318af1dbcfc929026d12c5ed030095ad98197eeeaed0"}, - {file = "coverage-7.4.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ce8c50520f57ec57aa21a63ea4f325c7b657386b3f02ccaedeccf9ebe27686e1"}, - {file = "coverage-7.4.3-cp38-cp38-win32.whl", hash = "sha256:708a3369dcf055c00ddeeaa2b20f0dd1ce664eeabde6623e516c5228b753654f"}, - {file = "coverage-7.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:1bf25fbca0c8d121a3e92a2a0555c7e5bc981aee5c3fdaf4bb7809f410f696b9"}, - {file = "coverage-7.4.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3b253094dbe1b431d3a4ac2f053b6d7ede2664ac559705a704f621742e034f1f"}, - {file = "coverage-7.4.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:77fbfc5720cceac9c200054b9fab50cb2a7d79660609200ab83f5db96162d20c"}, - {file = "coverage-7.4.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6679060424faa9c11808598504c3ab472de4531c571ab2befa32f4971835788e"}, - {file = "coverage-7.4.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4af154d617c875b52651dd8dd17a31270c495082f3d55f6128e7629658d63765"}, - {file = "coverage-7.4.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8640f1fde5e1b8e3439fe482cdc2b0bb6c329f4bb161927c28d2e8879c6029ee"}, - {file = "coverage-7.4.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:69b9f6f66c0af29642e73a520b6fed25ff9fd69a25975ebe6acb297234eda501"}, - {file = "coverage-7.4.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0842571634f39016a6c03e9d4aba502be652a6e4455fadb73cd3a3a49173e38f"}, - {file = "coverage-7.4.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a78ed23b08e8ab524551f52953a8a05d61c3a760781762aac49f8de6eede8c45"}, - {file = "coverage-7.4.3-cp39-cp39-win32.whl", hash = "sha256:c0524de3ff096e15fcbfe8f056fdb4ea0bf497d584454f344d59fce069d3e6e9"}, - {file = "coverage-7.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:0209a6369ccce576b43bb227dc8322d8ef9e323d089c6f3f26a597b09cb4d2aa"}, - {file = "coverage-7.4.3-pp38.pp39.pp310-none-any.whl", hash = "sha256:7cbde573904625509a3f37b6fecea974e363460b556a627c60dc2f47e2fffa51"}, - {file = "coverage-7.4.3.tar.gz", hash = "sha256:276f6077a5c61447a48d133ed13e759c09e62aff0dc84274a68dc18660104d52"}, + {file = "coverage-7.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0be5efd5127542ef31f165de269f77560d6cdef525fffa446de6f7e9186cfb2"}, + {file = "coverage-7.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ccd341521be3d1b3daeb41960ae94a5e87abe2f46f17224ba5d6f2b8398016cf"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09fa497a8ab37784fbb20ab699c246053ac294d13fc7eb40ec007a5043ec91f8"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1a93009cb80730c9bca5d6d4665494b725b6e8e157c1cb7f2db5b4b122ea562"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:690db6517f09336559dc0b5f55342df62370a48f5469fabf502db2c6d1cffcd2"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:09c3255458533cb76ef55da8cc49ffab9e33f083739c8bd4f58e79fecfe288f7"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8ce1415194b4a6bd0cdcc3a1dfbf58b63f910dcb7330fe15bdff542c56949f87"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b91cbc4b195444e7e258ba27ac33769c41b94967919f10037e6355e998af255c"}, + {file = "coverage-7.4.4-cp310-cp310-win32.whl", hash = "sha256:598825b51b81c808cb6f078dcb972f96af96b078faa47af7dfcdf282835baa8d"}, + {file = "coverage-7.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:09ef9199ed6653989ebbcaacc9b62b514bb63ea2f90256e71fea3ed74bd8ff6f"}, + {file = "coverage-7.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0f9f50e7ef2a71e2fae92774c99170eb8304e3fdf9c8c3c7ae9bab3e7229c5cf"}, + {file = "coverage-7.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:623512f8ba53c422fcfb2ce68362c97945095b864cda94a92edbaf5994201083"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0513b9508b93da4e1716744ef6ebc507aff016ba115ffe8ecff744d1322a7b63"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40209e141059b9370a2657c9b15607815359ab3ef9918f0196b6fccce8d3230f"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2b2b78c78293782fd3767d53e6474582f62443d0504b1554370bde86cc8227"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:73bfb9c09951125d06ee473bed216e2c3742f530fc5acc1383883125de76d9cd"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f384c3cc76aeedce208643697fb3e8437604b512255de6d18dae3f27655a384"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:54eb8d1bf7cacfbf2a3186019bcf01d11c666bd495ed18717162f7eb1e9dd00b"}, + {file = "coverage-7.4.4-cp311-cp311-win32.whl", hash = "sha256:cac99918c7bba15302a2d81f0312c08054a3359eaa1929c7e4b26ebe41e9b286"}, + {file = "coverage-7.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:b14706df8b2de49869ae03a5ccbc211f4041750cd4a66f698df89d44f4bd30ec"}, + {file = "coverage-7.4.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:201bef2eea65e0e9c56343115ba3814e896afe6d36ffd37bab783261db430f76"}, + {file = "coverage-7.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41c9c5f3de16b903b610d09650e5e27adbfa7f500302718c9ffd1c12cf9d6818"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d898fe162d26929b5960e4e138651f7427048e72c853607f2b200909794ed978"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ea79bb50e805cd6ac058dfa3b5c8f6c040cb87fe83de10845857f5535d1db70"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce4b94265ca988c3f8e479e741693d143026632672e3ff924f25fab50518dd51"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:00838a35b882694afda09f85e469c96367daa3f3f2b097d846a7216993d37f4c"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fdfafb32984684eb03c2d83e1e51f64f0906b11e64482df3c5db936ce3839d48"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9"}, + {file = "coverage-7.4.4-cp312-cp312-win32.whl", hash = "sha256:137eb07173141545e07403cca94ab625cc1cc6bc4c1e97b6e3846270e7e1fea0"}, + {file = "coverage-7.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:d71eec7d83298f1af3326ce0ff1d0ea83c7cb98f72b577097f9083b20bdaf05e"}, + {file = "coverage-7.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384"}, + {file = "coverage-7.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c"}, + {file = "coverage-7.4.4-cp38-cp38-win32.whl", hash = "sha256:dfa8fe35a0bb90382837b238fff375de15f0dcdb9ae68ff85f7a63649c98527e"}, + {file = "coverage-7.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:b2991665420a803495e0b90a79233c1433d6ed77ef282e8e152a324bbbc5e0c8"}, + {file = "coverage-7.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d"}, + {file = "coverage-7.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade"}, + {file = "coverage-7.4.4-cp39-cp39-win32.whl", hash = "sha256:d89d7b2974cae412400e88f35d86af72208e1ede1a541954af5d944a8ba46c57"}, + {file = "coverage-7.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:9ca28a302acb19b6af89e90f33ee3e1906961f94b54ea37de6737b7ca9d8827c"}, + {file = "coverage-7.4.4-pp38.pp39.pp310-none-any.whl", hash = "sha256:b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677"}, + {file = "coverage-7.4.4.tar.gz", hash = "sha256:c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49"}, ] [package.dependencies] @@ -933,14 +933,14 @@ test = ["coverage", "hypothesis (>=4.18.0,<5)", "pytest (>=6.2.5,<7)", "pytest-x [[package]] name = "eth-hash" -version = "0.6.0" +version = "0.7.0" description = "eth-hash: The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3" category = "main" optional = false python-versions = ">=3.8, <4" files = [ - {file = "eth-hash-0.6.0.tar.gz", hash = "sha256:ae72889e60db6acbb3872c288cfa02ed157f4c27630fcd7f9c8442302c31e478"}, - {file = "eth_hash-0.6.0-py3-none-any.whl", hash = "sha256:9f8daaa345764f8871dc461855049ac54ae4291d780279bce6fce7f24e3f17d3"}, + {file = "eth-hash-0.7.0.tar.gz", hash = "sha256:bacdc705bfd85dadd055ecd35fd1b4f846b671add101427e089a4ca2e8db310a"}, + {file = "eth_hash-0.7.0-py3-none-any.whl", hash = "sha256:b8d5a230a2b251f4a291e3164a23a14057c4a6de4b0aa4a16fa4dc9161b57e2f"}, ] [package.dependencies] @@ -1211,14 +1211,14 @@ files = [ [[package]] name = "googleapis-common-protos" -version = "1.62.0" +version = "1.63.0" description = "Common protobufs used in Google APIs" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "googleapis-common-protos-1.62.0.tar.gz", hash = "sha256:83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277"}, - {file = "googleapis_common_protos-1.62.0-py2.py3-none-any.whl", hash = "sha256:4750113612205514f9f6aa4cb00d523a94f3e8c06c5ad2fee466387dc4875f07"}, + {file = "googleapis-common-protos-1.63.0.tar.gz", hash = "sha256:17ad01b11d5f1d0171c06d3ba5c04c54474e883b66b949722b4938ee2694ef4e"}, + {file = "googleapis_common_protos-1.63.0-py2.py3-none-any.whl", hash = "sha256:ae45f75702f7c08b541f750854a678bd8f534a1a6bace6afe975f1d0a82d6632"}, ] [package.dependencies] @@ -1390,34 +1390,34 @@ files = [ [[package]] name = "importlib-metadata" -version = "7.0.1" +version = "7.1.0" description = "Read metadata from Python packages" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"}, - {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"}, + {file = "importlib_metadata-7.1.0-py3-none-any.whl", hash = "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570"}, + {file = "importlib_metadata-7.1.0.tar.gz", hash = "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"}, ] [package.dependencies] zipp = ">=0.5" [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] [[package]] name = "importlib-resources" -version = "6.1.2" +version = "6.4.0" description = "Read resources from Python packages" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_resources-6.1.2-py3-none-any.whl", hash = "sha256:9a0a862501dc38b68adebc82970140c9e4209fc99601782925178f8386339938"}, - {file = "importlib_resources-6.1.2.tar.gz", hash = "sha256:308abf8474e2dba5f867d279237cd4076482c3de7104a40b41426370e891549b"}, + {file = "importlib_resources-6.4.0-py3-none-any.whl", hash = "sha256:50d10f043df931902d4194ea07ec57960f66a80449ff867bfe782b4c486ba78c"}, + {file = "importlib_resources-6.4.0.tar.gz", hash = "sha256:cdb2b453b8046ca4e3798eb1d84f3cce1446a0e8e7b5ef4efb600f19fc398145"}, ] [package.dependencies] @@ -1425,7 +1425,7 @@ zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} [package.extras] docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-ruff (>=0.2.1)", "zipp (>=3.17)"] +testing = ["jaraco.test (>=5.4)", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-ruff (>=0.2.1)", "zipp (>=3.17)"] [[package]] name = "iniconfig" @@ -1829,19 +1829,19 @@ nicer-shell = ["ipython"] [[package]] name = "open-aea" -version = "1.48.0.post1" +version = "1.50.0" description = "Open Autonomous Economic Agent framework (without vendor lock-in)" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "open-aea-1.48.0.post1.tar.gz", hash = "sha256:8e4f9f7b5b486d9e4da5be37156f56f4b81b5064a36ecedea21664187f1fae3d"}, - {file = "open_aea-1.48.0.post1-py3-none-any.whl", hash = "sha256:b3e7d2647bcc22e36a7ebeada71cb1da1c0a4af4baf98bb279e42a3f153f2fc3"}, - {file = "open_aea-1.48.0.post1-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:4222ba4448dd1418dc28c56df150ff6054c9934f5f7d477e1ef614b754e10f4c"}, - {file = "open_aea-1.48.0.post1-py3-none-manylinux1_x86_64.whl", hash = "sha256:1c057310d50af36495509086cee2839421b5495ef7472a01279ee45b13863732"}, - {file = "open_aea-1.48.0.post1-py3-none-manylinux2014_aarch64.whl", hash = "sha256:c362e8dc3812c8eb4952ad190cf74395409fc985b04f5c28e7546cb7e7f59e18"}, - {file = "open_aea-1.48.0.post1-py3-none-win32.whl", hash = "sha256:7709f453f1cc4476b88247dafddc77ada01b0e6ad6f57e4c16a32b655f5e15bf"}, - {file = "open_aea-1.48.0.post1-py3-none-win_amd64.whl", hash = "sha256:59afd308752805adb1a9e45cc6473d0de461bb5da667f3b8ebc3946fe35a63d2"}, + {file = "open-aea-1.50.0.tar.gz", hash = "sha256:7354fbdfc3246cce2a69d50b5b3e6441b28cbe3ed689b7186f9afa6d035a153f"}, + {file = "open_aea-1.50.0-py3-none-any.whl", hash = "sha256:0768e13dc2844e519bb3af93f71795db17724b2ad47f68ce483496757b2be4ba"}, + {file = "open_aea-1.50.0-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:b6824c9c1290fa2f9fc03f286ca80efd75c3a7e1f0affeb962d9396ef266870a"}, + {file = "open_aea-1.50.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:59c899b073686cbffc9a1ec7086a7d7869597467e66028a01e9d7f8ac2a69d42"}, + {file = "open_aea-1.50.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:0284f8fa6bfea5516b880cf89ef03fb671c61773be70dfa1abc4d8063c7726e8"}, + {file = "open_aea-1.50.0-py3-none-win32.whl", hash = "sha256:57d0e79690e76b774056d64632065de2779d199ae2801132ed89c11f4d797077"}, + {file = "open_aea-1.50.0-py3-none-win_amd64.whl", hash = "sha256:fc552754e9696e8df35598f5dab2d795119dbc0fc0ecbcec1f9cb75718f1db7e"}, ] [package.dependencies] @@ -1857,7 +1857,7 @@ py-multibase = ">=1.0.0" py-multicodec = ">=0.2.0" pymultihash = "0.8.2" pytest = {version = ">=7.0.0,<7.3.0", optional = true, markers = "extra == \"all\""} -python-dotenv = ">=0.14.0,<0.18.0" +python-dotenv = ">=0.14.0,<0.22.0" pyyaml = "6.0.1" requests = "2.28.1" semver = ">=2.9.1,<3.0.0" @@ -1869,14 +1869,14 @@ test-tools = ["click (==8.0.2)", "coverage (>=6.4.4,<8.0.0)", "jsonschema (>=4.3 [[package]] name = "open-aea-cli-ipfs" -version = "1.48.0.post1" +version = "1.50.0" description = "CLI extension for open AEA framework wrapping IPFS functionality." category = "main" optional = false python-versions = "*" files = [ - {file = "open-aea-cli-ipfs-1.48.0.post1.tar.gz", hash = "sha256:601475e46c5933e56808a8cfa71d7fab5fe7b1db617ff282bb91c51d0bbb0018"}, - {file = "open_aea_cli_ipfs-1.48.0.post1-py3-none-any.whl", hash = "sha256:d41fb057466a35ee11ad2d45fa03195efae1cc22b9f829ae498804aa8aa94f1b"}, + {file = "open-aea-cli-ipfs-1.50.0.tar.gz", hash = "sha256:03c43d69a602f2cb82e6408fc145c15a63c3c30187daa0e8ceb70b77bdd48295"}, + {file = "open_aea_cli_ipfs-1.50.0-py3-none-any.whl", hash = "sha256:30060c6e317838a83b10e0460ab35400b205e827916290964606661bcf250f99"}, ] [package.dependencies] @@ -1886,14 +1886,14 @@ pytest = ">=7.0.0,<7.3.0" [[package]] name = "open-aea-ledger-cosmos" -version = "1.48.0.post1" +version = "1.50.0" description = "Python package wrapping the public and private key cryptography and ledger api of Cosmos." category = "main" optional = false python-versions = "*" files = [ - {file = "open-aea-ledger-cosmos-1.48.0.post1.tar.gz", hash = "sha256:3152e400b4810cee1681372c979b26811cf14dc789c4b7f1b1e273dddb0f2c45"}, - {file = "open_aea_ledger_cosmos-1.48.0.post1-py3-none-any.whl", hash = "sha256:32a553df95c7db83401838598d72d433876c767ddaeb4f828238c59a5d19b37a"}, + {file = "open-aea-ledger-cosmos-1.50.0.tar.gz", hash = "sha256:62f55b88947cbd645b2c621f378305f614b13f25b67bc7fe9d6dccba67a28557"}, + {file = "open_aea_ledger_cosmos-1.50.0-py3-none-any.whl", hash = "sha256:b5c437c2f8d2a64e510dd40c47d7493c0049fa4e9cb9342308baa80cdea3e8c6"}, ] [package.dependencies] @@ -1905,14 +1905,14 @@ pycryptodome = ">=3.10.1,<4.0.0" [[package]] name = "open-aea-ledger-ethereum" -version = "1.48.0.post1" +version = "1.50.0" description = "Python package wrapping the public and private key cryptography and ledger api of Ethereum." category = "main" optional = false python-versions = "*" files = [ - {file = "open-aea-ledger-ethereum-1.48.0.post1.tar.gz", hash = "sha256:1975731cae6f6923f1d97a8ced22ffa92c473550ba9908d5442a4b4b903a4ad5"}, - {file = "open_aea_ledger_ethereum-1.48.0.post1-py3-none-any.whl", hash = "sha256:017dbcf323630cb13d140e5b6b6cd481d4d20ecf15ee74373c746e19ce15e891"}, + {file = "open-aea-ledger-ethereum-1.50.0.tar.gz", hash = "sha256:d6784d604450d0fe9aeb008b2eb12bfc87d630391f8b82b591d67c1781adaaab"}, + {file = "open_aea_ledger_ethereum-1.50.0-py3-none-any.whl", hash = "sha256:619105843718d0b8270d9039749101eec3aead5c38d7041c541832e3d8e4826c"}, ] [package.dependencies] @@ -1923,32 +1923,32 @@ web3 = ">=6.0.0,<7" [[package]] name = "open-aea-test-autonomy" -version = "0.14.7" +version = "0.14.9" description = "Plugin containing test tools for open-autonomy packages." category = "main" optional = false python-versions = "*" files = [ - {file = "open-aea-test-autonomy-0.14.7.tar.gz", hash = "sha256:6b86ab693f4a91e707ff0a33130fab4b56b242596537e6f2813872c60baeb048"}, - {file = "open_aea_test_autonomy-0.14.7-py3-none-any.whl", hash = "sha256:a774f2a2a4f2dff313e87e7a4382c6b436d72f341b5959873c0288bb340e4dee"}, + {file = "open-aea-test-autonomy-0.14.9.tar.gz", hash = "sha256:9ca7055809e8a6bd65aa934a26cfad40ec0cc7ddf7f6112d23cc3ae996f4fc39"}, + {file = "open_aea_test_autonomy-0.14.9-py3-none-any.whl", hash = "sha256:efd1f96fdef1f60bf2692616e13bab097319107a8ce3d49b2271cc4af898ff9f"}, ] [package.dependencies] docker = "6.1.2" -open-aea = {version = ">=1.48.0.post1,<2.0.0", extras = ["all"]} -open-aea-ledger-ethereum = ">=1.48.0.post1,<2.0.0" +open-aea = {version = ">=1.49.0,<2.0.0", extras = ["all"]} +open-aea-ledger-ethereum = ">=1.49.0,<2.0.0" pytest = "7.2.1" [[package]] name = "open-autonomy" -version = "0.14.7" +version = "0.14.9" description = "A framework for the creation of autonomous agent services." category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "open-autonomy-0.14.7.tar.gz", hash = "sha256:e39c3f9c1359b346fd8d8ec562b8e70ca4cffe64a401c96f62126c4fa1ff569f"}, - {file = "open_autonomy-0.14.7-py3-none-any.whl", hash = "sha256:467f4af2bf972ac109da6272a8b8da3e1d8429989ef7e26facca9c3e458d2938"}, + {file = "open-autonomy-0.14.9.tar.gz", hash = "sha256:8b8cded7be5552f4dae81a7ddcc1b546faffea9ef36c6a60c5c420d52f69ee45"}, + {file = "open_autonomy-0.14.9-py3-none-any.whl", hash = "sha256:85cd9d50e53eee718f360541492323a0d26dd72fe843377fd53b9cc6c76c1bdc"}, ] [package.dependencies] @@ -1960,20 +1960,21 @@ Flask = ">=2.0.2,<3.0.0" gql = "3.5.0" hexbytes = "*" jsonschema = ">=4.3.0,<4.4.0" -open-aea = {version = "1.48.0.post1", extras = ["all"]} -open-aea-cli-ipfs = "1.48.0.post1" +open-aea = {version = "1.50.0", extras = ["all"]} +open-aea-cli-ipfs = "1.50.0" protobuf = ">=4.21.6,<4.25.0" pytest = "7.2.1" -python-dotenv = ">=0.14.5,<0.18.0" +python-dotenv = ">=0.14.5,<0.22.0" requests-toolbelt = "1.0.0" texttable = "1.6.7" +typing-extensions = ">=3.10.0.2" valory-docker-compose = "1.29.3" watchdog = ">=2.1.6" werkzeug = "2.0.3" [package.extras] -all = ["click (==8.0.2)", "coverage (>=6.4.4,<8.0.0)", "open-aea-cli-ipfs (==1.48.0.post1)", "pytest (>=7.0.0,<7.3.0)", "python-dotenv (>=0.14.5,<0.18.0)", "texttable (==1.6.7)"] -cli = ["click (==8.0.2)", "coverage (>=6.4.4,<8.0.0)", "open-aea-cli-ipfs (==1.48.0.post1)", "pytest (>=7.0.0,<7.3.0)", "python-dotenv (>=0.14.5,<0.18.0)", "texttable (==1.6.7)"] +all = ["click (==8.0.2)", "coverage (>=6.4.4,<8.0.0)", "open-aea-cli-ipfs (==1.50.0)", "pytest (>=7.0.0,<7.3.0)", "python-dotenv (>=0.14.5,<0.22.0)", "texttable (==1.6.7)"] +cli = ["click (==8.0.2)", "coverage (>=6.4.4,<8.0.0)", "open-aea-cli-ipfs (==1.50.0)", "pytest (>=7.0.0,<7.3.0)", "python-dotenv (>=0.14.5,<0.22.0)", "texttable (==1.6.7)"] [[package]] name = "packaging" @@ -2411,14 +2412,14 @@ files = [ [[package]] name = "python-dateutil" -version = "2.8.2" +version = "2.9.0.post0" description = "Extensions to the standard Python datetime module" category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, + {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"}, + {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"}, ] [package.dependencies] @@ -2426,14 +2427,14 @@ six = ">=1.5" [[package]] name = "python-dotenv" -version = "0.17.1" +version = "0.21.1" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.7" files = [ - {file = "python-dotenv-0.17.1.tar.gz", hash = "sha256:b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"}, - {file = "python_dotenv-0.17.1-py2.py3-none-any.whl", hash = "sha256:00aa34e92d992e9f8383730816359647f358f4a3be1ba45e5a5cefd27ee91544"}, + {file = "python-dotenv-0.21.1.tar.gz", hash = "sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49"}, + {file = "python_dotenv-0.21.1-py3-none-any.whl", hash = "sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"}, ] [package.extras] @@ -3244,21 +3245,21 @@ multidict = ">=4.0" [[package]] name = "zipp" -version = "3.17.0" +version = "3.18.1" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, - {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, + {file = "zipp-3.18.1-py3-none-any.whl", hash = "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b"}, + {file = "zipp-3.18.1.tar.gz", hash = "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [metadata] lock-version = "2.0" python-versions = "<3.11,>=3.8" -content-hash = "c5f8658a8e9b602366bed7ffb29dcf7153cb748a45e7936fc4284e55a5459059" +content-hash = "48d40bf46f413ce7136fa58d511bf3f3be7345a55effec1d29768151cea2159a" From 7c0005fff5cd21e80d980a1bf327dc5e4b6c2672 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 22 Mar 2024 18:20:06 +0100 Subject: [PATCH 08/24] [no ci] chore: fix parameter --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/skills/decision_maker_abci/models.py | 10 +++++++--- packages/valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 5557e549b..2fe4ebde5 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm", - "skill/valory/trader_abci/0.1.0": "bafybeiejondt4zdaiazwrfs3r36m2vvrdrljg2vx7owxtugazs7uo43uxu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu", + "skill/valory/decision_maker_abci/0.1.0": "bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle", + "skill/valory/trader_abci/0.1.0": "bafybeieopsyvdflx5rzpanp677uyywyfjy55m2ymzwixwlr2ennjs6aity", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiderjkq2sg4lvhxwvt4ihkwevyses7bc3n5y6wxtfz47pxkloibsu", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeic6fkjcjzxn5mtzmmz44df6zlv4slycwvzn33bmfa3mowdq24ihny", - "service/valory/trader/0.1.0": "bafybeibaqgtyoxxj4vyqhpjv7ragfpblnq6qyeazwqq6gbupqrqoguejj4" + "agent/valory/trader/0.1.0": "bafybeib3w7ykvchke6x26khjrxkt25dzdnqbhulas7dhad4ontctj3vfse", + "service/valory/trader/0.1.0": "bafybeib3uftng3jur4zwo47qftdcsjsvqyiuuihlp7hgylggy24tcv6skq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 544fa0e68..3562145df 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiderjkq2sg4lvhxwvt4ihkwevyses7bc3n5y6wxtfz47pxkloibsu - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm -- valory/trader_abci:0.1.0:bafybeiejondt4zdaiazwrfs3r36m2vvrdrljg2vx7owxtugazs7uo43uxu +- valory/decision_maker_abci:0.1.0:bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle +- valory/trader_abci:0.1.0:bafybeieopsyvdflx5rzpanp677uyywyfjy55m2ymzwixwlr2ennjs6aity - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 6113a0e04..a2c98c977 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeic6fkjcjzxn5mtzmmz44df6zlv4slycwvzn33bmfa3mowdq24ihny +agent: valory/trader:0.1.0:bafybeib3w7ykvchke6x26khjrxkt25dzdnqbhulas7dhad4ontctj3vfse number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index f0efa0484..20e2fb824 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -229,11 +229,15 @@ def nested_list_todict_workaround( class DecisionMakerParams(MarketManagerParams): """Decision maker's parameters.""" + # These parameters are from other ABCI skills, and are added + # here to avoid subclassing and avoid MyPy linter issues. + mech_contract_address: str + def __init__(self, *args: Any, **kwargs: Any) -> None: """Initialize the parameters' object.""" - self.mech_contract_address: str = self._ensure( - "mech_contract_address", kwargs, str - ) + # self.mech_contract_address: str = self._ensure( + # "mech_contract_address", kwargs, str + # ) # the number of days to sample bets from self.sample_bets_closing_days: int = self._ensure( "sample_bets_closing_days", kwargs, int diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 0a42dc82c..5609ddf5f 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -30,7 +30,7 @@ fingerprint: handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeiemsd445cbcvegbo7dy7wec6mdkdqpohx55z57cnds4y2zdoygram + models.py: bafybeiaz35d2w4g33l2qb63it2un7tff5dugosadpirvwve6qp25kwlolu payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 7b083164f..5c2fb1b75 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu +- valory/decision_maker_abci:0.1.0:bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiderjkq2sg4lvhxwvt4ihkwevyses7bc3n5y6wxtfz47pxkloibsu - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 5a7e658bb..267d5bd9d 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm +- valory/decision_maker_abci:0.1.0:bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: From 54bde75b20861a0d5eb2e29711f964d2f8abcb90 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 22 Mar 2024 18:33:34 +0100 Subject: [PATCH 09/24] [no ci] chore: fix params --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/skills/decision_maker_abci/models.py | 10 +++------- packages/valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/models.py | 8 ++++++-- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 2fe4ebde5..232d62f11 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle", - "skill/valory/trader_abci/0.1.0": "bafybeieopsyvdflx5rzpanp677uyywyfjy55m2ymzwixwlr2ennjs6aity", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiderjkq2sg4lvhxwvt4ihkwevyses7bc3n5y6wxtfz47pxkloibsu", + "skill/valory/decision_maker_abci/0.1.0": "bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm", + "skill/valory/trader_abci/0.1.0": "bafybeia3q2ykzyepaet6fbq2r4haucxh6p2towhoowmlimgdoqy2m6x26u", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeib3w7ykvchke6x26khjrxkt25dzdnqbhulas7dhad4ontctj3vfse", - "service/valory/trader/0.1.0": "bafybeib3uftng3jur4zwo47qftdcsjsvqyiuuihlp7hgylggy24tcv6skq" + "agent/valory/trader/0.1.0": "bafybeicfzk3clmgc5nb7azcrfp3bkigvwcqebr3glcdgeo74wnqyrzu2em", + "service/valory/trader/0.1.0": "bafybeibj4mnaa24k56qlxab3kny47z5uhutc76voymk6ypmygey7goecdm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 3562145df..a5504d191 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiderjkq2sg4lvhxwvt4ihkwevyses7bc3n5y6wxtfz47pxkloibsu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle -- valory/trader_abci:0.1.0:bafybeieopsyvdflx5rzpanp677uyywyfjy55m2ymzwixwlr2ennjs6aity +- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm +- valory/trader_abci:0.1.0:bafybeia3q2ykzyepaet6fbq2r4haucxh6p2towhoowmlimgdoqy2m6x26u - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index a2c98c977..a86eb30e3 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeib3w7ykvchke6x26khjrxkt25dzdnqbhulas7dhad4ontctj3vfse +agent: valory/trader:0.1.0:bafybeicfzk3clmgc5nb7azcrfp3bkigvwcqebr3glcdgeo74wnqyrzu2em number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index 20e2fb824..f0efa0484 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -229,15 +229,11 @@ def nested_list_todict_workaround( class DecisionMakerParams(MarketManagerParams): """Decision maker's parameters.""" - # These parameters are from other ABCI skills, and are added - # here to avoid subclassing and avoid MyPy linter issues. - mech_contract_address: str - def __init__(self, *args: Any, **kwargs: Any) -> None: """Initialize the parameters' object.""" - # self.mech_contract_address: str = self._ensure( - # "mech_contract_address", kwargs, str - # ) + self.mech_contract_address: str = self._ensure( + "mech_contract_address", kwargs, str + ) # the number of days to sample bets from self.sample_bets_closing_days: int = self._ensure( "sample_bets_closing_days", kwargs, int diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 5609ddf5f..0a42dc82c 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -30,7 +30,7 @@ fingerprint: handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeiaz35d2w4g33l2qb63it2un7tff5dugosadpirvwve6qp25kwlolu + models.py: bafybeiemsd445cbcvegbo7dy7wec6mdkdqpohx55z57cnds4y2zdoygram payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm diff --git a/packages/valory/skills/trader_abci/models.py b/packages/valory/skills/trader_abci/models.py index 07710137e..07301f7c1 100644 --- a/packages/valory/skills/trader_abci/models.py +++ b/packages/valory/skills/trader_abci/models.py @@ -100,9 +100,13 @@ class RandomnessApi(ApiSpecs): """A model for randomness api specifications.""" +class DecisionMakerMechInteractParams(DecisionMakerParams, MechInteractParams): + """A class joining DecisionMakerParams and MechInteractParams. This class + is required because both classes have common parameters.""" + + class TraderParams( - DecisionMakerParams, - MechInteractParams, + DecisionMakerMechInteractParams, TerminationParams, StakingParams, TxSettlementMultiplexerParams, diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 5c2fb1b75..11b8a2e08 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -13,7 +13,7 @@ fingerprint: dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeibi3t63vwfrx5sbkfhji3rb62dtwczpajuijqgul6bpcn3altcziq handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a - models.py: bafybeifci6cpttw33v77vszo7zncxityjjbviyv5glt76byrv7fu3cpcye + models.py: bafybeie5beqip2quzkq5okquh5k6edf3zta6lomuz7rn73e365dxs2qlry fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiderjkq2sg4lvhxwvt4ihkwevyses7bc3n5y6wxtfz47pxkloibsu +- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 267d5bd9d..5a7e658bb 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeidq27qainay2tbsghpjkbus7s5yajervgrlaygpkvqcvhgfwrrwle +- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: From e4433e03ba4fcd4d83a07279e9cd8f1c08a4353a Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 22 Mar 2024 18:49:25 +0100 Subject: [PATCH 10/24] [no ci] fix: params --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../skills/decision_maker_abci/models.py | 19 ++++--------------- .../skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/models.py | 10 +--------- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 19 insertions(+), 38 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 232d62f11..3dd917a36 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm", - "skill/valory/trader_abci/0.1.0": "bafybeia3q2ykzyepaet6fbq2r4haucxh6p2towhoowmlimgdoqy2m6x26u", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu", + "skill/valory/decision_maker_abci/0.1.0": "bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei", + "skill/valory/trader_abci/0.1.0": "bafybeidc3kprxmflzegdpaf6pqqllvhuyny2qrvgwkifui2yxpahrwoayq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia7q333bo3uzrlltjmflgqeqvyftwqcwz37x5exwuqylhxn4fdmde", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeicfzk3clmgc5nb7azcrfp3bkigvwcqebr3glcdgeo74wnqyrzu2em", - "service/valory/trader/0.1.0": "bafybeibj4mnaa24k56qlxab3kny47z5uhutc76voymk6ypmygey7goecdm" + "agent/valory/trader/0.1.0": "bafybeie3meci6msl7tlotjzvdzwmyiumyznnexh6aivra6c3eottufbhmu", + "service/valory/trader/0.1.0": "bafybeih5zxuivhcoroq7gnqwgoks5b26dxpe7pylhr23tu6e236ju6wfva" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index a5504d191..e893b1e28 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia7q333bo3uzrlltjmflgqeqvyftwqcwz37x5exwuqylhxn4fdmde - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm -- valory/trader_abci:0.1.0:bafybeia3q2ykzyepaet6fbq2r4haucxh6p2towhoowmlimgdoqy2m6x26u +- valory/decision_maker_abci:0.1.0:bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei +- valory/trader_abci:0.1.0:bafybeidc3kprxmflzegdpaf6pqqllvhuyny2qrvgwkifui2yxpahrwoayq - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index a86eb30e3..121da64cf 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeicfzk3clmgc5nb7azcrfp3bkigvwcqebr3glcdgeo74wnqyrzu2em +agent: valory/trader:0.1.0:bafybeie3meci6msl7tlotjzvdzwmyiumyznnexh6aivra6c3eottufbhmu number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index f0efa0484..fcbcc919b 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -58,6 +58,9 @@ from packages.valory.skills.decision_maker_abci.redeem_info import Trade from packages.valory.skills.decision_maker_abci.rounds import DecisionMakerAbciApp from packages.valory.skills.market_manager_abci.models import MarketManagerParams +from packages.valory.skills.mech_interact_abci.models import ( + Params as MechInteractParams, +) FromBlockMappingType = Dict[HexBytes, Union[int, str]] @@ -226,14 +229,11 @@ def nested_list_todict_workaround( return {value[0]: value[1] for value in values} -class DecisionMakerParams(MarketManagerParams): +class DecisionMakerParams(MarketManagerParams, MechInteractParams): """Decision maker's parameters.""" def __init__(self, *args: Any, **kwargs: Any) -> None: """Initialize the parameters' object.""" - self.mech_contract_address: str = self._ensure( - "mech_contract_address", kwargs, str - ) # the number of days to sample bets from self.sample_bets_closing_days: int = self._ensure( "sample_bets_closing_days", kwargs, int @@ -253,12 +253,8 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: self.blacklisting_duration: int = self._ensure( "blacklisting_duration", kwargs, int ) - self._ipfs_address: str = self._ensure("ipfs_address", kwargs, str) self._prompt_template: str = self._ensure("prompt_template", kwargs, str) check_prompt_template(self.prompt_template) - multisend_address = kwargs.get("multisend_address", None) - enforce(multisend_address is not None, "Multisend address not specified!") - self.multisend_address: str = multisend_address self.dust_threshold: int = self._ensure("dust_threshold", kwargs, int) self.conditional_tokens_address: str = self._ensure( "conditional_tokens_address", kwargs, str @@ -328,13 +324,6 @@ def using_kelly(self) -> bool: """Get the max bet amount if the `bet_amount_per_conf_threshold` strategy is used.""" return self.trading_strategy == STRATEGY_KELLY_CRITERION - @property - def ipfs_address(self) -> str: - """Get the IPFS address.""" - if self._ipfs_address.endswith("/"): - return self._ipfs_address - return f"{self._ipfs_address}/" - @property def prompt_template(self) -> PromptTemplate: """Get the prompt template as a string `PromptTemplate`.""" diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 0a42dc82c..a63db494d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -30,7 +30,7 @@ fingerprint: handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeiemsd445cbcvegbo7dy7wec6mdkdqpohx55z57cnds4y2zdoygram + models.py: bafybeig3k5ys4bqlxv2yxy7oa2s52igq6qmyn6sgzubvzkiptuk5jlwgna payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm diff --git a/packages/valory/skills/trader_abci/models.py b/packages/valory/skills/trader_abci/models.py index 07301f7c1..1ae88ce94 100644 --- a/packages/valory/skills/trader_abci/models.py +++ b/packages/valory/skills/trader_abci/models.py @@ -57,9 +57,6 @@ from packages.valory.skills.mech_interact_abci.models import ( MechResponseSpecs as BaseMechResponseSpecs, ) -from packages.valory.skills.mech_interact_abci.models import ( - Params as MechInteractParams, -) from packages.valory.skills.reset_pause_abci.rounds import Event as ResetPauseEvent from packages.valory.skills.staking_abci.models import StakingParams from packages.valory.skills.termination_abci.models import TerminationParams @@ -100,13 +97,8 @@ class RandomnessApi(ApiSpecs): """A model for randomness api specifications.""" -class DecisionMakerMechInteractParams(DecisionMakerParams, MechInteractParams): - """A class joining DecisionMakerParams and MechInteractParams. This class - is required because both classes have common parameters.""" - - class TraderParams( - DecisionMakerMechInteractParams, + DecisionMakerParams, # It also contains MechInteractParams TerminationParams, StakingParams, TxSettlementMultiplexerParams, diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 11b8a2e08..19115d4a3 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -13,7 +13,7 @@ fingerprint: dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeibi3t63vwfrx5sbkfhji3rb62dtwczpajuijqgul6bpcn3altcziq handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a - models.py: bafybeie5beqip2quzkq5okquh5k6edf3zta6lomuz7rn73e365dxs2qlry + models.py: bafybeigk7hs7xsfjoszsque6r6yvbrrhattfuli2nfend4istk465e6try fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibyw7gkebej6f3obwloviuy5p5bpyom744qeytvf2ae7rbtesdnmu +- valory/decision_maker_abci:0.1.0:bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia7q333bo3uzrlltjmflgqeqvyftwqcwz37x5exwuqylhxn4fdmde - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 5a7e658bb..55d6cf098 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeias5xuwknpoxkd3qbl7qa5y5g3r5i6x2kbzfi6mmrvxnnopjpi2vm +- valory/decision_maker_abci:0.1.0:bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: From 7df413cfdfeaa664c77daa749f8205844c019f1a Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 22 Mar 2024 19:12:10 +0100 Subject: [PATCH 11/24] [no ci] fix: round --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/skills/decision_maker_abci/skill.yaml | 2 +- .../decision_maker_abci/states/decision_request.py | 1 + packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 3dd917a36..6c3a95362 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei", - "skill/valory/trader_abci/0.1.0": "bafybeidc3kprxmflzegdpaf6pqqllvhuyny2qrvgwkifui2yxpahrwoayq", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia7q333bo3uzrlltjmflgqeqvyftwqcwz37x5exwuqylhxn4fdmde", + "skill/valory/decision_maker_abci/0.1.0": "bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4", + "skill/valory/trader_abci/0.1.0": "bafybeihiwqcte7sutsexsuz5w6h63qgc64t3smszabwid44h63qti5tgzu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeihhyhntaf5mgukq7lxgqks3kofdxodjhakei656u7dj4im5tjpoie", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeie3meci6msl7tlotjzvdzwmyiumyznnexh6aivra6c3eottufbhmu", - "service/valory/trader/0.1.0": "bafybeih5zxuivhcoroq7gnqwgoks5b26dxpe7pylhr23tu6e236ju6wfva" + "agent/valory/trader/0.1.0": "bafybeidq46f5hs3l7a6b5l3awxa6tdka5uwplyivcuw7imm5wret6id4ly", + "service/valory/trader/0.1.0": "bafybeiavv6t6ty2zeawe5jioplzmzeuwz3gflrp5v6dyyhku5qgtwxdlzq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index e893b1e28..a2238509d 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia7q333bo3uzrlltjmflgqeqvyftwqcwz37x5exwuqylhxn4fdmde +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihhyhntaf5mgukq7lxgqks3kofdxodjhakei656u7dj4im5tjpoie - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei -- valory/trader_abci:0.1.0:bafybeidc3kprxmflzegdpaf6pqqllvhuyny2qrvgwkifui2yxpahrwoayq +- valory/decision_maker_abci:0.1.0:bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4 +- valory/trader_abci:0.1.0:bafybeihiwqcte7sutsexsuz5w6h63qgc64t3smszabwid44h63qti5tgzu - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 121da64cf..640a00f1f 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeie3meci6msl7tlotjzvdzwmyiumyznnexh6aivra6c3eottufbhmu +agent: valory/trader:0.1.0:bafybeidq46f5hs3l7a6b5l3awxa6tdka5uwplyivcuw7imm5wret6id4ly number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index a63db494d..c2935f05d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -41,7 +41,7 @@ fingerprint: states/blacklisting.py: bafybeifruvxwwltndwazkzzbpc5nnnad3z5t5ofy6d3i7nssljbxl6gvxu states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne states/decision_receive.py: bafybeib3roo27nccj4eylaqwwzztzzzwsi6px5atjrch5wbqmpln2kyy6y - states/decision_request.py: bafybeia2ngyq4jbxjxaft4pobndrzm4kvxltcvrnzvr7ed6gyuqhst3sta + states/decision_request.py: bafybeicxf77bnvrh7z2one4sglvnf5idcmquz6vlln45zlabo47a6pxgz4 states/final_states.py: bafybeiantsmq3yuzg7qzk6hlyngj74jsx43rphghfwsvseakcxmu3n4kqm states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm states/order_subscription.py: bafybeiaoemltuh3zkch7hvaxzxxsofe3pomlgifj5hamkqqon5mg5eaoqq diff --git a/packages/valory/skills/decision_maker_abci/states/decision_request.py b/packages/valory/skills/decision_maker_abci/states/decision_request.py index 213e1a481..68c3c09db 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_request.py @@ -38,5 +38,6 @@ class DecisionRequestRound(CollectSameUntilThresholdRound): done_event = Event.DONE none_event = Event.NONE no_majority_event = Event.NO_MAJORITY + collection_key = get_name(SynchronizedData.participant_to_selection) selection_key = get_name(SynchronizedData.mech_requests) none_event = Event.SLOTS_UNSUPPORTED_ERROR diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 19115d4a3..924ae4c7b 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia7q333bo3uzrlltjmflgqeqvyftwqcwz37x5exwuqylhxn4fdmde +- valory/decision_maker_abci:0.1.0:bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihhyhntaf5mgukq7lxgqks3kofdxodjhakei656u7dj4im5tjpoie - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 55d6cf098..b98475e20 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeic545zpe7lb6jpgwzip7t43ytu5voiior47kla5dnbgwq66gcveei +- valory/decision_maker_abci:0.1.0:bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4 - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury behaviours: From a9eb60d720b118bb04c0c80c11e5ad2f4e11b4fd Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Mon, 25 Mar 2024 00:40:07 +0100 Subject: [PATCH 12/24] [no ci] chore: hashes --- packages/packages.json | 14 ++++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 6c3a95362..5c9a9a0d2 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,13 +12,15 @@ "contract/valory/agent_registry/0.1.0": "bafybeidt3nsgfqgieubz3nmpj6xj54uyjvfdeg5vjryld3kpnc5beelphi", "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", + "contract/valory/mech/0.1.0": "bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4", - "skill/valory/trader_abci/0.1.0": "bafybeihiwqcte7sutsexsuz5w6h63qgc64t3smszabwid44h63qti5tgzu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeihhyhntaf5mgukq7lxgqks3kofdxodjhakei656u7dj4im5tjpoie", + "skill/valory/decision_maker_abci/0.1.0": "bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a", + "skill/valory/trader_abci/0.1.0": "bafybeifdklcbro2lvm224tegwnkhrip5m4wdzk4qjbg3xx3gtlh4eyojji", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiekluo4v3jsrg5jnr3l4c5ftz6n7c424v6zs22c2ydvvjevxa73ai", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeidq46f5hs3l7a6b5l3awxa6tdka5uwplyivcuw7imm5wret6id4ly", - "service/valory/trader/0.1.0": "bafybeiavv6t6ty2zeawe5jioplzmzeuwz3gflrp5v6dyyhku5qgtwxdlzq" + "skill/valory/mech_interact_abci/0.1.0": "bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u", + "agent/valory/trader/0.1.0": "bafybeigslxushnwy2h7efigi4cy4fhzsbsuasxf6hdxx4kwhqphjnzgmmm", + "service/valory/trader/0.1.0": "bafybeihoajceydf5ytuo3covds32h2pypkx6ps726fdec5okxqgdjgduxy" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -39,7 +41,7 @@ "connection/valory/ledger/0.19.0": "bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", "connection/valory/ipfs/0.1.0": "bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii", - "skill/valory/mech_interact_abci/0.1.0": "bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury", + "skill/valory/mech_interact_abci/0.1.0": "bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u", "skill/valory/abstract_abci/0.1.0": "bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre", "skill/valory/reset_pause_abci/0.1.0": "bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu", "skill/valory/registration_abci/0.1.0": "bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index a2238509d..e8966879f 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,12 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihhyhntaf5mgukq7lxgqks3kofdxodjhakei656u7dj4im5tjpoie +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiekluo4v3jsrg5jnr3l4c5ftz6n7c424v6zs22c2ydvvjevxa73ai - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4 -- valory/trader_abci:0.1.0:bafybeihiwqcte7sutsexsuz5w6h63qgc64t3smszabwid44h63qti5tgzu +- valory/decision_maker_abci:0.1.0:bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a +- valory/trader_abci:0.1.0:bafybeifdklcbro2lvm224tegwnkhrip5m4wdzk4qjbg3xx3gtlh4eyojji - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury +- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 640a00f1f..ce2fded31 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeidq46f5hs3l7a6b5l3awxa6tdka5uwplyivcuw7imm5wret6id4ly +agent: valory/trader:0.1.0:bafybeigslxushnwy2h7efigi4cy4fhzsbsuasxf6hdxx4kwhqphjnzgmmm number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index c2935f05d..4cbb839f2 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury +- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 924ae4c7b..5b7dec94c 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihhyhntaf5mgukq7lxgqks3kofdxodjhakei656u7dj4im5tjpoie +- valory/decision_maker_abci:0.1.0:bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiekluo4v3jsrg5jnr3l4c5ftz6n7c424v6zs22c2ydvvjevxa73ai - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury +- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index b98475e20..347a273cd 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeianpth3d4mi4rjl6y7ux6fce4phi4iqluoybhfem7bg66tiyyz5l4 +- valory/decision_maker_abci:0.1.0:bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeicjwkzvjwzzoftb7wtzg4mdib643w4etctk4zifu6pskosijpjury +- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: main: args: {} From b26980f7369ce48ccaafe055de4b689ebfd30be4 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Mon, 25 Mar 2024 11:30:31 +0100 Subject: [PATCH 13/24] chore: linters --- packages/packages.json | 14 ++++++-------- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../decision_maker_abci/fsm_specification.yaml | 6 +++--- .../skills/decision_maker_abci/models.py | 2 -- .../skills/decision_maker_abci/skill.yaml | 6 +++--- .../skills/decision_maker_abci/states/base.py | 4 ++++ .../skills/trader_abci/fsm_specification.yaml | 18 +++++++++++++----- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 10 files changed, 37 insertions(+), 29 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 5c9a9a0d2..6e7a7d15a 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,15 +12,13 @@ "contract/valory/agent_registry/0.1.0": "bafybeidt3nsgfqgieubz3nmpj6xj54uyjvfdeg5vjryld3kpnc5beelphi", "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", - "contract/valory/mech/0.1.0": "bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a", - "skill/valory/trader_abci/0.1.0": "bafybeifdklcbro2lvm224tegwnkhrip5m4wdzk4qjbg3xx3gtlh4eyojji", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiekluo4v3jsrg5jnr3l4c5ftz6n7c424v6zs22c2ydvvjevxa73ai", + "skill/valory/decision_maker_abci/0.1.0": "bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey", + "skill/valory/trader_abci/0.1.0": "bafybeifqbheymjuszz4qbra3j7xjn32vawnwve6zgtpwthn25zvfskzwge", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifomor54dy3hbh3xorclsni7idiw2t5zlgy5ttwpd7fqz56zlqfzm", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "skill/valory/mech_interact_abci/0.1.0": "bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u", - "agent/valory/trader/0.1.0": "bafybeigslxushnwy2h7efigi4cy4fhzsbsuasxf6hdxx4kwhqphjnzgmmm", - "service/valory/trader/0.1.0": "bafybeihoajceydf5ytuo3covds32h2pypkx6ps726fdec5okxqgdjgduxy" + "agent/valory/trader/0.1.0": "bafybeibus44st4fnu4q4f6wufau7gg3lj6nxzscw7bmkm7v2zndvo6qd2m", + "service/valory/trader/0.1.0": "bafybeib2pf6kofi3abzdfxl6m6fxbxe54abiameg6yqxqzojyot47ghmge" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -42,10 +40,10 @@ "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", "connection/valory/ipfs/0.1.0": "bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii", "skill/valory/mech_interact_abci/0.1.0": "bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u", + "skill/valory/abstract_round_abci/0.1.0": "bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4", "skill/valory/abstract_abci/0.1.0": "bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre", "skill/valory/reset_pause_abci/0.1.0": "bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu", "skill/valory/registration_abci/0.1.0": "bafybeierykfwmk3gyv4b6szl3xbnngzztsruh6d6k6rcom32fnuveplm5a", - "skill/valory/abstract_round_abci/0.1.0": "bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4", "skill/valory/termination_abci/0.1.0": "bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe" } diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index e8966879f..238ea6aa7 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiekluo4v3jsrg5jnr3l4c5ftz6n7c424v6zs22c2ydvvjevxa73ai +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifomor54dy3hbh3xorclsni7idiw2t5zlgy5ttwpd7fqz56zlqfzm - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a -- valory/trader_abci:0.1.0:bafybeifdklcbro2lvm224tegwnkhrip5m4wdzk4qjbg3xx3gtlh4eyojji +- valory/decision_maker_abci:0.1.0:bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey +- valory/trader_abci:0.1.0:bafybeifqbheymjuszz4qbra3j7xjn32vawnwve6zgtpwthn25zvfskzwge - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index ce2fded31..2bfb1dd0d 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeigslxushnwy2h7efigi4cy4fhzsbsuasxf6hdxx4kwhqphjnzgmmm +agent: valory/trader:0.1.0:bafybeibus44st4fnu4q4f6wufau7gg3lj6nxzscw7bmkm7v2zndvo6qd2m number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/fsm_specification.yaml b/packages/valory/skills/decision_maker_abci/fsm_specification.yaml index d6d2314af..6df29335e 100644 --- a/packages/valory/skills/decision_maker_abci/fsm_specification.yaml +++ b/packages/valory/skills/decision_maker_abci/fsm_specification.yaml @@ -11,13 +11,13 @@ alphabet_in: - NO_SUBSCRIPTION - REDEEM_ROUND_TIMEOUT - ROUND_TIMEOUT -- SLOTS_UNSUPPORTED_ERROR - SUBSCRIPTION_ERROR - TIE - UNPROFITABLE default_start_state: SamplingRound final_states: - FinishedDecisionMakerRound +- FinishedDecisionRequestRound - FinishedSubscriptionRound - FinishedWithoutDecisionRound - FinishedWithoutRedeemingRound @@ -37,6 +37,7 @@ states: - DecisionReceiveRound - DecisionRequestRound - FinishedDecisionMakerRound +- FinishedDecisionRequestRound - FinishedSubscriptionRound - FinishedWithoutDecisionRound - FinishedWithoutRedeemingRound @@ -69,11 +70,10 @@ transition_func: (DecisionReceiveRound, ROUND_TIMEOUT): DecisionReceiveRound (DecisionReceiveRound, TIE): BlacklistingRound (DecisionReceiveRound, UNPROFITABLE): BlacklistingRound - (DecisionRequestRound, DONE): FinishedDecisionMakerRound + (DecisionRequestRound, DONE): FinishedDecisionRequestRound (DecisionRequestRound, NONE): ImpossibleRound (DecisionRequestRound, NO_MAJORITY): DecisionRequestRound (DecisionRequestRound, ROUND_TIMEOUT): DecisionRequestRound - (DecisionRequestRound, SLOTS_UNSUPPORTED_ERROR): BlacklistingRound (HandleFailedTxRound, BLACKLIST): BlacklistingRound (HandleFailedTxRound, NO_MAJORITY): HandleFailedTxRound (HandleFailedTxRound, NO_OP): RedeemRound diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index fcbcc919b..7dcd0c20b 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -19,7 +19,6 @@ """This module contains the models for the skill.""" -import json import os import re from dataclasses import dataclass, field @@ -38,7 +37,6 @@ Union, ) -from aea.exceptions import enforce from aea.skills.base import SkillContext from hexbytes import HexBytes from web3.constants import HASH_ZERO diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 4cbb839f2..b2844bf0f 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -26,17 +26,17 @@ fingerprint: behaviours/sampling.py: bafybeibtkli72qsvotkrsepkgpiumtr5sershtkpb427oygnszs3dpgxry behaviours/tool_selection.py: bafybeicxw4je76uc7znx4u2hq2b2aaxcf7blwfla7lhdhkqnf3kkupsczq dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm - fsm_specification.yaml: bafybeigxmyqggc6m5jmmnw5cugfcr7irugjrn6jffgc3q2snevuvcan7zu + fsm_specification.yaml: bafybeiffbl4aexajrjn6ui4hawmg7maoikuu2jgozgsjboclajw2rmcyty handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeig3k5ys4bqlxv2yxy7oa2s52igq6qmyn6sgzubvzkiptuk5jlwgna + models.py: bafybeic5bmc3di6huvdpa54lllf4okojjexvlj2mvzlg6kagk32rt54ktu payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm rounds.py: bafybeifz6kdjusm5ovcetjjuzfgthgbxfuyrbphwlm6qmzxp2dik3j6s6e states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeieyo3oqktvklpofcyyzqa3hsfv4rhon6cahjd5euq32rdtuxvft74 + states/base.py: bafybeibpzv4te3o5rz67cjnqo6dd5rmtt3awj5khamb6epomgnk7vfe5ui states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda states/blacklisting.py: bafybeifruvxwwltndwazkzzbpc5nnnad3z5t5ofy6d3i7nssljbxl6gvxu states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index 2be21dcc5..cfbd67f83 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -68,6 +68,10 @@ class SynchronizedData(MarketManagerSyncedData, TxSettlementSyncedData): This data is replicated by the tendermint application. """ + # These parameters are from other ABCI skills, and are added + # here to avoid subclassing and avoid MyPy linter issues. + mech_price: int + @property def sampled_bet_index(self) -> int: """Get the sampled bet.""" diff --git a/packages/valory/skills/trader_abci/fsm_specification.yaml b/packages/valory/skills/trader_abci/fsm_specification.yaml index 0939695ee..b34ced92d 100644 --- a/packages/valory/skills/trader_abci/fsm_specification.yaml +++ b/packages/valory/skills/trader_abci/fsm_specification.yaml @@ -5,7 +5,6 @@ alphabet_in: - CHECK_HISTORY - CHECK_LATE_ARRIVING_MESSAGE - CHECK_TIMEOUT -- DECISION_REQUESTING_DONE - DONE - FETCH_ERROR - FINALIZATION_FAILED @@ -13,6 +12,7 @@ alphabet_in: - INCORRECT_SERIALIZATION - INSUFFICIENT_BALANCE - INSUFFICIENT_FUNDS +- MECH_REQUESTING_DONE - MECH_RESPONSE_ERROR - NEGATIVE - NEXT_CHECKPOINT_NOT_REACHED_YET @@ -29,7 +29,7 @@ alphabet_in: - ROUND_TIMEOUT - SERVICE_EVICTED - SERVICE_NOT_STAKED -- SLOTS_UNSUPPORTED_ERROR +- SKIP_REQUEST - STAKING_DONE - SUBSCRIPTION_DONE - SUBSCRIPTION_ERROR @@ -61,6 +61,8 @@ states: - FinalizationRound - HandleFailedTxRound - ImpossibleRound +- MechRequestRound +- MechResponseRound - PostTxSettlementRound - PreTxSettlementRound - RandomnessRound @@ -122,11 +124,10 @@ transition_func: (DecisionReceiveRound, ROUND_TIMEOUT): DecisionReceiveRound (DecisionReceiveRound, TIE): BlacklistingRound (DecisionReceiveRound, UNPROFITABLE): BlacklistingRound - (DecisionRequestRound, DONE): PreTxSettlementRound + (DecisionRequestRound, DONE): MechRequestRound (DecisionRequestRound, NONE): ImpossibleRound (DecisionRequestRound, NO_MAJORITY): DecisionRequestRound (DecisionRequestRound, ROUND_TIMEOUT): DecisionRequestRound - (DecisionRequestRound, SLOTS_UNSUPPORTED_ERROR): BlacklistingRound (FinalizationRound, CHECK_HISTORY): CheckTransactionHistoryRound (FinalizationRound, CHECK_LATE_ARRIVING_MESSAGE): SynchronizeLateMessagesRound (FinalizationRound, DONE): ValidateTransactionRound @@ -136,8 +137,15 @@ transition_func: (HandleFailedTxRound, BLACKLIST): BlacklistingRound (HandleFailedTxRound, NO_MAJORITY): HandleFailedTxRound (HandleFailedTxRound, NO_OP): RedeemRound + (MechRequestRound, DONE): PreTxSettlementRound + (MechRequestRound, NO_MAJORITY): MechRequestRound + (MechRequestRound, ROUND_TIMEOUT): MechRequestRound + (MechRequestRound, SKIP_REQUEST): RedeemRound + (MechResponseRound, DONE): DecisionReceiveRound + (MechResponseRound, NO_MAJORITY): MechResponseRound + (MechResponseRound, ROUND_TIMEOUT): MechResponseRound (PostTxSettlementRound, BET_PLACEMENT_DONE): RedeemRound - (PostTxSettlementRound, DECISION_REQUESTING_DONE): DecisionReceiveRound + (PostTxSettlementRound, MECH_REQUESTING_DONE): MechResponseRound (PostTxSettlementRound, REDEEMING_DONE): CallCheckpointRound (PostTxSettlementRound, ROUND_TIMEOUT): PostTxSettlementRound (PostTxSettlementRound, STAKING_DONE): ResetAndPauseRound diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 5b7dec94c..0ccdb8eef 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -11,7 +11,7 @@ fingerprint: behaviours.py: bafybeigx2uevbnytt6hpwfsrk32u6pyv5scyqvyyzm2a25xaufrxvkldxi composition.py: bafybeidvxtqoghju4tkesiwi6qfzxe3zf2nbqmehimwvp5skmohkeozmei dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm - fsm_specification.yaml: bafybeibi3t63vwfrx5sbkfhji3rb62dtwczpajuijqgul6bpcn3altcziq + fsm_specification.yaml: bafybeiekppmzkubmypurbolow2fjq3vcapgztlqqu6balpq7wlkhzd2qwy handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a models.py: bafybeigk7hs7xsfjoszsque6r6yvbrrhattfuli2nfend4istk465e6try fingerprint_ignore_patterns: [] @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiekluo4v3jsrg5jnr3l4c5ftz6n7c424v6zs22c2ydvvjevxa73ai +- valory/decision_maker_abci:0.1.0:bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifomor54dy3hbh3xorclsni7idiw2t5zlgy5ttwpd7fqz56zlqfzm - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 347a273cd..8309def8a 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeid56axxrcx3alxkjsec6qltuiptdc37fmrsh53tj7k4j7file5f4a +- valory/decision_maker_abci:0.1.0:bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: From 2a636f2c49f344fe381eb4aa24fde9203cd1c375 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Mon, 25 Mar 2024 11:47:40 +0100 Subject: [PATCH 14/24] fix: linters --- packages/packages.json | 10 ++--- packages/valory/agents/trader/aea-config.yaml | 6 +-- packages/valory/services/trader/service.yaml | 2 +- .../skills/decision_maker_abci/rounds.py | 40 +++++++++---------- .../skills/decision_maker_abci/skill.yaml | 6 +-- .../states/decision_receive.py | 2 +- .../states/decision_request.py | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 +- .../tx_settlement_multiplexer_abci/rounds.py | 6 +-- .../tx_settlement_multiplexer_abci/skill.yaml | 4 +- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 6e7a7d15a..8cad6f10f 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey", - "skill/valory/trader_abci/0.1.0": "bafybeifqbheymjuszz4qbra3j7xjn32vawnwve6zgtpwthn25zvfskzwge", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifomor54dy3hbh3xorclsni7idiw2t5zlgy5ttwpd7fqz56zlqfzm", + "skill/valory/decision_maker_abci/0.1.0": "bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu", + "skill/valory/trader_abci/0.1.0": "bafybeiezdaw6vbionbxrrssofs4x2fhvm65quyks5mocjhbc3rhuf6sree", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiazq5yffmeszzdzmwlk75qnryywdel2zr7wfdjrjmufggo7y2denq", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeibus44st4fnu4q4f6wufau7gg3lj6nxzscw7bmkm7v2zndvo6qd2m", - "service/valory/trader/0.1.0": "bafybeib2pf6kofi3abzdfxl6m6fxbxe54abiameg6yqxqzojyot47ghmge" + "agent/valory/trader/0.1.0": "bafybeiaphpnnwtsy6ugf5kcuro3k5zyivnoifppv4cfhqgywrwalvc7i24", + "service/valory/trader/0.1.0": "bafybeifebqcki6qvcdtvw4hsvtig7juzu4ecpr6mhkrq62tg5tffrpwbky" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 238ea6aa7..2fb4e926a 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifomor54dy3hbh3xorclsni7idiw2t5zlgy5ttwpd7fqz56zlqfzm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiazq5yffmeszzdzmwlk75qnryywdel2zr7wfdjrjmufggo7y2denq - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey -- valory/trader_abci:0.1.0:bafybeifqbheymjuszz4qbra3j7xjn32vawnwve6zgtpwthn25zvfskzwge +- valory/decision_maker_abci:0.1.0:bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu +- valory/trader_abci:0.1.0:bafybeiezdaw6vbionbxrrssofs4x2fhvm65quyks5mocjhbc3rhuf6sree - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 2bfb1dd0d..82d5d3bfa 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibus44st4fnu4q4f6wufau7gg3lj6nxzscw7bmkm7v2zndvo6qd2m +agent: valory/trader:0.1.0:bafybeiaphpnnwtsy6ugf5kcuro3k5zyivnoifppv4cfhqgywrwalvc7i24 number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index 05609c45a..1cad612d5 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -82,12 +82,12 @@ class DecisionMakerAbciApp(AbciApp[Event]): Transition states: 0. SamplingRound - done: 1. - - none: 12. + - none: 13. - no majority: 0. - round timeout: 0. - - fetch error: 16. + - fetch error: 17. 1. SubscriptionRound - - done: 14. + - done: 15. - no subscription: 3. - none: 1. - subscription error: 1. @@ -108,11 +108,10 @@ class DecisionMakerAbciApp(AbciApp[Event]): - no majority: 4. - round timeout: 4. 5. DecisionRequestRound - - done: 11. - - slots unsupported error: 7. + - done: 12. - no majority: 5. - round timeout: 5. - - none: 16. + - none: 17. 6. DecisionReceiveRound - done: 8. - mech response error: 7. @@ -121,35 +120,36 @@ class DecisionMakerAbciApp(AbciApp[Event]): - unprofitable: 7. - round timeout: 6. 7. BlacklistingRound - - done: 12. - - none: 16. + - done: 13. + - none: 17. - no majority: 7. - round timeout: 7. - - fetch error: 16. + - fetch error: 17. 8. BetPlacementRound - done: 11. - - insufficient balance: 15. + - insufficient balance: 16. - no majority: 8. - round timeout: 8. - - none: 16. + - none: 17. 9. RedeemRound - done: 11. - - no redeeming: 13. + - no redeeming: 14. - no majority: 9. - - redeem round timeout: 13. - - none: 16. + - redeem round timeout: 14. + - none: 17. 10. HandleFailedTxRound - blacklist: 7. - no op: 9. - no majority: 10. 11. FinishedDecisionMakerRound - 12. FinishedWithoutDecisionRound - 13. FinishedWithoutRedeemingRound - 14. FinishedSubscriptionRound - 15. RefillRequiredRound - 16. ImpossibleRound + 12. FinishedDecisionRequestRound + 13. FinishedWithoutDecisionRound + 14. FinishedWithoutRedeemingRound + 15. FinishedSubscriptionRound + 16. RefillRequiredRound + 17. ImpossibleRound - Final states: {FinishedDecisionMakerRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, FinishedWithoutRedeemingRound, ImpossibleRound, RefillRequiredRound} + Final states: {FinishedDecisionMakerRound, FinishedDecisionRequestRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, FinishedWithoutRedeemingRound, ImpossibleRound, RefillRequiredRound} Timeouts: round timeout: 30.0 diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index b2844bf0f..47cb96ba8 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -34,14 +34,14 @@ fingerprint: payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeifz6kdjusm5ovcetjjuzfgthgbxfuyrbphwlm6qmzxp2dik3j6s6e + rounds.py: bafybeibk6wrimonboqzhsevg26mynt46gu63w5b5bnndtcdvqkorhf53pi states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeibpzv4te3o5rz67cjnqo6dd5rmtt3awj5khamb6epomgnk7vfe5ui states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda states/blacklisting.py: bafybeifruvxwwltndwazkzzbpc5nnnad3z5t5ofy6d3i7nssljbxl6gvxu states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeib3roo27nccj4eylaqwwzztzzzwsi6px5atjrch5wbqmpln2kyy6y - states/decision_request.py: bafybeicxf77bnvrh7z2one4sglvnf5idcmquz6vlln45zlabo47a6pxgz4 + states/decision_receive.py: bafybeiclng2o5skqc7jwuqggpk6guexaot6e2clgfbhejwe4zlkgayeshq + states/decision_request.py: bafybeieugthqhhisvyouhgqovz4ez5potmbffpparvs7dvsfkwr6gwt65u states/final_states.py: bafybeiantsmq3yuzg7qzk6hlyngj74jsx43rphghfwsvseakcxmu3n4kqm states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm states/order_subscription.py: bafybeiaoemltuh3zkch7hvaxzxxsofe3pomlgifj5hamkqqon5mg5eaoqq diff --git a/packages/valory/skills/decision_maker_abci/states/decision_receive.py b/packages/valory/skills/decision_maker_abci/states/decision_receive.py index a45b9ecd2..4b104e645 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_receive.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023 Valory AG +# Copyright 2023-2024 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/skills/decision_maker_abci/states/decision_request.py b/packages/valory/skills/decision_maker_abci/states/decision_request.py index 68c3c09db..af7330de3 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_request.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023 Valory AG +# Copyright 2023-2024 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 0ccdb8eef..ee65423a7 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifomor54dy3hbh3xorclsni7idiw2t5zlgy5ttwpd7fqz56zlqfzm +- valory/decision_maker_abci:0.1.0:bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiazq5yffmeszzdzmwlk75qnryywdel2zr7wfdjrjmufggo7y2denq - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py b/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py index 82707d569..06dff3b75 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py @@ -159,7 +159,7 @@ class TxSettlementMultiplexerAbciApp(AbciApp[Event]): - no majority: 0. - round timeout: 0. 1. PostTxSettlementRound - - decision requesting done: 3. + - mech requesting done: 3. - bet placement done: 4. - redeeming done: 6. - staking done: 7. @@ -167,14 +167,14 @@ class TxSettlementMultiplexerAbciApp(AbciApp[Event]): - round timeout: 1. - unrecognized: 8. 2. ChecksPassedRound - 3. FinishedDecisionRequestTxRound + 3. FinishedMechRequestTxRound 4. FinishedBetPlacementTxRound 5. FinishedSubscriptionTxRound 6. FinishedRedeemingTxRound 7. FinishedStakingTxRound 8. FailedMultiplexerRound - Final states: {ChecksPassedRound, FailedMultiplexerRound, FinishedBetPlacementTxRound, FinishedDecisionRequestTxRound, FinishedRedeemingTxRound, FinishedStakingTxRound, FinishedSubscriptionTxRound} + Final states: {ChecksPassedRound, FailedMultiplexerRound, FinishedBetPlacementTxRound, FinishedMechRequestTxRound, FinishedRedeemingTxRound, FinishedStakingTxRound, FinishedSubscriptionTxRound} Timeouts: round timeout: 30.0 diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 8309def8a..5f9e5af97 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -13,7 +13,7 @@ fingerprint: fsm_specification.yaml: bafybeib7nmznbbug6icxyahy34r6ory7ujkwnlakv3bgmnlecysr46l5v4 handlers.py: bafybeiafbqr7ojfcbwohvee7x4zzswad3ymfrrbjlfz7uuuttmn3qdfs6q models.py: bafybeigtmxoecoow663hgqnyinxarlrttyyt5ghpbdamdv4tc4kikcfx3a - rounds.py: bafybeiggq4tlyuuf2poxxtf2umzaolrmdgp2t6ceumqm2rsqu63hxq2hqu + rounds.py: bafybeig77b7m5fyhy4bsdnmveszagq27v2ck7627tyhw6zzn7spmz5qalu fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeicwjvjjrzbgtp34zphbu7gsydhs63vx4so52t4juqibei2rw2syey +- valory/decision_maker_abci:0.1.0:bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi - valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u behaviours: From 852eb890755b91ac0905ce79364221aba6e31b2c Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Mon, 25 Mar 2024 12:17:51 +0100 Subject: [PATCH 15/24] fix: linters --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 8cad6f10f..cdd152e94 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeihmk4i75jpvwf6qszgguuhxoiobijtjdbykgvhgdqfo6tmrcn2ycm", "contract/valory/transfer_nft_condition/0.1.0": "bafybeiaq6xatkp3c2anjupng7vdml3zed4sizz7sfs3xr5v2d7y3ujfr5q", "skill/valory/market_manager_abci/0.1.0": "bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai", - "skill/valory/decision_maker_abci/0.1.0": "bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu", - "skill/valory/trader_abci/0.1.0": "bafybeiezdaw6vbionbxrrssofs4x2fhvm65quyks5mocjhbc3rhuf6sree", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiazq5yffmeszzdzmwlk75qnryywdel2zr7wfdjrjmufggo7y2denq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeifusf64cc7oyzbowrllewso6gbin6bw6o27vlfn2ghufqluh3hliy", + "skill/valory/trader_abci/0.1.0": "bafybeihkmzgz6hoyv7et3moe6vd4q7a5gms2pskfyruq745hvzssqzy6da", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifxvwvayjjvyj4l6kahsisfhmzmfvtoqbzl3pdbungfmvrcywaznq", "skill/valory/staking_abci/0.1.0": "bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi", - "agent/valory/trader/0.1.0": "bafybeiaphpnnwtsy6ugf5kcuro3k5zyivnoifppv4cfhqgywrwalvc7i24", - "service/valory/trader/0.1.0": "bafybeifebqcki6qvcdtvw4hsvtig7juzu4ecpr6mhkrq62tg5tffrpwbky" + "agent/valory/trader/0.1.0": "bafybeibkk65rhkwbi5zynm6sscywlsz5a7uozotgc4jhz7jb4nkadzqjdu", + "service/valory/trader/0.1.0": "bafybeiggwjfenbvmddjlvmws4gany2vtuaq76xsdxzu6wy4zvzn7jqg2da" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -39,7 +39,7 @@ "connection/valory/ledger/0.19.0": "bafybeic3ft7l7ca3qgnderm4xupsfmyoihgi27ukotnz7b5hdczla2enya", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", "connection/valory/ipfs/0.1.0": "bafybeihndk6hohj3yncgrye5pw7b7w2kztj3avby5u5mfk2fpjh7hqphii", - "skill/valory/mech_interact_abci/0.1.0": "bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u", + "skill/valory/mech_interact_abci/0.1.0": "bafybeib5h5bvx3wsrjzuqdht2speum6aldkf7nu747px2gdn2mnpuvafgi", "skill/valory/abstract_round_abci/0.1.0": "bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4", "skill/valory/abstract_abci/0.1.0": "bafybeigcfsulh6doa6mifuihtfbdf46dtwlvmvtvilzosu6t5myh63rjre", "skill/valory/reset_pause_abci/0.1.0": "bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 2fb4e926a..d1d30d1ec 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,12 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeihcm6h4ae4lwjwu5k3prdyj7mvxv2plzpl444vmjzwhwwp5qathbu - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiazq5yffmeszzdzmwlk75qnryywdel2zr7wfdjrjmufggo7y2denq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifxvwvayjjvyj4l6kahsisfhmzmfvtoqbzl3pdbungfmvrcywaznq - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu -- valory/trader_abci:0.1.0:bafybeiezdaw6vbionbxrrssofs4x2fhvm65quyks5mocjhbc3rhuf6sree +- valory/decision_maker_abci:0.1.0:bafybeifusf64cc7oyzbowrllewso6gbin6bw6o27vlfn2ghufqluh3hliy +- valory/trader_abci:0.1.0:bafybeihkmzgz6hoyv7et3moe6vd4q7a5gms2pskfyruq745hvzssqzy6da - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u +- valory/mech_interact_abci:0.1.0:bafybeib5h5bvx3wsrjzuqdht2speum6aldkf7nu747px2gdn2mnpuvafgi customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 82d5d3bfa..ddadea3e2 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeiaphpnnwtsy6ugf5kcuro3k5zyivnoifppv4cfhqgywrwalvc7i24 +agent: valory/trader:0.1.0:bafybeibkk65rhkwbi5zynm6sscywlsz5a7uozotgc4jhz7jb4nkadzqjdu number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 47cb96ba8..2c34fa831 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 -- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u +- valory/mech_interact_abci:0.1.0:bafybeib5h5bvx3wsrjzuqdht2speum6aldkf7nu747px2gdn2mnpuvafgi behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index ee65423a7..3a9fac4d8 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihbor7t3ozvzxqbiie5wl57ol3k7sqkhd22q2boogmwzj7sfvzic4 - valory/termination_abci:0.1.0:bafybeif2gi2zvnixowmrqgvu6jm3eytwik7nvngv7cz5i44etg3iueorfe - valory/market_manager_abci:0.1.0:bafybeiftumqut5wlncpqsep4qtguhaqc7puxhd266ysvdh4u7zksj26aai -- valory/decision_maker_abci:0.1.0:bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiazq5yffmeszzdzmwlk75qnryywdel2zr7wfdjrjmufggo7y2denq +- valory/decision_maker_abci:0.1.0:bafybeifusf64cc7oyzbowrllewso6gbin6bw6o27vlfn2ghufqluh3hliy +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifxvwvayjjvyj4l6kahsisfhmzmfvtoqbzl3pdbungfmvrcywaznq - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u +- valory/mech_interact_abci:0.1.0:bafybeib5h5bvx3wsrjzuqdht2speum6aldkf7nu747px2gdn2mnpuvafgi behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 5f9e5af97..f054f0cc2 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeigr33fuqxsw7dwurncs7b4ogqa736k4ojktd3ucluv22setixe2a4 -- valory/decision_maker_abci:0.1.0:bafybeifpey4ppfogw6zp4ajj5ln32x5whnihva7zgsiherdkxy4w2qublu +- valory/decision_maker_abci:0.1.0:bafybeifusf64cc7oyzbowrllewso6gbin6bw6o27vlfn2ghufqluh3hliy - valory/staking_abci:0.1.0:bafybeihh6e5eptk5lttl4jeqxsd7pwbrlroojlxevht4jlvu4hj4iusnoi -- valory/mech_interact_abci:0.1.0:bafybeib3uelyyuohzu7zysgd7awonzox2ixgpuyclnphlmid7ak7ktva4u +- valory/mech_interact_abci:0.1.0:bafybeib5h5bvx3wsrjzuqdht2speum6aldkf7nu747px2gdn2mnpuvafgi behaviours: main: args: {} From 38d85bb5871a7e5c699ac224e5ba0ddfeac80e0f Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Tue, 2 Apr 2024 21:35:18 +0200 Subject: [PATCH 16/24] fix: mech_price --- packages/packages.json | 15 ++++++++------- packages/valory/agents/trader/aea-config.yaml | 9 +++++---- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/decision_receive.py | 3 ++- .../valory/skills/decision_maker_abci/skill.yaml | 9 +++++---- .../skills/decision_maker_abci/states/base.py | 9 +++++---- packages/valory/skills/trader_abci/skill.yaml | 7 ++++--- .../tx_settlement_multiplexer_abci/skill.yaml | 3 ++- 8 files changed, 32 insertions(+), 25 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index e3455cfcd..3c63bc5ec 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -6,7 +6,6 @@ "custom/w1kke/always_blue/0.1.0": "bafybeieshu32h3es2fslduuhr7nimuvh2vuibyeqdunzrcggaeohekg3jm", "contract/valory/market_maker/0.1.0": "bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq", "contract/valory/erc20/0.1.0": "bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54", - "contract/valory/mech/0.1.0": "bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa", "contract/valory/realitio/0.1.0": "bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq", "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4", "contract/valory/conditional_tokens/0.1.0": "bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu", @@ -14,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeie7bvctvvmphamfrujtnsg2wxeafuoquvgikhm33xrowtpybj2iyy", - "skill/valory/trader_abci/0.1.0": "bafybeif44yj3ylxwu3pch5tfejwxdoq42vu34cfapsbiolggkxygbcz4ve", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeico5v6u7dmy7tj4nwakmoef5ihirivtb7s5lxm3v6szsco3ulkctu", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq", + "skill/valory/trader_abci/0.1.0": "bafybeia62pxmjndmzc5igtd75fuolyuhrdjydbg7nwsdrtgrl4ta23m6zq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibamqzm5cyohumxk5fowlb7zx7jkkk33aite43so35yydxig4kwb4", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeid7u2back4fs6tjg2xreuuoxffhyts7zqnopkaf33727nnudb4zhu", - "service/valory/trader/0.1.0": "bafybeiasnt464j7qfatuju2g6e6k2rgtebwqrdpyi5hij7xr5uwpwp4a2e" + "agent/valory/trader/0.1.0": "bafybeigua6j7ssto4fh2astdgf2pcbxbvy2b7jrbr67x526ou4vouezede", + "service/valory/trader/0.1.0": "bafybeidgmrsiuzudmg5xylmvh3lxbnwengqccfdv6ztnxwrb32xfrwg7iq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -32,6 +31,7 @@ "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm", "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74", "contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa", + "contract/valory/mech/0.1.0": "bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy", "contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "connection/valory/abci/0.1.0": "bafybeiclexb6cnsog5yjz2qtvqyfnf7x5m7tpp56hblhk3pbocbvgjzhze", @@ -44,6 +44,7 @@ "skill/valory/registration_abci/0.1.0": "bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm", "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", - "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44" + "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", + "skill/valory/mech_interact_abci/0.1.0": "bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 3bb0d1329..54a3c4b84 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -21,7 +21,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54 - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa +- valory/mech:0.1.0:bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -44,11 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeico5v6u7dmy7tj4nwakmoef5ihirivtb7s5lxm3v6szsco3ulkctu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibamqzm5cyohumxk5fowlb7zx7jkkk33aite43so35yydxig4kwb4 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeie7bvctvvmphamfrujtnsg2wxeafuoquvgikhm33xrowtpybj2iyy -- valory/trader_abci:0.1.0:bafybeif44yj3ylxwu3pch5tfejwxdoq42vu34cfapsbiolggkxygbcz4ve +- valory/decision_maker_abci:0.1.0:bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq +- valory/trader_abci:0.1.0:bafybeia62pxmjndmzc5igtd75fuolyuhrdjydbg7nwsdrtgrl4ta23m6zq - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e +- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index f677b8e84..94075c859 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeid7u2back4fs6tjg2xreuuoxffhyts7zqnopkaf33727nnudb4zhu +agent: valory/trader:0.1.0:bafybeigua6j7ssto4fh2astdgf2pcbxbvy2b7jrbr67x526ou4vouezede number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index 10e948a18..1cbffd016 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -28,6 +28,7 @@ remove_fraction_wei, ) from packages.valory.skills.decision_maker_abci.io_.loader import ComponentPackageLoader +from packages.valory.skills.decision_maker_abci.models import PredictionResponse from packages.valory.skills.decision_maker_abci.payloads import DecisionReceivePayload from packages.valory.skills.decision_maker_abci.states.decision_receive import ( DecisionReceiveRound, @@ -95,7 +96,7 @@ def _get_decision( ) return None, None, None - result = json.loads(self.mech_response.result) + result = PredictionResponse(**json.loads(self.mech_response.result)) return ( result.vote, result.win_probability, diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index bab419d7b..33d513493 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -16,7 +16,7 @@ fingerprint: behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca - behaviours/decision_receive.py: bafybeidgka77mwaadjjomov53z7jd2dr3a3szhcxulglogzyfgzqip3qlm + behaviours/decision_receive.py: bafybeign4nl75334sgf4nni6glpbvzqgdw7vrclwiey6tmgj7x5pzmmaue behaviours/decision_request.py: bafybeicv2c5nwipgn6juhgohl7sol3bwkfknsvcrfcswbulukxkczi444i behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeifygejified3yoza3gy4g7ina6m4lmz4pp2abtwfuwrmiwznnvrua @@ -36,7 +36,7 @@ fingerprint: redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm rounds.py: bafybeibk6wrimonboqzhsevg26mynt46gu63w5b5bnndtcdvqkorhf53pi states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeibpzv4te3o5rz67cjnqo6dd5rmtt3awj5khamb6epomgnk7vfe5ui + states/base.py: bafybeiefeeubjxohtlts4whzw7pgo37c3mtelo5z5yccaxfypgrdjqs5du states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda states/blacklisting.py: bafybeifruvxwwltndwazkzzbpc5nnnad3z5t5ofy6d3i7nssljbxl6gvxu states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54 - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiaqkpudbwnjf2svagdwgl5vujhuhmdqiomee47m5t3z23iest2oxa +- valory/mech:0.1.0:bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -76,6 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq +- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji behaviours: main: args: {} @@ -268,7 +269,7 @@ models: method: GET parameters: {} response_key: result - response_type: dict + response_type: str retries: 5 url: '' class_name: MechResponseSpecs diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index cfbd67f83..ce8c4deba 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -68,10 +68,6 @@ class SynchronizedData(MarketManagerSyncedData, TxSettlementSyncedData): This data is replicated by the tendermint application. """ - # These parameters are from other ABCI skills, and are added - # here to avoid subclassing and avoid MyPy linter issues. - mech_price: int - @property def sampled_bet_index(self) -> int: """Get the sampled bet.""" @@ -176,6 +172,11 @@ def claim(self) -> bool: """Get the claim.""" return bool(self.db.get_strict("claim")) + @property + def mech_price(self) -> int: + """Get the mech's request price.""" + return int(self.db.get_strict("mech_price")) + @property def mech_requests(self) -> List[MechMetadata]: """Get the mech requests.""" diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index ecbeaf145..34d905520 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,9 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeie7bvctvvmphamfrujtnsg2wxeafuoquvgikhm33xrowtpybj2iyy -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeico5v6u7dmy7tj4nwakmoef5ihirivtb7s5lxm3v6szsco3ulkctu +- valory/decision_maker_abci:0.1.0:bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibamqzm5cyohumxk5fowlb7zx7jkkk33aite43so35yydxig4kwb4 - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e +- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji behaviours: main: args: {} @@ -274,7 +275,7 @@ models: method: GET parameters: {} response_key: result - response_type: dict + response_type: str retries: 5 url: '' class_name: MechResponseSpecs diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 6cfb178f7..7b7ee76a6 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,8 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeie7bvctvvmphamfrujtnsg2wxeafuoquvgikhm33xrowtpybj2iyy +- valory/decision_maker_abci:0.1.0:bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e +- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji behaviours: main: args: {} From 4ad81747429b8a7a1b638e26b8d7877f08316773 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Tue, 2 Apr 2024 22:24:49 +0200 Subject: [PATCH 17/24] fix: linters --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../decision_maker_abci/fsm_specification.yaml | 2 ++ packages/valory/skills/decision_maker_abci/rounds.py | 3 +++ .../valory/skills/decision_maker_abci/skill.yaml | 6 +++--- .../valory/skills/trader_abci/fsm_specification.yaml | 2 ++ packages/valory/skills/trader_abci/skill.yaml | 8 ++++---- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 9 files changed, 27 insertions(+), 20 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 3c63bc5ec..7251c8373 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq", - "skill/valory/trader_abci/0.1.0": "bafybeia62pxmjndmzc5igtd75fuolyuhrdjydbg7nwsdrtgrl4ta23m6zq", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibamqzm5cyohumxk5fowlb7zx7jkkk33aite43so35yydxig4kwb4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe", + "skill/valory/trader_abci/0.1.0": "bafybeihlqx7sua6cj7yipqhn7wlwhwjc6depswxk3kpfzsjntdfpgq73sy", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidiqpjcedi5svfzhauujtgcpnlkbysp2noow7yof7rk3b355fl6aa", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeigua6j7ssto4fh2astdgf2pcbxbvy2b7jrbr67x526ou4vouezede", - "service/valory/trader/0.1.0": "bafybeidgmrsiuzudmg5xylmvh3lxbnwengqccfdv6ztnxwrb32xfrwg7iq" + "agent/valory/trader/0.1.0": "bafybeihx6j642watydtns2plzzlxglsoildg3i2j2miwmtvmollvagnx2i", + "service/valory/trader/0.1.0": "bafybeih56piqvotdtqwo5mdosupha352uzjlzbarujflx55gus6vmlgi4e" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -45,6 +45,6 @@ "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", - "skill/valory/mech_interact_abci/0.1.0": "bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji" + "skill/valory/mech_interact_abci/0.1.0": "bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 54a3c4b84..b7f9fd38e 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,12 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibamqzm5cyohumxk5fowlb7zx7jkkk33aite43so35yydxig4kwb4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidiqpjcedi5svfzhauujtgcpnlkbysp2noow7yof7rk3b355fl6aa - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq -- valory/trader_abci:0.1.0:bafybeia62pxmjndmzc5igtd75fuolyuhrdjydbg7nwsdrtgrl4ta23m6zq +- valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe +- valory/trader_abci:0.1.0:bafybeihlqx7sua6cj7yipqhn7wlwhwjc6depswxk3kpfzsjntdfpgq73sy - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji +- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 94075c859..5cabc2817 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeigua6j7ssto4fh2astdgf2pcbxbvy2b7jrbr67x526ou4vouezede +agent: valory/trader:0.1.0:bafybeihx6j642watydtns2plzzlxglsoildg3i2j2miwmtvmollvagnx2i number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/fsm_specification.yaml b/packages/valory/skills/decision_maker_abci/fsm_specification.yaml index 6df29335e..d7a40598d 100644 --- a/packages/valory/skills/decision_maker_abci/fsm_specification.yaml +++ b/packages/valory/skills/decision_maker_abci/fsm_specification.yaml @@ -11,6 +11,7 @@ alphabet_in: - NO_SUBSCRIPTION - REDEEM_ROUND_TIMEOUT - ROUND_TIMEOUT +- SLOTS_UNSUPPORTED_ERROR - SUBSCRIPTION_ERROR - TIE - UNPROFITABLE @@ -74,6 +75,7 @@ transition_func: (DecisionRequestRound, NONE): ImpossibleRound (DecisionRequestRound, NO_MAJORITY): DecisionRequestRound (DecisionRequestRound, ROUND_TIMEOUT): DecisionRequestRound + (DecisionRequestRound, SLOTS_UNSUPPORTED_ERROR): BlacklistingRound (HandleFailedTxRound, BLACKLIST): BlacklistingRound (HandleFailedTxRound, NO_MAJORITY): HandleFailedTxRound (HandleFailedTxRound, NO_OP): RedeemRound diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index 1cad612d5..d8e13f005 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -109,6 +109,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): - round timeout: 4. 5. DecisionRequestRound - done: 12. + - slots unsupported error: 7. - no majority: 5. - round timeout: 5. - none: 17. @@ -200,6 +201,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): }, DecisionRequestRound: { Event.DONE: FinishedDecisionRequestRound, + Event.SLOTS_UNSUPPORTED_ERROR: BlacklistingRound, Event.NO_MAJORITY: DecisionRequestRound, Event.ROUND_TIMEOUT: DecisionRequestRound, # this is here because of `autonomy analyse fsm-specs` falsely reporting it as missing from the transition @@ -259,6 +261,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): get_name(SynchronizedData.utilized_tools), get_name(SynchronizedData.redeemed_condition_ids), get_name(SynchronizedData.payout_so_far), + get_name(SynchronizedData.mech_price), } ) final_states: Set[AppState] = { diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 33d513493..b6dbe5606 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -26,7 +26,7 @@ fingerprint: behaviours/sampling.py: bafybeibtkli72qsvotkrsepkgpiumtr5sershtkpb427oygnszs3dpgxry behaviours/tool_selection.py: bafybeicxw4je76uc7znx4u2hq2b2aaxcf7blwfla7lhdhkqnf3kkupsczq dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm - fsm_specification.yaml: bafybeiffbl4aexajrjn6ui4hawmg7maoikuu2jgozgsjboclajw2rmcyty + fsm_specification.yaml: bafybeicqwy4r4fhhpn3ppwly57wckl5dhwlvaer4vug7tg3qhdcxo2ssuq handlers.py: bafybeiggoetspwcvdojmbjdd67tmkoeedikmt6vsbcium3zjaljb6jzqu4 io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa @@ -34,7 +34,7 @@ fingerprint: payloads.py: bafybeihejpmrefonjecnove26g52ukxdlicdbbn7qvnh4lg53q54bgq4p4 policy.py: bafybeidbsu5zn456jpku65jajwlxyg5kn2ltlkctkculkj2i2tfmmwm4jq redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeibk6wrimonboqzhsevg26mynt46gu63w5b5bnndtcdvqkorhf53pi + rounds.py: bafybeidghyig7wuc2ldvoshanyghisgrxpbhjvjookwxueust77rwvxd2i states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeiefeeubjxohtlts4whzw7pgo37c3mtelo5z5yccaxfypgrdjqs5du states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji +- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/fsm_specification.yaml b/packages/valory/skills/trader_abci/fsm_specification.yaml index b34ced92d..c2e09de15 100644 --- a/packages/valory/skills/trader_abci/fsm_specification.yaml +++ b/packages/valory/skills/trader_abci/fsm_specification.yaml @@ -30,6 +30,7 @@ alphabet_in: - SERVICE_EVICTED - SERVICE_NOT_STAKED - SKIP_REQUEST +- SLOTS_UNSUPPORTED_ERROR - STAKING_DONE - SUBSCRIPTION_DONE - SUBSCRIPTION_ERROR @@ -128,6 +129,7 @@ transition_func: (DecisionRequestRound, NONE): ImpossibleRound (DecisionRequestRound, NO_MAJORITY): DecisionRequestRound (DecisionRequestRound, ROUND_TIMEOUT): DecisionRequestRound + (DecisionRequestRound, SLOTS_UNSUPPORTED_ERROR): BlacklistingRound (FinalizationRound, CHECK_HISTORY): CheckTransactionHistoryRound (FinalizationRound, CHECK_LATE_ARRIVING_MESSAGE): SynchronizeLateMessagesRound (FinalizationRound, DONE): ValidateTransactionRound diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 34d905520..c8aa16a2b 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -11,7 +11,7 @@ fingerprint: behaviours.py: bafybeigx2uevbnytt6hpwfsrk32u6pyv5scyqvyyzm2a25xaufrxvkldxi composition.py: bafybeidvxtqoghju4tkesiwi6qfzxe3zf2nbqmehimwvp5skmohkeozmei dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm - fsm_specification.yaml: bafybeiekppmzkubmypurbolow2fjq3vcapgztlqqu6balpq7wlkhzd2qwy + fsm_specification.yaml: bafybeiaulbsq76cc5h7jjz6oiezoui452mtyk6g2kbmhhzsggqrjqw4cuy handlers.py: bafybeibkiqwe7hoqccjirimd44nzeqkabc7oo74romqklssion27s5sa2a models.py: bafybeigk7hs7xsfjoszsque6r6yvbrrhattfuli2nfend4istk465e6try fingerprint_ignore_patterns: [] @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibamqzm5cyohumxk5fowlb7zx7jkkk33aite43so35yydxig4kwb4 +- valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidiqpjcedi5svfzhauujtgcpnlkbysp2noow7yof7rk3b355fl6aa - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji +- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 7b7ee76a6..8c31bffd4 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeiarkuay5j5clvy2pa5ffd2axl4um44wcojaibrmxt4wkttcnyy2qq +- valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeihil35lbpcfov3dqrxzyluhjkbuysx6qkozqrd5of47jhebtg7dji +- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu behaviours: main: args: {} From d6a92bcb2b192be72d8b74d5bc2dc062fe6fae7b Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Tue, 2 Apr 2024 22:43:51 +0200 Subject: [PATCH 18/24] fix: linters --- packages/packages.json | 8 ++++---- packages/valory/agents/trader/aea-config.yaml | 4 ++-- packages/valory/services/trader/service.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 2 +- .../tx_settlement_multiplexer_abci/fsm_specification.yaml | 8 ++++---- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 7251c8373..7f1efaea8 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -14,11 +14,11 @@ "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", "skill/valory/decision_maker_abci/0.1.0": "bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe", - "skill/valory/trader_abci/0.1.0": "bafybeihlqx7sua6cj7yipqhn7wlwhwjc6depswxk3kpfzsjntdfpgq73sy", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidiqpjcedi5svfzhauujtgcpnlkbysp2noow7yof7rk3b355fl6aa", + "skill/valory/trader_abci/0.1.0": "bafybeih6gywjaxwmjpfqlug4jwsy4ud6ydxxp6q7e3pdi2uirjutmqov7u", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigh5bg3hlvoemjganuvaxm7zxdee7ramjntmuiaky44k34ipzyrr4", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeihx6j642watydtns2plzzlxglsoildg3i2j2miwmtvmollvagnx2i", - "service/valory/trader/0.1.0": "bafybeih56piqvotdtqwo5mdosupha352uzjlzbarujflx55gus6vmlgi4e" + "agent/valory/trader/0.1.0": "bafybeidvlg4maynglx4rvqxnv2pfpj3iw3nadhdj5f5y2py6st5wov4spm", + "service/valory/trader/0.1.0": "bafybeifxchhjfptcxsqlwilp3v7nxjx3cde4eictagbjuvckbrtmkk5xqe" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index b7f9fd38e..f62981c5c 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidiqpjcedi5svfzhauujtgcpnlkbysp2noow7yof7rk3b355fl6aa +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh5bg3hlvoemjganuvaxm7zxdee7ramjntmuiaky44k34ipzyrr4 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe -- valory/trader_abci:0.1.0:bafybeihlqx7sua6cj7yipqhn7wlwhwjc6depswxk3kpfzsjntdfpgq73sy +- valory/trader_abci:0.1.0:bafybeih6gywjaxwmjpfqlug4jwsy4ud6ydxxp6q7e3pdi2uirjutmqov7u - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 5cabc2817..6bea2612c 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeihx6j642watydtns2plzzlxglsoildg3i2j2miwmtvmollvagnx2i +agent: valory/trader:0.1.0:bafybeidvlg4maynglx4rvqxnv2pfpj3iw3nadhdj5f5y2py6st5wov4spm number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index c8aa16a2b..62e166313 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -26,7 +26,7 @@ skills: - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidiqpjcedi5svfzhauujtgcpnlkbysp2noow7yof7rk3b355fl6aa +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh5bg3hlvoemjganuvaxm7zxdee7ramjntmuiaky44k34ipzyrr4 - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/fsm_specification.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/fsm_specification.yaml index 5070c9adf..d21d8966f 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/fsm_specification.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/fsm_specification.yaml @@ -1,7 +1,7 @@ alphabet_in: - BET_PLACEMENT_DONE - CHECKS_PASSED -- DECISION_REQUESTING_DONE +- MECH_REQUESTING_DONE - NO_MAJORITY - REDEEMING_DONE - REFILL_REQUIRED @@ -14,7 +14,7 @@ final_states: - ChecksPassedRound - FailedMultiplexerRound - FinishedBetPlacementTxRound -- FinishedDecisionRequestTxRound +- FinishedMechRequestTxRound - FinishedRedeemingTxRound - FinishedStakingTxRound - FinishedSubscriptionTxRound @@ -26,7 +26,7 @@ states: - ChecksPassedRound - FailedMultiplexerRound - FinishedBetPlacementTxRound -- FinishedDecisionRequestTxRound +- FinishedMechRequestTxRound - FinishedRedeemingTxRound - FinishedStakingTxRound - FinishedSubscriptionTxRound @@ -34,7 +34,7 @@ states: - PreTxSettlementRound transition_func: (PostTxSettlementRound, BET_PLACEMENT_DONE): FinishedBetPlacementTxRound - (PostTxSettlementRound, DECISION_REQUESTING_DONE): FinishedDecisionRequestTxRound + (PostTxSettlementRound, MECH_REQUESTING_DONE): FinishedMechRequestTxRound (PostTxSettlementRound, REDEEMING_DONE): FinishedRedeemingTxRound (PostTxSettlementRound, ROUND_TIMEOUT): PostTxSettlementRound (PostTxSettlementRound, STAKING_DONE): FinishedStakingTxRound diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 8c31bffd4..d3348eb0a 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -10,7 +10,7 @@ fingerprint: __init__.py: bafybeide6k22zk4f3hyzhpapaoddsnxpw5elqcfvrxxj4nfvpzctv6jqhu behaviours.py: bafybeictumcqn2pgo7y2duemvzoaafognfhl6s6il3tv53hq66tf7xgpsu dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm - fsm_specification.yaml: bafybeib7nmznbbug6icxyahy34r6ory7ujkwnlakv3bgmnlecysr46l5v4 + fsm_specification.yaml: bafybeicd7us5ffvsrxm7ybaanyzojbhmo7xtsfd3swtdem4dfsxkidxw7a handlers.py: bafybeiafbqr7ojfcbwohvee7x4zzswad3ymfrrbjlfz7uuuttmn3qdfs6q models.py: bafybeigtmxoecoow663hgqnyinxarlrttyyt5ghpbdamdv4tc4kikcfx3a rounds.py: bafybeig77b7m5fyhy4bsdnmveszagq27v2ck7627tyhw6zzn7spmz5qalu From 4890c9a4f5c1535365e848cd321783e91615403d Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 3 Apr 2024 10:33:20 +0200 Subject: [PATCH 19/24] chore: update mech_interact_abci hash --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 7f1efaea8..19c43a09f 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe", - "skill/valory/trader_abci/0.1.0": "bafybeih6gywjaxwmjpfqlug4jwsy4ud6ydxxp6q7e3pdi2uirjutmqov7u", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigh5bg3hlvoemjganuvaxm7zxdee7ramjntmuiaky44k34ipzyrr4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u", + "skill/valory/trader_abci/0.1.0": "bafybeige6xegnc5jyz56bwapy3rkduxca56qma7te3t5x2wh4ojocfqswe", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigh2q34o32jrli2rpnokoaafsorluxenzlzpnbu5yerxjq6kljtpa", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeidvlg4maynglx4rvqxnv2pfpj3iw3nadhdj5f5y2py6st5wov4spm", - "service/valory/trader/0.1.0": "bafybeifxchhjfptcxsqlwilp3v7nxjx3cde4eictagbjuvckbrtmkk5xqe" + "agent/valory/trader/0.1.0": "bafybeibo7frnnffeurypkni4ufpyzd5n3xi742wvvgde76jcyge26d6dnu", + "service/valory/trader/0.1.0": "bafybeifsp6kazjindgougcuorjijf6v6hfommpifwwusej4erxwrikg4ve" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -45,6 +45,6 @@ "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", - "skill/valory/mech_interact_abci/0.1.0": "bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu" + "skill/valory/mech_interact_abci/0.1.0": "bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index f62981c5c..6ef023692 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,12 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh5bg3hlvoemjganuvaxm7zxdee7ramjntmuiaky44k34ipzyrr4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh2q34o32jrli2rpnokoaafsorluxenzlzpnbu5yerxjq6kljtpa - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe -- valory/trader_abci:0.1.0:bafybeih6gywjaxwmjpfqlug4jwsy4ud6ydxxp6q7e3pdi2uirjutmqov7u +- valory/decision_maker_abci:0.1.0:bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u +- valory/trader_abci:0.1.0:bafybeige6xegnc5jyz56bwapy3rkduxca56qma7te3t5x2wh4ojocfqswe - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu +- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 6bea2612c..588b725ca 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeidvlg4maynglx4rvqxnv2pfpj3iw3nadhdj5f5y2py6st5wov4spm +agent: valory/trader:0.1.0:bafybeibo7frnnffeurypkni4ufpyzd5n3xi742wvvgde76jcyge26d6dnu number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index b6dbe5606..e69e5b33d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu +- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 62e166313..8a54c4bac 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh5bg3hlvoemjganuvaxm7zxdee7ramjntmuiaky44k34ipzyrr4 +- valory/decision_maker_abci:0.1.0:bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh2q34o32jrli2rpnokoaafsorluxenzlzpnbu5yerxjq6kljtpa - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu +- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index d3348eb0a..bf817c6ae 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeighmjp5bnefuhcwqdf54pcupd32uh4dpd7z4a6qcttwkz4gzgp2pe +- valory/decision_maker_abci:0.1.0:bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibqmg6lawncyot2xjsfsgtam6jubqravkhruex2o2vfzuc46khoiu +- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: main: args: {} From ea6579a39aae3d69a4aafd63c578d0c1cbc25529 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 3 Apr 2024 12:18:16 +0200 Subject: [PATCH 20/24] [no ci] fix: change multisend_batch_size to 1 by default --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 10 ++++++++-- packages/valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 19c43a09f..cb90d18ea 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u", - "skill/valory/trader_abci/0.1.0": "bafybeige6xegnc5jyz56bwapy3rkduxca56qma7te3t5x2wh4ojocfqswe", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigh2q34o32jrli2rpnokoaafsorluxenzlzpnbu5yerxjq6kljtpa", + "skill/valory/decision_maker_abci/0.1.0": "bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym", + "skill/valory/trader_abci/0.1.0": "bafybeigxegmgrglae7v7zmjurfnu7vw2b2qtpot2vbnb5arnr3d3wtuhoq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieto7yi63ujjfvdhecm4aw3dtkhnmcliqf3wh2hv4qmg3bjxw22bm", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeibo7frnnffeurypkni4ufpyzd5n3xi742wvvgde76jcyge26d6dnu", - "service/valory/trader/0.1.0": "bafybeifsp6kazjindgougcuorjijf6v6hfommpifwwusej4erxwrikg4ve" + "agent/valory/trader/0.1.0": "bafybeigbu656mr2ypsnriip3g24nlsjztvqonhfsd3sjcj2n6h67dky2im", + "service/valory/trader/0.1.0": "bafybeiateahngizps5gzxokq3qepnrarg2ph3pdruojqyxf5wuebdmvsb4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 6ef023692..5c9ca6eb0 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh2q34o32jrli2rpnokoaafsorluxenzlzpnbu5yerxjq6kljtpa +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieto7yi63ujjfvdhecm4aw3dtkhnmcliqf3wh2hv4qmg3bjxw22bm - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u -- valory/trader_abci:0.1.0:bafybeige6xegnc5jyz56bwapy3rkduxca56qma7te3t5x2wh4ojocfqswe +- valory/decision_maker_abci:0.1.0:bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym +- valory/trader_abci:0.1.0:bafybeigxegmgrglae7v7zmjurfnu7vw2b2qtpot2vbnb5arnr3d3wtuhoq - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge customs: @@ -155,7 +155,7 @@ models: reset_pause_duration: ${int:30} max_healthcheck: ${int:43200} multisend_address: ${str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} - multisend_batch_size: ${int:5} + multisend_batch_size: ${int:1} drand_public_key: ${str:868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31} service_registry_address: ${str:null} agent_registry_address: ${str:null} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 588b725ca..62eed0e3f 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibo7frnnffeurypkni4ufpyzd5n3xi742wvvgde76jcyge26d6dnu +agent: valory/trader:0.1.0:bafybeigbu656mr2ypsnriip3g24nlsjztvqonhfsd3sjcj2n6h67dky2im number_of_agents: 4 deployment: {} --- @@ -47,6 +47,7 @@ type: skill max_attempts: ${MAX_ATTEMPTS:int:10} max_healthcheck: ${MAX_HEALTHCHECK:int:120} multisend_address: ${MULTISEND_ADDRESS:str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} + multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:1} on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null} reset_tendermint_after: ${RESET_TM_AFTER:int:2} retry_attempts: ${RETRY_ATTEMPTS:int:400} @@ -79,6 +80,7 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} + request_price: ${REQUEST_PRICE:int:null} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -143,7 +145,7 @@ type: skill max_attempts: ${MAX_ATTEMPTS:int:10} max_healthcheck: ${MAX_HEALTHCHECK:int:120} multisend_address: ${MULTISEND_ADDRESS:str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} - multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:5} + multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:1} on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null} reset_tendermint_after: ${RESET_TM_AFTER:int:2} retry_attempts: ${RETRY_ATTEMPTS:int:400} @@ -238,6 +240,7 @@ type: skill max_attempts: ${MAX_ATTEMPTS:int:10} max_healthcheck: ${MAX_HEALTHCHECK:int:120} multisend_address: ${MULTISEND_ADDRESS:str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} + multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:1} on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null} reset_tendermint_after: ${RESET_TM_AFTER:int:2} retry_attempts: ${RETRY_ATTEMPTS:int:400} @@ -269,6 +272,7 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} + request_price: ${REQUEST_PRICE:int:null} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} @@ -331,6 +335,7 @@ type: skill max_attempts: ${MAX_ATTEMPTS:int:10} max_healthcheck: ${MAX_HEALTHCHECK:int:120} multisend_address: ${MULTISEND_ADDRESS:str:0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761} + multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:1} on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null} reset_tendermint_after: ${RESET_TM_AFTER:int:2} retry_attempts: ${RETRY_ATTEMPTS:int:400} @@ -362,6 +367,7 @@ type: skill average_block_time: ${ABT:int:5} abt_error_mult: ${ABT_ERROR_MULT:int:5} mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a} + request_price: ${REQUEST_PRICE:int:null} sample_bets_closing_days: ${SAMPLE_BETS_CLOSING_DAYS:int:10} trading_strategy: ${TRADING_STRATEGY:str:kelly_criterion} use_fallback_strategy: ${USE_FALLBACK_STRATEGY:bool:true} diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index e69e5b33d..e5ac38a37 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -149,7 +149,7 @@ models: max_attempts: 10 max_healthcheck: 120 multisend_address: '0x0000000000000000000000000000000000000000' - multisend_batch_size: 5 + multisend_batch_size: 1 on_chain_service_id: null request_retry_delay: 1.0 request_timeout: 10.0 diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 8a54c4bac..fbb68a733 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigh2q34o32jrli2rpnokoaafsorluxenzlzpnbu5yerxjq6kljtpa +- valory/decision_maker_abci:0.1.0:bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieto7yi63ujjfvdhecm4aw3dtkhnmcliqf3wh2hv4qmg3bjxw22bm - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: @@ -105,7 +105,7 @@ models: max_attempts: 10 max_healthcheck: 120 multisend_address: '0x0000000000000000000000000000000000000000' - multisend_batch_size: 5 + multisend_batch_size: 1 on_chain_service_id: null request_retry_delay: 1.0 request_timeout: 10.0 diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index bf817c6ae..15fca9bed 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeiha4nju25mkwddfht3qequdxoloioipchdukl34xcrb53fto3qa2u +- valory/decision_maker_abci:0.1.0:bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: From dc3d64ae1d6db239a195f1b8e3e1950f16415b4f Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 3 Apr 2024 15:36:36 +0200 Subject: [PATCH 21/24] [no ci] fix: exception handling --- .../behaviours/decision_receive.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index 1cbffd016..d22f16875 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -96,12 +96,19 @@ def _get_decision( ) return None, None, None - result = PredictionResponse(**json.loads(self.mech_response.result)) - return ( - result.vote, - result.win_probability, - result.confidence, - ) + try: + result = PredictionResponse(**json.loads(self.mech_response.result)) + return ( + result.vote, + result.win_probability, + result.confidence, + ) + except json.JSONDecodeError as exc: + self.context.logger.error(f"There was a JSONDecodeError parsing the mech's response: {exc}") + return None, None, None + except ValueError as exc: + self.context.logger.error(f"There was a ValueError parsing the mech's response: {exc}") + return None, None, None @staticmethod def _get_bet_sample_info(bet: Bet, vote: int) -> Tuple[int, int]: From b4f555070d5c362a7d1b3e81d01cbb134159a834 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 3 Apr 2024 17:09:44 +0200 Subject: [PATCH 22/24] fix: review changes --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/decision_receive.py | 18 ++++++++---------- .../behaviours/decision_request.py | 10 +++++----- .../skills/decision_maker_abci/skill.yaml | 4 ++-- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 27 insertions(+), 29 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index cb90d18ea..4d58b2106 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym", - "skill/valory/trader_abci/0.1.0": "bafybeigxegmgrglae7v7zmjurfnu7vw2b2qtpot2vbnb5arnr3d3wtuhoq", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieto7yi63ujjfvdhecm4aw3dtkhnmcliqf3wh2hv4qmg3bjxw22bm", + "skill/valory/decision_maker_abci/0.1.0": "bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia", + "skill/valory/trader_abci/0.1.0": "bafybeibia4jeqfoyccc7in5du3nw7spp3rc5cinevorfbucfa5qv2u72mu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia44ar2ezf22owqhj7npddvxsnkxxucozlqawbmgfecunpwieeui4", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeigbu656mr2ypsnriip3g24nlsjztvqonhfsd3sjcj2n6h67dky2im", - "service/valory/trader/0.1.0": "bafybeiateahngizps5gzxokq3qepnrarg2ph3pdruojqyxf5wuebdmvsb4" + "agent/valory/trader/0.1.0": "bafybeif67f4uvpjmanmup5odbbz7frujzwd54yso3a7nltfix237uglux4", + "service/valory/trader/0.1.0": "bafybeie2nljfckzi64p7c6vvrnt6bae2kfxot3tkwx6bdkh3z5qksnkwhm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 5c9ca6eb0..b7c102b8d 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -44,10 +44,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieto7yi63ujjfvdhecm4aw3dtkhnmcliqf3wh2hv4qmg3bjxw22bm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia44ar2ezf22owqhj7npddvxsnkxxucozlqawbmgfecunpwieeui4 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym -- valory/trader_abci:0.1.0:bafybeigxegmgrglae7v7zmjurfnu7vw2b2qtpot2vbnb5arnr3d3wtuhoq +- valory/decision_maker_abci:0.1.0:bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia +- valory/trader_abci:0.1.0:bafybeibia4jeqfoyccc7in5du3nw7spp3rc5cinevorfbucfa5qv2u72mu - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge customs: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 62eed0e3f..611b94b28 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeigbu656mr2ypsnriip3g24nlsjztvqonhfsd3sjcj2n6h67dky2im +agent: valory/trader:0.1.0:bafybeif67f4uvpjmanmup5odbbz7frujzwd54yso3a7nltfix237uglux4 number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index d22f16875..55d061ede 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -98,18 +98,16 @@ def _get_decision( try: result = PredictionResponse(**json.loads(self.mech_response.result)) - return ( - result.vote, - result.win_probability, - result.confidence, - ) - except json.JSONDecodeError as exc: - self.context.logger.error(f"There was a JSONDecodeError parsing the mech's response: {exc}") - return None, None, None - except ValueError as exc: - self.context.logger.error(f"There was a ValueError parsing the mech's response: {exc}") + except (json.JSONDecodeError, ValueError) as exc: + self.context.logger.error(f"Could not parse the mech's response: {exc}") return None, None, None + return ( + result.vote, + result.win_probability, + result.confidence, + ) + @staticmethod def _get_bet_sample_info(bet: Bet, vote: int) -> Tuple[int, int]: """Get the bet sample information.""" diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py index 2a485e143..06e418f8b 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py @@ -74,10 +74,10 @@ def setup(self) -> None: def async_act(self) -> Generator: """Do the action.""" with self.context.benchmark_tool.measure(self.behaviour_id).local(): - mech_requests = [] - if self.n_slots_supported: - mech_requests.append(self.metadata) - serialized_mech_requests = json.dumps(mech_requests, sort_keys=True) + payload_content = None + if self._metadata and self.n_slots_supported: + mech_requests = [self.metadata] + payload_content = json.dumps(mech_requests, sort_keys=True) agent = self.context.agent_address - payload = DecisionRequestPayload(agent, serialized_mech_requests) + payload = DecisionRequestPayload(agent, payload_content) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index e5ac38a37..f257ade9d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -16,8 +16,8 @@ fingerprint: behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca - behaviours/decision_receive.py: bafybeign4nl75334sgf4nni6glpbvzqgdw7vrclwiey6tmgj7x5pzmmaue - behaviours/decision_request.py: bafybeicv2c5nwipgn6juhgohl7sol3bwkfknsvcrfcswbulukxkczi444i + behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq + behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeifygejified3yoza3gy4g7ina6m4lmz4pp2abtwfuwrmiwznnvrua behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index fbb68a733..7918f5bda 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieto7yi63ujjfvdhecm4aw3dtkhnmcliqf3wh2hv4qmg3bjxw22bm +- valory/decision_maker_abci:0.1.0:bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia44ar2ezf22owqhj7npddvxsnkxxucozlqawbmgfecunpwieeui4 - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 15fca9bed..7a85d2ecc 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeieenl6umzmn7da4kkng4lbjses6ikqf2vr3fzeluvn3b3eqndnkym +- valory/decision_maker_abci:0.1.0:bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e - valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge behaviours: From a301c99e494c4c4cbdc5cd32ef713304ff9441ea Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Wed, 3 Apr 2024 21:15:20 +0200 Subject: [PATCH 23/24] chore: update hashes --- packages/packages.json | 14 +++++++------- packages/valory/agents/trader/aea-config.yaml | 10 +++++----- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 4 ++-- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 4d58b2106..82d3cbe3d 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia", - "skill/valory/trader_abci/0.1.0": "bafybeibia4jeqfoyccc7in5du3nw7spp3rc5cinevorfbucfa5qv2u72mu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia44ar2ezf22owqhj7npddvxsnkxxucozlqawbmgfecunpwieeui4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4", + "skill/valory/trader_abci/0.1.0": "bafybeiah5fcltnf7qu6e7i2wfbhscjkrn2g53qymjfumweowzxpj6hxciy", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidl2exsrv6aapnyarfsastsj2rrzvexosnhw4irhxhocrcektu23y", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeif67f4uvpjmanmup5odbbz7frujzwd54yso3a7nltfix237uglux4", - "service/valory/trader/0.1.0": "bafybeie2nljfckzi64p7c6vvrnt6bae2kfxot3tkwx6bdkh3z5qksnkwhm" + "agent/valory/trader/0.1.0": "bafybeibo5ah235aijlflgs465amtce5w62zg3sd4zv3kxtd4xcjvhtfclq", + "service/valory/trader/0.1.0": "bafybeib2iv2nqy55y6n5tn7igyob6jsegmu7kltf4cf7kgqqd6fa62vvmq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -31,7 +31,7 @@ "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm", "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74", "contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa", - "contract/valory/mech/0.1.0": "bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy", + "contract/valory/mech/0.1.0": "bafybeie6zwwup4mfrulzwme5453cli5mzcvfqwmpcrp3rpqzu4payapy4i", "contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "connection/valory/abci/0.1.0": "bafybeiclexb6cnsog5yjz2qtvqyfnf7x5m7tpp56hblhk3pbocbvgjzhze", @@ -45,6 +45,6 @@ "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", - "skill/valory/mech_interact_abci/0.1.0": "bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge" + "skill/valory/mech_interact_abci/0.1.0": "bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index b7c102b8d..9adc06bcd 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -21,7 +21,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54 - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy +- valory/mech:0.1.0:bafybeie6zwwup4mfrulzwme5453cli5mzcvfqwmpcrp3rpqzu4payapy4i - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -44,12 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia44ar2ezf22owqhj7npddvxsnkxxucozlqawbmgfecunpwieeui4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidl2exsrv6aapnyarfsastsj2rrzvexosnhw4irhxhocrcektu23y - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia -- valory/trader_abci:0.1.0:bafybeibia4jeqfoyccc7in5du3nw7spp3rc5cinevorfbucfa5qv2u72mu +- valory/decision_maker_abci:0.1.0:bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4 +- valory/trader_abci:0.1.0:bafybeiah5fcltnf7qu6e7i2wfbhscjkrn2g53qymjfumweowzxpj6hxciy - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge +- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 611b94b28..105b31ff8 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeif67f4uvpjmanmup5odbbz7frujzwd54yso3a7nltfix237uglux4 +agent: valory/trader:0.1.0:bafybeibo5ah235aijlflgs465amtce5w62zg3sd4zv3kxtd4xcjvhtfclq number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index f257ade9d..bc2332b8c 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54 - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeibvsxfzyztadliu3jvxmwou65wb7gzy3z5zgqeizz53frunuvaidy +- valory/mech:0.1.0:bafybeie6zwwup4mfrulzwme5453cli5mzcvfqwmpcrp3rpqzu4payapy4i - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge +- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 7918f5bda..10ef7ee40 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia44ar2ezf22owqhj7npddvxsnkxxucozlqawbmgfecunpwieeui4 +- valory/decision_maker_abci:0.1.0:bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidl2exsrv6aapnyarfsastsj2rrzvexosnhw4irhxhocrcektu23y - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge +- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 7a85d2ecc..545b4fe70 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeihyubwgcptbeorefbnldmtfzptc7bhddglvjagzi7u5axr4lxhcia +- valory/decision_maker_abci:0.1.0:bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4 - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibrfpixhjil5x6ego46g2jznanw37lluygwmyxyhawru3vsya7gge +- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a behaviours: main: args: {} From 072a0b335912d61478b991cdf598d58502aed933 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Thu, 4 Apr 2024 11:37:10 +0200 Subject: [PATCH 24/24] chore: update hashes --- packages/packages.json | 14 +++++++------- packages/valory/agents/trader/aea-config.yaml | 10 +++++----- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 4 ++-- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 82d3cbe3d..da34e1ae1 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,12 +13,12 @@ "contract/valory/service_staking_token/0.1.0": "bafybeibpe24zfvpipaut77tsutmednncjviqeoekxltsndovdz3ugek7bu", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4", - "skill/valory/trader_abci/0.1.0": "bafybeiah5fcltnf7qu6e7i2wfbhscjkrn2g53qymjfumweowzxpj6hxciy", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidl2exsrv6aapnyarfsastsj2rrzvexosnhw4irhxhocrcektu23y", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiftz2xjbld2njsywsii5pgp6354oqm6ultqyfyfsnemuzqulw6o2y", + "skill/valory/trader_abci/0.1.0": "bafybeidrrl5mni5i4gsde7pfms6shsljmnwdcgo4pqeaujvti446rkkgxu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifshd7ut2eyzyolvwpjcjxreq2c655gz4nh2vudglvfb7oog7gase", "skill/valory/staking_abci/0.1.0": "bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e", - "agent/valory/trader/0.1.0": "bafybeibo5ah235aijlflgs465amtce5w62zg3sd4zv3kxtd4xcjvhtfclq", - "service/valory/trader/0.1.0": "bafybeib2iv2nqy55y6n5tn7igyob6jsegmu7kltf4cf7kgqqd6fa62vvmq" + "agent/valory/trader/0.1.0": "bafybeib2gnqwi5mmlz3efkzlahgwunpwt75nhpsvitllllnet5zu7jtb5u", + "service/valory/trader/0.1.0": "bafybeie4sj2z3iaxxpuxe2sefkjaorwe5f5ndud2qmq6paf6vyiywjr7gm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -31,7 +31,7 @@ "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm", "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74", "contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa", - "contract/valory/mech/0.1.0": "bafybeie6zwwup4mfrulzwme5453cli5mzcvfqwmpcrp3rpqzu4payapy4i", + "contract/valory/mech/0.1.0": "bafybeiejdn3rqqa7smbeiypajy63um7okteimvj6bsud3gezneycmdc6te", "contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "connection/valory/abci/0.1.0": "bafybeiclexb6cnsog5yjz2qtvqyfnf7x5m7tpp56hblhk3pbocbvgjzhze", @@ -45,6 +45,6 @@ "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", - "skill/valory/mech_interact_abci/0.1.0": "bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a" + "skill/valory/mech_interact_abci/0.1.0": "bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 9adc06bcd..fb54db63d 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -21,7 +21,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54 - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeie6zwwup4mfrulzwme5453cli5mzcvfqwmpcrp3rpqzu4payapy4i +- valory/mech:0.1.0:bafybeiejdn3rqqa7smbeiypajy63um7okteimvj6bsud3gezneycmdc6te - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -44,12 +44,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidl2exsrv6aapnyarfsastsj2rrzvexosnhw4irhxhocrcektu23y +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifshd7ut2eyzyolvwpjcjxreq2c655gz4nh2vudglvfb7oog7gase - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4 -- valory/trader_abci:0.1.0:bafybeiah5fcltnf7qu6e7i2wfbhscjkrn2g53qymjfumweowzxpj6hxciy +- valory/decision_maker_abci:0.1.0:bafybeiftz2xjbld2njsywsii5pgp6354oqm6ultqyfyfsnemuzqulw6o2y +- valory/trader_abci:0.1.0:bafybeidrrl5mni5i4gsde7pfms6shsljmnwdcgo4pqeaujvti446rkkgxu - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a +- valory/mech_interact_abci:0.1.0:bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4 customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 105b31ff8..e2dad64cc 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibo5ah235aijlflgs465amtce5w62zg3sd4zv3kxtd4xcjvhtfclq +agent: valory/trader:0.1.0:bafybeib2gnqwi5mmlz3efkzlahgwunpwt75nhpsvitllllnet5zu7jtb5u number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index bc2332b8c..7858b6135 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeihnbk5wp7zb6hmaykqfxgdrvpwmxxh3xnmcwn3elopw3urjeyxo54 - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeie6zwwup4mfrulzwme5453cli5mzcvfqwmpcrp3rpqzu4payapy4i +- valory/mech:0.1.0:bafybeiejdn3rqqa7smbeiypajy63um7okteimvj6bsud3gezneycmdc6te - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a +- valory/mech_interact_abci:0.1.0:bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4 behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 10ef7ee40..340fae0b8 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,10 +25,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidl2exsrv6aapnyarfsastsj2rrzvexosnhw4irhxhocrcektu23y +- valory/decision_maker_abci:0.1.0:bafybeiftz2xjbld2njsywsii5pgp6354oqm6ultqyfyfsnemuzqulw6o2y +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifshd7ut2eyzyolvwpjcjxreq2c655gz4nh2vudglvfb7oog7gase - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a +- valory/mech_interact_abci:0.1.0:bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4 behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 545b4fe70..4539ee7d7 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeibeqcyy7qvubxjg7lwolsvvufuirsic5ymhdxvg7th2izdwcgfhw4 +- valory/decision_maker_abci:0.1.0:bafybeiftz2xjbld2njsywsii5pgp6354oqm6ultqyfyfsnemuzqulw6o2y - valory/staking_abci:0.1.0:bafybeibf565rftitlrlovlvchoe45ng72ctec74fsvrmegp3o4uepu4q2e -- valory/mech_interact_abci:0.1.0:bafybeibutwdwbxornznmhkwo7wvycvnx2adxzq2uxf6hegphdnmiflhx5a +- valory/mech_interact_abci:0.1.0:bafybeidxignwgujlkhw5hbek7xw2uz5nrd3h2xx7sj5zor263dgh4fm3p4 behaviours: main: args: {}