From 13b40739cf77633d899358f5b77d741d72c54eda Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 28 Feb 2024 12:47:27 -0500 Subject: [PATCH 1/4] Add ExecuteFastOrder test and negative test --- solana/ts/tests/04__interaction.ts | 114 +++++++++++++++++++++++++---- 1 file changed, 99 insertions(+), 15 deletions(-) diff --git a/solana/ts/tests/04__interaction.ts b/solana/ts/tests/04__interaction.ts index 2c7e442f..5e116c72 100644 --- a/solana/ts/tests/04__interaction.ts +++ b/solana/ts/tests/04__interaction.ts @@ -32,6 +32,7 @@ import { expectIxErr, expectIxOk, postLiquidityLayerVaa, + waitUntilSlot, } from "./helpers"; chaiUse(chaiAsPromised); @@ -157,20 +158,6 @@ describe("Matching Engine <> Token Router", function () { let wormholeSequence = 4000n; - const baseFastOrder: FastMarketOrder = { - amountIn: 50000000000n, - minAmountOut: 0n, - targetChain: wormholeSdk.CHAINS.solana, - redeemer: Array.from(Buffer.alloc(32, "deadbeef", "hex")), - sender: Array.from(Buffer.alloc(32, "beefdead", "hex")), - refundAddress: Array.from(Buffer.alloc(32, "beef", "hex")), - maxFee: 1000000n, - initAuctionFee: 100n, - deadline: 0, - redeemerMessage: Buffer.from("All your base are belong to us."), - }; - const sourceCctpDomain = 0; - describe("Settle Auction", function () { describe("Settle No Auction (Local)", function () { it("Settle", async function () { @@ -201,7 +188,7 @@ describe("Matching Engine <> Token Router", function () { describe("Settle Active Auction (Local)", function () { it("Settle", async function () { - const { prepareIx, preparedOrderResponse, auction, fastVaa, finalizedVaa } = + const { prepareIx, preparedOrderResponse, auction, fastVaa } = await prepareOrderResponse({ initAuction: true, executeOrder: false, @@ -255,6 +242,103 @@ describe("Matching Engine <> Token Router", function () { }); }); + describe("Execute Fast Order (Local)", function () { + it("Cannot Execute Fast Order (Auction Period Not Expired)", async function () { + const { auction: auctionAddress, fastVaa } = await prepareOrderResponse({ + initAuction: true, + executeOrder: false, + prepareOrderResponse: false, + }); + + const { address: executorToken } = await splToken.getOrCreateAssociatedTokenAccount( + connection, + payer, + USDC_MINT_ADDRESS, + liquidator.publicKey, + ); + + const settleIx = await matchingEngine.executeFastOrderLocalIx({ + payer: payer.publicKey, + fastVaa, + auction: auctionAddress, + executorToken, + }); + + const computeIx = ComputeBudgetProgram.setComputeUnitLimit({ + units: 250_000, + }); + + await expectIxErr( + connection, + [settleIx, computeIx], + [payer], + "Error Code: AuctionPeriodNotExpired", + ); + }); + it("Execute after Auction Period has Expired", async function () { + const { + prepareIx, + auction: auctionAddress, + fastVaa, + } = await prepareOrderResponse({ + initAuction: true, + executeOrder: false, + prepareOrderResponse: false, + }); + + const { address: executorToken } = await splToken.getOrCreateAssociatedTokenAccount( + connection, + payer, + USDC_MINT_ADDRESS, + liquidator.publicKey, + ); + + const auction = await matchingEngine.fetchAuction({ address: auctionAddress }); + const { duration, gracePeriod } = await matchingEngine.fetchAuctionParameters(); + + await waitUntilSlot( + connection, + auction.info!.startSlot.addn(duration + gracePeriod - 1).toNumber(), + ); + + const settleIx = await matchingEngine.executeFastOrderLocalIx({ + payer: payer.publicKey, + fastVaa, + auction: auctionAddress, + executorToken, + }); + + const { value: lookupTableAccount } = await connection.getAddressLookupTable( + lookupTableAddress, + ); + + const computeIx = ComputeBudgetProgram.setComputeUnitLimit({ + units: 400_000, + }); + await expectIxOk(connection, [prepareIx!, settleIx, computeIx], [payer], { + addressLookupTableAccounts: [lookupTableAccount!], + }); + }); + + before("Add Local Router Endpoint", async function () { + const ix = await matchingEngine.addLocalRouterEndpointIx({ + ownerOrAssistant: ownerAssistant.publicKey, + tokenRouterProgram: tokenRouter.ID, + }); + await expectIxOk(connection, [ix], [ownerAssistant]); + }); + + after("Remove Local Router Endpoint", async function () { + const ix = await matchingEngine.removeRouterEndpointIx( + { + ownerOrAssistant: ownerAssistant.publicKey, + }, + wormholeSdk.CHAIN_ID_SOLANA, + ); + await expectIxOk(connection, [ix], [ownerAssistant]); + }); + }); + describe("Redeem Fast Fill", function () { const payerToken = splToken.getAssociatedTokenAddressSync( USDC_MINT_ADDRESS, From b89f5d5bbc59ef2c9383097b91e95e2df6f2cc42 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 28 Feb 2024 14:07:54 -0500 Subject: [PATCH 2/4] Start implementing negative tests for market orders in TokenRouter --- solana/ts/tests/02__tokenRouter.ts | 48 +++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/solana/ts/tests/02__tokenRouter.ts b/solana/ts/tests/02__tokenRouter.ts index bce060ba..1caa1d2d 100644 --- a/solana/ts/tests/02__tokenRouter.ts +++ b/solana/ts/tests/02__tokenRouter.ts @@ -395,8 +395,35 @@ describe("Token Router", function () { // TODO }); - it.skip("Cannot Prepare Market Order without Delegating Authority to Custodian", async function () { - // TODO + it("Cannot Prepare Market Order without Delegating Authority to Custodian", async function () { + // TODO: This fails as expected, but we need to check for an error. + const orderSender = Keypair.generate(); + const preparedOrder = Keypair.generate(); + + const amountIn = 69n; + const minAmountOut = 0n; + const targetChain = foreignChain; + const redeemer = Array.from(Buffer.alloc(32, "deadbeef", "hex")); + const redeemerMessage = Buffer.from("All your base are belong to us"); + const ix = await tokenRouter.prepareMarketOrderIx( + { + payer: payer.publicKey, + orderSender: orderSender.publicKey, + preparedOrder: preparedOrder.publicKey, + srcToken: payerToken, + refundToken: payerToken, + }, + { + amountIn, + minAmountOut, + targetChain, + redeemer, + redeemerMessage, + }, + ); + + // Note: Passing an empty string somehow lets the assertion pass? + await expectIxErr(connection, [ix], [payer, orderSender, preparedOrder], ""); }); it("Prepare Market Order with Some Min Amount Out", async function () { @@ -665,8 +692,21 @@ describe("Token Router", function () { ); }); - it.skip("Cannot Place Market Order without Original Payer", async function () { - // TODO + it("Cannot Place Market Order without Original Payer", async function () { + const preparedOrder = localVariables.get("preparedOrder") as PublicKey; + + const newPayer = Keypair.generate(); + const ix = await tokenRouter.placeMarketOrderCctpIx({ + payer: newPayer.publicKey, + preparedOrder, + }); + + await expectIxErr( + connection, + [ix], + [newPayer], + "Err(failed to send transaction: Transaction signature verification failure)", + ); }); it("Cannot Place Market Order without Order Sender", async function () { From aed7a430e2962d9a3ed6b84a46c240b905d728c6 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 29 Feb 2024 13:52:51 -0500 Subject: [PATCH 3/4] More PrepareOrder tests; format changes --- solana/ts/tests/02__tokenRouter.ts | 189 ++++++++++++++++++++++------- 1 file changed, 148 insertions(+), 41 deletions(-) diff --git a/solana/ts/tests/02__tokenRouter.ts b/solana/ts/tests/02__tokenRouter.ts index 1caa1d2d..c1092c1a 100644 --- a/solana/ts/tests/02__tokenRouter.ts +++ b/solana/ts/tests/02__tokenRouter.ts @@ -387,16 +387,130 @@ describe("Token Router", function () { const localVariables = new Map(); - it.skip("Cannot Prepare Market Order with Insufficient Amount", async function () { - // TODO + it("Cannot Prepare Market Order with Insufficient Amount", async function () { + const orderSender = Keypair.generate(); + const preparedOrder = Keypair.generate(); + + const amountIn = 0n; + const minAmountOut = 0n; + const targetChain = foreignChain; + const redeemer = Array.from(Buffer.alloc(32, "deadbeef", "hex")); + const redeemerMessage = Buffer.from("All your base are belong to us"); + const ix = await tokenRouter.prepareMarketOrderIx( + { + payer: payer.publicKey, + orderSender: orderSender.publicKey, + preparedOrder: preparedOrder.publicKey, + srcToken: payerToken, + refundToken: payerToken, + }, + { + amountIn, + minAmountOut, + targetChain, + redeemer, + redeemerMessage, + }, + ); + + const approveIx = splToken.createApproveInstruction( + payerToken, + tokenRouter.custodianAddress(), + payer.publicKey, + amountIn, + ); + + await expectIxErr( + connection, + [approveIx, ix], + [payer, orderSender, preparedOrder], + "Error Code: InsufficientAmount", + ); }); - it.skip("Cannot Prepare Market Order with Invalid Redeemer", async function () { - // TODO + it("Cannot Prepare Market Order with Invalid Redeemer", async function () { + const orderSender = Keypair.generate(); + const preparedOrder = Keypair.generate(); + + const amountIn = 69n; + const minAmountOut = 0n; + const targetChain = foreignChain; + const redeemer = Array.from(Buffer.alloc(32, 0, "hex")); + const redeemerMessage = Buffer.from("All your base are belong to us"); + const ix = await tokenRouter.prepareMarketOrderIx( + { + payer: payer.publicKey, + orderSender: orderSender.publicKey, + preparedOrder: preparedOrder.publicKey, + srcToken: payerToken, + refundToken: payerToken, + }, + { + amountIn, + minAmountOut, + targetChain, + redeemer, + redeemerMessage, + }, + ); + + const approveIx = splToken.createApproveInstruction( + payerToken, + tokenRouter.custodianAddress(), + payer.publicKey, + amountIn, + ); + + await expectIxErr( + connection, + [approveIx, ix], + [payer, orderSender, preparedOrder], + "Error Code: InvalidRedeemer", + ); + }); + + it("Cannot Prepare Market Order with Min Amount Too High", async function () { + const orderSender = Keypair.generate(); + const preparedOrder = Keypair.generate(); + + const amountIn = 1n; + const minAmountOut = 2n; + const targetChain = foreignChain; + const redeemer = Array.from(Buffer.alloc(32, "deadbeef", "hex")); + const redeemerMessage = Buffer.from("All your base are belong to us"); + const ix = await tokenRouter.prepareMarketOrderIx( + { + payer: payer.publicKey, + orderSender: orderSender.publicKey, + preparedOrder: preparedOrder.publicKey, + srcToken: payerToken, + refundToken: payerToken, + }, + { + amountIn, + minAmountOut, + targetChain, + redeemer, + redeemerMessage, + }, + ); + + const approveIx = splToken.createApproveInstruction( + payerToken, + tokenRouter.custodianAddress(), + payer.publicKey, + amountIn, + ); + + await expectIxErr( + connection, + [approveIx, ix], + [payer, orderSender, preparedOrder], + "Error Code: MinAmountOutTooHigh", + ); }); it("Cannot Prepare Market Order without Delegating Authority to Custodian", async function () { - // TODO: This fails as expected, but we need to check for an error. const orderSender = Keypair.generate(); const preparedOrder = Keypair.generate(); @@ -422,8 +536,12 @@ describe("Token Router", function () { }, ); - // Note: Passing an empty string somehow lets the assertion pass? - await expectIxErr(connection, [ix], [payer, orderSender, preparedOrder], ""); + await expectIxErr( + connection, + [ix], + [payer, orderSender, preparedOrder], + "Error: owner does not match", + ); }); it("Prepare Market Order with Some Min Amount Out", async function () { @@ -678,9 +796,8 @@ describe("Token Router", function () { routerEndpoint: unregisteredEndpoint, }); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxErr( connection, [ix], @@ -705,7 +822,7 @@ describe("Token Router", function () { connection, [ix], [newPayer], - "Err(failed to send transaction: Transaction signature verification failure)", + "Transaction signature verification failure", ); }); @@ -740,9 +857,8 @@ describe("Token Router", function () { preparedOrder, }); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxOk(connection, [ix], [payer, orderSender], { addressLookupTableAccounts: [lookupTableAccount!], }); @@ -809,9 +925,8 @@ describe("Token Router", function () { preparedOrder, }); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxOk(connection, [ix], [payer, orderSender], { addressLookupTableAccounts: [lookupTableAccount!], }); @@ -836,9 +951,8 @@ describe("Token Router", function () { const { amount: balanceBefore } = await splToken.getAccount(connection, payerToken); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxOk( connection, [approveIx, prepareIx, ix], @@ -1031,9 +1145,8 @@ describe("Token Router", function () { units: 300_000, }); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxErr( connection, [computeIx, ix], @@ -1104,9 +1217,8 @@ describe("Token Router", function () { units: 300_000, }); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxErr( connection, [computeIx, ix], @@ -1178,9 +1290,8 @@ describe("Token Router", function () { units: 300_000, }); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxErr( connection, [computeIx, ix], @@ -1244,9 +1355,8 @@ describe("Token Router", function () { }, ); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxErr(connection, [ix], [payer], "Error Code: InvalidPayloadId", { addressLookupTableAccounts: [lookupTableAccount!], }); @@ -1318,9 +1428,8 @@ describe("Token Router", function () { }, ); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxErr(connection, [ix], [payer], "Error Code: AccountNotInitialized", { addressLookupTableAccounts: [lookupTableAccount!], }); @@ -1371,9 +1480,8 @@ describe("Token Router", function () { cctpMintRecipient, ); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxOk(connection, [computeIx, ix], [payer], { addressLookupTableAccounts: [lookupTableAccount!], }); @@ -1406,9 +1514,8 @@ describe("Token Router", function () { args, ); - const { value: lookupTableAccount } = await connection.getAddressLookupTable( - lookupTableAddress, - ); + const { value: lookupTableAccount } = + await connection.getAddressLookupTable(lookupTableAddress); await expectIxOk(connection, [ix], [payer], { addressLookupTableAccounts: [lookupTableAccount!], }); From 79ce9bc1c4026a0be09b065f764b1d71d506ddfe Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 3 Mar 2024 18:30:35 -0500 Subject: [PATCH 4/4] Add negative tests for order response preparation in MatchingEngine --- solana/ts/tests/01__matchingEngine.ts | 252 ++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) diff --git a/solana/ts/tests/01__matchingEngine.ts b/solana/ts/tests/01__matchingEngine.ts index fccc4a51..07c6f441 100644 --- a/solana/ts/tests/01__matchingEngine.ts +++ b/solana/ts/tests/01__matchingEngine.ts @@ -2667,6 +2667,258 @@ describe("Matching Engine", function () { const localVariables = new Map(); // TODO: add negative tests + it("Cannot Prepare Order Response with Emitter Chain Mismatch", async function () { + const redeemer = Keypair.generate(); + + const sourceCctpDomain = 0; + const cctpNonce = testCctpNonce++; + const amountIn = 690000n; // 69 cents + + // Concoct a Circle message. + const burnSource = Array.from(Buffer.alloc(32, "beefdead", "hex")); + const { destinationCctpDomain, burnMessage, encodedCctpMessage, cctpAttestation } = + await craftCctpTokenBurnMessage(engine, sourceCctpDomain, cctpNonce, amountIn); + + const fastMessage = new LiquidityLayerMessage({ + fastMarketOrder: { + amountIn, + minAmountOut: 0n, + targetChain: wormholeSdk.CHAIN_ID_SOLANA as number, + redeemer: Array.from(redeemer.publicKey.toBuffer()), + sender: new Array(32).fill(0), + refundAddress: new Array(32).fill(0), + maxFee: 42069n, + initAuctionFee: 2000n, + deadline: 2, + redeemerMessage: Buffer.from("Somebody set up us the bomb"), + }, + }); + + const finalizedMessage = new LiquidityLayerMessage({ + deposit: new LiquidityLayerDeposit( + { + tokenAddress: burnMessage.burnTokenAddress, + amount: amountIn, + sourceCctpDomain, + destinationCctpDomain, + cctpNonce, + burnSource, + mintRecipient: Array.from(engine.cctpMintRecipientAddress().toBuffer()), + }, + { + slowOrderResponse: { + baseFee: 420n, + }, + }, + ), + }); + + const finalizedVaa = await postLiquidityLayerVaa( + connection, + payer, + MOCK_GUARDIANS, + ethRouter, + wormholeSequence++, + finalizedMessage, + ); + const fastVaa = await postLiquidityLayerVaa( + connection, + payer, + MOCK_GUARDIANS, + ethRouter, + wormholeSequence++, + fastMessage, + "arbitrum", + ); + + const ix = await engine.prepareOrderResponseCctpIx( + { + payer: payer.publicKey, + fastVaa, + finalizedVaa, + mint: USDC_MINT_ADDRESS, + }, + { + encodedCctpMessage, + cctpAttestation, + }, + ); + + const computeIx = ComputeBudgetProgram.setComputeUnitLimit({ + units: 300_000, + }); + + await expectIxErr(connection, [computeIx, ix], [payer], "Error Code: VaaMismatch"); + }); + + it("Cannot Prepare Order Response with Emitter Address Mismatch", async function () { + const redeemer = Keypair.generate(); + + const sourceCctpDomain = 0; + const cctpNonce = testCctpNonce++; + const amountIn = 690000n; // 69 cents + + // Concoct a Circle message. + const burnSource = Array.from(Buffer.alloc(32, "beefdead", "hex")); + const { destinationCctpDomain, burnMessage, encodedCctpMessage, cctpAttestation } = + await craftCctpTokenBurnMessage(engine, sourceCctpDomain, cctpNonce, amountIn); + + const fastMessage = new LiquidityLayerMessage({ + fastMarketOrder: { + amountIn, + minAmountOut: 0n, + targetChain: wormholeSdk.CHAIN_ID_SOLANA as number, + redeemer: Array.from(redeemer.publicKey.toBuffer()), + sender: new Array(32).fill(0), + refundAddress: new Array(32).fill(0), + maxFee: 42069n, + initAuctionFee: 2000n, + deadline: 2, + redeemerMessage: Buffer.from("Somebody set up us the bomb"), + }, + }); + + const finalizedMessage = new LiquidityLayerMessage({ + deposit: new LiquidityLayerDeposit( + { + tokenAddress: burnMessage.burnTokenAddress, + amount: amountIn, + sourceCctpDomain, + destinationCctpDomain, + cctpNonce, + burnSource, + mintRecipient: Array.from(engine.cctpMintRecipientAddress().toBuffer()), + }, + { + slowOrderResponse: { + baseFee: 420n, + }, + }, + ), + }); + + const finalizedVaa = await postLiquidityLayerVaa( + connection, + payer, + MOCK_GUARDIANS, + ethRouter, + wormholeSequence++, + finalizedMessage, + ); + const fastVaa = await postLiquidityLayerVaa( + connection, + payer, + MOCK_GUARDIANS, + arbRouter, + wormholeSequence++, + fastMessage, + ); + + const ix = await engine.prepareOrderResponseCctpIx( + { + payer: payer.publicKey, + fastVaa, + finalizedVaa, + mint: USDC_MINT_ADDRESS, + }, + { + encodedCctpMessage, + cctpAttestation, + }, + ); + + const computeIx = ComputeBudgetProgram.setComputeUnitLimit({ + units: 300_000, + }); + + await expectIxErr(connection, [computeIx, ix], [payer], "Error Code: VaaMismatch"); + }); + + it("Cannot Prepare Order Response with Emitter Sequence Mismatch", async function () { + const redeemer = Keypair.generate(); + + const sourceCctpDomain = 0; + const cctpNonce = testCctpNonce++; + const amountIn = 690000n; // 69 cents + + // Concoct a Circle message. + const burnSource = Array.from(Buffer.alloc(32, "beefdead", "hex")); + const { destinationCctpDomain, burnMessage, encodedCctpMessage, cctpAttestation } = + await craftCctpTokenBurnMessage(engine, sourceCctpDomain, cctpNonce, amountIn); + + const fastMessage = new LiquidityLayerMessage({ + fastMarketOrder: { + amountIn, + minAmountOut: 0n, + targetChain: wormholeSdk.CHAIN_ID_SOLANA as number, + redeemer: Array.from(redeemer.publicKey.toBuffer()), + sender: new Array(32).fill(0), + refundAddress: new Array(32).fill(0), + maxFee: 42069n, + initAuctionFee: 2000n, + deadline: 2, + redeemerMessage: Buffer.from("Somebody set up us the bomb"), + }, + }); + + const finalizedMessage = new LiquidityLayerMessage({ + deposit: new LiquidityLayerDeposit( + { + tokenAddress: burnMessage.burnTokenAddress, + amount: amountIn, + sourceCctpDomain, + destinationCctpDomain, + cctpNonce, + burnSource, + mintRecipient: Array.from(engine.cctpMintRecipientAddress().toBuffer()), + }, + { + slowOrderResponse: { + baseFee: 420n, + }, + }, + ), + }); + + const finalizedVaa = await postLiquidityLayerVaa( + connection, + payer, + MOCK_GUARDIANS, + ethRouter, + wormholeSequence++, + finalizedMessage, + ); + const fastVaa = await postLiquidityLayerVaa( + connection, + payer, + MOCK_GUARDIANS, + ethRouter, + wormholeSequence + 2n, + fastMessage, + ); + + const ix = await engine.prepareOrderResponseCctpIx( + { + payer: payer.publicKey, + fastVaa, + finalizedVaa, + mint: USDC_MINT_ADDRESS, + }, + { + encodedCctpMessage, + cctpAttestation, + }, + ); + + const computeIx = ComputeBudgetProgram.setComputeUnitLimit({ + units: 300_000, + }); + + await expectIxErr(connection, [computeIx, ix], [payer], "Error Code: VaaMismatch"); + }); + + // TODO: Test timestamp mismatch + it.skip("Cannot Prepare Order Response with VAA Timestamp Mismatch", async function () {}); it("Prepare Order Response", async function () { const redeemer = Keypair.generate();