Merge branch 'main' into solana/fix-proposals

Author: a5-pickle

solana/ts/src/matchingEngine/index.ts

@@ -980,7 +980,7 @@ export class MatchingEngineProgram {
     }) {
         const {
             payer,
-            preparedOrderResponse,
+            preparedOrderResponse: inputPreparedOrderResponse,
             auction,
             fastVaa,
             executorToken,
@@ -992,6 +992,10 @@ export class MatchingEngineProgram {
         const mint = this.mint;
         const auctionAddress = auction ?? this.auctionAddress(fastVaaAccount.digest());
 
+        const preparedOrderResponse =
+            inputPreparedOrderResponse ??
+            this.preparedOrderResponseAddress(payer, fastVaaAccount.digest());
+
         const { auctionConfig, bestOfferToken } = await (async () => {
             if (inputAuctionConfig === undefined || inputBestOfferToken === undefined) {
                 const { info } = await this.fetchAuction({ address: auctionAddress });
@@ -1084,7 +1088,7 @@ export class MatchingEngineProgram {
             payer,
             auction: inputAuction,
             executorToken,
-            preparedOrderResponse,
+            preparedOrderResponse: inputPreparedOrderResponse,
             fastVaa,
             fastVaaAccount,
             auctionConfig: inputAuctionConfig,
@@ -1095,6 +1099,10 @@ export class MatchingEngineProgram {
 
         const mint = this.mint;
 
+        const preparedOrderResponse =
+            inputPreparedOrderResponse ??
+            this.preparedOrderResponseAddress(payer, fastVaaAccount.digest());
+
         const { auctionConfig, bestOfferToken } = await (async () => {
             if (inputAuctionConfig === undefined || inputBestOfferToken === undefined) {
                 const { info } = await this.fetchAuction({ address: auctionAddress });
@@ -1199,10 +1207,20 @@ export class MatchingEngineProgram {
         auction?: PublicKey;
         fastVaa: PublicKey;
     }) {
-        const { payer, preparedOrderResponse, auction, fastVaa } = accounts;
+        const {
+            payer,
+            preparedOrderResponse: inputPreparedOrderResponse,
+            auction,
+            fastVaa,
+        } = accounts;
         const fastVaaAccount = await VaaAccount.fetch(this.program.provider.connection, fastVaa);
 
         const mint = this.mint;
+
+        const preparedOrderResponse =
+            inputPreparedOrderResponse ??
+            this.preparedOrderResponseAddress(payer, fastVaaAccount.digest());
+
         const { targetChain, toRouterEndpoint } = await (async () => {
             const message = LiquidityLayerMessage.decode(fastVaaAccount.payload());
             if (message.fastMarketOrder == undefined) {

solana/ts/tests/01__matchingEngine.ts

@@ -3063,7 +3063,7 @@ describe("Matching Engine", function () {
 
             describe("Active Auction", function () {
                 it("Cannot Settle Executed Auction", async function () {
-                    const { auction, fastVaa, fastVaaAccount, prepareIx, preparedOrderResponse } =
+                    const { auction, fastVaa, fastVaaAccount, prepareIx } =
                         await prepareOrderResponse({
                             executeOrder: true,
                             initAuction: true,
@@ -3091,7 +3091,6 @@ describe("Matching Engine", function () {
                             payer: payer.publicKey,
                             fastVaa,
                             fastVaaAccount,
-                            preparedOrderResponse,
                             executorToken: liquidatorToken,
                             auction,
                             encodedCctpMessage,
@@ -3117,7 +3116,7 @@ describe("Matching Engine", function () {
                 });
 
                 it("Settle", async function () {
-                    const { auction, fastVaa, fastVaaAccount, prepareIx, preparedOrderResponse } =
+                    const { auction, fastVaa, fastVaaAccount, prepareIx } =
                         await prepareOrderResponse({
                             executeOrder: false,
                             initAuction: true,
@@ -3144,7 +3143,6 @@ describe("Matching Engine", function () {
                             payer: payer.publicKey,
                             fastVaa,
                             fastVaaAccount,
-                            preparedOrderResponse,
                             executorToken: liquidatorToken,
                             auction,
                             encodedCctpMessage,

solana/ts/tests/04__interaction.ts

@@ -289,15 +289,14 @@ describe("Matching Engine <> Token Router", function () {
         describe("Settle Auction", function () {
             describe("Settle No Auction (Local)", function () {
                 it("Settle", async function () {
-                    const { prepareIx, preparedOrderResponse, auction, fastVaa, finalizedVaa } =
+                    const { prepareIx, auction, fastVaa, finalizedVaa } =
                         await prepareOrderResponse({
                             initAuction: false,
                             executeOrder: false,
                             prepareOrderResponse: false,
                         });
                     const settleIx = await matchingEngine.settleAuctionNoneLocalIx({
                         payer: payer.publicKey,
-                        preparedOrderResponse,
                         fastVaa,
                         auction,
                     });
@@ -316,12 +315,11 @@ describe("Matching Engine <> Token Router", function () {
 
             describe("Settle Active Auction (Local)", function () {
                 it("Settle", async function () {
-                    const { prepareIx, preparedOrderResponse, auction, fastVaa } =
-                        await prepareOrderResponse({
-                            initAuction: true,
-                            executeOrder: false,
-                            prepareOrderResponse: false,
-                        });
+                    const { prepareIx, auction, fastVaa } = await prepareOrderResponse({
+                        initAuction: true,
+                        executeOrder: false,
+                        prepareOrderResponse: false,
+                    });
 
                     const { address: executorToken } =
                         await splToken.getOrCreateAssociatedTokenAccount(
@@ -333,7 +331,6 @@ describe("Matching Engine <> Token Router", function () {
 
                     const settleIx = await matchingEngine.settleAuctionActiveLocalIx({
                         payer: payer.publicKey,
-                        preparedOrderResponse,
                         fastVaa,
                         auction,
                         executorToken,