Feat/olas week

.gitignore

@@ -45,3 +45,5 @@ impact_evaluator
 
 temp/
 .1env
+
+impact_evaluator_local/

.gitleaksignore

@@ -29,3 +29,4 @@ e271cd3303d407521c714253870de451f8617150:packages/valory/skills/decision_making_
 d47f7de20573d541505169665c2ae779ea57a4b0:packages/valory/services/impact_evaluator/service.yaml:generic-api-key:245
 f91f017c41d644b87699fb06619d5bdb3b568838:packages/valory/services/impact_evaluator_local/service.yaml:generic-api-key:72
 32259d88007014423881fa2695c363b84c1eb667:packages/valory/skills/mech_interact_abci/skill.yaml:generic-api-key:80
+549de14725c5e9059ce72242aa00451714ff2296:packages/valory/skills/olas_week_abci/skill.yaml:generic-api-key:88

Makefile

@@ -90,6 +90,7 @@ test:
 	-rfE packages/valory/skills/decision_making_abci \
 	-rfE packages/valory/skills/llm_abci \
 	-rfE packages/valory/skills/twitter_write_abci \
+	-rfE packages/valory/skills/olas_week_abci \
 	--cov=packages.valory.skills.ceramic_read_abci \
 	--cov=packages.valory.skills.generic_scoring_abci \
 	--cov=packages.valory.skills.twitter_scoring_abci \
@@ -99,6 +100,7 @@ test:
 	--cov=packages.valory.skills.decision_making_abci \
 	--cov=packages.valory.skills.llm_abci \
 	--cov=packages.valory.skills.twitter_write_abci \
+	--cov=packages.valory.skills.olas_week_abci \
 	--cov-report=xml --cov-report=term --cov-report=term-missing --cov-config=.coveragerc
 	find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \;
 
@@ -135,6 +137,7 @@ fix-abci-app-specs:
 	autonomy analyse fsm-specs --update --app-class LLMAbciApp --package packages/valory/skills/llm_abci/ || (echo "Failed to check llm_abci abci consistency" && exit 1)
 	autonomy analyse fsm-specs --update --app-class TwitterWriteAbciApp --package packages/valory/skills/twitter_write_abci/ || (echo "Failed to check twitter_write_abci abci consistency" && exit 1)
 	autonomy analyse fsm-specs --update --app-class ImpactEvaluatorSkillAbciApp --package packages/valory/skills/impact_evaluator_abci/ || (echo "Failed to check impact_evaluator_abci abci consistency" && exit 1)
+	autonomy analyse fsm-specs --update --app-class WeekInOlasAbciApp --package packages/valory/skills/olas_week_abci/ || (echo "Failed to check olas_week_abci abci consistency" && exit 1)
 
 
 .PHONY: all-linters

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:bafybeiechrafvles27zw5melefdom6up6m2xsuaxzwy4zl3z47narm5biq --service
+    autonomy fetch valory/impact_evaluator:0.1.0:bafybeiaapq7a5g464bya2ic7rkidai23whm7jn4mie54nrc6kc2jpb7bf4 --service
     ```
 
 3. Build the Docker image of the service agents

packages/packages.json

@@ -1,22 +1,23 @@
 {
     "dev": {
-        "agent/valory/impact_evaluator/0.1.0": "bafybeicrf6rtgehmch3frbypmtoyezgk55wbjd2tmep4se55kk24takkwa",
-        "contract/valory/dynamic_contribution/0.1.0": "bafybeihjnddpy24wpqtsrf57qdxvku7l5w6sm36u6hkm7i2um7ln664ice",
-        "service/valory/impact_evaluator/0.1.0": "bafybeiechrafvles27zw5melefdom6up6m2xsuaxzwy4zl3z47narm5biq",
-        "skill/valory/dynamic_nft_abci/0.1.0": "bafybeihe7rav55tlymizd5ltiwwvqzqrfqswm5sxsaw6bioal35lecwhny",
-        "skill/valory/twitter_scoring_abci/0.1.0": "bafybeidccv4tsye4i45f443p7dkidfpw3ifu4jzi4gk4jiz2cscusondhy",
+        "agent/valory/impact_evaluator/0.1.0": "bafybeihirytmmua4677vv5avrzias2vd47hvziogaq2mfucg5lmlqctz24",
+        "contract/valory/dynamic_contribution/0.1.0": "bafybeiht364qavknmnuz7pwkw4zjzrkkugyzymgxrjvtasfcy7eya3nbxa",
+        "service/valory/impact_evaluator/0.1.0": "bafybeiaapq7a5g464bya2ic7rkidai23whm7jn4mie54nrc6kc2jpb7bf4",
+        "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiexenlxvf32jjlxrow35qlo4xtmi2ezznulczhayux2n2mx27ya6i",
+        "skill/valory/twitter_scoring_abci/0.1.0": "bafybeicngrngwq4fna57rj4lo4nsvt73t3x3d33jb52po5e6kc7stbkl3q",
         "skill/valory/ceramic_read_abci/0.1.0": "bafybeide5tbobzkwfdi7yzw6bsau36h43hdlgbnk2bfqvvhmq3hl3ucjmm",
         "skill/valory/ceramic_write_abci/0.1.0": "bafybeihnalj6zhl5pbf7x2lkznuhivwj45jzrafbtxatwebrpb7st2v6oa",
-        "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidro7arpqvceouk6qetxidtfgfrpc7m5zd5ojkufk6aaybznwscfi",
+        "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiexzqy6nrkfw2b6fbhqk5b4yipvj246lxzhipndeuub2zrlytwtgi",
         "skill/valory/generic_scoring_abci/0.1.0": "bafybeig4hoc5gjiyuwh2ye3mwneegq3s3cghl5j7yokvngacvn7ixwdoga",
         "protocol/valory/twitter/0.1.0": "bafybeib4eyf7qbs7kdntqzhwqsaaj4o2mzcokcztaza6qgwt7sbxgkqu2m",
         "protocol/valory/llm/1.0.0": "bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4",
         "connection/valory/twitter/0.1.0": "bafybeifm7tpjdd2y5dy5xzuxt3tebyqxmgn56agkqv64nloggqo5cr3sku",
         "connection/valory/openai/0.1.0": "bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq",
         "skill/valory/twitter_write_abci/0.1.0": "bafybeidjumloxy2yvoyymgzuwbua3ks2p66fyybna2qhrz2upzkxzjrznq",
         "skill/valory/llm_abci/0.1.0": "bafybeifesvwe5ya7imxefijpawgtd7aje5hhr4oh2bzgfsm2ucjp3lxije",
-        "skill/valory/decision_making_abci/0.1.0": "bafybeigx57k6zwiatveoiyczbhz6xbdtfhhbxg7442tjqyb7ljjfjusn5e",
-        "service/valory/impact_evaluator_local/0.1.0": "bafybeiespcdcu22mpeyzjeofat6rrly2jfrrcr4d62t7bs3hflem3oy4fi"
+        "skill/valory/decision_making_abci/0.1.0": "bafybeicjrztkcvqjnk6odukj3j2dr6ee4j2jaaw5nsga6byjhjyuxhng5m",
+        "service/valory/impact_evaluator_local/0.1.0": "bafybeih35wij4e32htxntga7svxddkgrrmcq36jae3xrmf4s6yuuovvcme",
+        "skill/valory/olas_week_abci/0.1.0": "bafybeidegg3yi5qww6q6r24pgjmmbkgconyfnecuohacljvferqqg3tc2e"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m",

packages/valory/agents/impact_evaluator/aea-config.yaml

@@ -23,7 +23,7 @@ connections:
 - valory/openai:0.1.0:bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq
 - valory/twitter:0.1.0:bafybeifm7tpjdd2y5dy5xzuxt3tebyqxmgn56agkqv64nloggqo5cr3sku
 contracts:
-- valory/dynamic_contribution:0.1.0:bafybeihjnddpy24wpqtsrf57qdxvku7l5w6sm36u6hkm7i2um7ln664ice
+- valory/dynamic_contribution:0.1.0:bafybeiht364qavknmnuz7pwkw4zjzrkkugyzymgxrjvtasfcy7eya3nbxa
 - valory/gnosis_safe:0.1.0:bafybeih6d3vxz3jlgodxm5b2qcwsmansqj4xobuyd6hjnhzremuvd65yrm
 - valory/gnosis_safe_proxy_factory:0.1.0:bafybeid6glyjikjxmefwmhn62cxiofophegjmg2z5vqqsvk6tmyunwc274
 - valory/multisend:0.1.0:bafybeieg4tywd5lww2vygvpkilg3hcepa4rmhehjuamyvdf6vazt554v6u
@@ -42,19 +42,20 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeigafjci7m7ezwzasav5xqo7v2mbxxn7qb4y7vnuc2wr2irzvn7wsy
 - valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq
-- valory/impact_evaluator_abci:0.1.0:bafybeidro7arpqvceouk6qetxidtfgfrpc7m5zd5ojkufk6aaybznwscfi
+- valory/impact_evaluator_abci:0.1.0:bafybeiexzqy6nrkfw2b6fbhqk5b4yipvj246lxzhipndeuub2zrlytwtgi
 - valory/generic_scoring_abci:0.1.0:bafybeig4hoc5gjiyuwh2ye3mwneegq3s3cghl5j7yokvngacvn7ixwdoga
-- valory/twitter_scoring_abci:0.1.0:bafybeidccv4tsye4i45f443p7dkidfpw3ifu4jzi4gk4jiz2cscusondhy
+- valory/twitter_scoring_abci:0.1.0:bafybeicngrngwq4fna57rj4lo4nsvt73t3x3d33jb52po5e6kc7stbkl3q
 - valory/ceramic_read_abci:0.1.0:bafybeide5tbobzkwfdi7yzw6bsau36h43hdlgbnk2bfqvvhmq3hl3ucjmm
 - valory/ceramic_write_abci:0.1.0:bafybeihnalj6zhl5pbf7x2lkznuhivwj45jzrafbtxatwebrpb7st2v6oa
-- valory/dynamic_nft_abci:0.1.0:bafybeihe7rav55tlymizd5ltiwwvqzqrfqswm5sxsaw6bioal35lecwhny
+- valory/dynamic_nft_abci:0.1.0:bafybeiexenlxvf32jjlxrow35qlo4xtmi2ezznulczhayux2n2mx27ya6i
 - valory/registration_abci:0.1.0:bafybeibndt6vxiwc2edgtaxpjbhwto3eyu33ujz3zmvtygvo2qz7xme5li
 - valory/reset_pause_abci:0.1.0:bafybeigeoc363gv3wp2rrmk6p2fdxney33nxd3owtpfugzapgruwe4klyu
 - valory/termination_abci:0.1.0:bafybeigqpij2sgrpnilqjljfciixop4fldq5qceixc7534q6af4potdmdm
 - valory/transaction_settlement_abci:0.1.0:bafybeia7rzsbea3ch4gcafyp3z6uvqh4npws2xpdwbkkdbrqqpjops7nui
 - valory/twitter_write_abci:0.1.0:bafybeidjumloxy2yvoyymgzuwbua3ks2p66fyybna2qhrz2upzkxzjrznq
-- valory/decision_making_abci:0.1.0:bafybeigx57k6zwiatveoiyczbhz6xbdtfhhbxg7442tjqyb7ljjfjusn5e
+- valory/decision_making_abci:0.1.0:bafybeicjrztkcvqjnk6odukj3j2dr6ee4j2jaaw5nsga6byjhjyuxhng5m
 - valory/llm_abci:0.1.0:bafybeifesvwe5ya7imxefijpawgtd7aje5hhr4oh2bzgfsm2ucjp3lxije
+- valory/olas_week_abci:0.1.0:bafybeidegg3yi5qww6q6r24pgjmmbkgconyfnecuohacljvferqqg3tc2e
 default_ledger: ethereum
 required_ledgers:
 - ethereum
@@ -213,6 +214,8 @@ models:
       max_tweet_pulls_allowed: ${int:80}
       twitter_search_endpoint: ${str:2/tweets/search/recent?}
       twitter_search_args: ${str:query=%23olas&tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results={max_results}&since_id={since_id}}
+      twitter_tweets_endpoint: ${str:2/users/1450081635559428107/tweets?}
+      twitter_tweets_args: ${str:tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}}
       openai_call_window_size: ${float:3600.0}
       openai_calls_allowed_in_window: ${int:100}
       tx_timeout: 10.0

packages/valory/contracts/dynamic_contribution/contract.py

@@ -111,7 +111,7 @@ def get_all_erc721_transfers(
         # the connection could time out.
         MAX_BLOCKS = 300000
         to_block = (
-            ledger_api.api.eth.get_block_number() if to_block == "latest" else to_block
+            ledger_api.api.eth.get_block_number() - 1 if to_block == "latest" else to_block
         )
         ranges = list(range(from_block, to_block, MAX_BLOCKS)) + [to_block]
 

packages/valory/contracts/dynamic_contribution/contract.yaml

@@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   __init__.py: bafybeidk77j5zmvjhf42ie7grv33hzjedgc6vdiwn22uzhlwuo6xh6hmsi
   build/DynamicContribution.json: bafybeicq5ee4hba3h6tsluzvdrtyvzllpqsseqys66e24bfrpjlegnxome
-  contract.py: bafybeidiroajv6euw4l2w4qyjgsqvwrktuzoaywjhx5wcqavdrmhvspeue
+  contract.py: bafybeihe45m6zeuymlanetr6purk4bx6vcxh5efjvn3rteovhexkksdpqy
 fingerprint_ignore_patterns: []
 class_name: DynamicContributionContract
 contract_interface_paths:

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:bafybeicrf6rtgehmch3frbypmtoyezgk55wbjd2tmep4se55kk24takkwa
+agent: valory/impact_evaluator:0.1.0:bafybeihirytmmua4677vv5avrzias2vd47hvziogaq2mfucg5lmlqctz24
 number_of_agents: 4
 deployment:
   agent:
@@ -107,6 +107,8 @@ extra:
         twitter_max_pages: ${TWITTER_MAX_PAGES:int:1}
         twitter_search_endpoint: ${TWITTER_SEARCH_ENDPOINT:str:2/tweets/search/recent?}
         twitter_search_args: ${TWITTER_SEARCH_ARGS:str:query=%23OlasNetwork&tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=25&since_id={since_id}}
+        twitter_tweets_endpoint: ${TWITTER_TWEETS_ENDPOINT:str:2/users/1450081635559428107/tweets?}
+        twitter_tweets_args: ${TWITTER_TWEETS_ARGS:str:tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}}
         tx_timeout: 10.0
         use_termination: ${USE_TERMINATION:bool:false}
         validate_timeout: 1205
@@ -179,6 +181,8 @@ extra:
         twitter_max_pages: ${TWITTER_MAX_PAGES:int:1}
         twitter_search_endpoint: ${TWITTER_SEARCH_ENDPOINT:str:2/tweets/search/recent?}
         twitter_search_args: ${TWITTER_SEARCH_ARGS:str:query=%23OlasNetwork&tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=25&since_id={since_id}}
+        twitter_tweets_endpoint: ${TWITTER_TWEETS_ENDPOINT:str:2/users/1450081635559428107/tweets?}
+        twitter_tweets_args: ${TWITTER_TWEETS_ARGS:str:tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}}
         tx_timeout: 10.0
         use_termination: ${USE_TERMINATION:bool:false}
         validate_timeout: 1205
@@ -251,6 +255,8 @@ extra:
         twitter_max_pages: ${TWITTER_MAX_PAGES:int:1}
         twitter_search_endpoint: ${TWITTER_SEARCH_ENDPOINT:str:2/tweets/search/recent?}
         twitter_search_args: ${TWITTER_SEARCH_ARGS:str:query=%23OlasNetwork&tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=25&since_id={since_id}}
+        twitter_tweets_endpoint: ${TWITTER_TWEETS_ENDPOINT:str:2/users/1450081635559428107/tweets?}
+        twitter_tweets_args: ${TWITTER_TWEETS_ARGS:str:tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}}
         tx_timeout: 10.0
         use_termination: ${USE_TERMINATION:bool:false}
         validate_timeout: 1205
@@ -325,6 +331,8 @@ extra:
         twitter_max_pages: ${TWITTER_MAX_PAGES:int:1}
         twitter_search_endpoint: ${TWITTER_SEARCH_ENDPOINT:str:2/tweets/search/recent?}
         twitter_search_args: ${TWITTER_SEARCH_ARGS:str:query=%23OlasNetwork&tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=25&since_id={since_id}}
+        twitter_tweets_endpoint: ${TWITTER_TWEETS_ENDPOINT:str:2/users/1450081635559428107/tweets?}
+        twitter_tweets_args: ${TWITTER_TWEETS_ARGS:str:tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}}
         tx_timeout: 10.0
         use_termination: ${USE_TERMINATION:bool:false}
         validate_timeout: 1205

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:bafybeicrf6rtgehmch3frbypmtoyezgk55wbjd2tmep4se55kk24takkwa
+agent: valory/impact_evaluator:0.1.0:bafybeihirytmmua4677vv5avrzias2vd47hvziogaq2mfucg5lmlqctz24
 number_of_agents: 1
 deployment:
   agent:
@@ -106,6 +106,8 @@ models:
       twitter_max_pages: ${TWITTER_MAX_PAGES:int:1}
       twitter_search_endpoint: ${TWITTER_SEARCH_ENDPOINT:str:2/tweets/search/recent?}
       twitter_search_args: ${TWITTER_SEARCH_ARGS:str:query=%23OlasNetwork&tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=25&since_id={since_id}}
+      twitter_tweets_endpoint: ${TWITTER_TWEETS_ENDPOINT:str:2/users/1450081635559428107/tweets?}
+      twitter_tweets_args: ${TWITTER_TWEETS_ARGS:str:tweet.fields=author_id,created_at&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}}
       tx_timeout: 10.0
       use_termination: ${USE_TERMINATION:bool:false}
       validate_timeout: 1205

packages/valory/skills/decision_making_abci/behaviours.py

@@ -55,6 +55,9 @@
     DailyTweetPreparation,
     ScheduledTweetPreparation,
 )
+from packages.valory.skills.decision_making_abci.tasks.week_in_olas_preparations import (
+    WeekInOlasCreatePreparation,
+)
 from packages.valory.skills.decision_making_abci.tasks.write_stream_preparation import (
     DailyOrbisPreparation,
     UpdateCentaursPreparation,
@@ -66,6 +69,14 @@
 previous_event_to_task_preparation_cls = {
     None: {
         "prev": None,
+        "next": ReadContributeDBPreparation,
+    },
+    Event.READ_CONTRIBUTE_DB.value: {
+        "prev": ReadContributeDBPreparation,
+        "next": ReadManualPointsPreparation,
+    },
+    Event.READ_MANUAL_POINTS.value: {
+        "prev": ReadManualPointsPreparation,
         "next": ReadCentaursPreparation,
     },
     Event.READ_CENTAURS.value: {
@@ -82,6 +93,10 @@
     },
     Event.DAILY_ORBIS.value: {
         "prev": DailyOrbisPreparation,
+        "next": WeekInOlasCreatePreparation,
+    },
+    Event.WEEK_IN_OLAS_CREATE.value: {
+        "prev": WeekInOlasCreatePreparation,
         "next": ScheduledTweetPreparation,
     },
     Event.SCHEDULED_TWEET.value: {
@@ -90,14 +105,6 @@
     },
     Event.UPDATE_CENTAURS.value: {
         "prev": UpdateCentaursPreparation,
-        "next": ReadContributeDBPreparation,
-    },
-    Event.READ_CONTRIBUTE_DB.value: {
-        "prev": ReadContributeDBPreparation,
-        "next": ReadManualPointsPreparation,
-    },
-    Event.READ_MANUAL_POINTS.value: {
-        "prev": ReadManualPointsPreparation,
         "next": ScorePreparation,
     },
     Event.SCORE.value: {
@@ -110,7 +117,7 @@
     },
     Event.NEXT_CENTAUR.value: {
         "prev": None,
-        "next": LLMPreparation,
+        "next": ReadContributeDBPreparation,
     },
 }
 

packages/valory/skills/decision_making_abci/fsm_specification.yaml

@@ -12,6 +12,7 @@ alphabet_in:
 - SCHEDULED_TWEET
 - SCORE
 - UPDATE_CENTAURS
+- WEEK_IN_OLAS_CREATE
 - WRITE_CONTRIBUTE_DB
 default_start_state: DecisionMakingRound
 final_states:
@@ -22,6 +23,7 @@ final_states:
 - FinishedDecisionMakingReadManualPointsRound
 - FinishedDecisionMakingScoreRound
 - FinishedDecisionMakingUpdateCentaurRound
+- FinishedDecisionMakingWeekInOlasRound
 - FinishedDecisionMakingWriteContributeDBRound
 - FinishedDecisionMakingWriteOrbisRound
 - FinishedDecisionMakingWriteTwitterRound
@@ -37,6 +39,7 @@ states:
 - FinishedDecisionMakingReadManualPointsRound
 - FinishedDecisionMakingScoreRound
 - FinishedDecisionMakingUpdateCentaurRound
+- FinishedDecisionMakingWeekInOlasRound
 - FinishedDecisionMakingWriteContributeDBRound
 - FinishedDecisionMakingWriteOrbisRound
 - FinishedDecisionMakingWriteTwitterRound
@@ -54,4 +57,5 @@ transition_func:
     (DecisionMakingRound, SCHEDULED_TWEET): FinishedDecisionMakingWriteTwitterRound
     (DecisionMakingRound, SCORE): FinishedDecisionMakingScoreRound
     (DecisionMakingRound, UPDATE_CENTAURS): FinishedDecisionMakingUpdateCentaurRound
+    (DecisionMakingRound, WEEK_IN_OLAS_CREATE): FinishedDecisionMakingWeekInOlasRound
     (DecisionMakingRound, WRITE_CONTRIBUTE_DB): FinishedDecisionMakingWriteContributeDBRound