Fix/perform work #105

Karrenbelt · 2022-09-02T12:51:13Z

perform work round / behaviour. Still need to revisit performatives, #98 , which is up next.

Karrenbelt · 2022-09-02T12:52:23Z

packages/keep3r_co/skills/keep3r_job/behaviours.py

+    def build_safe_raw_tx(
+        self,
+        tx_params: Dict[str, Any],
+    ) -> Generator[None, None, Optional[str]]:
+        """Build safe raw tx hash"""


still need to finish the bonding / activation and work transaction preparation. This is related to performatives and will also affect the tests, so next PR

Karrenbelt · 2022-09-02T12:53:27Z

packages/keep3r_co/skills/keep3r_job/behaviours.py

+
+            address = self.synchronized_data.safe_contract_address
+            contract_api_response = yield from self.get_contract_api_response(
+                performative=ContractApiMessage.Performative.GET_STATE,  # type: ignore


e.g. this should be GET_RAW_TRANSACTION, but it affects all transaction producing behaviours hence addressing separately

Karrenbelt · 2022-09-02T12:56:22Z

packages/keep3r_co/skills/keep3r_job/rounds.py

-    def process_payload(self, payload: BaseTxPayload) -> None:
-        """Process payload."""
-        raise NotImplementedError
+        _ = (Event.INSUFFICIENT_FUNDS,)


actually unnecessary I think, can be caught via error performative

we can prepare tx and submit to tx settlement, which will handle insufficient funds

agent-academy-2/packages/valory/skills/transaction_settlement_abci/behaviours.py

Lines 215 to 216 in 89ba928

if rpc_status == RPCResponseStatus.INSUFFICIENT_FUNDS:

# blacklist self.

Adamantios · 2022-09-02T13:11:21Z

packages/keep3r_co/skills/keep3r_job/behaviours.py

+    def build_safe_raw_tx(
+        self,
+        tx_params: Dict[str, Any],
+    ) -> Generator[None, None, Optional[str]]:


Do you think it is worth opening an issue on open-autonomy to extract a skill for this since it is also being done in the price estimation skill?

Perhaps, I don't understand it well enough. Why not as part of the tx settlement skill?

Karrenbelt · 2022-09-02T22:52:48Z

packages/keep3r_co/skills/keep3r_job/behaviours.py

-    def _get_raw_work_transaction_hash(self) -> Generator[None, None, Optional[str]]:
-
-        job_contract_api_response = yield from self.get_contract_api_response(
-            performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,  # type: ignore
-            contract_id=str(Keep3rTestJobContract.contract_id),
-            contract_callable="work",
-            contract_address=self.synchronized_data.current_job,
-            sender_address=self.context.agent_address,
-        )
-
-        if (
-            job_contract_api_response.performative
-            != ContractApiMessage.Performative.RAW_TRANSACTION
-        ):  # pragma: nocover
-            self.context.logger.warning("get raw work transaction unsuccessful!")
-            return None
-
-        tx_params = job_contract_api_response.raw_transaction.body
-        safe_contract_address = self.synchronized_data.safe_contract_address
-
-        safe_contract_api_msg = yield from self.get_contract_api_response(
-            performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,  # type: ignore
-            contract_address=safe_contract_address,
-            contract_id=str(GnosisSafeContract.contract_id),
-            contract_callable="get_raw_safe_transaction_hash",
-            to_address=tx_params["to_address"],
-            value=tx_params["ether_value"],
-            data=tx_params["data"],
-            safe_tx_gas=tx_params["safe_tx_gas"],
-        )
-        if (
-            safe_contract_api_msg.performative
-            != ContractApiMessage.Performative.RAW_TRANSACTION
-        ):  # pragma: nocover
-            self.context.logger.warning("Get work transaction hash unsuccessful!")
-            return None
-        tx_hash = cast(str, job_contract_api_response.raw_transaction.body.pop("hash"))
-
-        return tx_hash


moved here

agent-academy-2/packages/keep3r_co/skills/keep3r_job/behaviours.py

Lines 201 to 247 in 911bcec

def build_work_raw_tx(

self, job_address: str, address: str

) -> Generator[None, None, Optional[RawTx]]:

"""Build raw work transaction for a job contract"""

contract_api_response = yield from self.get_contract_api_response(

performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,

contract_id=str(Keep3rTestJobContract.contract_id),

contract_callable="build_work_tx",

contract_address=job_address,

address=address,

)

if (

contract_api_response.performative

!= ContractApiMessage.Performative.RAW_TRANSACTION

):

self.context.logger.error(

f"Failed build_work_raw_tx: {contract_api_response}"

)

return None

log_msg = f"`build_work_tx` contract api response on {contract_api_response}"

self.context.logger.info(f"{log_msg}: {contract_api_response}")

return cast(RawTx, contract_api_response.raw_transaction.body.get("data"))

def build_safe_raw_tx(

self,

tx_params: RawTx,

) -> Generator[None, None, Optional[str]]:

"""Build safe raw tx hash"""

contract_api_response = yield from self.get_contract_api_response(

performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,

contract_address=self.synchronized_data.safe_contract_address,

contract_id=str(GnosisSafeContract.contract_id),

contract_callable="get_raw_safe_transaction_hash",

to_address=tx_params["to"],

value=tx_params["value"],

data=tx_params["data"],

safe_tx_gas=tx_params["gas"],

)

if (

contract_api_response.performative

!= ContractApiMessage.Performative.RAW_TRANSACTION

):

self.context.logger.warning("build_safe_raw_tx unsuccessful!")

return None

return cast(str, contract_api_response.raw_transaction.body.pop("tx_hash"))

DavidMinarsch · 2022-09-04T12:08:46Z

packages/keep3r_co/skills/keep3r_job/behaviours.py

@@ -129,6 +129,31 @@ def has_sufficient_funds(self, address: str) -> Generator[None, None, bool]:
        self.context.logger.info(f"balance: {balance / 10 ** 18} ETH")
        return balance >= cast(int, self.context.params.insufficient_funds_threshold)

+    def build_safe_raw_tx(


I don't see this being called anywhere in async_act...

7bc5e3f

diff

agent-academy-2/packages/keep3r_co/skills/keep3r_job/behaviours.py

Line 323 in 7bc5e3f

bonding_tx = yield from self.build_safe_raw_tx(cast(RawTx, raw_tx))

diff

agent-academy-2/packages/keep3r_co/skills/keep3r_job/behaviours.py

Line 385 in 7bc5e3f

activation_tx = yield from self.build_safe_raw_tx(raw_tx)

diff

agent-academy-2/packages/keep3r_co/skills/keep3r_job/behaviours.py

Line 522 in 7bc5e3f

work_tx = yield from self.build_safe_raw_tx(raw_tx)

Tests/performatives

Fix performatives

Karrenbelt added 6 commits September 2, 2022 13:32

fix: perform_work behaviour

2c15aab

tests: perform_work behaviour

461c55f

fix: perform_work round

a0d35e8

tests: perform_work round

b5d2c77

refactor: build_safe_raw_tx

04b8f86

chore: linters

b6b31d0

Karrenbelt commented Sep 2, 2022

View reviewed changes

Adamantios reviewed Sep 2, 2022

View reviewed changes

Karrenbelt added 20 commits September 2, 2022 15:13

refactor: helper for keep3r v1 contract call

bc0351a

feat: build_keep3r_raw_tx

57276c3

chore: RawTx type annotation

e31b415

refactor: is_workable_job

95cf0bf

fix: Optional return has_bonded

f99e4c5

feat: get_bond_time helper

0045fe8

fix: Optional return in PathSelectionBehaviour

c729daf

fix: build_safe_raw_tx in BondingBehaviour

280d033

fix: build_safe_raw_tx in ActivationBehaviour

0c02d6a

fix: Optional return in IsProfitableBehaviour

403811e

feat: build_work_raw_tx helper

be72e1b

fix: Optional return in PerformWorkBehaviour

6349a8b

fix: Optional return in GetJobsBehaviour

e923d43

fix: keys build_safe_raw_tx

f453294

chore: linters

911bcec

tests: mock_keep3r_v1_raw_tx

40a4b51

tests: mock_build_work_tx_call

51f4684

tests: raw_tx - DUMMY_RAW_TX

6a2bfa6

tests: mock_build_safe_raw_tx

586e0df

refactor: test method naming

7760ddc

Karrenbelt commented Sep 2, 2022

View reviewed changes

DavidMinarsch reviewed Sep 4, 2022

View reviewed changes

DavidMinarsch added 2 commits September 4, 2022 14:16

Merge pull request #107 from valory-xyz/tests/performatives

24c6503

Tests/performatives

Merge pull request #106 from valory-xyz/fix/performatives

7bc5e3f

Fix performatives

DavidMinarsch merged commit 900dddf into feat/await_top_up Sep 5, 2022

DavidMinarsch deleted the fix/perform_work branch September 5, 2022 12:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/perform work #105

Fix/perform work #105

Karrenbelt commented Sep 2, 2022

Karrenbelt Sep 2, 2022

Karrenbelt Sep 2, 2022

Karrenbelt Sep 2, 2022

Karrenbelt Sep 2, 2022

Karrenbelt Sep 2, 2022

Karrenbelt Sep 2, 2022

Adamantios Sep 2, 2022

Karrenbelt Sep 2, 2022

Karrenbelt Sep 2, 2022

DavidMinarsch Sep 4, 2022

Karrenbelt Sep 5, 2022

	if rpc_status == RPCResponseStatus.INSUFFICIENT_FUNDS:
	# blacklist self.

	def build_work_raw_tx(
	self, job_address: str, address: str
	) -> Generator[None, None, Optional[RawTx]]:
	"""Build raw work transaction for a job contract"""

	contract_api_response = yield from self.get_contract_api_response(
	performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
	contract_id=str(Keep3rTestJobContract.contract_id),
	contract_callable="build_work_tx",
	contract_address=job_address,
	address=address,
	)
	if (
	contract_api_response.performative
	!= ContractApiMessage.Performative.RAW_TRANSACTION
	):
	self.context.logger.error(
	f"Failed build_work_raw_tx: {contract_api_response}"
	)
	return None
	log_msg = f"`build_work_tx` contract api response on {contract_api_response}"
	self.context.logger.info(f"{log_msg}: {contract_api_response}")
	return cast(RawTx, contract_api_response.raw_transaction.body.get("data"))

	def build_safe_raw_tx(
	self,
	tx_params: RawTx,
	) -> Generator[None, None, Optional[str]]:
	"""Build safe raw tx hash"""

	contract_api_response = yield from self.get_contract_api_response(
	performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
	contract_address=self.synchronized_data.safe_contract_address,
	contract_id=str(GnosisSafeContract.contract_id),
	contract_callable="get_raw_safe_transaction_hash",
	to_address=tx_params["to"],
	value=tx_params["value"],
	data=tx_params["data"],
	safe_tx_gas=tx_params["gas"],
	)
	if (
	contract_api_response.performative
	!= ContractApiMessage.Performative.RAW_TRANSACTION
	):
	self.context.logger.warning("build_safe_raw_tx unsuccessful!")
	return None
	return cast(str, contract_api_response.raw_transaction.body.pop("tx_hash"))

Fix/perform work #105

Fix/perform work #105

Conversation

Karrenbelt commented Sep 2, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment