Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/wveolas amount #115

Merged
merged 4 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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:bafybeiffhzgpy4tfklast46gdhrz2wyickvlibug4gbvxqam7ald2csgkm --service
autonomy fetch valory/impact_evaluator:0.1.0:bafybeiekpc55zh7cctov2y34kwrjelktynrhbnpkdofpv24y2r5woiljcy --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
@@ -1,22 +1,22 @@
{
"dev": {
"agent/valory/impact_evaluator/0.1.0": "bafybeihd7diqbkneyl2coi4chmfx3geayemv5a6hcalvputuiqj5uc5rui",
"agent/valory/impact_evaluator/0.1.0": "bafybeicffrcxtawbidkpv6wtkmtzsar7536ze5oo2x7l6guukjtweww5k4",
"contract/valory/dynamic_contribution/0.1.0": "bafybeia54zrihbupv35dkw23x4lc7cgeh3obinqlszvjighm7rxap6komi",
"service/valory/impact_evaluator/0.1.0": "bafybeiffhzgpy4tfklast46gdhrz2wyickvlibug4gbvxqam7ald2csgkm",
"service/valory/impact_evaluator/0.1.0": "bafybeiekpc55zh7cctov2y34kwrjelktynrhbnpkdofpv24y2r5woiljcy",
"skill/valory/dynamic_nft_abci/0.1.0": "bafybeibwx2r4pdvzy2myn5keawjskd5mz2w7yfdflqff5wz4cxiubpanlu",
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeiezvn76bbkmfuddcitooj7b3r7kv4cdehz7noepybqylhz2cjt3hm",
"skill/valory/ceramic_read_abci/0.1.0": "bafybeigqpkvsxfhz5jt3yuipmkl6eyfgqcw36226sgfhdgud7mphsjmopa",
"skill/valory/ceramic_write_abci/0.1.0": "bafybeighmakx2u2okkvokdimxyzrnfn5qb2cib3qzvzdh4tnkfr6hkx32a",
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeifi55u4cghp4mpq6fnolaoqozxiu4iqyecyo3kjc3m4xg3sow56bq",
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeif77v3kc5owyyze5pqzia64r6gyolxq47sq2wrcofgut7cgzjgosm",
"skill/valory/generic_scoring_abci/0.1.0": "bafybeiexjfu736oe3u43siklxsyqwvlltoks5rnmhl2t7jjmwpwuhc3fey",
"protocol/valory/twitter/0.1.0": "bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4",
"protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4",
"connection/valory/twitter/0.1.0": "bafybeibju7477agfjcveypdv4smso2iy6vy2iqy5lz2ua2bbjhyxlm5dre",
"connection/valory/openai/0.1.0": "bafybeiepsxac7e2tq3mcfkgcx62zt6oiaeic5wwcs4mnv733l762kn62du",
"skill/valory/twitter_write_abci/0.1.0": "bafybeiga55lbnr6k632ytgwintyuaxegrvvt7k6bn7vwymbgcq7w6tqi7m",
"skill/valory/llm_abci/0.1.0": "bafybeiav6mfjf5ltrhpmrelfpix3s7irgrk35ejx6zuqjm4wengyihmsse",
"skill/valory/decision_making_abci/0.1.0": "bafybeifgex5tw3vllnkulzwktupnirftaxr36c26vrdlpy5gcbtbry2eiy",
"service/valory/impact_evaluator_local/0.1.0": "bafybeignbzld4tcce2vjort7nrh2wckvpf636zek5lfffmlffpgxzqe6y4",
"skill/valory/decision_making_abci/0.1.0": "bafybeienzga5ue2r6z3psm4ihexhrmghqvfvql7qo6zbm7yhhu5vfcquva",
"service/valory/impact_evaluator_local/0.1.0": "bafybeiebfgaikpb4n32lrobba2d2ztvzqggnarmmt56ap222e3csjy6fpi",
"skill/valory/olas_week_abci/0.1.0": "bafybeiholnppuo6zfrxh3yqjedvf5m7s2w6ahwsdfq444zfo7jlvfigfdu",
"skill/valory/mech_interact_abci/0.1.0": "bafybeihwvjvxyv2ca2eskt3d5cvac4onr7m2hla2inydpqdipw4ze3yz6a",
"contract/valory/mech/0.1.0": "bafybeibv6ydk326zkny4pphze64zgzzv2sc5qkt2iyymoi6pt3ci2gtxne",
Expand Down
5 changes: 3 additions & 2 deletions packages/valory/agents/impact_evaluator/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protocols:
skills:
- valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi
- valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq
- valory/impact_evaluator_abci:0.1.0:bafybeifi55u4cghp4mpq6fnolaoqozxiu4iqyecyo3kjc3m4xg3sow56bq
- valory/impact_evaluator_abci:0.1.0:bafybeif77v3kc5owyyze5pqzia64r6gyolxq47sq2wrcofgut7cgzjgosm
- valory/generic_scoring_abci:0.1.0:bafybeiexjfu736oe3u43siklxsyqwvlltoks5rnmhl2t7jjmwpwuhc3fey
- valory/twitter_scoring_abci:0.1.0:bafybeiezvn76bbkmfuddcitooj7b3r7kv4cdehz7noepybqylhz2cjt3hm
- valory/ceramic_read_abci:0.1.0:bafybeigqpkvsxfhz5jt3yuipmkl6eyfgqcw36226sgfhdgud7mphsjmopa
Expand All @@ -53,7 +53,7 @@ skills:
- valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa
- valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja
- valory/twitter_write_abci:0.1.0:bafybeiga55lbnr6k632ytgwintyuaxegrvvt7k6bn7vwymbgcq7w6tqi7m
- valory/decision_making_abci:0.1.0:bafybeifgex5tw3vllnkulzwktupnirftaxr36c26vrdlpy5gcbtbry2eiy
- valory/decision_making_abci:0.1.0:bafybeienzga5ue2r6z3psm4ihexhrmghqvfvql7qo6zbm7yhhu5vfcquva
- valory/llm_abci:0.1.0:bafybeiav6mfjf5ltrhpmrelfpix3s7irgrk35ejx6zuqjm4wengyihmsse
- valory/olas_week_abci:0.1.0:bafybeiholnppuo6zfrxh3yqjedvf5m7s2w6ahwsdfq444zfo7jlvfigfdu
- valory/mech_interact_abci:0.1.0:bafybeihwvjvxyv2ca2eskt3d5cvac4onr7m2hla2inydpqdipw4ze3yz6a
Expand Down Expand Up @@ -255,6 +255,7 @@ models:
default_chain_id: ${str:ethereum}
transaction_service_url: ${str:https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/}
wveolas_address: ${str:0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40}
tweet_consensus_wveolas: ${int:2000000}
---
public_id: valory/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq
type: connection
Expand Down
6 changes: 5 additions & 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:bafybeihd7diqbkneyl2coi4chmfx3geayemv5a6hcalvputuiqj5uc5rui
agent: valory/impact_evaluator:0.1.0:bafybeicffrcxtawbidkpv6wtkmtzsar7536ze5oo2x7l6guukjtweww5k4
number_of_agents: 4
deployment:
agent:
Expand Down Expand Up @@ -128,6 +128,7 @@ extra:
default_chain_id: ${DEFAULT_CHAIN_ID:str:ethereum}
transaction_service_url: ${TRANSACTION_SERVICE_URL:str:https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/}
wveolas_address: ${WVEOLAS_ADDRESS:str:0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40}
tweet_consensus_wveolas: ${TWEET_CONSENSUS_WVEOLAS:int:2000000}
1:
models:
benchmark_tool:
Expand Down Expand Up @@ -208,6 +209,7 @@ extra:
default_chain_id: ${DEFAULT_CHAIN_ID:str:ethereum}
transaction_service_url: ${TRANSACTION_SERVICE_URL:str:https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/}
wveolas_address: ${WVEOLAS_ADDRESS:str:0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40}
tweet_consensus_wveolas: ${TWEET_CONSENSUS_WVEOLAS:int:2000000}
2:
models:
benchmark_tool:
Expand Down Expand Up @@ -288,6 +290,7 @@ extra:
default_chain_id: ${DEFAULT_CHAIN_ID:str:ethereum}
transaction_service_url: ${TRANSACTION_SERVICE_URL:str:https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/}
wveolas_address: ${WVEOLAS_ADDRESS:str:0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40}
tweet_consensus_wveolas: ${TWEET_CONSENSUS_WVEOLAS:int:2000000}
3:
models:
benchmark_tool:
Expand Down Expand Up @@ -372,6 +375,7 @@ extra:
default_chain_id: ${DEFAULT_CHAIN_ID:str:ethereum}
transaction_service_url: ${TRANSACTION_SERVICE_URL:str:https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/}
wveolas_address: ${WVEOLAS_ADDRESS:str:0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40}
tweet_consensus_wveolas: ${TWEET_CONSENSUS_WVEOLAS:int:2000000}
---
public_id: valory/ledger:0.19.0
type: connection
Expand Down
3 changes: 2 additions & 1 deletion packages/valory/services/impact_evaluator_local/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:bafybeihd7diqbkneyl2coi4chmfx3geayemv5a6hcalvputuiqj5uc5rui
agent: valory/impact_evaluator:0.1.0:bafybeicffrcxtawbidkpv6wtkmtzsar7536ze5oo2x7l6guukjtweww5k4
number_of_agents: 1
deployment:
agent:
Expand Down Expand Up @@ -122,6 +122,7 @@ models:
default_chain_id: ${DEFAULT_CHAIN_ID:str:ethereum}
transaction_service_url: ${TRANSACTION_SERVICE_URL:str:https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/}
wveolas_address: ${WVEOLAS_ADDRESS:str:0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40}
tweet_consensus_wveolas: ${TWEET_CONSENSUS_WVEOLAS:int:2000000}
---
public_id: valory/ledger:0.19.0
type: connection
Expand Down
3 changes: 3 additions & 0 deletions packages/valory/skills/decision_making_abci/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
"transaction_service_url", kwargs, str
)
self.wveolas_address = self._ensure("wveolas_address", kwargs, str)
self.tweet_consensus_wveolas = self._ensure(
"tweet_consensus_wveolas", kwargs, int
)
super().__init__(*args, **kwargs)


Expand Down
5 changes: 3 additions & 2 deletions packages/valory/skills/decision_making_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fingerprint:
dialogues.py: bafybeic5nwnax5tz6plxi5rww6davp23vgb6fixnlhzv2isoknuvb2bhye
fsm_specification.yaml: bafybeihqaaud54lucsousv5dbbn3mbqro3ryel3hxpzz33xkvf47tq4yhe
handlers.py: bafybeibo54pwzdc5o4zwsqqaveiebxsfqtk2px5nh662bb5mxydtc2oz5q
models.py: bafybeidlcxxckpzdkfbwp5tfz6lpiincektzrk3fg6gu7lpxsyonfv5caq
models.py: bafybeibhlnmazgfiv4prucyk5lbg2jli44vb3lznc5cu3csvhtnstkdp6y
payloads.py: bafybeif5bomwy74bwnphsk6bty6qb6efugvjnnopsz7qjunpe6gtgjaxya
rounds.py: bafybeic43lqt47fpenlrojgc27w7ws643f3yfdtfblrdufwgm4oqwghgwy
tasks/finished_pipeline_preparation.py: bafybeid652b53p7mtsbj3ksko3g2eezvg4nut2vukwvnfhxyfi4zkx3dym
Expand All @@ -21,7 +21,7 @@ fingerprint:
tasks/signature_validation.py: bafybeihyckhs37pvh77q4tn7cnaia3gs5x6wudyp22qipazaftycqtaezi
tasks/task_preparations.py: bafybeihqieo4logxhsqntyfjphimf243aapqr4go43jb3eacrt7ouystmq
tasks/tweet_validation_preparation.py: bafybeic57ncduxguroogueizijfupz7zk2kiexl3ram2zudmeizzxqmwlm
tasks/twitter_preparation.py: bafybeiaqtib5p7scfflhr5jk5zujgtzkovbvuevppvdz3tg3xyl2dioobq
tasks/twitter_preparation.py: bafybeib7d37czhntqj7tgicpytylz7z2l4yjoysqtfmhadsud3brtt5d4m
tasks/week_in_olas_preparations.py: bafybeidhcwqtdfzwim7uckv4yrzjfyiivu5wxs5thhxsi6ccoa4x5tq6bi
tasks/write_stream_preparation.py: bafybeiaa7a7wsr7acpv5my3tqupuzsxpk5d23wg6i4262ea46isaz3q6ai
tests/__init__.py: bafybeiff447fuzkdgyp5yoqqstzv2pyi2uiokng6lzrtfnsgspocghwypi
Expand Down Expand Up @@ -159,6 +159,7 @@ models:
serious_slash_unit_amount: 8000000000000000
transaction_service_url: https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/
wveolas_address: '0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40'
tweet_consensus_wveolas: 2000000
class_name: Params
requests:
args: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
)


TWEET_CONSENSUS_WVEOLAS_WEI = 2e6 * 1e18 # 2M wveolas to wei


class TwitterPreparation(TaskPreparation):
"""TwitterPreparation"""

Expand Down Expand Up @@ -349,7 +346,7 @@ def check_tweet_consensus(self, tweet: dict):
self.logger.info(f"Voter: {voter['address']} Voting power: {voting_power}")
total_voting_power += cast(int, voting_power)

consensus = total_voting_power >= TWEET_CONSENSUS_WVEOLAS_WEI
consensus = total_voting_power >= self.params.tweet_consensus_wveolas

self.behaviour.context.logger.info(
f"Voting power is {total_voting_power} for tweet {tweet['text']}. Executing? {consensus}"
Expand Down
3 changes: 2 additions & 1 deletion packages/valory/skills/impact_evaluator_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ skills:
- valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba
- valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa
- valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja
- valory/decision_making_abci:0.1.0:bafybeifgex5tw3vllnkulzwktupnirftaxr36c26vrdlpy5gcbtbry2eiy
- valory/decision_making_abci:0.1.0:bafybeienzga5ue2r6z3psm4ihexhrmghqvfvql7qo6zbm7yhhu5vfcquva
- valory/llm_abci:0.1.0:bafybeiav6mfjf5ltrhpmrelfpix3s7irgrk35ejx6zuqjm4wengyihmsse
- valory/twitter_write_abci:0.1.0:bafybeiga55lbnr6k632ytgwintyuaxegrvvt7k6bn7vwymbgcq7w6tqi7m
- valory/olas_week_abci:0.1.0:bafybeiholnppuo6zfrxh3yqjedvf5m7s2w6ahwsdfq444zfo7jlvfigfdu
Expand Down Expand Up @@ -196,6 +196,7 @@ models:
default_chain_id: ethereum
transaction_service_url: https://safe-transaction-mainnet.safe.global/api/v1/messages/{message_hash}/
wveolas_address: '0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40'
tweet_consensus_wveolas: 2000000
class_name: Params
randomness_api:
args:
Expand Down