Merge pull request #37 from janfabian/feat/two-height-bidtx

feat(two-height-bidtx): send the bid tx for height+1 and +2
skip-mev · Nov 24, 2023 · 1d40c25 · 1d40c25
2 parents 06fcf15 + 55a2f64
commit 1d40c25
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 52 deletions.
diff --git a/skipper-py/src/bot.py b/skipper-py/src/bot.py
@@ -190,19 +190,24 @@ async def run(self):
             # Iterate through each profitable opportunities
             for (transaction, contracts_copy) in transactions_with_contracts:
                 # Build the most profitable bundle from 
-                bidTx: Tx = self.build_most_profitable_bundle(
+                bidTxs: list[Tx] = self.build_most_profitable_bundle(
                                                 transaction=transaction,
                                                 contracts=contracts_copy
                                                 )
                 # If there is a profitable bundle, fire away!
                 end = time.time()
                 logging.info(f"Time from seeing {tx_hash} in mempool and building bundle if exists: {end - start}")
-                if bidTx is not None:
+                if bidTxs is not None:
                     # We only broadcast the bid transaction to the chain
                     # the bid transaction includes the bundle of transactions
                     # that will be executed if the bid is successful
-                    tx = self.client.broadcast_tx(tx=bidTx).wait_to_complete()
-                    logging.info(f"Broadcasted bid transaction {tx.tx_hash}")
+                    for bidTx in bidTxs:
+                        try:
+                            tx = self.client.broadcast_tx(tx=bidTx)
+                            logging.info(f"Broadcasted bid transaction {tx.tx_hash}")
+                        except Exception as e:
+                            logging.error(e)
+
 
 
     def build_most_profitable_bundle(self,
@@ -242,62 +247,65 @@ def build_most_profitable_bundle(self,
         logging.info(f"Profit: {highest_profit_route.profit}")
         logging.info(f"Bid: {bid}")
         logging.info(f"Tx Hash: {sha256(b64decode(transaction.tx_str)).hexdigest()}")
-
-        bundle = [
-            transaction.tx_bytes, 
-            self.executor.build_backrun_tx(
-                wallet=self.wallet,
-                client=self.client,
-                account_balance=self.account_balance,
-                fee_denom=self.fee_denom,
-                fee=self.fee,
-                gas_limit=self.gas_limit,
-                route=highest_profit_route,
-                chain_id=self.chain_id,
-                bid=bid
-            ),
-        ]
 
-        # Create the bid transacation that will be sent to the on-chain auction
-        bidTx = Tx()
         address = str(self.wallet.address())
-
-        # Create the bid message
-        msg = MsgAuctionBid(
-            bidder=address,
-            bid=Coin(amount=str(bid), 
-                                denom="ujuno"),
-            transactions=bundle,
-        )
-        bidTx.add_message(msg)
-
-        # Sign the bid transaction
         try:
             account = self.client.query_account(address=address)
         except RuntimeError as e:
             logging.error(e)
             return None
 
+        def build_tx(timeout_height: int):
+            bundle = [
+                transaction.tx_bytes, 
+                self.executor.build_backrun_tx(
+                    wallet=self.wallet,
+                    client=self.client,
+                    account_balance=self.account_balance,
+                    fee_denom=self.fee_denom,
+                    fee=self.fee,
+                    gas_limit=self.gas_limit,
+                    route=highest_profit_route,
+                    chain_id=self.chain_id,
+                    bid=bid,
+                    timeout_height=timeout_height
+                ),
+            ]
+
+            # Create the bid transacation that will be sent to the on-chain auction
+            bidTx = Tx()
+
+            # Create the bid message
+            msg = MsgAuctionBid(
+                bidder=address,
+                bid=Coin(amount=str(bid), 
+                                    denom="ujuno"),
+                transactions=bundle,
+            )
+            bidTx.add_message(msg)
+
+            bidTx.seal(
+                signing_cfgs=[SigningCfg.direct(self.wallet.public_key(), account.sequence)],
+                fee=self.fee, 
+                gas_limit=self.gas_limit,
+                timeout_height=timeout_height
+            )
+
+            bidTx.sign(
+                self.wallet.signer(), 
+                self.chain_id, 
+                account.number
+            )
+
+            bidTx.complete()
+
+            return bidTx;
+
         try:
             height = self.querier.query_block_height()
         except Exception as e:
             logging.error(e)
             return None
-
-        bidTx.seal(
-            signing_cfgs=[SigningCfg.direct(self.wallet.public_key(), account.sequence)],
-            fee=self.fee, 
-            gas_limit=self.gas_limit,
-            timeout_height=height+2
-        )
-
-        bidTx.sign(
-            self.wallet.signer(), 
-            self.chain_id, 
-            account.number
-        )
-
-        bidTx.complete()
 
-        return bidTx
+        return [build_tx(height + 1), build_tx(height + 2)]
 
diff --git a/skipper-py/src/executor/executor.py b/skipper-py/src/executor/executor.py
@@ -19,5 +19,6 @@ def build_backrun_tx(self,
                          gas_limit: int,
                          route: Route, 
                          bid: int,
-                         chain_id: str) -> bytes:
+                         chain_id: str,
+                         timeout_height: int) -> bytes:
         """"""
diff --git a/skipper-py/src/executor/executors/cw_multi_message.py b/skipper-py/src/executor/executors/cw_multi_message.py
@@ -3,7 +3,8 @@
 
 from cosmpy.aerial.wallet import LocalWallet
 from cosmpy.aerial.client import LedgerClient
-from cosmpy.aerial.tx import Transaction as Tx, SigningCfg
+from cosmpy.aerial.tx import SigningCfg
+from skip_utility.tx import TransactionWithTimeout as Tx
 from cosmpy.protos.cosmos.bank.v1beta1.tx_pb2 import MsgSend
 from cosmpy.protos.cosmos.base.v1beta1.coin_pb2 import Coin
 
@@ -23,7 +24,8 @@ def build_backrun_tx(self,
                          gas_limit: int,
                          route: Route, 
                          chain_id: str,
-                         bid: int) -> bytes:
+                         bid: int,
+                         timeout_height: int) -> bytes:
         """ Build backrun transaction for route"""
         tx = Tx()
         msgs = []
@@ -59,7 +61,8 @@ def build_backrun_tx(self,
                     wallet.public_key(), 
                     account.sequence+1)], # Sign with sequence + 1 since this is our backrun tx
             fee=fee, 
-            gas_limit=gas_limit
+            gas_limit=gas_limit,
+            timeout_height=timeout_height
             )
         tx.sign(
             wallet.signer(),