match tilt to new server svmbid format (#128)

Author: anihamde

auction-server/src/auction.rs

@@ -79,7 +79,7 @@ use {
         Deserializer,
         Serialize,
     },
-    solana_sdk::transaction::Transaction,
+    solana_sdk::transaction::VersionedTransaction,
     sqlx::types::time::OffsetDateTime,
     std::{
         result,
@@ -635,7 +635,7 @@ pub struct BidSvm {
     /// The transaction for bid.
     #[schema(example = "SGVsbG8sIFdvcmxkIQ==", value_type = String)]
     #[serde(with = "crate::serde::svm_transaction")]
-    pub transaction: Transaction,
+    pub transaction: VersionedTransaction,
 }
 
 #[derive(Serialize, ToSchema, Debug, Clone)]

auction-server/src/serde.rs

@@ -103,10 +103,10 @@ pub mod svm_transaction {
             Deserializer,
             Serializer,
         },
-        solana_sdk::transaction::Transaction,
+        solana_sdk::transaction::VersionedTransaction,
     };
 
-    pub fn serialize<S>(t: &Transaction, s: S) -> Result<S::Ok, S::Error>
+    pub fn serialize<S>(t: &VersionedTransaction, s: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
@@ -115,15 +115,15 @@ pub mod svm_transaction {
         s.serialize_str(base64_encoded.as_str())
     }
 
-    pub fn deserialize<'de, D>(d: D) -> Result<Transaction, D::Error>
+    pub fn deserialize<'de, D>(d: D) -> Result<VersionedTransaction, D::Error>
     where
         D: Deserializer<'de>,
     {
         let s: String = Deserialize::deserialize(d)?;
         let base64_decoded = STANDARD
             .decode(s)
             .map_err(|e| D::Error::custom(e.to_string()))?;
-        let transaction: Transaction =
+        let transaction: VersionedTransaction =
             bincode::deserialize(&base64_decoded).map_err(|e| D::Error::custom(e.to_string()))?;
         Ok(transaction)
     }

per_sdk/svm/dummy_tx.py

@@ -1,5 +1,6 @@
 import argparse
 import asyncio
+import base64
 import hashlib
 import logging
 import struct
@@ -8,11 +9,14 @@
 import httpx
 from solana.rpc.async_api import AsyncClient
 from solana.transaction import Transaction
+from solders.hash import Hash
 from solders.instruction import AccountMeta, Instruction
-from solders.message import Message
+from solders.message import MessageV0
+from solders.null_signer import NullSigner
 from solders.pubkey import Pubkey
 from solders.system_program import ID as system_pid
 from solders.sysvar import INSTRUCTIONS as sysvar_ixs_pid
+from solders.transaction import VersionedTransaction
 
 from per_sdk.svm.helpers import configure_logger, read_kp_from_json
 
@@ -73,6 +77,12 @@ def parse_args() -> argparse.Namespace:
         default=False,
         help="Submit the transaction directly on-chain instead of submitting to the server",
     )
+    parser.add_argument(
+        "--use-legacy-transaction-bid",
+        action="store_true",
+        default=False,
+        help="Use the legacy transaction message format instead of the versioned message format for the bid. Only applies if transaction is submitted as a bid (i.e. --submit-on-chain is not set)",
+    )
     return parser.parse_args()
 
 
@@ -138,27 +148,37 @@ async def main():
         ],
     )
 
-    tx = Transaction()
-    tx.add(ix_submit_bid)
-    tx.add(ix_dummy)
-
     if args.submit_on_chain:
         client = AsyncClient(args.rpc_url, "confirmed")
+        tx = Transaction(fee_payer=kp_searcher.pubkey())
+        tx.add(ix_submit_bid)
+        tx.add(ix_dummy)
         tx_sig = (
             await client.send_transaction(tx, kp_searcher, kp_relayer_signer)
         ).value
         conf = await client.confirm_transaction(tx_sig)
         assert conf.value[0].status is None, "Transaction failed"
         logger.info(f"Submitted transaction with signature {tx_sig}")
     else:
-        tx.sign_partial(kp_searcher)
-        message = bytes(Message([ix_submit_bid, ix_dummy], pk_searcher))
-        # TODO: impute one signature into the message
+        if args.use_legacy_transaction_bid:
+            tx = Transaction(fee_payer=kp_searcher.pubkey())
+            tx.add(ix_submit_bid)
+            tx.add(ix_dummy)
+            tx.sign_partial(kp_searcher)
+            serialized = base64.b64encode(
+                tx.serialize(verify_signatures=False)
+            ).decode()
+        else:
+            messagev0 = MessageV0.try_compile(
+                kp_searcher.pubkey(), [ix_submit_bid, ix_dummy], [], Hash.default()
+            )
+            signers = [kp_searcher, NullSigner(kp_relayer_signer.pubkey())]
+            partially_signed = VersionedTransaction(messagev0, signers)
+            serialized = base64.b64encode(bytes(partially_signed)).decode()
+
         bid_body = {
-            "permission_key": str(permission),
             "chain_id": "solana",
-            "amount": args.bid,
-            "transaction": message.hex(),
+            "transaction": serialized,
         }
         client = httpx.AsyncClient()
         resp = await client.post(