diff --git a/packages/packages.json b/packages/packages.json index e17d14a30..8d2577be6 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,15 +1,15 @@ { "dev": { - "skill/valory/market_manager_abci/0.1.0": "bafybeicjqkzen2gvpnc3syojcf6ibr4kjaorcwktikqp2zzxec6vs64oky", - "skill/valory/decision_maker_abci/0.1.0": "bafybeic77zhxf5a53ngfzacklmm3nag4t4jeufdhoeg3ykrmvknojtwipi", - "skill/valory/trader_abci/0.1.0": "bafybeibi3rt3rdk4bvng3tlmwdxal3mk3bflq4cgq3fxyjwzpmhj3y6pmy", - "contract/valory/market_maker/0.1.0": "bafybeif6hivvhxqv4a3uqo2v3yszluzrmngsp624utdi466xwo5qbz5bsi", - "agent/valory/trader/0.1.0": "bafybeigoojaxpc7sz7vuswkxvpa5lp37lipuwc4qycztqk4hxdesmxqcda", - "service/valory/trader/0.1.0": "bafybeidyuzdmwrt66w32oppopviesvhinmwd76q73zv3dex2th7nldpbyi", - "contract/valory/erc20/0.1.0": "bafybeiggo4u56drxusvcdruqrr7mlfzqbieg4hajalh4tkctxhh3c5lpdi", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidtrigrfjikl7tkbtowbp6mrdzxulayxnxcmviwy3gag557vnymlq", - "contract/valory/mech/0.1.0": "bafybeibfikekaruskx6ui7u4qnls57i2namfxi45zhqslziqyxg4npjzxu", - "contract/valory/realitio/0.1.0": "bafybeigb722aznqhc5lsbt3dn4bpyaqe5hnl5onmnestqmzliwtvl3eaom", + "skill/valory/market_manager_abci/0.1.0": "bafybeicqrgxbf2pocfh7332qzhcshwsarpwjkj3zroveklsrovozcppsvq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeihwjudh7pngsgflbrfe2kcvzkaq2edl5j3l3wb463eeagcwpaluay", + "skill/valory/trader_abci/0.1.0": "bafybeihgug7lpiuqoxjabfsqc337skofs67iljxs5ounvbqlu5e7ny3e4u", + "contract/valory/market_maker/0.1.0": "bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4", + "agent/valory/trader/0.1.0": "bafybeicmdnhfkx5d4fn2cyliscl4szazkaswgupzpzl33ql4cymtvygq5m", + "service/valory/trader/0.1.0": "bafybeig75imqyexby56t5udvkxikiapvo767hlygf6iczf4zgzc4vo7upy", + "contract/valory/erc20/0.1.0": "bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiab2iz65fsus7h3kk5j3unw6guzvtpfe6ytrcmayay5x2phqsxdlu", + "contract/valory/mech/0.1.0": "bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai", + "contract/valory/realitio/0.1.0": "bafybeicdgm2a7evjw6szcpo3uaam5mzd6axtevtzwvejr6uaeymbg437da", "contract/valory/realitio_proxy/0.1.0": "bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy", "contract/valory/conditional_tokens/0.1.0": "bafybeicxwjdbmjajgr5rsmadtkxxwmcm42r2htef3tvng73uzib4hmb6qa" }, @@ -22,20 +22,20 @@ "protocol/valory/acn/1.1.0": "bafybeiapa5ilsobggnspoqhspftwolrx52udrwmaxdxgrk26heuvl4oooa", "protocol/valory/tendermint/0.1.0": "bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa", "protocol/valory/ipfs/0.1.0": "bafybeibjzhsengtxfofqpxy6syamplevp35obemwfp4c5lhag3v2bvgysa", - "skill/valory/abstract_abci/0.1.0": "bafybeigopohwdk5m2kuk76dbwlokpdvxtxadgda5vq52i54ofpnndlwwuy", - "skill/valory/reset_pause_abci/0.1.0": "bafybeiblayblhp5wuirfomwcpgydg35ve5tfq3xxetlosjn47wva5ucmzy", - "skill/valory/registration_abci/0.1.0": "bafybeiggzuqokgt7itc6ekb5ylmdylvfbhxqxylyz4p62qah2lkjstgdwe", - "skill/valory/abstract_round_abci/0.1.0": "bafybeicqwr73cs3vndzafrjrjpw63vvqbbjsur7ptek77hsw3lurnood5y", - "connection/valory/abci/0.1.0": "bafybeigqurc4jzjqjs4ptbfz4r4qk6ued2tdw4op3zjnal645fbk4aikya", + "skill/valory/abstract_abci/0.1.0": "bafybeibpe6ohnm4ritfnghdtpczdqlrcwufrxr5g75inkkgazeqhonyclu", + "skill/valory/reset_pause_abci/0.1.0": "bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na", + "skill/valory/registration_abci/0.1.0": "bafybeifzdrmgiwx66cvxqg63uct6ul4hty6cg33i2hhwi7kkyljntfdopy", + "skill/valory/abstract_round_abci/0.1.0": "bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om", + "connection/valory/abci/0.1.0": "bafybeif7rsxcw72mbzwcui3ozfaay5qnqorj5c52zedpqf56zczsxox3xe", "connection/valory/http_client/0.23.0": "bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y", "connection/valory/ledger/0.19.0": "bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq", - "connection/valory/ipfs/0.1.0": "bafybeighbvg6if7bwswosgajlzgz36pwuyttu3vyfqgwi3xayvdxtl53lq", - "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeihlc3keplnos7vnlibehpt2rvfhlljyshbsvhbkwgyhgdvqublzeq", - "contract/valory/gnosis_safe/0.1.0": "bafybeicetxwbgfqxcaoack7knljqo4i6up4nqgvm272eyqdqii4hcis5ri", - "contract/valory/service_registry/0.1.0": "bafybeift7qksgjuqh67abas3gfbfwwwvhv6tj3lvgzv5wc2nrlnoe65ba4", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeicisazpyvnnzlqso3txiucxr5qhsa4ac7ius6b4mhouxr2wkadwfy", - "contract/valory/multisend/0.1.0": "bafybeidfktuprydtmi4umolfles5qaf7s3t26puvvs44hvkq6uwwr3ia3a", - "skill/valory/termination_abci/0.1.0": "bafybeieqfhvk6klnvxak3vo2ibslkrnnk2bfsn5l3gbaelcprd6cjngxki" + "connection/valory/ipfs/0.1.0": "bafybeiau32pzy55ta6ugl2bebevlxudal6pnlfomhplfm5mph6reaw3krq", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeiaylgywx2qtoaddokexql3d4iqfz5l7rlm5q24lzbn36we3ovfjmi", + "contract/valory/gnosis_safe/0.1.0": "bafybeih7gkbdtnhkc3i53mbsj7bcihqa7xau6ewsnew4kkul7phwb4ucjm", + "contract/valory/service_registry/0.1.0": "bafybeihtsj4dpoi4iaml2jctlth2y26diam3npkfe736vpg67tgb6th53a", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi", + "contract/valory/multisend/0.1.0": "bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a", + "skill/valory/termination_abci/0.1.0": "bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu" } } \ 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 26128f954..10d50769d 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -9,21 +9,21 @@ fingerprint: __init__.py: bafybeighcq4pmuzte6vhvvprrvo563vzghkoit2h6qdqxf2ma5bghevkee fingerprint_ignore_patterns: [] connections: -- valory/abci:0.1.0:bafybeigqurc4jzjqjs4ptbfz4r4qk6ued2tdw4op3zjnal645fbk4aikya +- valory/abci:0.1.0:bafybeif7rsxcw72mbzwcui3ozfaay5qnqorj5c52zedpqf56zczsxox3xe - valory/http_client:0.23.0:bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y -- valory/ipfs:0.1.0:bafybeighbvg6if7bwswosgajlzgz36pwuyttu3vyfqgwi3xayvdxtl53lq +- valory/ipfs:0.1.0:bafybeiau32pzy55ta6ugl2bebevlxudal6pnlfomhplfm5mph6reaw3krq - valory/ledger:0.19.0:bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a - valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq contracts: -- valory/gnosis_safe:0.1.0:bafybeicetxwbgfqxcaoack7knljqo4i6up4nqgvm272eyqdqii4hcis5ri -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeihlc3keplnos7vnlibehpt2rvfhlljyshbsvhbkwgyhgdvqublzeq -- valory/service_registry:0.1.0:bafybeift7qksgjuqh67abas3gfbfwwwvhv6tj3lvgzv5wc2nrlnoe65ba4 -- valory/market_maker:0.1.0:bafybeif6hivvhxqv4a3uqo2v3yszluzrmngsp624utdi466xwo5qbz5bsi -- valory/erc20:0.1.0:bafybeiggo4u56drxusvcdruqrr7mlfzqbieg4hajalh4tkctxhh3c5lpdi -- valory/multisend:0.1.0:bafybeidfktuprydtmi4umolfles5qaf7s3t26puvvs44hvkq6uwwr3ia3a -- valory/mech:0.1.0:bafybeibfikekaruskx6ui7u4qnls57i2namfxi45zhqslziqyxg4npjzxu +- valory/gnosis_safe:0.1.0:bafybeih7gkbdtnhkc3i53mbsj7bcihqa7xau6ewsnew4kkul7phwb4ucjm +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeiaylgywx2qtoaddokexql3d4iqfz5l7rlm5q24lzbn36we3ovfjmi +- valory/service_registry:0.1.0:bafybeihtsj4dpoi4iaml2jctlth2y26diam3npkfe736vpg67tgb6th53a +- valory/market_maker:0.1.0:bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4 +- valory/erc20:0.1.0:bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe +- valory/multisend:0.1.0:bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a +- valory/mech:0.1.0:bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai - valory/conditional_tokens:0.1.0:bafybeicxwjdbmjajgr5rsmadtkxxwmcm42r2htef3tvng73uzib4hmb6qa -- valory/realitio:0.1.0:bafybeigb722aznqhc5lsbt3dn4bpyaqe5hnl5onmnestqmzliwtvl3eaom +- valory/realitio:0.1.0:bafybeicdgm2a7evjw6szcpo3uaam5mzd6axtevtzwvejr6uaeymbg437da - valory/realitio_proxy:0.1.0:bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy protocols: - open_aea/signing:1.0.0:bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m @@ -35,16 +35,16 @@ protocols: - valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby - valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa skills: -- valory/abstract_abci:0.1.0:bafybeigopohwdk5m2kuk76dbwlokpdvxtxadgda5vq52i54ofpnndlwwuy -- valory/abstract_round_abci:0.1.0:bafybeicqwr73cs3vndzafrjrjpw63vvqbbjsur7ptek77hsw3lurnood5y -- valory/registration_abci:0.1.0:bafybeiggzuqokgt7itc6ekb5ylmdylvfbhxqxylyz4p62qah2lkjstgdwe -- valory/reset_pause_abci:0.1.0:bafybeiblayblhp5wuirfomwcpgydg35ve5tfq3xxetlosjn47wva5ucmzy -- valory/termination_abci:0.1.0:bafybeieqfhvk6klnvxak3vo2ibslkrnnk2bfsn5l3gbaelcprd6cjngxki -- valory/transaction_settlement_abci:0.1.0:bafybeicisazpyvnnzlqso3txiucxr5qhsa4ac7ius6b4mhouxr2wkadwfy -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidtrigrfjikl7tkbtowbp6mrdzxulayxnxcmviwy3gag557vnymlq -- valory/market_manager_abci:0.1.0:bafybeicjqkzen2gvpnc3syojcf6ibr4kjaorcwktikqp2zzxec6vs64oky -- valory/decision_maker_abci:0.1.0:bafybeic77zhxf5a53ngfzacklmm3nag4t4jeufdhoeg3ykrmvknojtwipi -- valory/trader_abci:0.1.0:bafybeibi3rt3rdk4bvng3tlmwdxal3mk3bflq4cgq3fxyjwzpmhj3y6pmy +- valory/abstract_abci:0.1.0:bafybeibpe6ohnm4ritfnghdtpczdqlrcwufrxr5g75inkkgazeqhonyclu +- valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om +- valory/registration_abci:0.1.0:bafybeifzdrmgiwx66cvxqg63uct6ul4hty6cg33i2hhwi7kkyljntfdopy +- valory/reset_pause_abci:0.1.0:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na +- valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu +- valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiab2iz65fsus7h3kk5j3unw6guzvtpfe6ytrcmayay5x2phqsxdlu +- valory/market_manager_abci:0.1.0:bafybeicqrgxbf2pocfh7332qzhcshwsarpwjkj3zroveklsrovozcppsvq +- valory/decision_maker_abci:0.1.0:bafybeihwjudh7pngsgflbrfe2kcvzkaq2edl5j3l3wb463eeagcwpaluay +- valory/trader_abci:0.1.0:bafybeihgug7lpiuqoxjabfsqc337skofs67iljxs5ounvbqlu5e7ny3e4u default_ledger: ethereum required_ledgers: - ethereum @@ -76,11 +76,11 @@ logging_config: propagate: true dependencies: open-aea-ledger-cosmos: - version: ==1.39.0 + version: ==1.38.0 open-aea-ledger-ethereum: - version: ==1.39.0 + version: ==1.38.0 open-aea-test-autonomy: - version: ==0.12.1.post1 + version: ==0.12.0 skill_exception_policy: stop_and_exit connection_exception_policy: just_log default_connection: null diff --git a/packages/valory/contracts/erc20/contract.yaml b/packages/valory/contracts/erc20/contract.yaml index 3b4632157..8f4ee149b 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.39.0 + version: ==1.38.0 open-aea-test-autonomy: - version: ==0.12.1.post1 + version: ==0.12.0 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 9b3741ccb..ed9feff04 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.39.0 + version: ==1.38.0 open-aea-test-autonomy: - version: ==0.12.1.post1 + version: ==0.12.0 packaging: {} py-eth-sig-utils: {} requests: {} diff --git a/packages/valory/contracts/mech/contract.yaml b/packages/valory/contracts/mech/contract.yaml index 429716ec0..63b1c80ed 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.39.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 eth_typing: {} diff --git a/packages/valory/contracts/realitio/contract.py b/packages/valory/contracts/realitio/contract.py index 478f832fc..f7282a03c 100644 --- a/packages/valory/contracts/realitio/contract.py +++ b/packages/valory/contracts/realitio/contract.py @@ -128,3 +128,15 @@ def build_claim_winnings( args=claim_params, ) return dict(data=data) + + @classmethod + def get_history_hash( + cls, + ledger_api: LedgerApi, + contract_address: str, + question_id: bytes, + ) -> JSONLike: + """Get history hash for a question""" + contract = cls.get_instance(ledger_api, contract_address) + data = contract.functions.getHistoryHash(question_id).call() + return dict(data=data) diff --git a/packages/valory/contracts/realitio/contract.yaml b/packages/valory/contracts/realitio/contract.yaml index 07ebac706..8a1cf23fb 100644 --- a/packages/valory/contracts/realitio/contract.yaml +++ b/packages/valory/contracts/realitio/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeictahkgfmlqv5kksvj6klmxtmjdpeq4sp3x7dp2yr5x4kmzbcihse build/Realitio.json: bafybeiagi7zoeoy5s7duhg4oeuekj2s6z5mad2z6g2pn3n5elsvze25qiu - contract.py: bafybeibygb64t4bhajvoyf54o6tkvwedsczhwltkqwwxmix2w6ar2wcvyy + contract.py: bafybeicvb4v6iw7dkjhnlgaiewkrdmkozxxxu24zqnmya5aiahnttnjhwa fingerprint_ignore_patterns: [] class_name: RealitioContract contract_interface_paths: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index d578e0723..c01982bcc 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:bafybeigoojaxpc7sz7vuswkxvpa5lp37lipuwc4qycztqk4hxdesmxqcda +agent: valory/trader:0.1.0:bafybeicmdnhfkx5d4fn2cyliscl4szazkaswgupzpzl33ql4cymtvygq5m number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/behaviours/reedem.py b/packages/valory/skills/decision_maker_abci/behaviours/reedem.py index 595083910..c88b0a32c 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/reedem.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/reedem.py @@ -147,6 +147,7 @@ def __init__(self, **kwargs: Any) -> None: self._built_data: Optional[HexBytes] = None self._current_redeem_info: Optional[Trade] = None self._expected_winnings: int = 0 + self._history_hash: bytes = ZERO_BYTES @property def current_redeem_info(self) -> Trade: @@ -215,6 +216,21 @@ def finalized(self, flag: bool) -> None: """Set whether the current market has been finalized.""" self._finalized = flag + @property + def history_hash(self) -> bytes: + """Get the history hash for the current question.""" + return self._history_hash + + @history_hash.setter + def history_hash(self, history_hash: bytes) -> None: + """Set the history hash for the current question.""" + self._history_hash = history_hash + + @property + def is_history_hash_null(self) -> bool: + """Return whether the current history hash is null.""" + return self.history_hash == b"\x00" * 32 + @property def already_resolved(self) -> bool: """Get whether the current market has already been resolved.""" @@ -336,6 +352,16 @@ def _check_finalized(self) -> WaitableConditionType: ) return result + def _get_history_hash(self) -> WaitableConditionType: + """Get the history hash for the current question id.""" + result = yield from self._realitio_interact( + contract_callable="get_history_hash", + data_key="data", + placeholder=get_name(RedeemBehaviour.history_hash), + question_id=self.current_question_id, + ) + return result + def _check_already_resolved(self) -> WaitableConditionType: """Check whether someone has already resolved for this market.""" result = yield from self._conditional_tokens_interact( @@ -416,13 +442,18 @@ def _build_redeem_data(self) -> WaitableConditionType: def _prepare_single_redeem(self) -> Generator: """Prepare a multisend transaction for a single redeeming action.""" yield from self.wait_for_condition_with_sleep(self._check_already_resolved) - steps = [self._build_redeem_data] + steps = [] if not self.already_resolved: - steps[:0] = [ - self._build_resolve_data, - self._build_claim_data, - ] + # 1. resolve the question if it hasn't been resolved yet + steps.append(self._build_resolve_data) + + yield from self.wait_for_condition_with_sleep(self._get_history_hash) + if not self.is_history_hash_null: + # 2. claim the winnings if claiming has not been done yet + steps.append(self._build_claim_data) + # 3. we always redeem the position + steps.append(self._build_redeem_data) for build_step in steps: yield from self.wait_for_condition_with_sleep(build_step) diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 426da9bc6..18d4ddc60 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -18,7 +18,7 @@ fingerprint: behaviours/decision_receive.py: bafybeifn4xuv2z3niyhgd35ufncrdpaisw7pd4qkw2vv3cte5koqe2mxqy behaviours/decision_request.py: bafybeifjlh5cfitjd6wjcvcgoji2bhsi4r5nzpqocotwprmn26eiphlmqq behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/reedem.py: bafybeib25frcafu6iikppidwqqovwjkzkxif6m3f4crmklohpj6yixprsq + behaviours/reedem.py: bafybeidrk7lauummzwygtzc7hmpimlgnd7haia6lmm57z5spfdwu33rlbm behaviours/round_behaviour.py: bafybeifk5utwuaneima4rdeow7tcpbe6hcc2utlzxcw3w7vsm5zw7zpamm behaviours/sampling.py: bafybeiadikynvkaofbko72jc45xthhmmjfmlkpgramormhxwk5u47rnwdu dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm @@ -41,20 +41,20 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/gnosis_safe:0.1.0:bafybeicetxwbgfqxcaoack7knljqo4i6up4nqgvm272eyqdqii4hcis5ri -- valory/market_maker:0.1.0:bafybeif6hivvhxqv4a3uqo2v3yszluzrmngsp624utdi466xwo5qbz5bsi -- valory/erc20:0.1.0:bafybeiggo4u56drxusvcdruqrr7mlfzqbieg4hajalh4tkctxhh3c5lpdi -- valory/multisend:0.1.0:bafybeidfktuprydtmi4umolfles5qaf7s3t26puvvs44hvkq6uwwr3ia3a -- valory/mech:0.1.0:bafybeibfikekaruskx6ui7u4qnls57i2namfxi45zhqslziqyxg4npjzxu +- valory/gnosis_safe:0.1.0:bafybeih7gkbdtnhkc3i53mbsj7bcihqa7xau6ewsnew4kkul7phwb4ucjm +- valory/market_maker:0.1.0:bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4 +- valory/erc20:0.1.0:bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe +- valory/multisend:0.1.0:bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a +- valory/mech:0.1.0:bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai - valory/conditional_tokens:0.1.0:bafybeicxwjdbmjajgr5rsmadtkxxwmcm42r2htef3tvng73uzib4hmb6qa -- valory/realitio:0.1.0:bafybeigb722aznqhc5lsbt3dn4bpyaqe5hnl5onmnestqmzliwtvl3eaom +- valory/realitio:0.1.0:bafybeicdgm2a7evjw6szcpo3uaam5mzd6axtevtzwvejr6uaeymbg437da - valory/realitio_proxy:0.1.0:bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- valory/abstract_round_abci:0.1.0:bafybeicqwr73cs3vndzafrjrjpw63vvqbbjsur7ptek77hsw3lurnood5y -- valory/market_manager_abci:0.1.0:bafybeicjqkzen2gvpnc3syojcf6ibr4kjaorcwktikqp2zzxec6vs64oky -- valory/transaction_settlement_abci:0.1.0:bafybeicisazpyvnnzlqso3txiucxr5qhsa4ac7ius6b4mhouxr2wkadwfy +- valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om +- valory/market_manager_abci:0.1.0:bafybeicqrgxbf2pocfh7332qzhcshwsarpwjkj3zroveklsrovozcppsvq +- valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi behaviours: main: args: {} diff --git a/packages/valory/skills/market_manager_abci/graph_tooling/requests.py b/packages/valory/skills/market_manager_abci/graph_tooling/requests.py index 6bae79a4c..f4dcfdcc4 100644 --- a/packages/valory/skills/market_manager_abci/graph_tooling/requests.py +++ b/packages/valory/skills/market_manager_abci/graph_tooling/requests.py @@ -207,17 +207,7 @@ def _fetch_redeem_info(self) -> Generator[None, None, Optional[list]]: res, res_context="trades", ) - - filtered_redeem_info = [ - entry - for entry in redeem_info # type: ignore[union-attr] - if len(entry.get("fpmm", {}).get("question", {}).get("answers", [])) == 1 - ] - - # FIXME Redeem functionality deactivated temporarily - filtered_redeem_info = [] - - return filtered_redeem_info + return redeem_info def _fetch_block_number( self, timestamp: int diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index f6640d746..09b1ec6bf 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -16,7 +16,7 @@ fingerprint: graph_tooling/queries/__init__.py: bafybeihbybnl53i7k57ql5ujt5ru5n2eg324jfndh4lcnm4fk52mwbkjda graph_tooling/queries/network.py: bafybeigeq72ys2nrjqspj2uacaudrgljrne5a3o5jvzsktldxdq6m2xmeu graph_tooling/queries/omen.py: bafybeiajk65gvqkxvxekywqqy2kob3vobjsealqlyxis3z6mpwhyng7hh4 - graph_tooling/requests.py: bafybeics4oueh3nemdvl366vqgnf3ltea2ab443qtfaoqgl63tmct227qa + graph_tooling/requests.py: bafybeicv7hdo4a56pqteaxoxi5tskfbb34u2ajmhu7canoco3mi3jv6fmy handlers.py: bafybeihot2i2yvfkz2gcowvt66wdu6tkjbmv7hsmc4jzt4reqeaiuphbtu models.py: bafybeiaplszooak63fo3i6agaoyol4tpof4q4tvoj4j6f2cr2corajnl3a payloads.py: bafybeiamavgddfbzofpsjthmw6j7g2dyxm7fb6hvdb47kweyrx4w2ihcfi @@ -26,7 +26,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeicqwr73cs3vndzafrjrjpw63vvqbbjsur7ptek77hsw3lurnood5y +- valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index dff539b90..f0218ec92 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -19,14 +19,14 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeicqwr73cs3vndzafrjrjpw63vvqbbjsur7ptek77hsw3lurnood5y -- valory/registration_abci:0.1.0:bafybeiggzuqokgt7itc6ekb5ylmdylvfbhxqxylyz4p62qah2lkjstgdwe -- valory/reset_pause_abci:0.1.0:bafybeiblayblhp5wuirfomwcpgydg35ve5tfq3xxetlosjn47wva5ucmzy -- valory/transaction_settlement_abci:0.1.0:bafybeicisazpyvnnzlqso3txiucxr5qhsa4ac7ius6b4mhouxr2wkadwfy -- valory/termination_abci:0.1.0:bafybeieqfhvk6klnvxak3vo2ibslkrnnk2bfsn5l3gbaelcprd6cjngxki -- valory/market_manager_abci:0.1.0:bafybeicjqkzen2gvpnc3syojcf6ibr4kjaorcwktikqp2zzxec6vs64oky -- valory/decision_maker_abci:0.1.0:bafybeic77zhxf5a53ngfzacklmm3nag4t4jeufdhoeg3ykrmvknojtwipi -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidtrigrfjikl7tkbtowbp6mrdzxulayxnxcmviwy3gag557vnymlq +- valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om +- valory/registration_abci:0.1.0:bafybeifzdrmgiwx66cvxqg63uct6ul4hty6cg33i2hhwi7kkyljntfdopy +- valory/reset_pause_abci:0.1.0:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na +- valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi +- valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu +- valory/market_manager_abci:0.1.0:bafybeicqrgxbf2pocfh7332qzhcshwsarpwjkj3zroveklsrovozcppsvq +- valory/decision_maker_abci:0.1.0:bafybeihwjudh7pngsgflbrfe2kcvzkaq2edl5j3l3wb463eeagcwpaluay +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiab2iz65fsus7h3kk5j3unw6guzvtpfe6ytrcmayay5x2phqsxdlu 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 1e4557ff1..cf3154e26 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -19,8 +19,8 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeicqwr73cs3vndzafrjrjpw63vvqbbjsur7ptek77hsw3lurnood5y -- valory/decision_maker_abci:0.1.0:bafybeic77zhxf5a53ngfzacklmm3nag4t4jeufdhoeg3ykrmvknojtwipi +- valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om +- valory/decision_maker_abci:0.1.0:bafybeihwjudh7pngsgflbrfe2kcvzkaq2edl5j3l3wb463eeagcwpaluay behaviours: main: args: {} diff --git a/poetry.lock b/poetry.lock index fa4f7b8ac..f567718c6 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" @@ -737,35 +737,35 @@ files = [ [[package]] name = "cryptography" -version = "41.0.3" +version = "41.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "cryptography-41.0.3-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:652627a055cb52a84f8c448185922241dd5217443ca194d5739b44612c5e6507"}, - {file = "cryptography-41.0.3-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:8f09daa483aedea50d249ef98ed500569841d6498aa9c9f4b0531b9964658922"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4fd871184321100fb400d759ad0cddddf284c4b696568204d281c902fc7b0d81"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84537453d57f55a50a5b6835622ee405816999a7113267739a1b4581f83535bd"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:3fb248989b6363906827284cd20cca63bb1a757e0a2864d4c1682a985e3dca47"}, - {file = "cryptography-41.0.3-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:42cb413e01a5d36da9929baa9d70ca90d90b969269e5a12d39c1e0d475010116"}, - {file = "cryptography-41.0.3-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:aeb57c421b34af8f9fe830e1955bf493a86a7996cc1338fe41b30047d16e962c"}, - {file = "cryptography-41.0.3-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6af1c6387c531cd364b72c28daa29232162010d952ceb7e5ca8e2827526aceae"}, - {file = "cryptography-41.0.3-cp37-abi3-win32.whl", hash = "sha256:0d09fb5356f975974dbcb595ad2d178305e5050656affb7890a1583f5e02a306"}, - {file = "cryptography-41.0.3-cp37-abi3-win_amd64.whl", hash = "sha256:a983e441a00a9d57a4d7c91b3116a37ae602907a7618b882c8013b5762e80574"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5259cb659aa43005eb55a0e4ff2c825ca111a0da1814202c64d28a985d33b087"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:67e120e9a577c64fe1f611e53b30b3e69744e5910ff3b6e97e935aeb96005858"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:7efe8041897fe7a50863e51b77789b657a133c75c3b094e51b5e4b5cec7bf906"}, - {file = "cryptography-41.0.3-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ce785cf81a7bdade534297ef9e490ddff800d956625020ab2ec2780a556c313e"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:57a51b89f954f216a81c9d057bf1a24e2f36e764a1ca9a501a6964eb4a6800dd"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c2f0d35703d61002a2bbdcf15548ebb701cfdd83cdc12471d2bae80878a4207"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:23c2d778cf829f7d0ae180600b17e9fceea3c2ef8b31a99e3c694cbbf3a24b84"}, - {file = "cryptography-41.0.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:95dd7f261bb76948b52a5330ba5202b91a26fbac13ad0e9fc8a3ac04752058c7"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:41d7aa7cdfded09b3d73a47f429c298e80796c8e825ddfadc84c8a7f12df212d"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d0d651aa754ef58d75cec6edfbd21259d93810b73f6ec246436a21b7841908de"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:ab8de0d091acbf778f74286f4989cf3d1528336af1b59f3e5d2ebca8b5fe49e1"}, - {file = "cryptography-41.0.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a74fbcdb2a0d46fe00504f571a2a540532f4c188e6ccf26f1f178480117b33c4"}, - {file = "cryptography-41.0.3.tar.gz", hash = "sha256:6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34"}, + {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:80907d3faa55dc5434a16579952ac6da800935cd98d14dbd62f6f042c7f5e839"}, + {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:35c00f637cd0b9d5b6c6bd11b6c3359194a8eba9c46d4e875a3660e3b400005f"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cecfefa17042941f94ab54f769c8ce0fe14beff2694e9ac684176a2535bf9714"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e40211b4923ba5a6dc9769eab704bdb3fbb58d56c5b336d30996c24fcf12aadb"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:23a25c09dfd0d9f28da2352503b23e086f8e78096b9fd585d1d14eca01613e13"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2ed09183922d66c4ec5fdaa59b4d14e105c084dd0febd27452de8f6f74704143"}, + {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5a0f09cefded00e648a127048119f77bc2b2ec61e736660b5789e638f43cc397"}, + {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:9eeb77214afae972a00dee47382d2591abe77bdae166bda672fb1e24702a3860"}, + {file = "cryptography-41.0.4-cp37-abi3-win32.whl", hash = "sha256:3b224890962a2d7b57cf5eeb16ccaafba6083f7b811829f00476309bce2fe0fd"}, + {file = "cryptography-41.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c880eba5175f4307129784eca96f4e70b88e57aa3f680aeba3bab0e980b0f37d"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:004b6ccc95943f6a9ad3142cfabcc769d7ee38a3f60fb0dddbfb431f818c3a67"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:86defa8d248c3fa029da68ce61fe735432b047e32179883bdb1e79ed9bb8195e"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:37480760ae08065437e6573d14be973112c9e6dcaf5f11d00147ee74f37a3829"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b5f4dfe950ff0479f1f00eda09c18798d4f49b98f4e2006d644b3301682ebdca"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7e53db173370dea832190870e975a1e09c86a879b613948f09eb49324218c14d"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5b72205a360f3b6176485a333256b9bcd48700fc755fef51c8e7e67c4b63e3ac"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:93530900d14c37a46ce3d6c9e6fd35dbe5f5601bf6b3a5c325c7bffc030344d9"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:efc8ad4e6fc4f1752ebfb58aefece8b4e3c4cae940b0994d43649bdfce8d0d4f"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c3391bd8e6de35f6f1140e50aaeb3e2b3d6a9012536ca23ab0d9c35ec18c8a91"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:0d9409894f495d465fe6fda92cb70e8323e9648af912d5b9141d616df40a87b8"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8ac4f9ead4bbd0bc8ab2d318f97d85147167a488be0e08814a37eb2f439d5cf6"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:047c4603aeb4bbd8db2756e38f5b8bd7e94318c047cfe4efeb5d715e08b49311"}, + {file = "cryptography-41.0.4.tar.gz", hash = "sha256:7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a"}, ] [package.dependencies] @@ -1257,14 +1257,14 @@ grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] [[package]] name = "google-api-python-client" -version = "2.99.0" +version = "2.100.0" description = "Google API Client Library for Python" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "google-api-python-client-2.99.0.tar.gz", hash = "sha256:e733fd0f2c8793b1a000d5e69ac81b1b9ec0665b445b7ed83bdbbb0038973306"}, - {file = "google_api_python_client-2.99.0-py2.py3-none-any.whl", hash = "sha256:40272131d3a4a7aecab840ebcf3df51c54d49560156f3b9d54a4ef82c795985d"}, + {file = "google-api-python-client-2.100.0.tar.gz", hash = "sha256:eaed50efc2f8a4027dcca8fd0037f4b1b03b8093efc84ce3cb6c75bfc79a7e31"}, + {file = "google_api_python_client-2.100.0-py2.py3-none-any.whl", hash = "sha256:226ca35355993d6182506c51745ab5149405cdf6a92975b2725ab3e0d757dbe9"}, ] [package.dependencies] @@ -1845,14 +1845,14 @@ files = [ [[package]] name = "netaddr" -version = "0.8.0" +version = "0.9.0" description = "A network address manipulation library for Python" category = "main" optional = false python-versions = "*" files = [ - {file = "netaddr-0.8.0-py2.py3-none-any.whl", hash = "sha256:9666d0232c32d2656e5e5f8d735f58fd6c7457ce52fc21c98d45f2af78f990ac"}, - {file = "netaddr-0.8.0.tar.gz", hash = "sha256:d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243"}, + {file = "netaddr-0.9.0-py3-none-any.whl", hash = "sha256:5148b1055679d2a1ec070c521b7db82137887fabd6d7e37f5199b44f775c3bb1"}, + {file = "netaddr-0.9.0.tar.gz", hash = "sha256:7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128"}, ] [[package]] @@ -1899,18 +1899,18 @@ files = [ [[package]] name = "open-aea" -version = "1.39.0" +version = "1.38.0" description = "Open Autonomous Economic Agent framework (without vendor lock-in)" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "open-aea-1.39.0.tar.gz", hash = "sha256:c4a8f7373d0e9680f1883a58d4e028833859a9a8a1634ff06714bc397527a211"}, - {file = "open_aea-1.39.0-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:2bd7b2b8a78a9e2960c6b1918db4bff35196303360c1f79114de55b5428b83e9"}, - {file = "open_aea-1.39.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:1f30be12d9917cd553462a9bbd936eced3f7e24baa3bd705551b886b9f4e6c0d"}, - {file = "open_aea-1.39.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:343ce35b2af09de070eabb055dfe22baebff106d0bb9052ee92d22816442ce1b"}, - {file = "open_aea-1.39.0-py3-none-win32.whl", hash = "sha256:9931e92952eec4de3883a5c94f67ee877e13fd74e596506effc399194e75a8c5"}, - {file = "open_aea-1.39.0-py3-none-win_amd64.whl", hash = "sha256:3be7279bd17b7e4f66418e51de5a1041b455bfcb929e091b81cbd33d5f20c46d"}, + {file = "open-aea-1.38.0.tar.gz", hash = "sha256:4778bba6666521f5480193543e9f00c2643034933ea8776a9f3c61e2d2e64163"}, + {file = "open_aea-1.38.0-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:a97914afbe2bd63212a521ef4a2804cb69486802382fc73637ffa3d50e6b9731"}, + {file = "open_aea-1.38.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:f0533f36c8020e74e185f7df10e5668afd1dd56557827b4996c12403d93a9478"}, + {file = "open_aea-1.38.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:f9400dd594af24d31f750ec1144ed0c153b139c4f47ba6e01a81d4eb8b970696"}, + {file = "open_aea-1.38.0-py3-none-win32.whl", hash = "sha256:255beadc88119e81399228285b6378d09f79897dd4725a6778ae53a60be76b33"}, + {file = "open_aea-1.38.0-py3-none-win_amd64.whl", hash = "sha256:85c63a9dd79e9e248c0fc4884329748d5f4a59f6c2867833fe749fee8a684f94"}, ] [package.dependencies] @@ -1962,14 +1962,14 @@ develop = ["coverage (>=5.3)", "flake8 (>=3.8)", "isort (>=5.8)", "mypy (>=0.900 [[package]] name = "open-aea-cli-ipfs" -version = "1.39.0" +version = "1.38.0" description = "CLI extension for open AEA framework wrapping IPFS functionality." category = "main" optional = false python-versions = "*" files = [ - {file = "open-aea-cli-ipfs-1.39.0.tar.gz", hash = "sha256:d45bd7dd707bd4df3263b129d367dcd220c7343fac747203928e320cf5616800"}, - {file = "open_aea_cli_ipfs-1.39.0-py3-none-any.whl", hash = "sha256:4831903457ce89d04c1c9f3078a1d4062ba7e58e8a56e0d2295acbbebb5af05d"}, + {file = "open-aea-cli-ipfs-1.38.0.tar.gz", hash = "sha256:b22ae4ab7746b579d7c402960f07bcf34fa8508d80532f07c77da8d01b689b00"}, + {file = "open_aea_cli_ipfs-1.38.0-py3-none-any.whl", hash = "sha256:308d2344dcb7cad5b73e731b8c20b9c30d188921314ee6c872a40e42a5f80485"}, ] [package.dependencies] @@ -2003,14 +2003,14 @@ requests = "*" [[package]] name = "open-aea-ledger-cosmos" -version = "1.39.0" +version = "1.38.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.39.0.tar.gz", hash = "sha256:7855f02ab4e23a7d85dc061cccf0fbbfa946bde097a2a3872f0d3fb0fe1357ca"}, - {file = "open_aea_ledger_cosmos-1.39.0-py3-none-any.whl", hash = "sha256:7c213d86d8b852de45f73ebabee7cadc2124e428e64482f40b5a7eb0b6c50a35"}, + {file = "open-aea-ledger-cosmos-1.38.0.tar.gz", hash = "sha256:0c132eea49b1453de9b731c3302f3807ee4d19c344c8eec60ed3dafabab09889"}, + {file = "open_aea_ledger_cosmos-1.38.0-py3-none-any.whl", hash = "sha256:014367e0271be3eea4b4e1e8e7b6fd0f72aabad65137b2af6bec2d0bf2d0044c"}, ] [package.dependencies] @@ -2022,14 +2022,14 @@ pycryptodome = ">=3.10.1,<4.0.0" [[package]] name = "open-aea-ledger-ethereum" -version = "1.39.0" +version = "1.38.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.39.0.tar.gz", hash = "sha256:4b5b217ed3c77ac2fb4901d4cc50176050ce27b5ddb4bdd16f6fddb9349875c1"}, - {file = "open_aea_ledger_ethereum-1.39.0-py3-none-any.whl", hash = "sha256:bafcdb5398f77f32b652cf92d1f8e6989dfa78259bc7c092d19cbd65b0ffd5bc"}, + {file = "open-aea-ledger-ethereum-1.38.0.tar.gz", hash = "sha256:a5ebb4203796af1e9fcd0a3a8b3a6f0dcf71262a38cce32c2c5386e2bd8ef632"}, + {file = "open_aea_ledger_ethereum-1.38.0-py3-none-any.whl", hash = "sha256:d805b8bf246d8f30980a6210b9695b97b7f92ea24da750565bc6e0f2b60ddfba"}, ] [package.dependencies] @@ -2040,20 +2040,20 @@ open-aea-web3 = "6.0.1" [[package]] name = "open-aea-test-autonomy" -version = "0.12.1.post1" +version = "0.12.0" description = "Plugin containing test tools for open-autonomy packages." category = "main" optional = false python-versions = "*" files = [ - {file = "open-aea-test-autonomy-0.12.1.post1.tar.gz", hash = "sha256:b59297a4585103a61ab89e588330dee4f43e4c58b1d435d581f27bc6bcc1374b"}, - {file = "open_aea_test_autonomy-0.12.1.post1-py3-none-any.whl", hash = "sha256:ed7b9d2222e985641d014e8c7847c6b7cce540066a846af4134077d7b975f9d7"}, + {file = "open-aea-test-autonomy-0.12.0.tar.gz", hash = "sha256:b9c164996e3d3633567241f3919af72b0fdebb39d4e2e24cdfed52571c7838a4"}, + {file = "open_aea_test_autonomy-0.12.0-py3-none-any.whl", hash = "sha256:f2cfb41246b4261fbbdd4eefd227d5d27ae71a584e70f409650168e9c587abe4"}, ] [package.dependencies] docker = "6.1.2" -open-aea = {version = ">=1.39.0,<2.0.0", extras = ["all"]} -open-aea-ledger-ethereum = ">=1.39.0,<2.0.0" +open-aea = {version = ">=1.38.0,<2.0.0", extras = ["all"]} +open-aea-ledger-ethereum = ">=1.38.0,<2.0.0" pytest = "7.2.1" [[package]] @@ -2093,23 +2093,22 @@ tester = ["eth-tester[py-evm] (==v0.8.0-b.3)", "py-geth (>=3.11.0)"] [[package]] name = "open-autonomy" -version = "0.12.1.post1" +version = "0.12.0" description = "A framework for the creation of autonomous agent services." category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "open-autonomy-0.12.1.post1.tar.gz", hash = "sha256:89f09a32dc8eadde466c4d4c463894f3d8e2ea90cd14f7d99b5cd4c902e9a907"}, - {file = "open_autonomy-0.12.1.post1-py3-none-any.whl", hash = "sha256:974fd44ca666cb1ff5c5724ae66c195eaf3b5167dd18d001fd1cc38245649e1c"}, + {file = "open-autonomy-0.12.0.tar.gz", hash = "sha256:a4568a2eac13373c13744bbc5b8403ff321395c6c4481db0bda268fa7c23be7a"}, + {file = "open_autonomy-0.12.0-py3-none-any.whl", hash = "sha256:606edc8da3450234191c555cbe14fec1568bc09d8f5d92e001980b2af064a03e"}, ] [package.dependencies] click = "8.0.2" docker = "6.1.2" Flask = ">=2.0.2,<3.0.0" -hexbytes = "*" -open-aea = {version = "1.39.0", extras = ["all"]} -open-aea-cli-ipfs = "1.39.0" +open-aea = {version = "1.38.0", extras = ["all"]} +open-aea-cli-ipfs = "1.38.0" pandas = ">=1.5.3" pytest = "7.2.1" python-dotenv = ">=0.14.0,<0.18.0" @@ -2119,8 +2118,8 @@ watchdog = ">=2.1.6" werkzeug = "2.0.3" [package.extras] -all = ["click (==8.0.2)", "open-aea-cli-ipfs (==1.39.0)", "python-dotenv (>=0.14.0,<0.18.0)", "texttable (==1.6.7)"] -cli = ["click (==8.0.2)", "open-aea-cli-ipfs (==1.39.0)", "python-dotenv (>=0.14.0,<0.18.0)", "texttable (==1.6.7)"] +all = ["click (==8.0.2)", "open-aea-cli-ipfs (==1.38.0)", "python-dotenv (>=0.14.0,<0.18.0)", "texttable (==1.6.7)"] +cli = ["click (==8.0.2)", "open-aea-cli-ipfs (==1.38.0)", "python-dotenv (>=0.14.0,<0.18.0)", "texttable (==1.6.7)"] [[package]] name = "packaging" @@ -3613,4 +3612,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = ">=3.10, <3.11" -content-hash = "1e75c7f45ac002b83c442190a952e0dc501c50ffe1241a65f94f7ff5c3c11a3e" +content-hash = "ca2f51408defa2cc5d1c39096101ceb6fef99a50232def53db4827bdc5e52eac" diff --git a/pyproject.toml b/pyproject.toml index 94fa959ff..8816b4d94 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,21 +16,21 @@ include = "packages" [tool.poetry.dependencies] python = ">=3.10, <3.11" -open-autonomy = "==0.12.1.post1" +open-autonomy = "==0.12.0" requests = "==2.28.2" 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.39.0" -open-aea-ledger-cosmos = "==1.39.0" +open-aea-ledger-ethereum = "==1.38.0" +open-aea-ledger-cosmos = "==1.38.0" protobuf = "<=3.20.1,>=3.19" hypothesis = "==6.21.6" -open-aea-test-autonomy = "==0.12.1.post1" +open-aea-test-autonomy = "==0.12.0" open-aea-web3 = "==6.0.1" ipfshttpclient = "==0.8.0a2" -open-aea-cli-ipfs = "==1.39.0" +open-aea-cli-ipfs = "==1.38.0" aiohttp = "<3.8,>=3.7.4" certifi = "*" multidict = "*" diff --git a/tox.ini b/tox.ini index 6ca031d3d..47a4de9c5 100644 --- a/tox.ini +++ b/tox.ini @@ -18,21 +18,21 @@ deps = [deps-packages] deps = {[deps-tests]deps} - open-autonomy==0.12.1.post1 + open-autonomy==0.12.0 requests==2.28.2 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.39.0 - open-aea-ledger-cosmos==1.39.0 + open-aea-ledger-ethereum==1.38.0 + open-aea-ledger-cosmos==1.38.0 protobuf<=3.20.1,>=3.19 hypothesis==6.21.6 - open-aea-test-autonomy==0.12.1.post1 + open-aea-test-autonomy==0.12.0 open-aea-web3==6.0.1 ipfshttpclient==0.8.0a2 - open-aea-cli-ipfs==1.39.0 + open-aea-cli-ipfs==1.38.0 aiohttp<3.8,>=3.7.4 certifi multidict @@ -102,7 +102,7 @@ commands = isort --check-only --gitignore {env:SERVICE_SPECIFIC_PACKAGES} script [testenv:check-hash] skipsdist = True usedevelop = True -deps = open-autonomy[all]==0.12.1.post1 +deps = open-autonomy[all]==0.12.0 commands = autonomy init --reset --author ci --remote --ipfs --ipfs-node "/dns/registry.autonolas.tech/tcp/443/https" autonomy packages sync