From d98244ef952b31e7f6fa86acc48e43cc1a0f1c2d Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Wed, 16 Aug 2023 19:02:03 +0530 Subject: [PATCH 01/11] bump: open-aea and open-autonomy --- .github/workflows/main_workflow.yml | 2 +- Pipfile | 19 ++++++----- packages/packages.json | 28 ++++++++--------- tox.ini | 49 ++++++++++++++--------------- 4 files changed, 48 insertions(+), 50 deletions(-) diff --git a/.github/workflows/main_workflow.yml b/.github/workflows/main_workflow.yml index a8277649..d547bb7f 100644 --- a/.github/workflows/main_workflow.yml +++ b/.github/workflows/main_workflow.yml @@ -158,7 +158,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - python-version: [ "3.7", "3.8", "3.9", "3.10" ] + python-version: [ "3.8", "3.9", "3.10", "3.11" ] timeout-minutes: 30 diff --git a/Pipfile b/Pipfile index cb34303a..30564615 100644 --- a/Pipfile +++ b/Pipfile @@ -12,19 +12,18 @@ name = "pypi" aiohttp = "==3.7.4.post0" asn1crypto = "==1.5.1" certifi = "==2021.10.8" -grpcio = "==1.47.5" +grpcio = "==1.53.0" hypothesis = "==6.21.6" -pandas = "==1.3.5" -py-ecc = "==5.2.0" -py-eth-sig-utils = "==0.4.0" +pandas = "==1.5.3" +py-ecc = "==6.0.0" pytz = "==2022.2.1" requests = "==2.28.2" -open-aea = "==1.37.0" -open-aea-ledger-ethereum = "==1.37.0" -open-aea-ledger-cosmos = "==1.37.0" -open-aea-cli-ipfs = "==1.37.0" -open-aea-test-autonomy = "==0.10.10.post1" -open-autonomy = {version = "==0.10.10.post1", extras = ["all"]} +open-aea = "==1.38.0" +open-aea-ledger-ethereum = "==1.38.0" +open-aea-ledger-cosmos = "==1.38.0" +open-aea-cli-ipfs = "==1.38.0" +open-aea-test-autonomy = "==0.11.0" +open-autonomy = {version = "==0.11.0", extras = ["all"]} tomte = {version = "==0.2.12", extras = ["tests", "cli"]} [requires] diff --git a/packages/packages.json b/packages/packages.json index df743774..55e49d43 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -15,28 +15,28 @@ }, "third_party": { "protocol/valory/abci/0.1.0": "bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe", - "connection/valory/abci/0.1.0": "bafybeic6beo7cpd2qtotntlbmsrs3qfn7fw5eh2vkav6milat6awao46pu", + "connection/valory/abci/0.1.0": "bafybeihczvjnki5kxhyixkh4lxuxkqsuhqmpn63tneyj76p7cmgaxqo7pu", "protocol/valory/contract_api/1.0.0": "bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa", "protocol/valory/http/1.0.0": "bafybeia5bxdua2i6chw6pg47bvoljzcpuqxzy4rdrorbdmcbnwmnfdobtu", "protocol/valory/ledger_api/1.0.0": "bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby", "connection/valory/http_client/0.23.0": "bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y", - "connection/valory/ledger/0.19.0": "bafybeiejc7g7ebv3cleiqb4f4h4pspcu6vtr54332szwlqiabfs3sfdh44", - "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeiesdz7xfijeomjpps3e5k3zspvisx2xje6yqub6hzj4uczr7q33wq", - "contract/valory/service_registry/0.1.0": "bafybeidjm7w7pugc6kzrxlhbtnnc4rpgr3pkrg3owdxacrccar5qqwyu2e", + "connection/valory/ledger/0.19.0": "bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeihuyxtxqp5f5sviid5hgtpuncd545hiurp3pjdbhqbs3u4kag4a2a", + "contract/valory/service_registry/0.1.0": "bafybeihi2tfcf4l7j6tzwb6vptrctkj57zye2oqxmyfwxc4u7gb2v3fmwa", "protocol/open_aea/signing/1.0.0": "bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m", "protocol/valory/tendermint/0.1.0": "bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa", - "skill/valory/abstract_abci/0.1.0": "bafybeih3bwx5apteinnoxts7sqmjlskntdbo7vvnmdbs5noo2pv76by7fu", - "contract/valory/gnosis_safe/0.1.0": "bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm", + "skill/valory/abstract_abci/0.1.0": "bafybeibcemiz3qxoordadxwkxkjp7g7rerbfwap6wqxiepcms22ocb3v7i", + "contract/valory/gnosis_safe/0.1.0": "bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm", "protocol/valory/acn/1.1.0": "bafybeiapa5ilsobggnspoqhspftwolrx52udrwmaxdxgrk26heuvl4oooa", - "skill/valory/abstract_round_abci/0.1.0": "bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm", + "skill/valory/abstract_round_abci/0.1.0": "bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq", - "contract/valory/multisend/0.1.0": "bafybeict2k3vf3c4fvzosaq5kku2ivtzsskbomrujmmoicut7eg52onnje", - "contract/valory/multicall2/0.1.0": "bafybeihdhxhs7lf5uy4fi7g3s3q2ge34q575pydbh7ccbcd4ebggsakpgy", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm", - "skill/valory/registration_abci/0.1.0": "bafybeia25gpusnkakb2dp4heqkwtuftbc2apppq3i4bds6sphltsovgzvi", - "skill/valory/reset_pause_abci/0.1.0": "bafybeigzvwbzktclahjbsyiwqnj6poree4iveon5pric6s5ixb6wrhkdhq", - "skill/valory/termination_abci/0.1.0": "bafybeibcdgnarxyyqexncpfewcemraryywtwueuv7qthsjuean5l77lp2e", + "contract/valory/multisend/0.1.0": "bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq", + "contract/valory/multicall2/0.1.0": "bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe", + "skill/valory/registration_abci/0.1.0": "bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu", + "skill/valory/reset_pause_abci/0.1.0": "bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy", + "skill/valory/termination_abci/0.1.0": "bafybeies2zrbcsajnsgjq2ljr352gzvjsvkoycu65tuj5avnxlgjqlevci", "protocol/valory/ipfs/0.1.0": "bafybeibjzhsengtxfofqpxy6syamplevp35obemwfp4c5lhag3v2bvgysa", - "connection/valory/ipfs/0.1.0": "bafybeicwe4fksbhaqs4qycfdqbzgqtikfn3u4g5y5fucxfmriezwwf7hse" + "connection/valory/ipfs/0.1.0": "bafybeihr5kvz2oj4uxpiqcbjwfx5hpftm4drubugwcabdcht4gpna3l6ja" } } \ No newline at end of file diff --git a/tox.ini b/tox.ini index 1b69c0ac..e48afca3 100644 --- a/tox.ini +++ b/tox.ini @@ -19,20 +19,19 @@ deps = aiohttp==3.7.4.post0 asn1crypto==1.5.1 certifi==2021.10.8 - grpcio==1.47.5 + grpcio==1.53.0 hypothesis==6.21.6 - pandas==1.3.5 - py-ecc==5.2.0 - py-eth-sig-utils==0.4.0 + pandas==1.5.3 + py-ecc==6.0.0 pytz==2022.2.1 tomte[tests]==0.2.12 requests==2.28.2 - open-aea==1.37.0 - open-aea-ledger-ethereum==1.37.0 - open-aea-ledger-cosmos==1.37.0 - open-aea-cli-ipfs==1.37.0 - open-aea-test-autonomy==0.10.10.post1 - open-autonomy==0.10.10.post1 + open-aea==1.38.0 + open-aea-ledger-ethereum==1.38.0 + open-aea-ledger-cosmos==1.38.0 + open-aea-cli-ipfs==1.38.0 + open-aea-test-autonomy==0.11.0 + open-autonomy==0.11.0 setenv = PYTHONHASHSEED=0 PACKAGES_PATHS = packages/elcollectooorr @@ -41,15 +40,6 @@ commands = autonomy packages sync pytest -rfE --doctest-modules {env:PACKAGES_PATHS} --cov=packages --cov-report=xml --cov-report=term --cov-report=term-missing --cov-config=.coveragerc {posargs} -[testenv:py3.7-linux] -basepython = python3.7 -platform=^linux$ -usedevelop = True -deps = - {[testenv]deps} -setenv = - {[testenv]setenv} - [testenv:py3.8-linux] basepython = python3.8 platform=^linux$ @@ -77,9 +67,9 @@ deps = setenv = {[testenv]setenv} -[testenv:py3.7-win] -basepython = python3.7 -platform=^win32$ +[testenv:py3.11-linux] +basepython = python3.11 +platform=^linux$ usedevelop = True deps = {[testenv]deps} @@ -113,9 +103,9 @@ deps = setenv = {[testenv]setenv} -[testenv:py3.7-darwin] -basepython = python3.7 -platform=^darwin$ +[testenv:py3.11-win] +basepython = python3.11 +platform=^win32$ usedevelop = True deps = {[testenv]deps} @@ -149,6 +139,15 @@ deps = setenv = {[testenv]setenv} +[testenv:py3.11-darwin] +basepython = python3.11 +platform=^darwin$ +usedevelop = True +deps = + {[testenv]deps} +setenv = + {[testenv]setenv} + [testenv:bandit] skipsdist = True skip_install = True From f418e03607eb110e6bb5f4e47223c9028b4a8a69 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Wed, 16 Aug 2023 19:34:52 +0530 Subject: [PATCH 02/11] fix: dependencies --- docs/index.md | 2 +- .../agents/elcollectooorr/aea-config.yaml | 46 +++++++++---------- .../contracts/artblocks/contract.yaml | 6 +-- .../artblocks_minter_filter/contract.yaml | 6 +-- .../artblocks_periphery/contract.yaml | 6 +-- .../contracts/basket/contract.yaml | 7 ++- .../contracts/basket_factory/contract.yaml | 5 +- .../contracts/token_settings/contract.yaml | 5 +- .../contracts/token_vault/contract.yaml | 7 ++- .../token_vault_factory/contract.yaml | 5 +- .../services/elcollectooorr/service.yaml | 2 +- .../skills/elcollectooorr_abci/skill.yaml | 28 +++++------ .../fractionalize_deployment_abci/skill.yaml | 14 +++--- packages/packages.json | 24 +++++----- 14 files changed, 79 insertions(+), 84 deletions(-) diff --git a/docs/index.md b/docs/index.md index 406fed05..935d8b14 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,7 +22,7 @@ In order to run a local demo of the El Collectooorr service: 2. Fetch the El Collectooorr service. ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeif6gawz3ksbyo6hqhhmwiqcfvfyyswdmbvof4fftcdxbdnqvoy5ti --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeihgddsuyzulsw6rxs5o5snk6c57q7vwnskdpbxmmhcu7fy7hchny4 --service ``` 3. Build the Docker image of the service agents diff --git a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml index 1cfdeac7..b507faaa 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml +++ b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml @@ -33,24 +33,24 @@ fingerprint: tests/test_token_vault_factory/test_contract.py: bafybeibpcizflmxkpi4ik7pnqwxhzjxrin2hret55lvrikigqhv5ptr3dm fingerprint_ignore_patterns: [] connections: -- valory/abci:0.1.0:bafybeic6beo7cpd2qtotntlbmsrs3qfn7fw5eh2vkav6milat6awao46pu +- valory/abci:0.1.0:bafybeihczvjnki5kxhyixkh4lxuxkqsuhqmpn63tneyj76p7cmgaxqo7pu - valory/http_client:0.23.0:bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y -- valory/ipfs:0.1.0:bafybeicwe4fksbhaqs4qycfdqbzgqtikfn3u4g5y5fucxfmriezwwf7hse -- valory/ledger:0.19.0:bafybeiejc7g7ebv3cleiqb4f4h4pspcu6vtr54332szwlqiabfs3sfdh44 +- valory/ipfs:0.1.0:bafybeihr5kvz2oj4uxpiqcbjwfx5hpftm4drubugwcabdcht4gpna3l6ja +- valory/ledger:0.19.0:bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a - valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq contracts: -- elcollectooorr/artblocks:0.1.0:bafybeid2eqzviqf6ev6nkpc6gmuxdw4jqgoxs6fbhu5eennmwamhc6bbrm -- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeid23gtqd7g6ssvx5us4424r3lnh5s2uzjaql6jsuzswtpmzzxftxa -- elcollectooorr/artblocks_periphery:0.1.0:bafybeicy73dgqvi2nbon32matutxdek4vynumlngap6iqlwg6zce2pae5q -- elcollectooorr/basket:0.1.0:bafybeielqog2qh575iu2j2v4fd7vs2jq6xina2ix3425775qvxpubkbooi -- elcollectooorr/basket_factory:0.1.0:bafybeib6i2uhb7euis6ocpbpe2hedrs4t67rfmupe7lashyffho266ffjy -- elcollectooorr/token_vault:0.1.0:bafybeihe7xw7urmxuthebdp7aoak325gpkn377aopsyr7cuvbkozb65yg4 -- elcollectooorr/token_vault_factory:0.1.0:bafybeiatj6mo2clnhv3hlncstzdwp33gvds552pon43vqy22oj36cimx5i -- valory/gnosis_safe:0.1.0:bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeiesdz7xfijeomjpps3e5k3zspvisx2xje6yqub6hzj4uczr7q33wq -- valory/multicall2:0.1.0:bafybeihdhxhs7lf5uy4fi7g3s3q2ge34q575pydbh7ccbcd4ebggsakpgy -- valory/multisend:0.1.0:bafybeict2k3vf3c4fvzosaq5kku2ivtzsskbomrujmmoicut7eg52onnje -- valory/service_registry:0.1.0:bafybeidjm7w7pugc6kzrxlhbtnnc4rpgr3pkrg3owdxacrccar5qqwyu2e +- elcollectooorr/artblocks:0.1.0:bafybeih45mi4rp5bjxcfdpl7pshrckrkx2i6epp3lmkkl3n2fj6x3ov7yi +- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm +- elcollectooorr/artblocks_periphery:0.1.0:bafybeiadvorgnioqh7aazkz6yml72fpep6k2fzlvvtqtlyadbnvehiyzza +- elcollectooorr/basket:0.1.0:bafybeiewzytr3qsr7fzuw7i75pawt5xrfrudq7oejwqk7oahtojl5qk2hq +- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje +- elcollectooorr/token_vault:0.1.0:bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy +- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeihuyxtxqp5f5sviid5hgtpuncd545hiurp3pjdbhqbs3u4kag4a2a +- valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y +- valory/multisend:0.1.0:bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq +- valory/service_registry:0.1.0:bafybeihi2tfcf4l7j6tzwb6vptrctkj57zye2oqxmyfwxc4u7gb2v3fmwa protocols: - open_aea/signing:1.0.0:bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m - valory/abci:0.1.0:bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe @@ -61,14 +61,14 @@ protocols: - valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby - valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa skills: -- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeie3znamhs7ektaojbp3dqe465mjzw2luonhyyt5kq7xfzvqiirygq -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeihs5ilq3beu5f2ufdxtzx2s2zvocgg4hyjjju75w4m3pqdhdn5req -- valory/abstract_abci:0.1.0:bafybeih3bwx5apteinnoxts7sqmjlskntdbo7vvnmdbs5noo2pv76by7fu -- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm -- valory/registration_abci:0.1.0:bafybeia25gpusnkakb2dp4heqkwtuftbc2apppq3i4bds6sphltsovgzvi -- valory/reset_pause_abci:0.1.0:bafybeigzvwbzktclahjbsyiwqnj6poree4iveon5pric6s5ixb6wrhkdhq -- valory/termination_abci:0.1.0:bafybeibcdgnarxyyqexncpfewcemraryywtwueuv7qthsjuean5l77lp2e -- valory/transaction_settlement_abci:0.1.0:bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm +- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeibmbrp5ftzwmuivz73lukchudxy6d7rfsin5kohgxcizygjaakpri +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeia7eaqfensnivqlybhsgonwapffqld3udymf5jkm6lgfkbb42hg7m +- valory/abstract_abci:0.1.0:bafybeibcemiz3qxoordadxwkxkjp7g7rerbfwap6wqxiepcms22ocb3v7i +- valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa +- valory/registration_abci:0.1.0:bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu +- valory/reset_pause_abci:0.1.0:bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy +- valory/termination_abci:0.1.0:bafybeies2zrbcsajnsgjq2ljr352gzvjsvkoycu65tuj5avnxlgjqlevci +- valory/transaction_settlement_abci:0.1.0:bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/elcollectooorr/contracts/artblocks/contract.yaml b/packages/elcollectooorr/contracts/artblocks/contract.yaml index 35f5cd46..d20e6f9a 100644 --- a/packages/elcollectooorr/contracts/artblocks/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks/contract.yaml @@ -14,9 +14,9 @@ class_name: ArtBlocksContract contract_interface_paths: ethereum: build/artblocks.json contracts: -- valory/multicall2:0.1.0:bafybeihdhxhs7lf5uy4fi7g3s3q2ge34q575pydbh7ccbcd4ebggsakpgy +- valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml b/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml index f65a92aa..070cf098 100644 --- a/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml @@ -14,9 +14,9 @@ class_name: ArtBlocksMinterFilterContract contract_interface_paths: ethereum: build/MinterFilter.json contracts: -- valory/multicall2:0.1.0:bafybeihdhxhs7lf5uy4fi7g3s3q2ge34q575pydbh7ccbcd4ebggsakpgy +- valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml b/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml index 177e7869..6fc20978 100644 --- a/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml @@ -14,9 +14,9 @@ class_name: ArtBlocksPeripheryContract contract_interface_paths: ethereum: build/Minter.json contracts: -- valory/multicall2:0.1.0:bafybeihdhxhs7lf5uy4fi7g3s3q2ge34q575pydbh7ccbcd4ebggsakpgy +- valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/basket/contract.yaml b/packages/elcollectooorr/contracts/basket/contract.yaml index 6beb5223..5e8249fe 100644 --- a/packages/elcollectooorr/contracts/basket/contract.yaml +++ b/packages/elcollectooorr/contracts/basket/contract.yaml @@ -14,13 +14,12 @@ fingerprint: tests/test_contract.py: bafybeigopcgatpmvxk7exysrocbp36axrlnvti5rx75l2px2eq6jxzhwvm fingerprint_ignore_patterns: [] contracts: -- elcollectooorr/basket_factory:0.1.0:bafybeib6i2uhb7euis6ocpbpe2hedrs4t67rfmupe7lashyffho266ffjy +- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje class_name: BasketContract contract_interface_paths: ethereum: build/Basket.json dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - py-eth-sig-utils: {} - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/basket_factory/contract.yaml b/packages/elcollectooorr/contracts/basket_factory/contract.yaml index 9527ef2d..8e7ac00f 100644 --- a/packages/elcollectooorr/contracts/basket_factory/contract.yaml +++ b/packages/elcollectooorr/contracts/basket_factory/contract.yaml @@ -20,6 +20,5 @@ contract_interface_paths: dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - py-eth-sig-utils: {} - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/token_settings/contract.yaml b/packages/elcollectooorr/contracts/token_settings/contract.yaml index 7b829629..dc62a77f 100644 --- a/packages/elcollectooorr/contracts/token_settings/contract.yaml +++ b/packages/elcollectooorr/contracts/token_settings/contract.yaml @@ -20,6 +20,5 @@ contract_interface_paths: dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - py-eth-sig-utils: {} - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/token_vault/contract.yaml b/packages/elcollectooorr/contracts/token_vault/contract.yaml index 38e2df03..16b28697 100644 --- a/packages/elcollectooorr/contracts/token_vault/contract.yaml +++ b/packages/elcollectooorr/contracts/token_vault/contract.yaml @@ -12,13 +12,12 @@ fingerprint: contract.py: bafybeigtduehmywbipyr465i7gleb653lw3rg7gnb7hzaftdwxfle7pdpi fingerprint_ignore_patterns: [] contracts: -- elcollectooorr/token_vault_factory:0.1.0:bafybeiatj6mo2clnhv3hlncstzdwp33gvds552pon43vqy22oj36cimx5i +- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae class_name: TokenVaultContract contract_interface_paths: ethereum: build/TokenVault.json dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - py-eth-sig-utils: {} - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml b/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml index 2e88fd41..f7c1c6f4 100644 --- a/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml +++ b/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml @@ -18,6 +18,5 @@ contract_interface_paths: dependencies: open-aea-ledger-ethereum: version: ==1.37.0 - py-eth-sig-utils: {} - web3: - version: ==5.31.4 + open-aea-web3: + version: ==6.0.1 diff --git a/packages/elcollectooorr/services/elcollectooorr/service.yaml b/packages/elcollectooorr/services/elcollectooorr/service.yaml index ba635331..5d017526 100644 --- a/packages/elcollectooorr/services/elcollectooorr/service.yaml +++ b/packages/elcollectooorr/services/elcollectooorr/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiheuht3rkoreuimqcyqcdfcp6rjtegvor77xthlb6s2dw5sv4x4uu fingerprint_ignore_patterns: [] -agent: elcollectooorr/elcollectooorr:0.1.0:bafybeifvwmsgfek4tj4fuezaatab6xid75qchxays7omzw4amsccbdpj4q +agent: elcollectooorr/elcollectooorr:0.1.0:bafybeib32bbjggo65hmvey4qljj24vo6afrdgjgxbcnhy6gjxgsvzyyfqm number_of_agents: 4 deployment: {} --- diff --git a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml index 24853c49..b2f401c4 100644 --- a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml +++ b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml @@ -25,23 +25,23 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- elcollectooorr/artblocks:0.1.0:bafybeid2eqzviqf6ev6nkpc6gmuxdw4jqgoxs6fbhu5eennmwamhc6bbrm -- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeid23gtqd7g6ssvx5us4424r3lnh5s2uzjaql6jsuzswtpmzzxftxa -- elcollectooorr/artblocks_periphery:0.1.0:bafybeicy73dgqvi2nbon32matutxdek4vynumlngap6iqlwg6zce2pae5q -- elcollectooorr/basket_factory:0.1.0:bafybeib6i2uhb7euis6ocpbpe2hedrs4t67rfmupe7lashyffho266ffjy -- elcollectooorr/token_vault:0.1.0:bafybeihe7xw7urmxuthebdp7aoak325gpkn377aopsyr7cuvbkozb65yg4 -- elcollectooorr/token_vault_factory:0.1.0:bafybeiatj6mo2clnhv3hlncstzdwp33gvds552pon43vqy22oj36cimx5i -- valory/gnosis_safe:0.1.0:bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm -- valory/multisend:0.1.0:bafybeict2k3vf3c4fvzosaq5kku2ivtzsskbomrujmmoicut7eg52onnje +- elcollectooorr/artblocks:0.1.0:bafybeih45mi4rp5bjxcfdpl7pshrckrkx2i6epp3lmkkl3n2fj6x3ov7yi +- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm +- elcollectooorr/artblocks_periphery:0.1.0:bafybeiadvorgnioqh7aazkz6yml72fpep6k2fzlvvtqtlyadbnvehiyzza +- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje +- elcollectooorr/token_vault:0.1.0:bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy +- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm +- valory/multisend:0.1.0:bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeihs5ilq3beu5f2ufdxtzx2s2zvocgg4hyjjju75w4m3pqdhdn5req -- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm -- valory/registration_abci:0.1.0:bafybeia25gpusnkakb2dp4heqkwtuftbc2apppq3i4bds6sphltsovgzvi -- valory/reset_pause_abci:0.1.0:bafybeigzvwbzktclahjbsyiwqnj6poree4iveon5pric6s5ixb6wrhkdhq -- valory/termination_abci:0.1.0:bafybeibcdgnarxyyqexncpfewcemraryywtwueuv7qthsjuean5l77lp2e -- valory/transaction_settlement_abci:0.1.0:bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeia7eaqfensnivqlybhsgonwapffqld3udymf5jkm6lgfkbb42hg7m +- valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa +- valory/registration_abci:0.1.0:bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu +- valory/reset_pause_abci:0.1.0:bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy +- valory/termination_abci:0.1.0:bafybeies2zrbcsajnsgjq2ljr352gzvjsvkoycu65tuj5avnxlgjqlevci +- valory/transaction_settlement_abci:0.1.0:bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe behaviours: main: args: {} diff --git a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml index 5fc6edca..70c89437 100644 --- a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml +++ b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml @@ -17,16 +17,16 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- elcollectooorr/basket:0.1.0:bafybeielqog2qh575iu2j2v4fd7vs2jq6xina2ix3425775qvxpubkbooi -- elcollectooorr/basket_factory:0.1.0:bafybeib6i2uhb7euis6ocpbpe2hedrs4t67rfmupe7lashyffho266ffjy -- elcollectooorr/token_vault:0.1.0:bafybeihe7xw7urmxuthebdp7aoak325gpkn377aopsyr7cuvbkozb65yg4 -- elcollectooorr/token_vault_factory:0.1.0:bafybeiatj6mo2clnhv3hlncstzdwp33gvds552pon43vqy22oj36cimx5i -- valory/gnosis_safe:0.1.0:bafybeibhezhwgi5ustv675gfohsq5l5xjijp36gqueuicyl2ofrtkrortm +- elcollectooorr/basket:0.1.0:bafybeiewzytr3qsr7fzuw7i75pawt5xrfrudq7oejwqk7oahtojl5qk2hq +- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje +- elcollectooorr/token_vault:0.1.0:bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy +- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- valory/abstract_round_abci:0.1.0:bafybeibqpzbklnljvtc67yon4ciijxj75d7vazm7rurcvbbfnk6jtudukm -- valory/transaction_settlement_abci:0.1.0:bafybeiepus7qsa47gt7dyk32gaqsoae6whjoxfnplttulxrvmcauyerrdm +- valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa +- valory/transaction_settlement_abci:0.1.0:bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe behaviours: main: args: {} diff --git a/packages/packages.json b/packages/packages.json index 55e49d43..280ad4cd 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,17 +1,17 @@ { "dev": { - "contract/elcollectooorr/basket_factory/0.1.0": "bafybeib6i2uhb7euis6ocpbpe2hedrs4t67rfmupe7lashyffho266ffjy", - "contract/elcollectooorr/token_vault_factory/0.1.0": "bafybeiatj6mo2clnhv3hlncstzdwp33gvds552pon43vqy22oj36cimx5i", - "contract/elcollectooorr/basket/0.1.0": "bafybeielqog2qh575iu2j2v4fd7vs2jq6xina2ix3425775qvxpubkbooi", - "contract/elcollectooorr/token_vault/0.1.0": "bafybeihe7xw7urmxuthebdp7aoak325gpkn377aopsyr7cuvbkozb65yg4", - "contract/elcollectooorr/artblocks/0.1.0": "bafybeid2eqzviqf6ev6nkpc6gmuxdw4jqgoxs6fbhu5eennmwamhc6bbrm", - "contract/elcollectooorr/artblocks_minter_filter/0.1.0": "bafybeid23gtqd7g6ssvx5us4424r3lnh5s2uzjaql6jsuzswtpmzzxftxa", - "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeicy73dgqvi2nbon32matutxdek4vynumlngap6iqlwg6zce2pae5q", - "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeihs5ilq3beu5f2ufdxtzx2s2zvocgg4hyjjju75w4m3pqdhdn5req", - "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeie3znamhs7ektaojbp3dqe465mjzw2luonhyyt5kq7xfzvqiirygq", - "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeifvwmsgfek4tj4fuezaatab6xid75qchxays7omzw4amsccbdpj4q", - "contract/elcollectooorr/token_settings/0.1.0": "bafybeihgm5kx2wzq7vsf6wsq4bx64th2rkyrquezaairvijxcwiruv6csi", - "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeif6gawz3ksbyo6hqhhmwiqcfvfyyswdmbvof4fftcdxbdnqvoy5ti" + "contract/elcollectooorr/basket_factory/0.1.0": "bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje", + "contract/elcollectooorr/token_vault_factory/0.1.0": "bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae", + "contract/elcollectooorr/basket/0.1.0": "bafybeiewzytr3qsr7fzuw7i75pawt5xrfrudq7oejwqk7oahtojl5qk2hq", + "contract/elcollectooorr/token_vault/0.1.0": "bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy", + "contract/elcollectooorr/artblocks/0.1.0": "bafybeih45mi4rp5bjxcfdpl7pshrckrkx2i6epp3lmkkl3n2fj6x3ov7yi", + "contract/elcollectooorr/artblocks_minter_filter/0.1.0": "bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm", + "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeiadvorgnioqh7aazkz6yml72fpep6k2fzlvvtqtlyadbnvehiyzza", + "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeia7eaqfensnivqlybhsgonwapffqld3udymf5jkm6lgfkbb42hg7m", + "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeibmbrp5ftzwmuivz73lukchudxy6d7rfsin5kohgxcizygjaakpri", + "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeib32bbjggo65hmvey4qljj24vo6afrdgjgxbcnhy6gjxgsvzyyfqm", + "contract/elcollectooorr/token_settings/0.1.0": "bafybeigbpqq2yeewri7uglazh2j4lpz77vpnkq4q2rt2wplhv72r2vfc5u", + "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeihgddsuyzulsw6rxs5o5snk6c57q7vwnskdpbxmmhcu7fy7hchny4" }, "third_party": { "protocol/valory/abci/0.1.0": "bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe", From 0c44dfc71f11745adc926d200ce2ac5ebee93fe1 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Wed, 16 Aug 2023 19:46:35 +0530 Subject: [PATCH 03/11] fix: readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 601d3b36..8f112686 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ These steps only work for operators registered on-chain! Then fetch the service: ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeif6gawz3ksbyo6hqhhmwiqcfvfyyswdmbvof4fftcdxbdnqvoy5ti --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeihgddsuyzulsw6rxs5o5snk6c57q7vwnskdpbxmmhcu7fy7hchny4 --service cd elcollectooorr ``` From 43d87e0ea21890cdda4b9d880de4fff75a904479 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Thu, 17 Aug 2023 15:38:18 +0530 Subject: [PATCH 04/11] fix: remove the usage of deprecated methods --- README.md | 2 +- docs/index.md | 2 +- .../agents/elcollectooorr/aea-config.yaml | 22 +++++++++---------- .../agents/elcollectooorr/tests/conftest.py | 8 +++---- .../tests/helpers/artblocks_utils.py | 20 ++++++++--------- .../tests/test_agents/base_elcollectooorr.py | 4 ++-- .../contracts/artblocks/contract.py | 8 +++---- .../contracts/artblocks/contract.yaml | 2 +- .../contracts/artblocks_periphery/contract.py | 2 +- .../artblocks_periphery/contract.yaml | 2 +- .../contracts/basket/contract.py | 20 ++++++++--------- .../contracts/basket/contract.yaml | 4 ++-- .../contracts/basket_factory/contract.py | 8 +++---- .../contracts/basket_factory/contract.yaml | 2 +- .../contracts/token_settings/contract.py | 6 ++--- .../contracts/token_settings/contract.yaml | 2 +- .../contracts/token_vault/contract.py | 8 +++---- .../contracts/token_vault/contract.yaml | 4 ++-- .../contracts/token_vault_factory/contract.py | 14 ++++++------ .../token_vault_factory/contract.yaml | 2 +- .../services/elcollectooorr/service.yaml | 2 +- .../skills/elcollectooorr_abci/skill.yaml | 12 +++++----- .../fractionalize_deployment_abci/skill.yaml | 8 +++---- packages/packages.json | 22 +++++++++---------- 24 files changed, 93 insertions(+), 93 deletions(-) diff --git a/README.md b/README.md index 8f112686..1fd570b2 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ These steps only work for operators registered on-chain! Then fetch the service: ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeihgddsuyzulsw6rxs5o5snk6c57q7vwnskdpbxmmhcu7fy7hchny4 --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeibkj3xg64c2w5jdf7nctkqxwbzx6oojuqsjajs2wbbn4wnnxi2xhe --service cd elcollectooorr ``` diff --git a/docs/index.md b/docs/index.md index 935d8b14..b4d75a55 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,7 +22,7 @@ In order to run a local demo of the El Collectooorr service: 2. Fetch the El Collectooorr service. ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeihgddsuyzulsw6rxs5o5snk6c57q7vwnskdpbxmmhcu7fy7hchny4 --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeibkj3xg64c2w5jdf7nctkqxwbzx6oojuqsjajs2wbbn4wnnxi2xhe --service ``` 3. Build the Docker image of the service agents diff --git a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml index b507faaa..84b90a7b 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml +++ b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml @@ -7,11 +7,11 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidulnstm63bgmfo34rd74xqcvf36o7ly7w7s4bylr4afbclnogn6q tests/__init__.py: bafybeiek3wepzhlahicjtjqrnxg7zis5cdy4y6ixemjklisocxtbgnpkqm - tests/conftest.py: bafybeihrv4kjnm653qlwocnbv66y7ufxipvsihpzgpdjyx76dx3qjpsdtm + tests/conftest.py: bafybeig5kczh6oi6lzdvug4ost2konoox75ki4jymeujsjozzqctqhngwa tests/data/json_server/data.json: bafybeibg6rfceitizdby4o2dhvpnlc64tdeustfxawliodviomrdltqrg4 tests/fixture_helpers.py: bafybeiftrapue6wb6dv6wfsdhuaxc2prn6fzltcdbrynnvbpvyqkzzvyau tests/helpers/__init__.py: bafybeifzu3wezqxxzwznjug3xwqlumu76fmdvj7aiywutqgrakbxzimu3i - tests/helpers/artblocks_utils.py: bafybeid7gcxt7t42oc5k74ddpx5cpyciwkfegmjrdcbrcfoqq3c4wxfquy + tests/helpers/artblocks_utils.py: bafybeibcyv4mp5xrkepsqlhgq5okz2hbjlose6w6wra75exhoxzcbdfkbi tests/helpers/constants.py: bafybeidzusrogrrpltcvbth6t7ceuhzkotcj6aqy77ew3mnxsd6midntcm tests/helpers/docker/__init__.py: bafybeidakk3cxongkwm6pkuokufzpqr2ms2fvnecmdpxdm5lk7d2ko244q tests/helpers/docker/elcol_net.py: bafybeia3rzjwwc3isxqnzh6b33lf2m3psuzxj4jlrx7zwomzctxzy6sqoy @@ -20,7 +20,7 @@ fingerprint: tests/helpers/hardhat/hardhat.config.js: bafybeiag3rxhb2luzd4nr6whsti7wtlnvzlm32gctq45p6xfwmsyijpe54 tests/helpers/hardhat/package.json: bafybeifjyofuzq66sjjtxdynvy4be5rxzkiuwyntjibrjvsrly5ddeai64 tests/test_agents/__init__.py: bafybeifocm5xbm4nryrzkmzot4bzfnrcnc7nggepgsywterkgw4f44awfi - tests/test_agents/base_elcollectooorr.py: bafybeie5kyqqrroitn24bgtjfyjoejncttsjog7cplc4zefoxgd7rjiw6a + tests/test_agents/base_elcollectooorr.py: bafybeiefd5ojyjvujjitygp5s5z6eryi7fbfikhsu27fqqtx6up6dmaoyi tests/test_agents/test_elcollectooorr_abci.py: bafybeiecsznoutrwxoftf4iu2sesezfxuyzvpyahsv5wnl54hb5xvsp5wa tests/test_fractionalize_deployment_abci/__init__.py: bafybeifpwsaub3khxsixvj6yc2b7zlmkpt3h6m2q65x2zmmo6uvcbpdgpm tests/test_fractionalize_deployment_abci/test_behaviours.py: bafybeid74vtqghw3uykuufsso5xxtin57v7s4d2p4euxqyiw7q4cop5qqy @@ -39,13 +39,13 @@ connections: - valory/ledger:0.19.0:bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a - valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq contracts: -- elcollectooorr/artblocks:0.1.0:bafybeih45mi4rp5bjxcfdpl7pshrckrkx2i6epp3lmkkl3n2fj6x3ov7yi +- elcollectooorr/artblocks:0.1.0:bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm - elcollectooorr/artblocks_minter_filter:0.1.0:bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm -- elcollectooorr/artblocks_periphery:0.1.0:bafybeiadvorgnioqh7aazkz6yml72fpep6k2fzlvvtqtlyadbnvehiyzza -- elcollectooorr/basket:0.1.0:bafybeiewzytr3qsr7fzuw7i75pawt5xrfrudq7oejwqk7oahtojl5qk2hq -- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje -- elcollectooorr/token_vault:0.1.0:bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy -- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- elcollectooorr/artblocks_periphery:0.1.0:bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe +- elcollectooorr/basket:0.1.0:bafybeiacdg2lvo7yq3phse44vbncvfw4mj2kkwuvdbndxtuvg7bucnhp3e +- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 +- elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee +- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea - valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm - valory/gnosis_safe_proxy_factory:0.1.0:bafybeihuyxtxqp5f5sviid5hgtpuncd545hiurp3pjdbhqbs3u4kag4a2a - valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y @@ -61,8 +61,8 @@ protocols: - valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby - valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa skills: -- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeibmbrp5ftzwmuivz73lukchudxy6d7rfsin5kohgxcizygjaakpri -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeia7eaqfensnivqlybhsgonwapffqld3udymf5jkm6lgfkbb42hg7m +- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeiflxuycml6g3d7bgo2bwbvonbn4oyfe44f67c2fphrqrb7ttb6quq +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeiclvd7kd2hykcczujbijaqtc6qpnnbodryom5dcm2miwkeofl5j74 - valory/abstract_abci:0.1.0:bafybeibcemiz3qxoordadxwkxkjp7g7rerbfwap6wqxiepcms22ocb3v7i - valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa - valory/registration_abci:0.1.0:bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu diff --git a/packages/elcollectooorr/agents/elcollectooorr/tests/conftest.py b/packages/elcollectooorr/agents/elcollectooorr/tests/conftest.py index 91634ee7..de68372d 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/tests/conftest.py +++ b/packages/elcollectooorr/agents/elcollectooorr/tests/conftest.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-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. @@ -290,20 +290,20 @@ def setup_artblocks_contract( with open(ARTBLOCKS_MINTER_FILTER_FILE) as minter_filter_file: minter_filter = json.load(minter_filter_file) artblocks_minter_filter = instance.eth.contract( - address=instance.toChecksumAddress(ARTBLOCKS_FILTER_ADDRESS), + address=instance.to_checksum_address(ARTBLOCKS_FILTER_ADDRESS), abi=minter_filter["abi"], ) with open(ARTBLOCKS_CORE_FILE) as artblocks_file: artblocks = json.load(artblocks_file) artblocks_core = instance.eth.contract( - address=instance.toChecksumAddress(ARTBLOCKS_ADDRESS), abi=artblocks["abi"] + address=instance.to_checksum_address(ARTBLOCKS_ADDRESS), abi=artblocks["abi"] ) with open(ARTBLOCKS_PERIPHERY_FILE) as artblocks_periphery_file: artblocks_periphery = json.load(artblocks_periphery_file) artblocks_periphery = instance.eth.contract( - address=instance.toChecksumAddress(ARTBLOCKS_SET_PRICE_MINTER), + address=instance.to_checksum_address(ARTBLOCKS_SET_PRICE_MINTER), abi=artblocks_periphery["abi"], ) diff --git a/packages/elcollectooorr/agents/elcollectooorr/tests/helpers/artblocks_utils.py b/packages/elcollectooorr/agents/elcollectooorr/tests/helpers/artblocks_utils.py index dbb91092..7f4df18d 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/tests/helpers/artblocks_utils.py +++ b/packages/elcollectooorr/agents/elcollectooorr/tests/helpers/artblocks_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-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. @@ -63,7 +63,7 @@ def create_project( ) -> Any: """Create an artblocks project.""" return artblocks_core_contract.functions.addProject( - project_name, instance.toChecksumAddress(artist_address), price_in_wei, dyanmic + project_name, instance.to_checksum_address(artist_address), price_in_wei, dyanmic ) @@ -74,7 +74,7 @@ def add_mint_whitelisted( ) -> Any: """Whitelist a mint in the core arblocks contract.""" return artblocks_core_contract.functions.addMintWhitelisted( - instance.toChecksumAddress(address), + instance.to_checksum_address(address), ) @@ -97,7 +97,7 @@ def add_approved_minter( """Whitelist a minter on the MinterFilter contract.""" return artblocks_minter_filter.functions.addApprovedMinter( - instance.toChecksumAddress(minter_address), + instance.to_checksum_address(minter_address), ) @@ -108,7 +108,7 @@ def set_minter_for_project( return artblocks_minter_filter.functions.setMinterForProject( project_id, - instance.toChecksumAddress(minter_address), + instance.to_checksum_address(minter_address), ) @@ -149,15 +149,15 @@ def toggle_contract_mintable( def send_tx(instance: Any, private_key: str, sender_address: str, tx: Any) -> None: """Send the provided tx.""" - raw_tx = tx.buildTransaction( + raw_tx = tx.build_transaction( { "from": sender_address, "chainId": ELCOL_NET_CHAIN_ID, "gasPrice": instance.eth.gas_price, - "nonce": instance.eth.getTransactionCount( - instance.toChecksumAddress(sender_address) + "nonce": instance.eth.get_transaction_count( + instance.to_checksum_address(sender_address) ), } ) - signed_tx = instance.eth.account.signTransaction(raw_tx, private_key=private_key) - instance.eth.sendRawTransaction(signed_tx.rawTransaction) + signed_tx = instance.eth.account.sign_transaction(raw_tx, private_key=private_key) + instance.eth.send_raw_transaction(signed_tx.rawTransaction) diff --git a/packages/elcollectooorr/agents/elcollectooorr/tests/test_agents/base_elcollectooorr.py b/packages/elcollectooorr/agents/elcollectooorr/tests/test_agents/base_elcollectooorr.py index 7223bada..2e5b3803 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/tests/test_agents/base_elcollectooorr.py +++ b/packages/elcollectooorr/agents/elcollectooorr/tests/test_agents/base_elcollectooorr.py @@ -249,8 +249,8 @@ def _deposit_to_safe_contract(self, timeout: int = 200) -> None: "value": Wei(ONE_ETH), "chainId": self.ELCOL_NET_CHAIN_ID, "gasPrice": instance.eth.gas_price, - "nonce": instance.eth.getTransactionCount( - instance.toChecksumAddress(sender_address) + "nonce": instance.eth.get_transaction_count( + instance.to_checksum_address(sender_address) ), } ) diff --git a/packages/elcollectooorr/contracts/artblocks/contract.py b/packages/elcollectooorr/contracts/artblocks/contract.py index 4356d181..09d234f7 100644 --- a/packages/elcollectooorr/contracts/artblocks/contract.py +++ b/packages/elcollectooorr/contracts/artblocks/contract.py @@ -286,8 +286,8 @@ def process_purchase_receipt( """ ledger_api = cast(EthereumApi, ledger_api) contract = cls.get_instance(ledger_api, contract_address) - receipt = ledger_api.api.eth.getTransactionReceipt(tx_hash) - logs = contract.events.Mint().processReceipt(receipt) + receipt = ledger_api.api.eth.get_transaction_receipt(tx_hash) + logs = contract.events.Mint().process_receipt(receipt) if len(logs) == 0: _logger.error(f"No 'Mint' events were emitted in the tx={tx_hash}") @@ -326,8 +326,8 @@ def safe_transfer_from_data( :return: the tx # noqa: DAR202 """ instance = cls.get_instance(ledger_api, contract_address) - from_address = ledger_api.api.toChecksumAddress(from_address) - to_address = ledger_api.api.toChecksumAddress(to_address) + from_address = ledger_api.api.to_checksum_address(from_address) + to_address = ledger_api.api.to_checksum_address(to_address) data = instance.encodeABI( fn_name="safeTransferFrom", args=[ diff --git a/packages/elcollectooorr/contracts/artblocks/contract.yaml b/packages/elcollectooorr/contracts/artblocks/contract.yaml index d20e6f9a..ffa06877 100644 --- a/packages/elcollectooorr/contracts/artblocks/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeic4ormumf5hol3alsqybl6um2bqjze25tgtoe7ncvqlwxqb4m7zny build/artblocks.json: bafybeic6sjiqbak6zfzc3hvgroz4bcvg2featpfrgzqrmhumv2lrbcanta - contract.py: bafybeigkbhlhhetux2jlxsdd43wnww6l52bxcppohylnlb7glp2uvueuvq + contract.py: bafybeicbvwgvdnoo6jylb65dafty4ha3zw4nov5vupndennm6f4a2aqnga fingerprint_ignore_patterns: [] class_name: ArtBlocksContract contract_interface_paths: diff --git a/packages/elcollectooorr/contracts/artblocks_periphery/contract.py b/packages/elcollectooorr/contracts/artblocks_periphery/contract.py index a1ee98a3..feac7126 100644 --- a/packages/elcollectooorr/contracts/artblocks_periphery/contract.py +++ b/packages/elcollectooorr/contracts/artblocks_periphery/contract.py @@ -213,7 +213,7 @@ def purchase_to( sender_address, ) - raw_tx = contract.functions.purchaseTo(to_address, project_id).buildTransaction( + raw_tx = contract.functions.purchaseTo(to_address, project_id).build_transaction( tx_parameters ) diff --git a/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml b/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml index 6fc20978..4c9efe62 100644 --- a/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeigc7hvddoxcdqdkybwiu6bhytnlu2l3k4v4v4dbyexyzpnrkvwghi build/Minter.json: bafybeieqfmxzi2jdpuy6ayqpi7cs3yvb3z4lypyafxv5qunzsx5f2utl44 - contract.py: bafybeifb42guvwi2t3absjd4k342464a2nh53vokdue6no4pbrrwuz76d4 + contract.py: bafybeibs32j7qw3es4ibpcgjvyyfiuq2m23cxwen5ptggugkkqdykehmny fingerprint_ignore_patterns: [] class_name: ArtBlocksPeripheryContract contract_interface_paths: diff --git a/packages/elcollectooorr/contracts/basket/contract.py b/packages/elcollectooorr/contracts/basket/contract.py index f7a09843..5619adb6 100644 --- a/packages/elcollectooorr/contracts/basket/contract.py +++ b/packages/elcollectooorr/contracts/basket/contract.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-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. @@ -226,7 +226,7 @@ def approve( raw_tx = basket.functions.approve( operator_address, token_id, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -278,7 +278,7 @@ def set_approve_for_all( raw_tx = basket.functions.setApprovalForAll( operator_address, is_approved, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -330,7 +330,7 @@ def withdraw_erc721( raw_tx = basket.functions.withdrawERC721( token_address, token_id, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -382,7 +382,7 @@ def withdraw_erc721_unsafe( raw_tx = basket.functions.withdrawERC721Unsafe( token_address, token_id, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -427,7 +427,7 @@ def withdraw_eth( sender_address, ) - raw_tx = basket.functions.withdrawETH().buildTransaction(tx_parameters) + raw_tx = basket.functions.withdrawETH().build_transaction(tx_parameters) return raw_tx @@ -476,7 +476,7 @@ def withdraw_erc20( raw_tx = basket.functions.withdrawERC20( token_address, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -531,7 +531,7 @@ def transfer_from( sender_address, new_owner_address, token_id, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -584,7 +584,7 @@ def safe_transfer_from( sender_address, new_owner_address, token_id, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -779,7 +779,7 @@ def approve_abi( """ ledger_api = cast(EthereumApi, ledger_api) basket = cls.get_instance(ledger_api, contract_address) - operator_address = ledger_api.api.toChecksumAddress(operator_address) + operator_address = ledger_api.api.to_checksum_address(operator_address) data = basket.encodeABI( fn_name="approve", diff --git a/packages/elcollectooorr/contracts/basket/contract.yaml b/packages/elcollectooorr/contracts/basket/contract.yaml index 5e8249fe..a1c2dc78 100644 --- a/packages/elcollectooorr/contracts/basket/contract.yaml +++ b/packages/elcollectooorr/contracts/basket/contract.yaml @@ -9,12 +9,12 @@ fingerprint: README.md: bafybeidivjoq36doknaw7u7dyyis57nigzkkd5g2x66ejh3a4757cnjtbm __init__.py: bafybeiav66mysea6p62i7hg4vukzqgxp2khzftxxhjyjlq34fzkjyvbaba build/Basket.json: bafybeidg5favibiv4jzggfgmtme6lkheg4smgdwkj76xvkrqpsnsswftba - contract.py: bafybeievs5yhvkrqo7idvpf7lxty3odtqqslsfn4gsrabgzuum3csmyu7q + contract.py: bafybeid2vcysyv6arx6frg64iaw5uk4badzfq5lk6i7xmnof65skfoy7va tests/__init__.py: bafybeigq6zj3x5frzgwooqftwcvinzh7yhziibop6zedcdn3kwyks2rqty tests/test_contract.py: bafybeigopcgatpmvxk7exysrocbp36axrlnvti5rx75l2px2eq6jxzhwvm fingerprint_ignore_patterns: [] contracts: -- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje +- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 class_name: BasketContract contract_interface_paths: ethereum: build/Basket.json diff --git a/packages/elcollectooorr/contracts/basket_factory/contract.py b/packages/elcollectooorr/contracts/basket_factory/contract.py index 1b53c35b..a86207f2 100644 --- a/packages/elcollectooorr/contracts/basket_factory/contract.py +++ b/packages/elcollectooorr/contracts/basket_factory/contract.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-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. @@ -132,7 +132,7 @@ def create_basket( if nonce is None: raise ValueError("No nonce returned.") # pragma: nocover - raw_tx = factory_contract.functions.createBasket().buildTransaction( + raw_tx = factory_contract.functions.createBasket().build_transaction( tx_parameters ) @@ -167,8 +167,8 @@ def get_basket_address( """ ledger_api = cast(EthereumApi, ledger_api) contract = cls.get_instance(ledger_api, contract_address) - receipt = ledger_api.api.eth.getTransactionReceipt(tx_hash) - logs = contract.events.NewBasket().processReceipt(receipt) + receipt = ledger_api.api.eth.get_transaction_receipt(tx_hash) + logs = contract.events.NewBasket().process_receipt(receipt) if len(logs) == 0: _logger.error(f"No 'NewBasket' events were emitted in the tx={tx_hash}") diff --git a/packages/elcollectooorr/contracts/basket_factory/contract.yaml b/packages/elcollectooorr/contracts/basket_factory/contract.yaml index 8e7ac00f..18e6cbab 100644 --- a/packages/elcollectooorr/contracts/basket_factory/contract.yaml +++ b/packages/elcollectooorr/contracts/basket_factory/contract.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeihgjg2w76cskr5v5b6lz7w6k5qjkygtzu2nof74deomy3z7rqkt7y __init__.py: bafybeiav66mysea6p62i7hg4vukzqgxp2khzftxxhjyjlq34fzkjyvbaba build/BasketFactory.json: bafybeigrhyobgofcivfzchurfkegahetannmw7ekpiz3pyid6q2w3newbu - contract.py: bafybeidlh2sa3xrljoolvdsxoknbd67qkaej3lxa76omeo5qsk3awebu2y + contract.py: bafybeihbviefks7zyxww3pzkjtvi2ao5egyicogfnrmtou7wwjwedlvnwy tests/__init__.py: bafybeigq6zj3x5frzgwooqftwcvinzh7yhziibop6zedcdn3kwyks2rqty tests/test_contract.py: bafybeibawnv57slrmxwtyyqzhux3x23mvrmnrpcpih7lndfrsit52lvri4 fingerprint_ignore_patterns: [] diff --git a/packages/elcollectooorr/contracts/token_settings/contract.py b/packages/elcollectooorr/contracts/token_settings/contract.py index e8769ee4..e472e4f8 100644 --- a/packages/elcollectooorr/contracts/token_settings/contract.py +++ b/packages/elcollectooorr/contracts/token_settings/contract.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-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. @@ -168,7 +168,7 @@ def transfer_ownership( transaction_dict = settings_contract.functions.transferOwnership( new_owner_address - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return transaction_dict @@ -234,7 +234,7 @@ def set_fee_receiver( raw_tx = settings_contract.functions.setFeeReceiver( new_receiver_address - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx diff --git a/packages/elcollectooorr/contracts/token_settings/contract.yaml b/packages/elcollectooorr/contracts/token_settings/contract.yaml index dc62a77f..d4b682c6 100644 --- a/packages/elcollectooorr/contracts/token_settings/contract.yaml +++ b/packages/elcollectooorr/contracts/token_settings/contract.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeigrh2epuprtrmwcofpgdbvd35nsnf6cqopekoxqw5mxmzbolnp4sq __init__.py: bafybeifjptgrg7eco2pubk6dmo6bihomttudza37c6jluz4gse7dkhnqwy build/TokenSettings.json: bafybeiefchbpv5ckkqpsxi3x2bjufg7f4qsxr6tkhzlcggryvzh5alvdta - contract.py: bafybeiacab6ln5nrzvpfekj3p355r55uuxzpzktwy2u7pofdsao7rnohdq + contract.py: bafybeifbpeypm4wkgmygkxyncucpud7ijgdszmwywrfvucu2krv5pai2im tests/__init__.py: bafybeifw7pwisnee2n5jtpywjjqphbmzw4rypjgo4jwyix7ypfx6epcley tests/test_contract.py: bafybeia5qvm5w3u3d7du7aws6z6m5zr4zrfqgr5tlhmsl4wz7dlfhizpum fingerprint_ignore_patterns: [] diff --git a/packages/elcollectooorr/contracts/token_vault/contract.py b/packages/elcollectooorr/contracts/token_vault/contract.py index ac7354d5..109b3257 100644 --- a/packages/elcollectooorr/contracts/token_vault/contract.py +++ b/packages/elcollectooorr/contracts/token_vault/contract.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-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. @@ -273,7 +273,7 @@ def kick_curator( raw_tx = token_vault_contract.functions.kickCurator( curator_address - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -327,7 +327,7 @@ def transfer_erc20( raw_tx = token_vault_contract.functions.transfer( receiver_address, amount - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -352,7 +352,7 @@ def get_transfer_erc20_data( """ instance = cls.get_instance(ledger_api, contract_address) - receiver_address = ledger_api.api.toChecksumAddress(receiver_address) + receiver_address = ledger_api.api.to_checksum_address(receiver_address) data = instance.encodeABI(fn_name="transfer", args=[receiver_address, amount]) return {"data": data} diff --git a/packages/elcollectooorr/contracts/token_vault/contract.yaml b/packages/elcollectooorr/contracts/token_vault/contract.yaml index 16b28697..07bc250b 100644 --- a/packages/elcollectooorr/contracts/token_vault/contract.yaml +++ b/packages/elcollectooorr/contracts/token_vault/contract.yaml @@ -9,10 +9,10 @@ fingerprint: README.md: bafybeihkxnnr72tylr2wk3gwsj2ugqcv64vwwac3njhyz4g7vuq6ttod44 __init__.py: bafybeibto4ar2ljo4mtsq6hl7i524ignnxpzhwpbfftueihdnpqvmcw3vi build/TokenVault.json: bafybeih27h2cvvfhymipkfgma7poctswwrbzwunfsf2y26pbnti566pxvu - contract.py: bafybeigtduehmywbipyr465i7gleb653lw3rg7gnb7hzaftdwxfle7pdpi + contract.py: bafybeihcrjjfgkvqpmcq3jdcsmbipho4wmrd5wkhda2pjxblfecq44sfby fingerprint_ignore_patterns: [] contracts: -- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea class_name: TokenVaultContract contract_interface_paths: ethereum: build/TokenVault.json diff --git a/packages/elcollectooorr/contracts/token_vault_factory/contract.py b/packages/elcollectooorr/contracts/token_vault_factory/contract.py index 206fff53..9c98575e 100644 --- a/packages/elcollectooorr/contracts/token_vault_factory/contract.py +++ b/packages/elcollectooorr/contracts/token_vault_factory/contract.py @@ -300,7 +300,7 @@ def mint( # pylint: disable=too-many-locals token_supply, list_price, fee, - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -345,7 +345,7 @@ def pause( sender_address, ) - raw_tx = token_vault_contract.functions.pause().buildTransaction(tx_parameters) + raw_tx = token_vault_contract.functions.pause().build_transaction(tx_parameters) return raw_tx @@ -390,7 +390,7 @@ def renounce_ownership( sender_address, ) - raw_tx = token_vault_contract.functions.renounceOwnership().buildTransaction( + raw_tx = token_vault_contract.functions.renounceOwnership().build_transaction( tx_parameters ) @@ -441,7 +441,7 @@ def transfer_ownership( raw_tx = token_vault_contract.functions.transferOwnership( new_owner_address - ).buildTransaction(tx_parameters) + ).build_transaction(tx_parameters) return raw_tx @@ -486,7 +486,7 @@ def unpause( sender_address, ) - raw_tx = token_vault_contract.functions.unpause().buildTransaction( + raw_tx = token_vault_contract.functions.unpause().build_transaction( tx_parameters ) @@ -658,8 +658,8 @@ def get_vault_address( """ ledger_api = cast(EthereumApi, ledger_api) contract = cls.get_instance(ledger_api, contract_address) - receipt = ledger_api.api.eth.getTransactionReceipt(tx_hash) - logs = contract.events.Mint().processReceipt(receipt) + receipt = ledger_api.api.eth.get_transaction_receipt(tx_hash) + logs = contract.events.Mint().process_receipt(receipt) if len(logs) == 0: _logger.error(f"No 'Mint' events were emitted in the tx={tx_hash}") diff --git a/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml b/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml index f7c1c6f4..d3c03c23 100644 --- a/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml +++ b/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeibunypsax2ynyhetktuwehvn6ast7tn4ga7t4z7uwe2jmysx6foki __init__.py: bafybeibto4ar2ljo4mtsq6hl7i524ignnxpzhwpbfftueihdnpqvmcw3vi build/ERC721VaultFactory.json: bafybeiedxlmem43q36q4kcymefbs2luxhylb5xg7ebc7bx7yqjvwulffju - contract.py: bafybeiajd23zzdx7gqgyd44iotknwqatdwada4ysxtxpzdrhkxy75nhsku + contract.py: bafybeia5vdg2p7dc2yccirsowzhebq25s2a3kam7qslfxloeowdiug6tbm fingerprint_ignore_patterns: [] contracts: [] class_name: TokenVaultFactoryContract diff --git a/packages/elcollectooorr/services/elcollectooorr/service.yaml b/packages/elcollectooorr/services/elcollectooorr/service.yaml index 5d017526..009cdc26 100644 --- a/packages/elcollectooorr/services/elcollectooorr/service.yaml +++ b/packages/elcollectooorr/services/elcollectooorr/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiheuht3rkoreuimqcyqcdfcp6rjtegvor77xthlb6s2dw5sv4x4uu fingerprint_ignore_patterns: [] -agent: elcollectooorr/elcollectooorr:0.1.0:bafybeib32bbjggo65hmvey4qljj24vo6afrdgjgxbcnhy6gjxgsvzyyfqm +agent: elcollectooorr/elcollectooorr:0.1.0:bafybeifrcden4yfbhglk6qtfrwd7wyjzb4nzlqrcyvd3ehoygxx3xcgxj4 number_of_agents: 4 deployment: {} --- diff --git a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml index b2f401c4..764d9293 100644 --- a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml +++ b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml @@ -25,18 +25,18 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- elcollectooorr/artblocks:0.1.0:bafybeih45mi4rp5bjxcfdpl7pshrckrkx2i6epp3lmkkl3n2fj6x3ov7yi +- elcollectooorr/artblocks:0.1.0:bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm - elcollectooorr/artblocks_minter_filter:0.1.0:bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm -- elcollectooorr/artblocks_periphery:0.1.0:bafybeiadvorgnioqh7aazkz6yml72fpep6k2fzlvvtqtlyadbnvehiyzza -- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje -- elcollectooorr/token_vault:0.1.0:bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy -- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- elcollectooorr/artblocks_periphery:0.1.0:bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe +- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 +- elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee +- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea - valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm - valory/multisend:0.1.0:bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeia7eaqfensnivqlybhsgonwapffqld3udymf5jkm6lgfkbb42hg7m +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeiclvd7kd2hykcczujbijaqtc6qpnnbodryom5dcm2miwkeofl5j74 - valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa - valory/registration_abci:0.1.0:bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu - valory/reset_pause_abci:0.1.0:bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy diff --git a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml index 70c89437..c8f4fe48 100644 --- a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml +++ b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml @@ -17,10 +17,10 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- elcollectooorr/basket:0.1.0:bafybeiewzytr3qsr7fzuw7i75pawt5xrfrudq7oejwqk7oahtojl5qk2hq -- elcollectooorr/basket_factory:0.1.0:bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje -- elcollectooorr/token_vault:0.1.0:bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy -- elcollectooorr/token_vault_factory:0.1.0:bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae +- elcollectooorr/basket:0.1.0:bafybeiacdg2lvo7yq3phse44vbncvfw4mj2kkwuvdbndxtuvg7bucnhp3e +- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 +- elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee +- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea - valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa diff --git a/packages/packages.json b/packages/packages.json index 280ad4cd..21b66940 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,17 +1,17 @@ { "dev": { - "contract/elcollectooorr/basket_factory/0.1.0": "bafybeihkdhwrowx7r7qrp4z2v2dgyoljx55q2r3uzvszc6z6brf6435gje", - "contract/elcollectooorr/token_vault_factory/0.1.0": "bafybeicuzqrksvkxo3sjzpgy76kmbq6bsqggpcprhzpbda6v7o4ptonvae", - "contract/elcollectooorr/basket/0.1.0": "bafybeiewzytr3qsr7fzuw7i75pawt5xrfrudq7oejwqk7oahtojl5qk2hq", - "contract/elcollectooorr/token_vault/0.1.0": "bafybeiet54mciulkz4kfc4l4gmuyleewxg2vmvdxb4snfufciyshjcnvsy", - "contract/elcollectooorr/artblocks/0.1.0": "bafybeih45mi4rp5bjxcfdpl7pshrckrkx2i6epp3lmkkl3n2fj6x3ov7yi", + "contract/elcollectooorr/basket_factory/0.1.0": "bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4", + "contract/elcollectooorr/token_vault_factory/0.1.0": "bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea", + "contract/elcollectooorr/basket/0.1.0": "bafybeiacdg2lvo7yq3phse44vbncvfw4mj2kkwuvdbndxtuvg7bucnhp3e", + "contract/elcollectooorr/token_vault/0.1.0": "bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee", + "contract/elcollectooorr/artblocks/0.1.0": "bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm", "contract/elcollectooorr/artblocks_minter_filter/0.1.0": "bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm", - "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeiadvorgnioqh7aazkz6yml72fpep6k2fzlvvtqtlyadbnvehiyzza", - "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeia7eaqfensnivqlybhsgonwapffqld3udymf5jkm6lgfkbb42hg7m", - "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeibmbrp5ftzwmuivz73lukchudxy6d7rfsin5kohgxcizygjaakpri", - "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeib32bbjggo65hmvey4qljj24vo6afrdgjgxbcnhy6gjxgsvzyyfqm", - "contract/elcollectooorr/token_settings/0.1.0": "bafybeigbpqq2yeewri7uglazh2j4lpz77vpnkq4q2rt2wplhv72r2vfc5u", - "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeihgddsuyzulsw6rxs5o5snk6c57q7vwnskdpbxmmhcu7fy7hchny4" + "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe", + "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeiclvd7kd2hykcczujbijaqtc6qpnnbodryom5dcm2miwkeofl5j74", + "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeiflxuycml6g3d7bgo2bwbvonbn4oyfe44f67c2fphrqrb7ttb6quq", + "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeifrcden4yfbhglk6qtfrwd7wyjzb4nzlqrcyvd3ehoygxx3xcgxj4", + "contract/elcollectooorr/token_settings/0.1.0": "bafybeieufimov6qsxum6imt36txei66b2mrp5uhgxrembyxs7ixe3khdle", + "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeibkj3xg64c2w5jdf7nctkqxwbzx6oojuqsjajs2wbbn4wnnxi2xhe" }, "third_party": { "protocol/valory/abci/0.1.0": "bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe", From fe704170ca12b8b9306673cd47036618547c03d7 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 11:34:08 +0530 Subject: [PATCH 05/11] chore: open-autonomy@0.11.1 --- Pipfile | 4 ++-- tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pipfile b/Pipfile index 30564615..64398d48 100644 --- a/Pipfile +++ b/Pipfile @@ -22,8 +22,8 @@ open-aea = "==1.38.0" open-aea-ledger-ethereum = "==1.38.0" open-aea-ledger-cosmos = "==1.38.0" open-aea-cli-ipfs = "==1.38.0" -open-aea-test-autonomy = "==0.11.0" -open-autonomy = {version = "==0.11.0", extras = ["all"]} +open-aea-test-autonomy = "==0.11.1" +open-autonomy = {version = "==0.11.1", extras = ["all"]} tomte = {version = "==0.2.12", extras = ["tests", "cli"]} [requires] diff --git a/tox.ini b/tox.ini index e48afca3..422f7d6b 100644 --- a/tox.ini +++ b/tox.ini @@ -30,8 +30,8 @@ deps = open-aea-ledger-ethereum==1.38.0 open-aea-ledger-cosmos==1.38.0 open-aea-cli-ipfs==1.38.0 - open-aea-test-autonomy==0.11.0 - open-autonomy==0.11.0 + open-aea-test-autonomy==0.11.1 + open-autonomy==0.11.1 setenv = PYTHONHASHSEED=0 PACKAGES_PATHS = packages/elcollectooorr From 1bd3fe302723db6e3a11a2fb70011090f422e6fc Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 11:36:18 +0530 Subject: [PATCH 06/11] chore: bump packages --- .../agents/elcollectooorr/aea-config.yaml | 28 ++++++++-------- .../services/elcollectooorr/service.yaml | 2 +- .../skills/elcollectooorr_abci/skill.yaml | 16 +++++----- .../fractionalize_deployment_abci/skill.yaml | 6 ++-- packages/packages.json | 32 +++++++++---------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml index 84b90a7b..7acfd041 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml +++ b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml @@ -33,9 +33,9 @@ fingerprint: tests/test_token_vault_factory/test_contract.py: bafybeibpcizflmxkpi4ik7pnqwxhzjxrin2hret55lvrikigqhv5ptr3dm fingerprint_ignore_patterns: [] connections: -- valory/abci:0.1.0:bafybeihczvjnki5kxhyixkh4lxuxkqsuhqmpn63tneyj76p7cmgaxqo7pu +- valory/abci:0.1.0:bafybeicasheudousm2unmh5qmy5n3qdq5hmkg2j42fxfm2crxmgq3nzjkq - valory/http_client:0.23.0:bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y -- valory/ipfs:0.1.0:bafybeihr5kvz2oj4uxpiqcbjwfx5hpftm4drubugwcabdcht4gpna3l6ja +- valory/ipfs:0.1.0:bafybeiau32pzy55ta6ugl2bebevlxudal6pnlfomhplfm5mph6reaw3krq - valory/ledger:0.19.0:bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a - valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq contracts: @@ -46,11 +46,11 @@ contracts: - elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 - elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee - elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea -- valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeihuyxtxqp5f5sviid5hgtpuncd545hiurp3pjdbhqbs3u4kag4a2a +- valory/gnosis_safe:0.1.0:bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeie4iivrxcd5dcwzj3y2t66mc5mdvtsuqu426gk2kcdc6fxbki6neu - valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y -- valory/multisend:0.1.0:bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq -- valory/service_registry:0.1.0:bafybeihi2tfcf4l7j6tzwb6vptrctkj57zye2oqxmyfwxc4u7gb2v3fmwa +- valory/multisend:0.1.0:bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a +- valory/service_registry:0.1.0:bafybeif6x4zvsokwcetbrjdb4uyv4l3pqx756cg2ohv2zgcky5yuiwuqvi protocols: - open_aea/signing:1.0.0:bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m - valory/abci:0.1.0:bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe @@ -61,14 +61,14 @@ protocols: - valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby - valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa skills: -- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeiflxuycml6g3d7bgo2bwbvonbn4oyfe44f67c2fphrqrb7ttb6quq -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeiclvd7kd2hykcczujbijaqtc6qpnnbodryom5dcm2miwkeofl5j74 -- valory/abstract_abci:0.1.0:bafybeibcemiz3qxoordadxwkxkjp7g7rerbfwap6wqxiepcms22ocb3v7i -- valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa -- valory/registration_abci:0.1.0:bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu -- valory/reset_pause_abci:0.1.0:bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy -- valory/termination_abci:0.1.0:bafybeies2zrbcsajnsgjq2ljr352gzvjsvkoycu65tuj5avnxlgjqlevci -- valory/transaction_settlement_abci:0.1.0:bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe +- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeiawbqrrxfalbvuy32ogmy3lywqigutfoilo25ejyc46sjbjbm5bri +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeihpyumgrjc5dy2zrbgoytzhbwo6mjksoflyj6sbhm4t47a7uslq54 +- valory/abstract_abci:0.1.0:bafybeicg7dv7cff34nv2k2z47c4yp4kddsxp3wozonzow6tnvfvwndz3cy +- valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq +- valory/registration_abci:0.1.0:bafybeibc4kczqbh23sc6tufrzn3axmhp3vjav7fa3u6cnpvolrbbc2fd7i +- valory/reset_pause_abci:0.1.0:bafybeid445uy6wwvugf3byzl7r73c7teu6xr5ezxb4h7cxbenghg3copvy +- valory/termination_abci:0.1.0:bafybeiguy7pkrcptg6c754ioig4mlkr7truccym3fpv6jwpjx2tmpdbzhi +- valory/transaction_settlement_abci:0.1.0:bafybeidpsnguxizkpihtkqzojr3em7yy7c6qc7gxpbh5vglmwws5wke7bi default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/elcollectooorr/services/elcollectooorr/service.yaml b/packages/elcollectooorr/services/elcollectooorr/service.yaml index 009cdc26..58488cb9 100644 --- a/packages/elcollectooorr/services/elcollectooorr/service.yaml +++ b/packages/elcollectooorr/services/elcollectooorr/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiheuht3rkoreuimqcyqcdfcp6rjtegvor77xthlb6s2dw5sv4x4uu fingerprint_ignore_patterns: [] -agent: elcollectooorr/elcollectooorr:0.1.0:bafybeifrcden4yfbhglk6qtfrwd7wyjzb4nzlqrcyvd3ehoygxx3xcgxj4 +agent: elcollectooorr/elcollectooorr:0.1.0:bafybeidq7366dnn3bfieppbtfifx6jfjhub32fregkel7rjgbagrzjwrse number_of_agents: 4 deployment: {} --- diff --git a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml index 764d9293..5ff34e7c 100644 --- a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml +++ b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml @@ -31,17 +31,17 @@ contracts: - elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 - elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee - elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea -- valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm -- valory/multisend:0.1.0:bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq +- valory/gnosis_safe:0.1.0:bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei +- valory/multisend:0.1.0:bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeiclvd7kd2hykcczujbijaqtc6qpnnbodryom5dcm2miwkeofl5j74 -- valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa -- valory/registration_abci:0.1.0:bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu -- valory/reset_pause_abci:0.1.0:bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy -- valory/termination_abci:0.1.0:bafybeies2zrbcsajnsgjq2ljr352gzvjsvkoycu65tuj5avnxlgjqlevci -- valory/transaction_settlement_abci:0.1.0:bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeihpyumgrjc5dy2zrbgoytzhbwo6mjksoflyj6sbhm4t47a7uslq54 +- valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq +- valory/registration_abci:0.1.0:bafybeibc4kczqbh23sc6tufrzn3axmhp3vjav7fa3u6cnpvolrbbc2fd7i +- valory/reset_pause_abci:0.1.0:bafybeid445uy6wwvugf3byzl7r73c7teu6xr5ezxb4h7cxbenghg3copvy +- valory/termination_abci:0.1.0:bafybeiguy7pkrcptg6c754ioig4mlkr7truccym3fpv6jwpjx2tmpdbzhi +- valory/transaction_settlement_abci:0.1.0:bafybeidpsnguxizkpihtkqzojr3em7yy7c6qc7gxpbh5vglmwws5wke7bi behaviours: main: args: {} diff --git a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml index c8f4fe48..72c7adc1 100644 --- a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml +++ b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml @@ -21,12 +21,12 @@ contracts: - elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 - elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee - elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea -- valory/gnosis_safe:0.1.0:bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm +- valory/gnosis_safe:0.1.0:bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- valory/abstract_round_abci:0.1.0:bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa -- valory/transaction_settlement_abci:0.1.0:bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe +- valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq +- valory/transaction_settlement_abci:0.1.0:bafybeidpsnguxizkpihtkqzojr3em7yy7c6qc7gxpbh5vglmwws5wke7bi behaviours: main: args: {} diff --git a/packages/packages.json b/packages/packages.json index 21b66940..c8ea2e8f 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -7,36 +7,36 @@ "contract/elcollectooorr/artblocks/0.1.0": "bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm", "contract/elcollectooorr/artblocks_minter_filter/0.1.0": "bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm", "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe", - "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeiclvd7kd2hykcczujbijaqtc6qpnnbodryom5dcm2miwkeofl5j74", - "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeiflxuycml6g3d7bgo2bwbvonbn4oyfe44f67c2fphrqrb7ttb6quq", - "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeifrcden4yfbhglk6qtfrwd7wyjzb4nzlqrcyvd3ehoygxx3xcgxj4", + "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeihpyumgrjc5dy2zrbgoytzhbwo6mjksoflyj6sbhm4t47a7uslq54", + "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeiawbqrrxfalbvuy32ogmy3lywqigutfoilo25ejyc46sjbjbm5bri", + "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeidq7366dnn3bfieppbtfifx6jfjhub32fregkel7rjgbagrzjwrse", "contract/elcollectooorr/token_settings/0.1.0": "bafybeieufimov6qsxum6imt36txei66b2mrp5uhgxrembyxs7ixe3khdle", - "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeibkj3xg64c2w5jdf7nctkqxwbzx6oojuqsjajs2wbbn4wnnxi2xhe" + "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeifbfsehwpgoiypjpihyqhghbfqkox6edgtqwh2pg46kycksxczvye" }, "third_party": { "protocol/valory/abci/0.1.0": "bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe", - "connection/valory/abci/0.1.0": "bafybeihczvjnki5kxhyixkh4lxuxkqsuhqmpn63tneyj76p7cmgaxqo7pu", + "connection/valory/abci/0.1.0": "bafybeicasheudousm2unmh5qmy5n3qdq5hmkg2j42fxfm2crxmgq3nzjkq", "protocol/valory/contract_api/1.0.0": "bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa", "protocol/valory/http/1.0.0": "bafybeia5bxdua2i6chw6pg47bvoljzcpuqxzy4rdrorbdmcbnwmnfdobtu", "protocol/valory/ledger_api/1.0.0": "bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby", "connection/valory/http_client/0.23.0": "bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y", "connection/valory/ledger/0.19.0": "bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a", - "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeihuyxtxqp5f5sviid5hgtpuncd545hiurp3pjdbhqbs3u4kag4a2a", - "contract/valory/service_registry/0.1.0": "bafybeihi2tfcf4l7j6tzwb6vptrctkj57zye2oqxmyfwxc4u7gb2v3fmwa", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeie4iivrxcd5dcwzj3y2t66mc5mdvtsuqu426gk2kcdc6fxbki6neu", + "contract/valory/service_registry/0.1.0": "bafybeif6x4zvsokwcetbrjdb4uyv4l3pqx756cg2ohv2zgcky5yuiwuqvi", "protocol/open_aea/signing/1.0.0": "bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m", "protocol/valory/tendermint/0.1.0": "bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa", - "skill/valory/abstract_abci/0.1.0": "bafybeibcemiz3qxoordadxwkxkjp7g7rerbfwap6wqxiepcms22ocb3v7i", - "contract/valory/gnosis_safe/0.1.0": "bafybeigaeon5qhgdwhduw4wtjt7x7o3hpz62aifr5a7522ynll3nps3qnm", + "skill/valory/abstract_abci/0.1.0": "bafybeicg7dv7cff34nv2k2z47c4yp4kddsxp3wozonzow6tnvfvwndz3cy", + "contract/valory/gnosis_safe/0.1.0": "bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei", "protocol/valory/acn/1.1.0": "bafybeiapa5ilsobggnspoqhspftwolrx52udrwmaxdxgrk26heuvl4oooa", - "skill/valory/abstract_round_abci/0.1.0": "bafybeicyy4g3x6ol6x2ayzcdkg2wstubqecp6ycgo6f2c2bhjnhwdjs3qa", + "skill/valory/abstract_round_abci/0.1.0": "bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq", - "contract/valory/multisend/0.1.0": "bafybeiemglycsigpsf2f6ohfdlsha7w6lrc5nmhlydmocna4apa7b4cqcq", + "contract/valory/multisend/0.1.0": "bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a", "contract/valory/multicall2/0.1.0": "bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeic7vatd3um6en3fqdxpbdsdq4n2zdqf3c4m5cs2r73ag5pbgdohoe", - "skill/valory/registration_abci/0.1.0": "bafybeigexg5mw5sh35qkhlaeegycgtkd2ym5o4marjc5o7gl7t352hohiu", - "skill/valory/reset_pause_abci/0.1.0": "bafybeigabcdz5en52zuxzxa6a4p5c7z4qyi3fcfp7lodqusjh32z5obcqy", - "skill/valory/termination_abci/0.1.0": "bafybeies2zrbcsajnsgjq2ljr352gzvjsvkoycu65tuj5avnxlgjqlevci", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeidpsnguxizkpihtkqzojr3em7yy7c6qc7gxpbh5vglmwws5wke7bi", + "skill/valory/registration_abci/0.1.0": "bafybeibc4kczqbh23sc6tufrzn3axmhp3vjav7fa3u6cnpvolrbbc2fd7i", + "skill/valory/reset_pause_abci/0.1.0": "bafybeid445uy6wwvugf3byzl7r73c7teu6xr5ezxb4h7cxbenghg3copvy", + "skill/valory/termination_abci/0.1.0": "bafybeiguy7pkrcptg6c754ioig4mlkr7truccym3fpv6jwpjx2tmpdbzhi", "protocol/valory/ipfs/0.1.0": "bafybeibjzhsengtxfofqpxy6syamplevp35obemwfp4c5lhag3v2bvgysa", - "connection/valory/ipfs/0.1.0": "bafybeihr5kvz2oj4uxpiqcbjwfx5hpftm4drubugwcabdcht4gpna3l6ja" + "connection/valory/ipfs/0.1.0": "bafybeiau32pzy55ta6ugl2bebevlxudal6pnlfomhplfm5mph6reaw3krq" } } \ No newline at end of file From f8f892d2bb87122095c89abdd7133c32c9947f9c Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 11:36:44 +0530 Subject: [PATCH 07/11] fix: pin pipenv --- .github/workflows/main_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main_workflow.yml b/.github/workflows/main_workflow.yml index d547bb7f..b4776cbc 100644 --- a/.github/workflows/main_workflow.yml +++ b/.github/workflows/main_workflow.yml @@ -30,7 +30,7 @@ jobs: sudo apt-get autoremove sudo apt-get autoclean pip install --upgrade setuptools==60.10.0 - pip install pipenv + pip install pipenv==2023.7.23 - name: Pipenv install requirements run: | pipenv install --dev --skip-lock From a232966253e0100f255be519299532c9560e2008 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 11:42:22 +0530 Subject: [PATCH 08/11] fix: readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fd570b2..c2498344 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ These steps only work for operators registered on-chain! Then fetch the service: ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeibkj3xg64c2w5jdf7nctkqxwbzx6oojuqsjajs2wbbn4wnnxi2xhe --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeifbfsehwpgoiypjpihyqhghbfqkox6edgtqwh2pg46kycksxczvye --service cd elcollectooorr ``` From 1d0582c623277ae9e33b8d5664f699b1f9a35149 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 15:40:53 +0530 Subject: [PATCH 09/11] fix: doc hash --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index b4d75a55..8f7f819b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,7 +22,7 @@ In order to run a local demo of the El Collectooorr service: 2. Fetch the El Collectooorr service. ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeibkj3xg64c2w5jdf7nctkqxwbzx6oojuqsjajs2wbbn4wnnxi2xhe --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeifbfsehwpgoiypjpihyqhghbfqkox6edgtqwh2pg46kycksxczvye --service ``` 3. Build the Docker image of the service agents From 39ae0cb3f0e65c78ca1d278a069b48ca7626adbc Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 16:54:17 +0530 Subject: [PATCH 10/11] fix: version specifier --- docs/index.md | 2 +- .../agents/elcollectooorr/aea-config.yaml | 18 +++++++------- .../contracts/artblocks/contract.yaml | 2 +- .../artblocks_minter_filter/contract.yaml | 2 +- .../artblocks_periphery/contract.yaml | 2 +- .../contracts/basket/contract.yaml | 4 ++-- .../contracts/basket_factory/contract.yaml | 2 +- .../contracts/token_settings/contract.yaml | 2 +- .../contracts/token_vault/contract.yaml | 4 ++-- .../token_vault_factory/contract.yaml | 2 +- .../services/elcollectooorr/service.yaml | 2 +- .../skills/elcollectooorr_abci/skill.yaml | 14 +++++------ .../fractionalize_deployment_abci/skill.yaml | 8 +++---- packages/packages.json | 24 +++++++++---------- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/index.md b/docs/index.md index 8f7f819b..787ec739 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,7 +22,7 @@ In order to run a local demo of the El Collectooorr service: 2. Fetch the El Collectooorr service. ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeifbfsehwpgoiypjpihyqhghbfqkox6edgtqwh2pg46kycksxczvye --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeibqtdhopa6tihudojalrkucub2tfcc4misqzevk5zlxrlr3ww5xoe --service ``` 3. Build the Docker image of the service agents diff --git a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml index 7acfd041..f78407ea 100644 --- a/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml +++ b/packages/elcollectooorr/agents/elcollectooorr/aea-config.yaml @@ -39,13 +39,13 @@ connections: - valory/ledger:0.19.0:bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a - valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq contracts: -- elcollectooorr/artblocks:0.1.0:bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm -- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm -- elcollectooorr/artblocks_periphery:0.1.0:bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe -- elcollectooorr/basket:0.1.0:bafybeiacdg2lvo7yq3phse44vbncvfw4mj2kkwuvdbndxtuvg7bucnhp3e -- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 -- elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee -- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea +- elcollectooorr/artblocks:0.1.0:bafybeiepiixv6hj7ixn3ulthrlqbqmajo64bgtofdwkxitqgk25k3n65f4 +- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeih3ipynxlvxnbo23uicvgboxaju56cmeqiwlhpf43x2usgj7ht3ou +- elcollectooorr/artblocks_periphery:0.1.0:bafybeihmrifd62j3b2qddxyo5y2h3mtidhaikqcgyjrht3dhqv4kxlelka +- elcollectooorr/basket:0.1.0:bafybeibaghl7z7xhr4fot5kghbmgnbjr6yuyc7o2uthhore2i3fn2kov34 +- elcollectooorr/basket_factory:0.1.0:bafybeibpvhb6k6klcut7drszoffe3o4whb4rxxrhbnr6uh5mea6h6vnqim +- elcollectooorr/token_vault:0.1.0:bafybeigw3jkb5hjc4n3lcteq3m5ts2vvaxei2pg435mj22lenulcjo5oby +- elcollectooorr/token_vault_factory:0.1.0:bafybeia5vkbr6hpvrp2xvpcoaqcajo7eszvlne73ouxvcki73pdd6bmuzy - valory/gnosis_safe:0.1.0:bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei - valory/gnosis_safe_proxy_factory:0.1.0:bafybeie4iivrxcd5dcwzj3y2t66mc5mdvtsuqu426gk2kcdc6fxbki6neu - valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y @@ -61,8 +61,8 @@ protocols: - valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby - valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa skills: -- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeiawbqrrxfalbvuy32ogmy3lywqigutfoilo25ejyc46sjbjbm5bri -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeihpyumgrjc5dy2zrbgoytzhbwo6mjksoflyj6sbhm4t47a7uslq54 +- elcollectooorr/elcollectooorr_abci:0.1.0:bafybeigszeyoid5fz7xocougw4jkhrgcpheox42dzde3a7hmmu762dd7xy +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeicx65zanvm6u63xgxic7n72gqmlbhpw3clxfq6ncgtkqra3oqzesu - valory/abstract_abci:0.1.0:bafybeicg7dv7cff34nv2k2z47c4yp4kddsxp3wozonzow6tnvfvwndz3cy - valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq - valory/registration_abci:0.1.0:bafybeibc4kczqbh23sc6tufrzn3axmhp3vjav7fa3u6cnpvolrbbc2fd7i diff --git a/packages/elcollectooorr/contracts/artblocks/contract.yaml b/packages/elcollectooorr/contracts/artblocks/contract.yaml index ffa06877..24699830 100644 --- a/packages/elcollectooorr/contracts/artblocks/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks/contract.yaml @@ -17,6 +17,6 @@ contracts: - valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml b/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml index 070cf098..200ff616 100644 --- a/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks_minter_filter/contract.yaml @@ -17,6 +17,6 @@ contracts: - valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml b/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml index 4c9efe62..85aee517 100644 --- a/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml +++ b/packages/elcollectooorr/contracts/artblocks_periphery/contract.yaml @@ -17,6 +17,6 @@ contracts: - valory/multicall2:0.1.0:bafybeiffhnnk3ibb3z53jxg4rfwcgjl657f56v3ld4rgafgavxxys3h74y dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/basket/contract.yaml b/packages/elcollectooorr/contracts/basket/contract.yaml index a1c2dc78..4881f4b0 100644 --- a/packages/elcollectooorr/contracts/basket/contract.yaml +++ b/packages/elcollectooorr/contracts/basket/contract.yaml @@ -14,12 +14,12 @@ fingerprint: tests/test_contract.py: bafybeigopcgatpmvxk7exysrocbp36axrlnvti5rx75l2px2eq6jxzhwvm fingerprint_ignore_patterns: [] contracts: -- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 +- elcollectooorr/basket_factory:0.1.0:bafybeibpvhb6k6klcut7drszoffe3o4whb4rxxrhbnr6uh5mea6h6vnqim class_name: BasketContract contract_interface_paths: ethereum: build/Basket.json dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/basket_factory/contract.yaml b/packages/elcollectooorr/contracts/basket_factory/contract.yaml index 18e6cbab..e59217e9 100644 --- a/packages/elcollectooorr/contracts/basket_factory/contract.yaml +++ b/packages/elcollectooorr/contracts/basket_factory/contract.yaml @@ -19,6 +19,6 @@ contract_interface_paths: ethereum: build/BasketFactory.json dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/token_settings/contract.yaml b/packages/elcollectooorr/contracts/token_settings/contract.yaml index d4b682c6..2372d943 100644 --- a/packages/elcollectooorr/contracts/token_settings/contract.yaml +++ b/packages/elcollectooorr/contracts/token_settings/contract.yaml @@ -19,6 +19,6 @@ contract_interface_paths: ethereum: build/TokenSettings.json dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/token_vault/contract.yaml b/packages/elcollectooorr/contracts/token_vault/contract.yaml index 07bc250b..00153568 100644 --- a/packages/elcollectooorr/contracts/token_vault/contract.yaml +++ b/packages/elcollectooorr/contracts/token_vault/contract.yaml @@ -12,12 +12,12 @@ fingerprint: contract.py: bafybeihcrjjfgkvqpmcq3jdcsmbipho4wmrd5wkhda2pjxblfecq44sfby fingerprint_ignore_patterns: [] contracts: -- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea +- elcollectooorr/token_vault_factory:0.1.0:bafybeia5vkbr6hpvrp2xvpcoaqcajo7eszvlne73ouxvcki73pdd6bmuzy class_name: TokenVaultContract contract_interface_paths: ethereum: build/TokenVault.json dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml b/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml index d3c03c23..c4d13761 100644 --- a/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml +++ b/packages/elcollectooorr/contracts/token_vault_factory/contract.yaml @@ -17,6 +17,6 @@ contract_interface_paths: ethereum: build/ERC721VaultFactory.json dependencies: open-aea-ledger-ethereum: - version: ==1.37.0 + version: ==1.38.0 open-aea-web3: version: ==6.0.1 diff --git a/packages/elcollectooorr/services/elcollectooorr/service.yaml b/packages/elcollectooorr/services/elcollectooorr/service.yaml index 58488cb9..e7bd6c77 100644 --- a/packages/elcollectooorr/services/elcollectooorr/service.yaml +++ b/packages/elcollectooorr/services/elcollectooorr/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiheuht3rkoreuimqcyqcdfcp6rjtegvor77xthlb6s2dw5sv4x4uu fingerprint_ignore_patterns: [] -agent: elcollectooorr/elcollectooorr:0.1.0:bafybeidq7366dnn3bfieppbtfifx6jfjhub32fregkel7rjgbagrzjwrse +agent: elcollectooorr/elcollectooorr:0.1.0:bafybeifz2cax7nglf3s3u5se55hbx4liwsvqdatofytu4uxpc33dmwmd2m number_of_agents: 4 deployment: {} --- diff --git a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml index 5ff34e7c..032d8980 100644 --- a/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml +++ b/packages/elcollectooorr/skills/elcollectooorr_abci/skill.yaml @@ -25,18 +25,18 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- elcollectooorr/artblocks:0.1.0:bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm -- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm -- elcollectooorr/artblocks_periphery:0.1.0:bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe -- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 -- elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee -- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea +- elcollectooorr/artblocks:0.1.0:bafybeiepiixv6hj7ixn3ulthrlqbqmajo64bgtofdwkxitqgk25k3n65f4 +- elcollectooorr/artblocks_minter_filter:0.1.0:bafybeih3ipynxlvxnbo23uicvgboxaju56cmeqiwlhpf43x2usgj7ht3ou +- elcollectooorr/artblocks_periphery:0.1.0:bafybeihmrifd62j3b2qddxyo5y2h3mtidhaikqcgyjrht3dhqv4kxlelka +- elcollectooorr/basket_factory:0.1.0:bafybeibpvhb6k6klcut7drszoffe3o4whb4rxxrhbnr6uh5mea6h6vnqim +- elcollectooorr/token_vault:0.1.0:bafybeigw3jkb5hjc4n3lcteq3m5ts2vvaxei2pg435mj22lenulcjo5oby +- elcollectooorr/token_vault_factory:0.1.0:bafybeia5vkbr6hpvrp2xvpcoaqcajo7eszvlne73ouxvcki73pdd6bmuzy - valory/gnosis_safe:0.1.0:bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei - valory/multisend:0.1.0:bafybeie7m7pjbnw7cccpbvmbgkut24dtlt4cgvug3tbac7gej37xvwbv3a protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: -- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeihpyumgrjc5dy2zrbgoytzhbwo6mjksoflyj6sbhm4t47a7uslq54 +- elcollectooorr/fractionalize_deployment_abci:0.1.0:bafybeicx65zanvm6u63xgxic7n72gqmlbhpw3clxfq6ncgtkqra3oqzesu - valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq - valory/registration_abci:0.1.0:bafybeibc4kczqbh23sc6tufrzn3axmhp3vjav7fa3u6cnpvolrbbc2fd7i - valory/reset_pause_abci:0.1.0:bafybeid445uy6wwvugf3byzl7r73c7teu6xr5ezxb4h7cxbenghg3copvy diff --git a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml index 72c7adc1..d58aa085 100644 --- a/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml +++ b/packages/elcollectooorr/skills/fractionalize_deployment_abci/skill.yaml @@ -17,10 +17,10 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- elcollectooorr/basket:0.1.0:bafybeiacdg2lvo7yq3phse44vbncvfw4mj2kkwuvdbndxtuvg7bucnhp3e -- elcollectooorr/basket_factory:0.1.0:bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4 -- elcollectooorr/token_vault:0.1.0:bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee -- elcollectooorr/token_vault_factory:0.1.0:bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea +- elcollectooorr/basket:0.1.0:bafybeibaghl7z7xhr4fot5kghbmgnbjr6yuyc7o2uthhore2i3fn2kov34 +- elcollectooorr/basket_factory:0.1.0:bafybeibpvhb6k6klcut7drszoffe3o4whb4rxxrhbnr6uh5mea6h6vnqim +- elcollectooorr/token_vault:0.1.0:bafybeigw3jkb5hjc4n3lcteq3m5ts2vvaxei2pg435mj22lenulcjo5oby +- elcollectooorr/token_vault_factory:0.1.0:bafybeia5vkbr6hpvrp2xvpcoaqcajo7eszvlne73ouxvcki73pdd6bmuzy - valory/gnosis_safe:0.1.0:bafybeigvqg4lapdaa23dpc3pv67rdptdhey6e435mxqsw2gb2u74yw4yei protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa diff --git a/packages/packages.json b/packages/packages.json index c8ea2e8f..c9d09996 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,17 +1,17 @@ { "dev": { - "contract/elcollectooorr/basket_factory/0.1.0": "bafybeiaulnlpxjikrzdehhp6tnogzajscip36t7ftlpvadiem2o47labn4", - "contract/elcollectooorr/token_vault_factory/0.1.0": "bafybeidxm4elfgl4omf6wlaevvcuyrkmpst3k3klonmp7foubsx2x7cmea", - "contract/elcollectooorr/basket/0.1.0": "bafybeiacdg2lvo7yq3phse44vbncvfw4mj2kkwuvdbndxtuvg7bucnhp3e", - "contract/elcollectooorr/token_vault/0.1.0": "bafybeihm5352dvty56cnpa2d24aejm5rkky2236ncsncakarnw5p4334ee", - "contract/elcollectooorr/artblocks/0.1.0": "bafybeifdyj3eqy65smqscqqbsamr4q6e4ebfs3jj54au6tw3gezqqrz4zm", - "contract/elcollectooorr/artblocks_minter_filter/0.1.0": "bafybeicanahpmwfcglreyxwgpb6utvsknia7dgcqrtz4giqxyejopla4vm", - "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeieugvwntqpyelm22v6grzaxjv6ijaw6nq3elhuzvarv3exjmlqebe", - "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeihpyumgrjc5dy2zrbgoytzhbwo6mjksoflyj6sbhm4t47a7uslq54", - "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeiawbqrrxfalbvuy32ogmy3lywqigutfoilo25ejyc46sjbjbm5bri", - "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeidq7366dnn3bfieppbtfifx6jfjhub32fregkel7rjgbagrzjwrse", - "contract/elcollectooorr/token_settings/0.1.0": "bafybeieufimov6qsxum6imt36txei66b2mrp5uhgxrembyxs7ixe3khdle", - "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeifbfsehwpgoiypjpihyqhghbfqkox6edgtqwh2pg46kycksxczvye" + "contract/elcollectooorr/basket_factory/0.1.0": "bafybeibpvhb6k6klcut7drszoffe3o4whb4rxxrhbnr6uh5mea6h6vnqim", + "contract/elcollectooorr/token_vault_factory/0.1.0": "bafybeia5vkbr6hpvrp2xvpcoaqcajo7eszvlne73ouxvcki73pdd6bmuzy", + "contract/elcollectooorr/basket/0.1.0": "bafybeibaghl7z7xhr4fot5kghbmgnbjr6yuyc7o2uthhore2i3fn2kov34", + "contract/elcollectooorr/token_vault/0.1.0": "bafybeigw3jkb5hjc4n3lcteq3m5ts2vvaxei2pg435mj22lenulcjo5oby", + "contract/elcollectooorr/artblocks/0.1.0": "bafybeiepiixv6hj7ixn3ulthrlqbqmajo64bgtofdwkxitqgk25k3n65f4", + "contract/elcollectooorr/artblocks_minter_filter/0.1.0": "bafybeih3ipynxlvxnbo23uicvgboxaju56cmeqiwlhpf43x2usgj7ht3ou", + "contract/elcollectooorr/artblocks_periphery/0.1.0": "bafybeihmrifd62j3b2qddxyo5y2h3mtidhaikqcgyjrht3dhqv4kxlelka", + "skill/elcollectooorr/fractionalize_deployment_abci/0.1.0": "bafybeicx65zanvm6u63xgxic7n72gqmlbhpw3clxfq6ncgtkqra3oqzesu", + "skill/elcollectooorr/elcollectooorr_abci/0.1.0": "bafybeigszeyoid5fz7xocougw4jkhrgcpheox42dzde3a7hmmu762dd7xy", + "agent/elcollectooorr/elcollectooorr/0.1.0": "bafybeifz2cax7nglf3s3u5se55hbx4liwsvqdatofytu4uxpc33dmwmd2m", + "contract/elcollectooorr/token_settings/0.1.0": "bafybeidgkuuwp2ycf3oy6ohvlbcjr6b66ll6kxgs4olomo422bebvyzusm", + "service/elcollectooorr/elcollectooorr/0.1.0": "bafybeibqtdhopa6tihudojalrkucub2tfcc4misqzevk5zlxrlr3ww5xoe" }, "third_party": { "protocol/valory/abci/0.1.0": "bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe", From ea7eb37ddf22412b30ff29ade196ce3349cde3c0 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 21 Aug 2023 16:58:17 +0530 Subject: [PATCH 11/11] fix: doc hashes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2498344..bdb0daa0 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ These steps only work for operators registered on-chain! Then fetch the service: ```bash - autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeifbfsehwpgoiypjpihyqhghbfqkox6edgtqwh2pg46kycksxczvye --service + autonomy fetch elcollectooorr/elcollectooorr:0.1.0:bafybeibqtdhopa6tihudojalrkucub2tfcc4misqzevk5zlxrlr3ww5xoe --service cd elcollectooorr ```