Skip to content

Commit fd7ae70

Browse files
authored
Merge pull request #227 from valory-xyz/fix/points
Fix/points
2 parents fe1eb4a + d7e718f commit fd7ae70

File tree

16 files changed

+53
-45
lines changed

16 files changed

+53
-45
lines changed

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit:
3131
2. Fetch the IEKit.
3232

3333
```bash
34-
autonomy fetch valory/impact_evaluator:0.1.0:bafybeihbdws7fzicgmbvvrnwbaeuznqve7n7njt3nmcmznrynlcr7y5whq --service
34+
autonomy fetch valory/impact_evaluator:0.1.0:bafybeihelzs5bn7o2c5kz3eotw5g2ga77laen3l2ohonb455b7uvqib74e --service
3535
```
3636

3737
3. Build the Docker image of the service agents
@@ -93,7 +93,7 @@ In order to run a local demo service based on the IEKit:
9393
EARLIEST_BLOCK_TO_MONITOR=16097553
9494
RESET_TENDERMINT_AFTER=5
9595
TWITTER_SEARCH_ARGS=query=%23OlasNetwork&tweet.fields=author_id,created_at,conversation_id&user.fields=name&expansions=author_id&max_results=100&since_id={since_id}
96-
MAX_POINTS_PER_PERIOD=5000
96+
MAX_POINTS_PER_PERIOD=1000
9797
USE_ACN=false
9898
TWITTER_TWEETS_ARGS=tweet.fields=author_id,created_at,conversation_id,public_metrics&user.fields=name&expansions=author_id&max_results=10&start_time={start_time}
9999
DEFAULT_CHAIN_ID=gnosis

packages/packages.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
"connection/valory/openai/0.1.0": "bafybeifz2n6s6u3zvvryhhxpkvn6guyp2jwpagtyjducvgwoldtmz7ea64",
1616
"connection/valory/farcaster/0.1.0": "bafybeibbdas7lxbipksodaphjms3uop7vnzjqkroktjq2g6wbvgtlldaxi",
1717
"skill/valory/dynamic_nft_abci/0.1.0": "bafybeic7w6vqpt6rqlw6t7opzm3px2gwb6doo2a6etyyqueez24mbrcqqy",
18-
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeier6oydc5saiyt2e47moz3n54degmlq2ekcifeagc4ggfcj6aemna",
18+
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeibwbxtdz6ypba4vpkxg4esqs3f5ug5ljlwza7njyccoyzmx37dpdu",
1919
"skill/valory/ceramic_read_abci/0.1.0": "bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u",
2020
"skill/valory/ceramic_write_abci/0.1.0": "bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i",
21-
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeiblxwctj3dzgpn5ev6jpfcm73cdrwhjxetl35sjsyy5hpecbcmozi",
21+
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeicc4cvshbkhcuaevonh3drpw5iqzsnvdnntiwkogu7x6oeufmy2dy",
2222
"skill/valory/generic_scoring_abci/0.1.0": "bafybeiffup7abnyqjinsakjawzwr6t6pp32joiuoz4gara7jm7tlfo725q",
2323
"skill/valory/twitter_write_abci/0.1.0": "bafybeibp7zai2qwvfjd5fgpayx44x5c2zshbukpobvz2la7ws2l5f5fjde",
2424
"skill/valory/llm_abci/0.1.0": "bafybeib2k62hilwglfad33bzxkjlviw5bxwiw7z3rjvweyeamatdjznpeq",
2525
"skill/valory/decision_making_abci/0.1.0": "bafybeidj3owli2etpxxfgpfevqis7mtlxmnujsrfqw3pwfq6zvfc5rhfy4",
26-
"skill/valory/olas_week_abci/0.1.0": "bafybeihtfb7c6m5ncznftfiww62pjwi3w2mkpzbjdwry5mf5msh5szzjt4",
27-
"skill/valory/mech_interact_abci/0.1.0": "bafybeibzhywzwowfmebf4o2bppyjupdpjkdsawceetam4ac3lmh5yp22xy",
26+
"skill/valory/olas_week_abci/0.1.0": "bafybeihsnuymbv3wb6yvmbxegd5usctbzakfz27255lnvxlhncxsu3s7xi",
27+
"skill/valory/mech_interact_abci/0.1.0": "bafybeicpskytv7osu6bdpmcweemlsb4f3m6gldzpyoxgawkczsmvlrzgma",
2828
"skill/valory/farcaster_write_abci/0.1.0": "bafybeigx2wyujnojer7er7g2eufm5lojon2dckotvsgwb6tn5iyiwdfgsu",
2929
"skill/valory/farcaster_test_abci/0.1.0": "bafybeihd3h37ngkxlqo6o3vuvdik54bwmbrjmqcxtgsr5is3tqgbk73yoa",
3030
"skill/valory/staking_abci/0.1.0": "bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay",
31-
"agent/valory/impact_evaluator/0.1.0": "bafybeicno3rvvk6racd3ounebvhh5vcghbnbgjkdqqdj633nuwarkchfou",
31+
"agent/valory/impact_evaluator/0.1.0": "bafybeiekj2zd5wcqq7kzqw5ymi626wekpnrjzjsadj7bi3g2rnz32mdaku",
3232
"agent/valory/farcaster_test/0.1.0": "bafybeiefui6dnhhy5leqyvfrbkeleb64gap5tzctkrzzggjf4ubbxamjvy",
33-
"service/valory/impact_evaluator/0.1.0": "bafybeihbdws7fzicgmbvvrnwbaeuznqve7n7njt3nmcmznrynlcr7y5whq",
34-
"service/valory/impact_evaluator_local/0.1.0": "bafybeidnu46oftf25amc54lc4glx27pih62xq5xc4xii66ga62njli74fa"
33+
"service/valory/impact_evaluator/0.1.0": "bafybeihelzs5bn7o2c5kz3eotw5g2ga77laen3l2ohonb455b7uvqib74e",
34+
"service/valory/impact_evaluator_local/0.1.0": "bafybeihadh3gm5ouff4mgql5scregpniw7ovavmwvacaujqoix5ktghwnq"
3535
},
3636
"third_party": {
3737
"protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ protocols:
4545
skills:
4646
- valory/abstract_abci:0.1.0:bafybeieo7pe5wqjphs5izpz5aujjbubymlxub62b3rhx6yglu65ibalffu
4747
- valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti
48-
- valory/impact_evaluator_abci:0.1.0:bafybeiblxwctj3dzgpn5ev6jpfcm73cdrwhjxetl35sjsyy5hpecbcmozi
48+
- valory/impact_evaluator_abci:0.1.0:bafybeicc4cvshbkhcuaevonh3drpw5iqzsnvdnntiwkogu7x6oeufmy2dy
4949
- valory/generic_scoring_abci:0.1.0:bafybeiffup7abnyqjinsakjawzwr6t6pp32joiuoz4gara7jm7tlfo725q
50-
- valory/twitter_scoring_abci:0.1.0:bafybeier6oydc5saiyt2e47moz3n54degmlq2ekcifeagc4ggfcj6aemna
50+
- valory/twitter_scoring_abci:0.1.0:bafybeibwbxtdz6ypba4vpkxg4esqs3f5ug5ljlwza7njyccoyzmx37dpdu
5151
- valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u
5252
- valory/ceramic_write_abci:0.1.0:bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i
5353
- valory/dynamic_nft_abci:0.1.0:bafybeic7w6vqpt6rqlw6t7opzm3px2gwb6doo2a6etyyqueez24mbrcqqy
@@ -58,8 +58,8 @@ skills:
5858
- valory/twitter_write_abci:0.1.0:bafybeibp7zai2qwvfjd5fgpayx44x5c2zshbukpobvz2la7ws2l5f5fjde
5959
- valory/decision_making_abci:0.1.0:bafybeidj3owli2etpxxfgpfevqis7mtlxmnujsrfqw3pwfq6zvfc5rhfy4
6060
- valory/llm_abci:0.1.0:bafybeib2k62hilwglfad33bzxkjlviw5bxwiw7z3rjvweyeamatdjznpeq
61-
- valory/olas_week_abci:0.1.0:bafybeihtfb7c6m5ncznftfiww62pjwi3w2mkpzbjdwry5mf5msh5szzjt4
62-
- valory/mech_interact_abci:0.1.0:bafybeibzhywzwowfmebf4o2bppyjupdpjkdsawceetam4ac3lmh5yp22xy
61+
- valory/olas_week_abci:0.1.0:bafybeihsnuymbv3wb6yvmbxegd5usctbzakfz27255lnvxlhncxsu3s7xi
62+
- valory/mech_interact_abci:0.1.0:bafybeicpskytv7osu6bdpmcweemlsb4f3m6gldzpyoxgawkczsmvlrzgma
6363
- valory/staking_abci:0.1.0:bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay
6464
default_ledger: ethereum
6565
required_ledgers:
@@ -267,7 +267,7 @@ models:
267267
finalize_timeout: 60.0
268268
history_check_timeout: 1205
269269
centaur_id_to_secrets: ${str:{}}
270-
max_points_per_period: ${int:5000}
270+
max_points_per_period: ${int:1000}
271271
use_slashing: ${bool:false}
272272
slash_cooldown_hours: ${int:3}
273273
slash_threshold_amount: ${int:10000000000000000}

packages/valory/services/impact_evaluator/service.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license: Apache-2.0
88
fingerprint:
99
README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
1010
fingerprint_ignore_patterns: []
11-
agent: valory/impact_evaluator:0.1.0:bafybeicno3rvvk6racd3ounebvhh5vcghbnbgjkdqqdj633nuwarkchfou
11+
agent: valory/impact_evaluator:0.1.0:bafybeiekj2zd5wcqq7kzqw5ymi626wekpnrjzjsadj7bi3g2rnz32mdaku
1212
number_of_agents: 4
1313
deployment:
1414
agent:
@@ -112,7 +112,7 @@ extra:
112112
use_termination: ${USE_TERMINATION:bool:true}
113113
validate_timeout: 1205
114114
centaur_id_to_secrets: ${CENTAUR_ID_TO_SECRETS:str:{}}
115-
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:900}
115+
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:1000}
116116
openai_call_window_size: ${OPENAI_CALL_WINDOW_SIZE:float:3600.0}
117117
openai_calls_allowed_in_window: ${OPENAI_CALLS_ALLOWED_IN_WINDOW:int:100}
118118
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}
@@ -208,7 +208,7 @@ extra:
208208
use_termination: ${USE_TERMINATION:bool:true}
209209
validate_timeout: 1205
210210
centaur_id_to_secrets: ${CENTAUR_ID_TO_SECRETS:str:{}}
211-
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:900}
211+
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:1000}
212212
openai_call_window_size: ${OPENAI_CALL_WINDOW_SIZE:float:3600.0}
213213
openai_calls_allowed_in_window: ${OPENAI_CALLS_ALLOWED_IN_WINDOW:int:100}
214214
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}
@@ -304,7 +304,7 @@ extra:
304304
use_termination: ${USE_TERMINATION:bool:true}
305305
validate_timeout: 1205
306306
centaur_id_to_secrets: ${CENTAUR_ID_TO_SECRETS:str:{}}
307-
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:900}
307+
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:1000}
308308
openai_call_window_size: ${OPENAI_CALL_WINDOW_SIZE:float:3600.0}
309309
openai_calls_allowed_in_window: ${OPENAI_CALLS_ALLOWED_IN_WINDOW:int:100}
310310
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}
@@ -404,7 +404,7 @@ extra:
404404
finalize_timeout: 60.0
405405
history_check_timeout: 1205
406406
centaur_id_to_secrets: ${CENTAUR_ID_TO_SECRETS:str:{}}
407-
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:900}
407+
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:1000}
408408
openai_call_window_size: ${OPENAI_CALL_WINDOW_SIZE:float:3600.0}
409409
openai_calls_allowed_in_window: ${OPENAI_CALLS_ALLOWED_IN_WINDOW:int:100}
410410
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}

packages/valory/services/impact_evaluator_local/service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license: Apache-2.0
88
fingerprint:
99
README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
1010
fingerprint_ignore_patterns: []
11-
agent: valory/impact_evaluator:0.1.0:bafybeicno3rvvk6racd3ounebvhh5vcghbnbgjkdqqdj633nuwarkchfou
11+
agent: valory/impact_evaluator:0.1.0:bafybeiekj2zd5wcqq7kzqw5ymi626wekpnrjzjsadj7bi3g2rnz32mdaku
1212
number_of_agents: 1
1313
deployment:
1414
agent:
@@ -111,7 +111,7 @@ models:
111111
use_termination: ${USE_TERMINATION:bool:true}
112112
validate_timeout: 1205
113113
centaur_id_to_secrets: ${CENTAUR_ID_TO_SECRETS:str:{}}
114-
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:5000}
114+
max_points_per_period: ${MAX_POINTS_PER_PERIOD:int:1000}
115115
openai_call_window_size: ${OPENAI_CALL_WINDOW_SIZE:float:3600.0}
116116
openai_calls_allowed_in_window: ${OPENAI_CALLS_ALLOWED_IN_WINDOW:int:100}
117117
service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://dummy_service.autonolas.tech/}

packages/valory/skills/impact_evaluator_abci/skill.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ skills:
2626
- valory/abstract_round_abci:0.1.0:bafybeibiw4oqwqvo4jccwz5fb73iardzychgvcl66tceiildohoju2ikti
2727
- valory/ceramic_read_abci:0.1.0:bafybeigz7rzfls3niv3urfb4z4vwr525ooxveelgg3djpvkg5jzetxlm2u
2828
- valory/generic_scoring_abci:0.1.0:bafybeiffup7abnyqjinsakjawzwr6t6pp32joiuoz4gara7jm7tlfo725q
29-
- valory/twitter_scoring_abci:0.1.0:bafybeier6oydc5saiyt2e47moz3n54degmlq2ekcifeagc4ggfcj6aemna
29+
- valory/twitter_scoring_abci:0.1.0:bafybeibwbxtdz6ypba4vpkxg4esqs3f5ug5ljlwza7njyccoyzmx37dpdu
3030
- valory/ceramic_write_abci:0.1.0:bafybeic6c3iub3nsr5tmr7g5vzoixbin6w64ewudfiq6u4r2fiqwbg753i
3131
- valory/dynamic_nft_abci:0.1.0:bafybeic7w6vqpt6rqlw6t7opzm3px2gwb6doo2a6etyyqueez24mbrcqqy
3232
- valory/registration_abci:0.1.0:bafybeib3n6vqkfbrcubcbliebjnuwyywdinxkbzt76n6gbn2kg7ace47dq
@@ -36,8 +36,8 @@ skills:
3636
- valory/decision_making_abci:0.1.0:bafybeidj3owli2etpxxfgpfevqis7mtlxmnujsrfqw3pwfq6zvfc5rhfy4
3737
- valory/llm_abci:0.1.0:bafybeib2k62hilwglfad33bzxkjlviw5bxwiw7z3rjvweyeamatdjznpeq
3838
- valory/twitter_write_abci:0.1.0:bafybeibp7zai2qwvfjd5fgpayx44x5c2zshbukpobvz2la7ws2l5f5fjde
39-
- valory/olas_week_abci:0.1.0:bafybeihtfb7c6m5ncznftfiww62pjwi3w2mkpzbjdwry5mf5msh5szzjt4
40-
- valory/mech_interact_abci:0.1.0:bafybeibzhywzwowfmebf4o2bppyjupdpjkdsawceetam4ac3lmh5yp22xy
39+
- valory/olas_week_abci:0.1.0:bafybeihsnuymbv3wb6yvmbxegd5usctbzakfz27255lnvxlhncxsu3s7xi
40+
- valory/mech_interact_abci:0.1.0:bafybeicpskytv7osu6bdpmcweemlsb4f3m6gldzpyoxgawkczsmvlrzgma
4141
- valory/staking_abci:0.1.0:bafybeieutg3epfnqtaucw6rpkq7vzzt5pkziqt4zlpjmispz2gqzth45ay
4242
behaviours:
4343
main:
@@ -176,7 +176,7 @@ models:
176176
twitter_tweets_args: tweet.fields=author_id,created_at,conversation_id,public_metrics&user.fields=name&expansions=author_id&max_results=50&start_time={start_time}
177177
openai_call_window_size: 3600.0
178178
openai_calls_allowed_in_window: 100
179-
max_points_per_period: 5000
179+
max_points_per_period: 1000
180180
tx_timeout: 10.0
181181
whitelist_api_key: null
182182
whitelist_endpoint: http://localhost

packages/valory/skills/mech_interact_abci/behaviours/request.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def _get_wrapped_native_balance(
222222

223223
def update_safe_balances(self) -> WaitableConditionType:
224224
"""Check the safe's balance."""
225-
account = self.params.safe_contract_address_gnosis
225+
account = self.synchronized_data.safe_contract_address
226226
wallet = yield from self._get_native_balance(account)
227227
if wallet is None:
228228
return False
@@ -328,11 +328,11 @@ def _build_multisend_data(
328328
def _build_multisend_safe_tx_hash(self) -> WaitableConditionType:
329329
"""Prepares and returns the safe tx hash for a multisend tx."""
330330
self.context.logger.info(
331-
f"Building multisend safe tx hash: safe={self.params.safe_contract_address_gnosis}"
331+
f"Building multisend safe tx hash: safe={self.synchronized_data.safe_contract_address}"
332332
)
333333
response_msg = yield from self.get_contract_api_response(
334334
performative=ContractApiMessage.Performative.GET_STATE, # type: ignore
335-
contract_address=self.params.safe_contract_address_gnosis,
335+
contract_address=self.synchronized_data.safe_contract_address,
336336
contract_id=str(GnosisSafeContract.contract_id),
337337
contract_callable="get_raw_safe_transaction_hash",
338338
to_address=self.params.multisend_address,
@@ -475,7 +475,7 @@ def async_act(self) -> Generator:
475475
None,
476476
None,
477477
self.params.mech_chain_id,
478-
self.params.safe_contract_address_gnosis,
478+
self.synchronized_data.safe_contract_address,
479479
None,
480480
None,
481481
)
@@ -497,7 +497,7 @@ def async_act(self) -> Generator:
497497
self.tx_hex,
498498
self.price,
499499
self.params.mech_chain_id,
500-
self.params.safe_contract_address_gnosis,
500+
self.synchronized_data.safe_contract_address,
501501
*serialized_data,
502502
)
503503
yield from self.finish_behaviour(payload)

packages/valory/skills/mech_interact_abci/models.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
112112
== self.mech_marketplace_config.priority_mech_address,
113113
"The mech contract address must be the same as the priority mech address when using the marketplace.",
114114
)
115-
self.safe_contract_address_gnosis: str = self._ensure(
116-
"safe_contract_address_gnosis", kwargs, str
117-
)
118115
super().__init__(*args, **kwargs)
119116

120117
@property

packages/valory/skills/mech_interact_abci/skill.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ fingerprint:
1010
__init__.py: bafybeidf3nlv5fpvfy4libtscayhirdw64shgmhfmvjiftjmjkmhu7auxq
1111
behaviours/__init__.py: bafybeie3zsi6p3yanz5mqwpkdrcgywaqvkit3hdintsb4awnvalgxpxa4i
1212
behaviours/base.py: bafybeif4dvt4p5wfh6q3ybqwnzy62lbr3vqy322sr3wm6pkcrha2ggin6q
13-
behaviours/request.py: bafybeidl25lhusageykea2u4lktjr3cqhj2jox3eo4t4nhor7hbi3h7bdq
13+
behaviours/request.py: bafybeic7nul5iawujburikfdr544g23gxto2wb3jqs4it3kpqffp3fdgrq
1414
behaviours/response.py: bafybeibigqdtdxxzufx7cclzjrafszg2lb6y5ommp3jzbyoit735wtm7tq
1515
behaviours/round_behaviour.py: bafybeib33inrpyzzlx7k7i3okkslsx4p46dgdaww2m5k7rno57o5nndage
1616
dialogues.py: bafybeigjmyzd2bx6mgqiet2c223k6wkc5jk7kdkstbhpaxlqxatey26tlm
1717
fsm_specification.yaml: bafybeiapzwz6zcneelc2b2wrcb7cae7x6vbthmf6a57cm4mv6hucp67lz4
1818
handlers.py: bafybeiduy2nwkqdynainuimkjulcv7u2qq6iglkuut3gfurkckydapitg4
19-
models.py: bafybeihywx7wdzil4uuqsg5sllsary7nzpaimzq7742bledoanl3wmx5wi
19+
models.py: bafybeidfes4ovzsyntxvqtx55qi2tznmllhzznf5qmozi52zrukiyrtbni
2020
payloads.py: bafybeie3s5irdmcggst5kmbm6duyhr4nm2qc67fkwznhrdskri4qzmkmla
2121
rounds.py: bafybeif7taciv6pqupb7xuewurqssziplbjeobbv4d7ea3vbngz3kpjnee
2222
states/__init__.py: bafybeie34wx5znr2hxwh3gs2fchmbeuzjcfnraymdvtzjaxaq5zsiw233q
@@ -147,7 +147,6 @@ models:
147147
validate_timeout: 1205
148148
multisend_batch_size: 50
149149
mech_contract_address: '0x77af31De935740567Cf4fF1986D04B2c964A786a'
150-
safe_contract_address_gnosis: '0x0000000000000000000000000000000000000000'
151150
mech_request_price: null
152151
mech_chain_id: gnosis
153152
mech_wrapped_native_token_address: '0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d'

packages/valory/skills/olas_week_abci/skill.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ models:
139139
max_tweet_pulls_allowed: 80
140140
openai_call_window_size: 3600.0
141141
openai_calls_allowed_in_window: 100
142-
max_points_per_period: 5000
143142
validate_timeout: 1205
144143
use_termination: false
145144
use_slashing: false

packages/valory/skills/twitter_scoring_abci/behaviours.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,11 +1029,16 @@ def async_act(self) -> Generator:
10291029
"Evaluation data is not valid: key not valid"
10301030
)
10311031
else:
1032-
points = 100 * (
1032+
# Tweet quality, relationship and engagement go from 1 to 3.
1033+
# When we add the three of them, the total value goes from 3 to 9.
1034+
# We want to scale that value up so it goes from 1 to 10.
1035+
# (S - 3) / (9 - 3) = (X - 1) / (10 - 1) -> X = (3S - 7) / 2
1036+
S = (
10331037
TWEET_QUALITY_TO_POINTS[quality]
10341038
+ TWEET_RELATIONSHIP_TO_POINTS[relationship]
10351039
+ engagement
10361040
)
1041+
points = 1.5 * S - 3.5
10371042
except Exception as e:
10381043
self.context.logger.error(
10391044
f"Evaluation data is not valid: exception {e}"

packages/valory/skills/twitter_scoring_abci/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
107107
)
108108
self.staking_contract_addresses = kwargs.get("staking_contract_addresses", [])
109109
self.contributors_contract_address = kwargs.get("contributors_contract_address")
110+
self.safe_contract_address_gnosis = kwargs.get("safe_contract_address_gnosis")
110111
super().__init__(*args, **kwargs)
111112

112113

packages/valory/skills/twitter_scoring_abci/rounds.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,11 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]:
537537
get_name(
538538
SynchronizedData.performed_twitter_tasks
539539
): performed_twitter_tasks,
540+
# Overwrite safe address with the gnosis one before
541+
# a mech request
542+
get_name(
543+
SynchronizedData.safe_contract_address
544+
): self.context.params.safe_contract_address_gnosis,
540545
},
541546
)
542547
return synchronized_data, Event.DONE

0 commit comments

Comments
 (0)