Feat/sell #350

annasambrook · 2024-11-13T10:12:55Z

No description provided.

# Conflicts: # packages/packages.json # packages/valory/agents/trader/aea-config.yaml # packages/valory/services/trader/service.yaml # packages/valory/services/trader_pearl/service.yaml # packages/valory/skills/decision_maker_abci/skill.yaml # packages/valory/skills/trader_abci/skill.yaml # packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

packages/valory/contracts/market_maker/contract.py

packages/valory/skills/decision_maker_abci/states/sell_outcome_token.py

packages/valory/skills/decision_maker_abci/models.py

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

Adamantios · 2024-11-13T14:30:27Z

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

+        # TODO: not sure this is the correct use of remove_fraction_wei, is sell amount in wxDAI?
+        self.sell_amount = remove_fraction_wei(sell_amount, self.params.slippage)


Yes, the sell amount should be in WEI, though I do not think we should subtract the slippage from it.

…reachability' into feat/sell # Conflicts: # packages/packages.json # packages/valory/agents/trader/aea-config.yaml # packages/valory/services/trader/service.yaml # packages/valory/services/trader_pearl/service.yaml # packages/valory/skills/decision_maker_abci/skill.yaml # packages/valory/skills/trader_abci/skill.yaml # packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

annasambrook · 2024-11-22T13:23:49Z

We need to wait for the staking-kpi-reachability pr is merged before merging this as it relies on changes made there.

# Conflicts: # packages/packages.json # packages/valory/agents/trader/aea-config.yaml # packages/valory/services/trader/service.yaml # packages/valory/services/trader_pearl/service.yaml # packages/valory/skills/decision_maker_abci/skill.yaml # packages/valory/skills/market_manager_abci/skill.yaml # packages/valory/skills/trader_abci/skill.yaml # packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

packages/valory/skills/decision_maker_abci/behaviours/base.py

packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py

Adamantios · 2024-12-05T14:44:24Z

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

+    def _build_sell_tx(self) -> WaitableConditionType:
+        """Get the sell tx data encoded."""
+        response_msg = yield from self.get_contract_api_response(
+            performative=ContractApiMessage.Performative.GET_STATE,  # type: ignore
+            contract_address=self.market_maker_contract_address,
+            contract_id=str(FixedProductMarketMakerContract.contract_id),
+            contract_callable="get_sell_data",
+            return_amount=self.return_amount,
+            outcome_index=self.outcome_index,
+            max_outcome_tokens_to_sell=self.sell_amount,
+        )
+        if response_msg.performative != ContractApiMessage.Performative.STATE:
+            self.context.logger.error(
+                f"Could not get the data for the buy transaction: {response_msg}"
+            )
+            return False
+
+        sell_data = response_msg.state.body.get("data", None)
+        if sell_data is None:
+            self.context.logger.error(
+                f"Something went wrong while trying to encode the buy data: {response_msg}"
+            )
+            return False
+
+        batch = MultisendBatch(
+            to=self.market_maker_contract_address,
+            data=HexBytes(sell_data),
+        )
+        self.multisend_batches.append(batch)
+        return True


Same as above.

Adamantios · 2024-12-05T14:46:20Z

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

+            # if the vote is the same as the previous vote then there is no change in the supported outcome, so we
+            # should not sell
+            if self.synchronized_data.vote == self.synchronized_data.previous_vote:
+                payload = MultisigTxPayload(
+                    agent, tx_submitter, betting_tx_hex, mocking_mode
+                )
+
+                yield from self.finish_behaviour(payload)


We will not need this check as it will be moved to the post tx settlement that comes after the bet placement round.

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

Adamantios · 2024-12-05T14:50:22Z

packages/valory/skills/decision_maker_abci/states/decision_receive.py

+        # update the previous vote before calling the super method
+        SynchronizedData.update(
+            previous_vote=SynchronizedData.vote
+        )


We will need to update this as we discussed.

# Conflicts: # packages/packages.json # packages/valory/agents/trader/aea-config.yaml # packages/valory/services/trader/service.yaml # packages/valory/services/trader_pearl/service.yaml # packages/valory/skills/decision_maker_abci/skill.yaml # packages/valory/skills/market_manager_abci/skill.yaml # packages/valory/skills/trader_abci/skill.yaml # packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

Reported error: > Issue: [B105:hardcoded_password_string] Possible hardcoded password: 'sell_outcome_token_done'

Do not allow merging on `main` from any branch other than `develop`. [no ci]

Update the bets so that we map all the investments per vote

# Conflicts: # packages/packages.json # packages/valory/agents/trader/aea-config.yaml # packages/valory/services/trader/service.yaml # packages/valory/services/trader_pearl/service.yaml # packages/valory/skills/decision_maker_abci/skill.yaml # packages/valory/skills/trader_abci/skill.yaml # packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

Adamantios · 2024-12-09T15:42:16Z

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

@@ -77,7 +77,7 @@ def _build_approval_tx(self) -> WaitableConditionType:
        status = yield from self.build_approval_tx(
            self.return_amount,
            self.market_maker_contract_address,
-            self.market_maker_contract_address,
+            self.sampled_bet.get_outcome(self.outcome_index),


This is a string, not a token address.

Adamantios · 2024-12-09T15:42:20Z

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py

+        if previous_vote == 0:
+            return self.sampled_bet.invested_amount_yes
+
+        else:
+            return self.sampled_bet.invested_amount_no


You cannot know if index 0 will always be "yes".

You could extract the following logic to a separate method and reuse it here:

trader/packages/valory/skills/market_manager_abci/bets.py

Lines 290 to 294 in a3aae14

if vote is None:

return False

vote_name = self.get_outcome(vote)

to_update = self.investments[vote_name]

…ement.py fix: replace approval tx with status Co-authored-by: Adamantios Zaras <[email protected]>

…ement.py Co-authored-by: Adamantios Zaras <[email protected]>

keshav1998 · 2024-12-10T13:53:47Z

packages/valory/skills/market_manager_abci/bets.py

    queue_status: QueueStatus = QueueStatus.FRESH
+    # a mapping from vote to investment amounts
+    investments: Dict[str, List[int]] = dataclasses.field(default_factory=dict)


Invesments will be treated as a dataclass when decoding is being done, a hook will have to be setup for this or will have to make investments as a data class

keshav1998 · 2024-12-10T13:55:36Z

packages/valory/skills/market_manager_abci/bets.py


    def __post_init__(self) -> None:
        """Post initialization to adjust the values."""
        self._validate()
        self._cast()
        self._check_usefulness()
+        self.investments = {self.yes: [], self.no: []}


Suggested change

self.investments = {self.yes: [], self.no: []}

if self.outcomes:

self.investments = {self.yes: [], self.no: []}

else:

self.investments = {}

keshav1998 · 2024-12-10T13:56:14Z

packages/valory/skills/market_manager_abci/bets.py

The decoder will have to updated to check for new missing arguments

annasambrook added 6 commits November 7, 2024 18:21

feat/add sell outcome token feature

d841608

fix error in reported message

501b33d

add return amount and sell outcome token round

65cb73a

chore: generators

b7e7a51

chore: generators

1284dfb

annasambrook requested a review from Adamantios November 13, 2024 10:31

Adamantios reviewed Nov 13, 2024

View reviewed changes

packages/valory/contracts/market_maker/contract.py Outdated Show resolved Hide resolved

Adamantios reviewed Nov 13, 2024

View reviewed changes

packages/valory/skills/decision_maker_abci/states/sell_outcome_token.py Outdated Show resolved Hide resolved

Adamantios reviewed Nov 13, 2024

View reviewed changes

packages/valory/skills/decision_maker_abci/models.py Outdated Show resolved Hide resolved

Adamantios reviewed Nov 13, 2024

View reviewed changes

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py Outdated Show resolved Hide resolved

Adamantios reviewed Nov 13, 2024

View reviewed changes

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py Outdated Show resolved Hide resolved

Adamantios reviewed Nov 13, 2024

View reviewed changes

packages/valory/skills/decision_maker_abci/behaviours/sell_outcome_token.py Outdated Show resolved Hide resolved

Adamantios reviewed Nov 13, 2024

View reviewed changes

annasambrook added 4 commits November 15, 2024 12:33

make requested changes

7cf0997

make suggested changes

104de4f

chore: generators

e35ce11

annasambrook added 4 commits November 22, 2024 13:28

fix: change copyright date

1711625

chore: generators

502897e

add: previous_vote and sell logic

445998e

Adamantios changed the base branch from main to hotfix/staking-kpi-reachability December 5, 2024 13:23

Adamantios requested changes Dec 5, 2024

View reviewed changes

annasambrook and others added 5 commits December 5, 2024 15:33

add: initial fsm changes to include sell outcome token round

fe78d74

chore: generators

3fd007f

fix: copyright date

5e0524c

chore: ignore bandit's false positive error

b65ba87

Reported error: > Issue: [B105:hardcoded_password_string] Possible hardcoded password: 'sell_outcome_token_done'

Adamantios and others added 14 commits December 6, 2024 20:38

chore: run generators

e9ba6ee

feat: update the bets so that we store investments per vote

a3aae14

chore: create an action to enforce a merge rule for main

89cd038

Do not allow merging on `main` from any branch other than `develop`. [no ci]

Merge pull request #367 from valory-xyz/feat/bets-structure

cf12051

Update the bets so that we map all the investments per vote

Merge remote-tracking branch 'origin/feat/sell' into feat/sell

3dc7f7e

fix: approval tx status

2709c8c

fix: build approval tx

f919d2e

fix: make return amount property

0a5fc2c

fix: build approval tx token

d0e3497

fix: remove is wxdai check

2f0afa2

chore: generators

87d1205

chore: generators

2e90b9e

chore: generators

cdfa138

Adamantios reviewed Dec 9, 2024

View reviewed changes

annasambrook and others added 2 commits December 9, 2024 15:46

Update packages/valory/skills/decision_maker_abci/behaviours/bet_plac…

d234b5e

…ement.py fix: replace approval tx with status Co-authored-by: Adamantios Zaras <[email protected]>

Update packages/valory/skills/decision_maker_abci/behaviours/bet_plac…

235881b

…ement.py Co-authored-by: Adamantios Zaras <[email protected]>

keshav1998 requested changes Dec 10, 2024

View reviewed changes

Adamantios force-pushed the hotfix/staking-kpi-reachability branch from 48d1f1e to b8190fc Compare December 11, 2024 16:29

Base automatically changed from hotfix/staking-kpi-reachability to develop December 16, 2024 10:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/sell #350

Feat/sell #350

annasambrook commented Nov 13, 2024

Adamantios Nov 13, 2024

annasambrook commented Nov 22, 2024

Adamantios Dec 5, 2024

Adamantios Dec 5, 2024

Adamantios Dec 5, 2024

Adamantios Dec 9, 2024

Adamantios Dec 9, 2024

keshav1998 Dec 10, 2024

keshav1998 Dec 10, 2024

keshav1998 Dec 10, 2024

		# TODO: not sure this is the correct use of remove_fraction_wei, is sell amount in wxDAI?
		self.sell_amount = remove_fraction_wei(sell_amount, self.params.slippage)

	if vote is None:
	return False

	vote_name = self.get_outcome(vote)
	to_update = self.investments[vote_name]

Feat/sell #350

Are you sure you want to change the base?

Feat/sell #350

Conversation

annasambrook commented Nov 13, 2024

Choose a reason for hiding this comment

annasambrook commented Nov 22, 2024

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