Skip to content

Commit

Permalink
Merge pull request #223 from valory-xyz/fix/user
Browse files Browse the repository at this point in the history
fix: user epoch
  • Loading branch information
dvilelaf authored Nov 12, 2024
2 parents 505cec4 + 59fae90 commit 36b988a
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:bafybeidmt7obmuz2bdqdomgylgapokih7jwjwn57pq6daiizgkzq3gkcdu --service
autonomy fetch valory/impact_evaluator:0.1.0:bafybeib2doczuv4qoru7xxvinakmbhg73cw72mauhjek7vgi2jlngl4gvy --service
```

3. Build the Docker image of the service agents
Expand Down
10 changes: 5 additions & 5 deletions packages/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"connection/valory/openai/0.1.0": "bafybeifz2n6s6u3zvvryhhxpkvn6guyp2jwpagtyjducvgwoldtmz7ea64",
"connection/valory/farcaster/0.1.0": "bafybeibbdas7lxbipksodaphjms3uop7vnzjqkroktjq2g6wbvgtlldaxi",
"skill/valory/dynamic_nft_abci/0.1.0": "bafybeidrfsjm75ixwhud4vrxaswj7rlviervh2waquafedrcr2mipts26y",
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeidqaj3j73v73f725ubv6vecfrvvmmxpfyzm6oro7rmnmslxaaq65e",
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeig62izsraoluo7kai7te2pcwgy7utbxldklawpw3itwhyyvwelifq",
"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": "bafybeiapzvtsptv6mlunhhhqcxvn4ogt672zgho3zymwarwlfum5oincwu",
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeiexhxom7fp7t3mbvrtnlgo5r45dnap2b4jnwkt56p37dyikdyi74q",
"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",
Expand All @@ -28,10 +28,10 @@
"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": "bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay",
"agent/valory/impact_evaluator/0.1.0": "bafybeiahkygqtth6nmhg6qg4bnlxkb5gcbcercadw43fpbxaicowghbg7q",
"agent/valory/impact_evaluator/0.1.0": "bafybeibu43hbpldh6xhgrv5f2gp3cougpbwsforvqwgh6khklla6s6upfu",
"agent/valory/farcaster_test/0.1.0": "bafybeiefui6dnhhy5leqyvfrbkeleb64gap5tzctkrzzggjf4ubbxamjvy",
"service/valory/impact_evaluator/0.1.0": "bafybeidmt7obmuz2bdqdomgylgapokih7jwjwn57pq6daiizgkzq3gkcdu",
"service/valory/impact_evaluator_local/0.1.0": "bafybeif2lj57ys2j5yfmdruudxst6rhpymkaoh5en5vyomt72pa74d7iti"
"service/valory/impact_evaluator/0.1.0": "bafybeib2doczuv4qoru7xxvinakmbhg73cw72mauhjek7vgi2jlngl4gvy",
"service/valory/impact_evaluator_local/0.1.0": "bafybeiexxk3qtqodnoflpaczdy7lhpofm3b7vxqurvdpsn4ivblxv3qlta"
},
"third_party": {
"protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",
Expand Down
4 changes: 2 additions & 2 deletions packages/valory/agents/impact_evaluator/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ protocols:
skills:
- valory/abstract_abci:0.1.0:bafybeieo7pe5wqjphs5izpz5aujjbubymlxub62b3rhx6yglu65ibalffu
- valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti
- valory/impact_evaluator_abci:0.1.0:bafybeiapzvtsptv6mlunhhhqcxvn4ogt672zgho3zymwarwlfum5oincwu
- valory/impact_evaluator_abci:0.1.0:bafybeiexhxom7fp7t3mbvrtnlgo5r45dnap2b4jnwkt56p37dyikdyi74q
- valory/generic_scoring_abci:0.1.0:bafybeif46mwn3oxfqu7i5tg6trce3t7koa3vmbrub47ffz7gcr5p6qlvri
- valory/twitter_scoring_abci:0.1.0:bafybeidqaj3j73v73f725ubv6vecfrvvmmxpfyzm6oro7rmnmslxaaq65e
- valory/twitter_scoring_abci:0.1.0:bafybeig62izsraoluo7kai7te2pcwgy7utbxldklawpw3itwhyyvwelifq
- valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u
- valory/ceramic_write_abci:0.1.0:bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i
- valory/dynamic_nft_abci:0.1.0:bafybeidrfsjm75ixwhud4vrxaswj7rlviervh2waquafedrcr2mipts26y
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/services/impact_evaluator/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license: Apache-2.0
fingerprint:
README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
fingerprint_ignore_patterns: []
agent: valory/impact_evaluator:0.1.0:bafybeiahkygqtth6nmhg6qg4bnlxkb5gcbcercadw43fpbxaicowghbg7q
agent: valory/impact_evaluator:0.1.0:bafybeibu43hbpldh6xhgrv5f2gp3cougpbwsforvqwgh6khklla6s6upfu
number_of_agents: 4
deployment:
agent:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license: Apache-2.0
fingerprint:
README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
fingerprint_ignore_patterns: []
agent: valory/impact_evaluator:0.1.0:bafybeiahkygqtth6nmhg6qg4bnlxkb5gcbcercadw43fpbxaicowghbg7q
agent: valory/impact_evaluator:0.1.0:bafybeibu43hbpldh6xhgrv5f2gp3cougpbwsforvqwgh6khklla6s6upfu
number_of_agents: 1
deployment:
agent:
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/skills/impact_evaluator_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ skills:
- valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti
- valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u
- valory/generic_scoring_abci:0.1.0:bafybeif46mwn3oxfqu7i5tg6trce3t7koa3vmbrub47ffz7gcr5p6qlvri
- valory/twitter_scoring_abci:0.1.0:bafybeidqaj3j73v73f725ubv6vecfrvvmmxpfyzm6oro7rmnmslxaaq65e
- valory/twitter_scoring_abci:0.1.0:bafybeig62izsraoluo7kai7te2pcwgy7utbxldklawpw3itwhyyvwelifq
- valory/ceramic_write_abci:0.1.0:bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i
- valory/dynamic_nft_abci:0.1.0:bafybeidrfsjm75ixwhud4vrxaswj7rlviervh2waquafedrcr2mipts26y
- valory/registration_abci:0.1.0:bafybeib3n6vqkfbrcubcbliebjnuwyywdinxkbzt76n6gbn2kg7ace47dq
Expand Down
21 changes: 11 additions & 10 deletions packages/valory/skills/twitter_scoring_abci/behaviours.py
Original file line number Diff line number Diff line change
Expand Up @@ -1134,17 +1134,18 @@ 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 service_multisig and user.get("wallet_address", None):
staking_contract_address = yield from self.get_staking_contract(
user["wallet_address"]
)
epoch = (
staking_contract_to_epoch[staking_contract_address]
if staking_contract_address
else None
)
if user:
service_multisig = user.get("service_multisig", None)
if service_multisig and user.get("wallet_address", None):
staking_contract_address = yield from self.get_staking_contract(
user["wallet_address"]
)
epoch = (
staking_contract_to_epoch[staking_contract_address]
if staking_contract_address
else None
)

# Store the tweet id and awarded points
user_tweets = {} if not user else user.get("tweets", {})
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/skills/twitter_scoring_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license: Apache-2.0
aea_version: '>=1.0.0, <2.0.0'
fingerprint:
__init__.py: bafybeifudgakkjoyahuewp2o4gvqayw7nsgpyxw2ayrpgmzexurh2xomaq
behaviours.py: bafybeicmuc6vqundgmwg3kge6urnhg4yoejiled3tgtjsp7lzdgfy3mlc4
behaviours.py: bafybeibqztwvj6ku5f5q4cf3hmloeeci6ied6dejjtdfsjepw5k62wdtjq
dialogues.py: bafybeibdqzn37hbo2cq4skww4uh2zvvsjyaxxvdhxisefbdvmjp7rh53si
fsm_specification.yaml: bafybeihbq2olrdqx2x5lcvypxyi44ecog4nntsvw2v6oeab4imvj5nz6ae
handlers.py: bafybeid3nqvcyotqj5g5hlgrz57nf7vpjysmgvsxe3p7644f4z5dcwqn6u
Expand Down

0 comments on commit 36b988a

Please sign in to comment.