diff --git a/.gitignore b/.gitignore index 3398280..3b47016 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ **/__pycache__/** .nix-venv .env +.env* .hypothesis/ .coverage .pytest_cache diff --git a/packages/lstolas/agents/lst_agent/aea-config.yaml b/packages/lstolas/agents/lst_agent/aea-config.yaml index e806957..3069936 100644 --- a/packages/lstolas/agents/lst_agent/aea-config.yaml +++ b/packages/lstolas/agents/lst_agent/aea-config.yaml @@ -24,7 +24,7 @@ protocols: - open_aea/signing:1.0.0:bafybeig2d36zxy65vd7fwhs7scotuktydcarm74aprmrb5nioiymr3yixm skills: - eightballer/prometheus:0.1.0:bafybeicl5i7e467aowfarke4bbyixo2dggar276njmvyuwbsby5pxshhtu -- lstolas/lst_skill:0.1.0:bafybeigpmounpcjgk2lppmtri56foqjwkr2xewnff6ssz3awqnecptgzdi +- lstolas/lst_skill:0.1.0:bafybeihfca72nbmpn27wkhgg3q3fdjz3w3cr4byk6m2vyv6dfzebi5hflq customs: [] default_ledger: ethereum required_ledgers: diff --git a/packages/lstolas/agents/lst_agent_prod/aea-config.yaml b/packages/lstolas/agents/lst_agent_prod/aea-config.yaml index a69402f..22a5b7e 100644 --- a/packages/lstolas/agents/lst_agent_prod/aea-config.yaml +++ b/packages/lstolas/agents/lst_agent_prod/aea-config.yaml @@ -24,7 +24,7 @@ protocols: - open_aea/signing:1.0.0:bafybeig2d36zxy65vd7fwhs7scotuktydcarm74aprmrb5nioiymr3yixm skills: - eightballer/prometheus:0.1.0:bafybeicl5i7e467aowfarke4bbyixo2dggar276njmvyuwbsby5pxshhtu -- lstolas/lst_skill:0.1.0:bafybeigpmounpcjgk2lppmtri56foqjwkr2xewnff6ssz3awqnecptgzdi +- lstolas/lst_skill:0.1.0:bafybeihfca72nbmpn27wkhgg3q3fdjz3w3cr4byk6m2vyv6dfzebi5hflq customs: [] default_ledger: ethereum required_ledgers: @@ -99,10 +99,10 @@ models: args: l1_starting_block: 23648061 l2_starting_block: 42790245 - layer_1_rpc_endpoint: https://0xrpc.io/eth + layer_1_rpc_endpoint: ${LAYER_1_RPC:str:https://0xrpc.io/eth} layer_1_amb_home: '0x4C36d2919e407f0Cc2Ee3c993ccF8ac26d9CE64e' layer_1_olas_address: '0x0001A500A6B18995B03f44bb040A5fFc28E45CB0' - layer_2_rpc_endpoint: https://gnosis.oat.farm + layer_2_rpc_endpoint: ${LAYER_2_RPC:str:https://gnosis.oat.farm} layer_2_amb_home: '0x75Df5AF045d91108662D8080fD1FEFAd6aA0bb59' layer_2_amb_helper: '0x7d94ece17e81355326e3359115D4B02411825EdD' lst_collector_address: '0x64003846B67D66AfdFb03325fa4292b76FCF182F' diff --git a/packages/lstolas/skills/lst_skill/behaviours_classes/redeem_round.py b/packages/lstolas/skills/lst_skill/behaviours_classes/redeem_round.py index 9226d88..d66d69f 100644 --- a/packages/lstolas/skills/lst_skill/behaviours_classes/redeem_round.py +++ b/packages/lstolas/skills/lst_skill/behaviours_classes/redeem_round.py @@ -101,15 +101,6 @@ def is_triggered(self) -> bool: oldest_blocks: list[int] = [self.strategy.layer_2_api.api.eth.block_number] for event in potential_events_to_process: - self.send_notification_to_user( - title="Redeem request detected", - msg=dedent(f""" - Detected a redeem request with batch hash {event.batch_hash}. Attempting to process it. - Chain ID: {self.strategy.layer_2_api.api.eth.chain_id} - Contract Address: {self.strategy.lst_staking_processor_l2_address} - Block Number: {event.block_number} - """), - ) self.context.logger.info(f"Checking on event: {event}") queued_hash = ( @@ -149,6 +140,15 @@ def is_triggered(self) -> bool: ) if will_txn_be_sent: + self.send_notification_to_user( + title="Redeem request detected", + msg=dedent(f""" + Detected a redeem request with batch hash {event.batch_hash}. Attempting to process it. + Chain ID: {self.strategy.layer_2_api.api.eth.chain_id} + Contract Address: {self.strategy.lst_staking_processor_l2_address} + Block Number: {event.block_number} + """), + ) self.events_to_process.append(event) self.log.info( f"Request with batch hash {event.batch_hash} is state: {request_status} and will be sent." diff --git a/packages/lstolas/skills/lst_skill/skill.yaml b/packages/lstolas/skills/lst_skill/skill.yaml index 95ef65e..dc476a7 100644 --- a/packages/lstolas/skills/lst_skill/skill.yaml +++ b/packages/lstolas/skills/lst_skill/skill.yaml @@ -18,7 +18,7 @@ fingerprint: behaviours_classes/claim_reward_tokens_round.py: bafybeia7d26votggvlw36wtp623unczgdmlwojqhkj4t62aeqdxrij6h64 behaviours_classes/error_rounds.py: bafybeihtghxlbb5k6s4egdibglto7h43xk3fz7vclhrizncq5vkwzlsqu4 behaviours_classes/finalize_bridged_tokens_round.py: bafybeifnxckqnez2apllpwlxj6rvrfat732xhorhqle3aut6wl2dr7ekxu - behaviours_classes/redeem_round.py: bafybeidn2dndogpohxjvlsxzyq5owgkb3tob2eqkzu2b6jcf6dncvgdobe + behaviours_classes/redeem_round.py: bafybeiansmwfn7y5gh7kh55brskmh7gpbwevebrelhxooovmrpndm5yagq behaviours_classes/starting_round.py: bafybeift5drjrtwcbssumcpfm2eczus6z6si4gppokvymhbqkfsajmhun4 behaviours_classes/trigger_l2_to_l1_bridge.py: bafybeiac6nikhnpyveenvtzdzwxqxe5ivtayxlz5enmpcfvtsmtnnpvbwm behaviours_classes/waiting_round.py: bafybeiekbnjih5txvpxi75itpjfv7nr65bf7kbgd2f4tdvanbjsewdp2ma diff --git a/packages/packages.json b/packages/packages.json index 2514dab..aff9d22 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -11,9 +11,9 @@ "contract/eightballer/amb_gnosis_helper/0.1.0": "bafybeig37p3q4se2it75kt4zvqvrvzk4fqc7eyspspt3txooxxljkurkey", "contract/eightballer/erc_20/0.1.0": "bafybeig622mhgil3uq34d4l3r6moxisgvxwxtrosds2x7glx3kg5z4yqzq", "contract/lstolas/lst_staking_token_locked/0.1.0": "bafybeidw4povdmyzpszkzgnw6iv3w4gnbzboqq5dolxegjptcadv26lgyy", - "skill/lstolas/lst_skill/0.1.0": "bafybeigpmounpcjgk2lppmtri56foqjwkr2xewnff6ssz3awqnecptgzdi", - "agent/lstolas/lst_agent/0.1.0": "bafybeigs56tnzbw66pnqgxbsju2s2opwlf5akdf3fageesbt6a65msyqwe", - "agent/lstolas/lst_agent_prod/0.1.0": "bafybeiekrzmcu2jgnw5p4yse4bokb6ihxjswhficxwox56mv7rphfqawxy" + "skill/lstolas/lst_skill/0.1.0": "bafybeihfca72nbmpn27wkhgg3q3fdjz3w3cr4byk6m2vyv6dfzebi5hflq", + "agent/lstolas/lst_agent/0.1.0": "bafybeicuxgbuoectjyloy44nlgxhnxtlscsgrhf4fo5ntyzpoesl3u3lh4", + "agent/lstolas/lst_agent_prod/0.1.0": "bafybeicisavghmxycsljnifw4tx76hjizoy4d2jff3dmxilrsvondu6zqq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeig2d36zxy65vd7fwhs7scotuktydcarm74aprmrb5nioiymr3yixm",