diff --git a/docs/index.md b/docs/index.md index 12696d94..8cee897e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeih5vepds7mcyfhtndq5whazz7q3uop4l6o3j7cqohjnjs42pzzwtu --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeicjnkwqoptmt2ctpu6s7y772hk3yj6qhffv2lnwyossxlqaadpls4 --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 847d1275..89fd1413 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -10,28 +10,28 @@ "contract/valory/veolas_delegation/0.1.0": "bafybeihxyctwgxszfxfzfjaqedsyplx35cujjot4ayjguuu2nfa4hesl74", "contract/valory/erc20/0.1.0": "bafybeihls7n3wfwruv2snkutv635w5n7zq22mioyty4rziutpsgze4toxe", "contract/valory/mech_marketplace/0.1.0": "bafybeifsq7velt7qeftuft6gsdl7sn5axjli7gcyelymwlsmtlydizp23y", - "contract/valory/staking/0.1.0": "bafybeigrdux7644dtfgci4wqpa4u63nczxy2qpvar3dnegmb3notidnydi", + "contract/valory/staking/0.1.0": "bafybeigmat7vewdwah5xlfulr67ap3x332zofb7npxzxdlofuyqjh6wjga", "connection/valory/twitter/0.1.0": "bafybeiffqsvt3i37sd5qdsmpzf5i4hm37uosbobyogg5oyosovjs66buni", "connection/valory/openai/0.1.0": "bafybeifz2n6s6u3zvvryhhxpkvn6guyp2jwpagtyjducvgwoldtmz7ea64", "connection/valory/farcaster/0.1.0": "bafybeibbdas7lxbipksodaphjms3uop7vnzjqkroktjq2g6wbvgtlldaxi", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeihiujrp5papummfkfbabwuhziie2y5f3x7y2rats6i7iuncto3yhm", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiducngt5xv6ubkmearwom6wokgy3nwxemjnnzdyooxdjk73twepka", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeidrfsjm75ixwhud4vrxaswj7rlviervh2waquafedrcr2mipts26y", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic3gwxtzfx7mg4pbepe6zosjsjovbopztf5ynckaiux5uwhd5ox3y", "skill/valory/ceramic_read_abci/0.1.0": "bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u", "skill/valory/ceramic_write_abci/0.1.0": "bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeids5wj42cdlaawfemuvaepw7tyzcdrbzjy4nh27jz7gylulhzqniu", - "skill/valory/generic_scoring_abci/0.1.0": "bafybeiaihmptaalhpv55mzqdrg6asmclh7icw5vyqv3rio7gygocdx7doq", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeicfewnjabl3iy74q3uejs643zc5ybhvi526yoorydij5n4q37jh3y", + "skill/valory/generic_scoring_abci/0.1.0": "bafybeif46mwn3oxfqu7i5tg6trce3t7koa3vmbrub47ffz7gcr5p6qlvri", "skill/valory/twitter_write_abci/0.1.0": "bafybeibp7zai2qwvfjd5fgpayx44x5c2zshbukpobvz2la7ws2l5f5fjde", "skill/valory/llm_abci/0.1.0": "bafybeib2k62hilwglfad33bzxkjlviw5bxwiw7z3rjvweyeamatdjznpeq", - "skill/valory/decision_making_abci/0.1.0": "bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e", - "skill/valory/olas_week_abci/0.1.0": "bafybeibptel6eva6pfpzs6k7n7swrkx6imrlelfpuozygirvpkbucbzfii", + "skill/valory/decision_making_abci/0.1.0": "bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee", + "skill/valory/olas_week_abci/0.1.0": "bafybeifpuvpiztlwfhz3dgzxbkgul7e3xrafefunzwdvehxmeebd5fz74q", "skill/valory/mech_interact_abci/0.1.0": "bafybeidaevbuo3srnvjtjnumqn6gjkcqogj5rmvl2dcwygvvhhskba4yza", "skill/valory/farcaster_write_abci/0.1.0": "bafybeigx2wyujnojer7er7g2eufm5lojon2dckotvsgwb6tn5iyiwdfgsu", "skill/valory/farcaster_test_abci/0.1.0": "bafybeihd3h37ngkxlqo6o3vuvdik54bwmbrjmqcxtgsr5is3tqgbk73yoa", - "skill/valory/staking_abci/0.1.0": "bafybeidgmviq6inwwjachktoeddmyuo7iyg7yfyhvhvy3znndkvuuudllq", - "agent/valory/impact_evaluator/0.1.0": "bafybeifcetrx7cdusxyorf4mbwasz2ei37wqcre6lldpyejfmbm3wm6nmu", + "skill/valory/staking_abci/0.1.0": "bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay", + "agent/valory/impact_evaluator/0.1.0": "bafybeibussqbnigq3k3lsxu2z3mci4eis3uftl4jgwcin4nreynz4u26ty", "agent/valory/farcaster_test/0.1.0": "bafybeiefui6dnhhy5leqyvfrbkeleb64gap5tzctkrzzggjf4ubbxamjvy", - "service/valory/impact_evaluator/0.1.0": "bafybeih5vepds7mcyfhtndq5whazz7q3uop4l6o3j7cqohjnjs42pzzwtu", - "service/valory/impact_evaluator_local/0.1.0": "bafybeiddkkwkto7656vvwr4r3qudeevudn2vk4sdbcpckzr357xzsi5t4m" + "service/valory/impact_evaluator/0.1.0": "bafybeicjnkwqoptmt2ctpu6s7y772hk3yj6qhffv2lnwyossxlqaadpls4", + "service/valory/impact_evaluator_local/0.1.0": "bafybeibwu2hwmqovff6ldhhotznsmmxxp76xp6zv6wegqjhkx7yzxa7cqm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 9824f1d2..9cd74879 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -30,7 +30,7 @@ contracts: - valory/service_registry:0.1.0:bafybeicky7duncl25yif5gduo7a3ccgbgfo4pkx6rvexooyvzgyomcfuy4 - valory/veolas_delegation:0.1.0:bafybeihxyctwgxszfxfzfjaqedsyplx35cujjot4ayjguuu2nfa4hesl74 - valory/mech_marketplace:0.1.0:bafybeifsq7velt7qeftuft6gsdl7sn5axjli7gcyelymwlsmtlydizp23y -- valory/staking:0.1.0:bafybeigrdux7644dtfgci4wqpa4u63nczxy2qpvar3dnegmb3notidnydi +- valory/staking:0.1.0:bafybeigmat7vewdwah5xlfulr67ap3x332zofb7npxzxdlofuyqjh6wjga protocols: - open_aea/signing:1.0.0:bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi - valory/abci:0.1.0:bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u @@ -45,22 +45,22 @@ protocols: skills: - valory/abstract_abci:0.1.0:bafybeieo7pe5wqjphs5izpz5aujjbubymlxub62b3rhx6yglu65ibalffu - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti -- valory/impact_evaluator_abci:0.1.0:bafybeids5wj42cdlaawfemuvaepw7tyzcdrbzjy4nh27jz7gylulhzqniu -- valory/generic_scoring_abci:0.1.0:bafybeiaihmptaalhpv55mzqdrg6asmclh7icw5vyqv3rio7gygocdx7doq -- valory/twitter_scoring_abci:0.1.0:bafybeiducngt5xv6ubkmearwom6wokgy3nwxemjnnzdyooxdjk73twepka +- valory/impact_evaluator_abci:0.1.0:bafybeicfewnjabl3iy74q3uejs643zc5ybhvi526yoorydij5n4q37jh3y +- valory/generic_scoring_abci:0.1.0:bafybeif46mwn3oxfqu7i5tg6trce3t7koa3vmbrub47ffz7gcr5p6qlvri +- valory/twitter_scoring_abci:0.1.0:bafybeic3gwxtzfx7mg4pbepe6zosjsjovbopztf5ynckaiux5uwhd5ox3y - valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u - valory/ceramic_write_abci:0.1.0:bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i -- valory/dynamic_nft_abci:0.1.0:bafybeihiujrp5papummfkfbabwuhziie2y5f3x7y2rats6i7iuncto3yhm +- valory/dynamic_nft_abci:0.1.0:bafybeidrfsjm75ixwhud4vrxaswj7rlviervh2waquafedrcr2mipts26y - valory/registration_abci:0.1.0:bafybeib3n6vqkfbrcubcbliebjnuwyywdinxkbzt76n6gbn2kg7ace47dq - valory/reset_pause_abci:0.1.0:bafybeihkj6lmaypspyxe5qqrjgnolyck62pyvqoylr24ab6ue4steqcw7e - valory/termination_abci:0.1.0:bafybeifi2uodnrjsrivj53g3sjutocmyusbx6mlsb6oanqdyt2mfbyvusy - valory/transaction_settlement_abci:0.1.0:bafybeigh2vkt74jrad5gtsczrgqcuhcqe7jkgjy7jdw56yamlzwwnaymjy - valory/twitter_write_abci:0.1.0:bafybeibp7zai2qwvfjd5fgpayx44x5c2zshbukpobvz2la7ws2l5f5fjde -- valory/decision_making_abci:0.1.0:bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e +- valory/decision_making_abci:0.1.0:bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee - valory/llm_abci:0.1.0:bafybeib2k62hilwglfad33bzxkjlviw5bxwiw7z3rjvweyeamatdjznpeq -- valory/olas_week_abci:0.1.0:bafybeibptel6eva6pfpzs6k7n7swrkx6imrlelfpuozygirvpkbucbzfii +- valory/olas_week_abci:0.1.0:bafybeifpuvpiztlwfhz3dgzxbkgul7e3xrafefunzwdvehxmeebd5fz74q - valory/mech_interact_abci:0.1.0:bafybeidaevbuo3srnvjtjnumqn6gjkcqogj5rmvl2dcwygvvhhskba4yza -- valory/staking_abci:0.1.0:bafybeidgmviq6inwwjachktoeddmyuo7iyg7yfyhvhvy3znndkvuuudllq +- valory/staking_abci:0.1.0:bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/contracts/staking/contract.py b/packages/valory/contracts/staking/contract.py index 41545049..31dbed77 100644 --- a/packages/valory/contracts/staking/contract.py +++ b/packages/valory/contracts/staking/contract.py @@ -165,7 +165,7 @@ def get_account_to_service_map( contract_instance = ledger_api.api.eth.contract( Web3.to_checksum_address(contract_address), abi=CONTRIBUTORS_ABI ) - social_id, service_id, multisig_address, staking_contract_address = contract_instance.functions.mapAccountServiceInfo(wallet_address).call() + social_id, service_id, multisig_address, staking_contract_address = contract_instance.functions.mapAccountServiceInfo(Web3.to_checksum_address(wallet_address)).call() return dict( social_id=social_id, service_id=service_id, diff --git a/packages/valory/contracts/staking/contract.yaml b/packages/valory/contracts/staking/contract.yaml index 68e7172e..3f765167 100644 --- a/packages/valory/contracts/staking/contract.yaml +++ b/packages/valory/contracts/staking/contract.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiclvbed42bmvsm3qqxosfu4kxbc6vuhxaant2od2hmszpkznh3z74 __init__.py: bafybeif5vpc3dfrlxlch7brbhmdwksabyzddpfqgm56vdbbkek3t3br6ke build/staking.json: bafybeia2o6m3k6uwrz5qua5dcmljc3tfd477yjw6lsmfzoyjrjohtffuie - contract.py: bafybeift3vamacnppjzt7eio6ztqjtfcf6z6hf4k7ky5e2mlu7d5ttzrci + contract.py: bafybeibbsgpgyn2yzdd5le3xkxa3k2u52yxiufcxqxyx4qpwuzvt7cpgzy fingerprint_ignore_patterns: [] contracts: [] class_name: Staking diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 137de50a..44891873 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeifcetrx7cdusxyorf4mbwasz2ei37wqcre6lldpyejfmbm3wm6nmu +agent: valory/impact_evaluator:0.1.0:bafybeibussqbnigq3k3lsxu2z3mci4eis3uftl4jgwcin4nreynz4u26ty number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 970c9427..e911a6fe 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeifcetrx7cdusxyorf4mbwasz2ei37wqcre6lldpyejfmbm3wm6nmu +agent: valory/impact_evaluator:0.1.0:bafybeibussqbnigq3k3lsxu2z3mci4eis3uftl4jgwcin4nreynz4u26ty number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_making_abci/skill.yaml b/packages/valory/skills/decision_making_abci/skill.yaml index df389715..63d305bb 100644 --- a/packages/valory/skills/decision_making_abci/skill.yaml +++ b/packages/valory/skills/decision_making_abci/skill.yaml @@ -52,13 +52,13 @@ connections: [] contracts: - valory/veolas_delegation:0.1.0:bafybeihxyctwgxszfxfzfjaqedsyplx35cujjot4ayjguuu2nfa4hesl74 - valory/compatibility_fallback_handler:0.1.0:bafybeiem3j5mautdeb7cfwix7jfespittlfbmm2tseficlshbx7iwyxebe -- valory/staking:0.1.0:bafybeigrdux7644dtfgci4wqpa4u63nczxy2qpvar3dnegmb3notidnydi +- valory/staking:0.1.0:bafybeigmat7vewdwah5xlfulr67ap3x332zofb7npxzxdlofuyqjh6wjga protocols: - valory/contract_api:1.0.0:bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i skills: - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti - valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u -- valory/staking_abci:0.1.0:bafybeidgmviq6inwwjachktoeddmyuo7iyg7yfyhvhvy3znndkvuuudllq +- valory/staking_abci:0.1.0:bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay behaviours: main: args: {} diff --git a/packages/valory/skills/dynamic_nft_abci/skill.yaml b/packages/valory/skills/dynamic_nft_abci/skill.yaml index 91a077ad..9f63c95f 100644 --- a/packages/valory/skills/dynamic_nft_abci/skill.yaml +++ b/packages/valory/skills/dynamic_nft_abci/skill.yaml @@ -31,7 +31,7 @@ protocols: - valory/http:1.0.0:bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae skills: - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti -- valory/decision_making_abci:0.1.0:bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e +- valory/decision_making_abci:0.1.0:bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee behaviours: main: args: {} diff --git a/packages/valory/skills/generic_scoring_abci/skill.yaml b/packages/valory/skills/generic_scoring_abci/skill.yaml index bcd4143f..698b5638 100644 --- a/packages/valory/skills/generic_scoring_abci/skill.yaml +++ b/packages/valory/skills/generic_scoring_abci/skill.yaml @@ -28,7 +28,7 @@ contracts: [] protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti -- valory/decision_making_abci:0.1.0:bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e +- valory/decision_making_abci:0.1.0:bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee behaviours: main: args: {} diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 2d37bdbd..19038568 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -25,20 +25,20 @@ protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti - valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u -- valory/generic_scoring_abci:0.1.0:bafybeiaihmptaalhpv55mzqdrg6asmclh7icw5vyqv3rio7gygocdx7doq -- valory/twitter_scoring_abci:0.1.0:bafybeiducngt5xv6ubkmearwom6wokgy3nwxemjnnzdyooxdjk73twepka +- valory/generic_scoring_abci:0.1.0:bafybeif46mwn3oxfqu7i5tg6trce3t7koa3vmbrub47ffz7gcr5p6qlvri +- valory/twitter_scoring_abci:0.1.0:bafybeic3gwxtzfx7mg4pbepe6zosjsjovbopztf5ynckaiux5uwhd5ox3y - valory/ceramic_write_abci:0.1.0:bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i -- valory/dynamic_nft_abci:0.1.0:bafybeihiujrp5papummfkfbabwuhziie2y5f3x7y2rats6i7iuncto3yhm +- valory/dynamic_nft_abci:0.1.0:bafybeidrfsjm75ixwhud4vrxaswj7rlviervh2waquafedrcr2mipts26y - valory/registration_abci:0.1.0:bafybeib3n6vqkfbrcubcbliebjnuwyywdinxkbzt76n6gbn2kg7ace47dq - valory/reset_pause_abci:0.1.0:bafybeihkj6lmaypspyxe5qqrjgnolyck62pyvqoylr24ab6ue4steqcw7e - valory/termination_abci:0.1.0:bafybeifi2uodnrjsrivj53g3sjutocmyusbx6mlsb6oanqdyt2mfbyvusy - valory/transaction_settlement_abci:0.1.0:bafybeigh2vkt74jrad5gtsczrgqcuhcqe7jkgjy7jdw56yamlzwwnaymjy -- valory/decision_making_abci:0.1.0:bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e +- valory/decision_making_abci:0.1.0:bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee - valory/llm_abci:0.1.0:bafybeib2k62hilwglfad33bzxkjlviw5bxwiw7z3rjvweyeamatdjznpeq - valory/twitter_write_abci:0.1.0:bafybeibp7zai2qwvfjd5fgpayx44x5c2zshbukpobvz2la7ws2l5f5fjde -- valory/olas_week_abci:0.1.0:bafybeibptel6eva6pfpzs6k7n7swrkx6imrlelfpuozygirvpkbucbzfii +- valory/olas_week_abci:0.1.0:bafybeifpuvpiztlwfhz3dgzxbkgul7e3xrafefunzwdvehxmeebd5fz74q - valory/mech_interact_abci:0.1.0:bafybeidaevbuo3srnvjtjnumqn6gjkcqogj5rmvl2dcwygvvhhskba4yza -- valory/staking_abci:0.1.0:bafybeidgmviq6inwwjachktoeddmyuo7iyg7yfyhvhvy3znndkvuuudllq +- valory/staking_abci:0.1.0:bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay behaviours: main: args: {} diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index 1727cb7c..7ca1c5a0 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -31,7 +31,7 @@ protocols: - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti -- valory/decision_making_abci:0.1.0:bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e +- valory/decision_making_abci:0.1.0:bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee behaviours: main: args: {} diff --git a/packages/valory/skills/staking_abci/skill.yaml b/packages/valory/skills/staking_abci/skill.yaml index 2ded44e5..2e9fe488 100644 --- a/packages/valory/skills/staking_abci/skill.yaml +++ b/packages/valory/skills/staking_abci/skill.yaml @@ -18,7 +18,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: - valory/gnosis_safe:0.1.0:bafybeiaw4yr7ubqlp63iz5wxqep3a5fokqs3kqva7sp2nsqg355zzucqgm -- valory/staking:0.1.0:bafybeigrdux7644dtfgci4wqpa4u63nczxy2qpvar3dnegmb3notidnydi +- valory/staking:0.1.0:bafybeigmat7vewdwah5xlfulr67ap3x332zofb7npxzxdlofuyqjh6wjga - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y protocols: - valory/contract_api:1.0.0:bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i diff --git a/packages/valory/skills/twitter_scoring_abci/behaviours.py b/packages/valory/skills/twitter_scoring_abci/behaviours.py index b0002ff0..1cee516b 100644 --- a/packages/valory/skills/twitter_scoring_abci/behaviours.py +++ b/packages/valory/skills/twitter_scoring_abci/behaviours.py @@ -183,9 +183,7 @@ def get_staking_epoch( contract_callable="get_epoch", ) if contract_api_msg.performative != ContractApiMessage.Performative.STATE: - self.context.logger.error( - f"Error getting the epoch: [{contract_api_msg.performative}]" - ) + self.context.logger.error(f"Error getting the epoch: [{contract_api_msg}]") return None epoch = cast(int, contract_api_msg.state.body["epoch"]) @@ -212,6 +210,9 @@ def get_staking_contract( staking_contract_address = cast( str, contract_api_msg.state.body["staking_contract_address"] ) + + if staking_contract_address == "0x0000000000000000000000000000000000000000": + return None return staking_contract_address @@ -1097,6 +1098,10 @@ def get_update_diff(self) -> Generator[None, None, Dict]: epoch = yield from self.get_staking_epoch(staking_contract_address) staking_contract_to_epoch[staking_contract_address] = epoch + self.context.logger.info( + f"Staking contracts to epoch: {staking_contract_to_epoch}" + ) + # Update data for tweet_id, tweet in tweets.items(): if "points" not in tweet: @@ -1126,10 +1131,11 @@ def get_update_diff(self) -> Generator[None, None, Dict]: current_period_points += new_points # Get the user staking contract and epoch (if the user is staked) + service_multisig = user.get("service_multisig", None) epoch = None - if wallet_address: + if service_multisig and user.get("wallet_address", None): staking_contract_address = yield from self.get_staking_contract( - wallet_address + user["wallet_address"] ) epoch = ( staking_contract_to_epoch[staking_contract_address] diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index f97a387f..d3eb647c 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeifudgakkjoyahuewp2o4gvqayw7nsgpyxw2ayrpgmzexurh2xomaq - behaviours.py: bafybeiedkr6tkokdddtaybnbvz7sv4x27l4o5yxocvjp6pp3uuzexqygam + behaviours.py: bafybeibufmn2qylj6izxcc7scpx46oqd4udrvwrpap3nbkfidzkgwve7ha dialogues.py: bafybeibdqzn37hbo2cq4skww4uh2zvvsjyaxxvdhxisefbdvmjp7rh53si fsm_specification.yaml: bafybeihbq2olrdqx2x5lcvypxyi44ecog4nntsvw2v6oeab4imvj5nz6ae handlers.py: bafybeid3nqvcyotqj5g5hlgrz57nf7vpjysmgvsxe3p7644f4z5dcwqn6u @@ -26,13 +26,13 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/staking:0.1.0:bafybeigrdux7644dtfgci4wqpa4u63nczxy2qpvar3dnegmb3notidnydi +- valory/staking:0.1.0:bafybeigmat7vewdwah5xlfulr67ap3x332zofb7npxzxdlofuyqjh6wjga protocols: - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 - valory/contract_api:1.0.0:bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i skills: - valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti -- valory/decision_making_abci:0.1.0:bafybeiejtrllovij4ty56pczfgpnhohobqubr3qtw2oslvqxp2lwmibu4e +- valory/decision_making_abci:0.1.0:bafybeif4kh36c2urn4nkaxwysmfe6bm6wdhnbmrsmbzsmo7kpaaaa7ewee - valory/mech_interact_abci:0.1.0:bafybeidaevbuo3srnvjtjnumqn6gjkcqogj5rmvl2dcwygvvhhskba4yza behaviours: main: