Merge pull request #23 from ironaddicteddog/fix-stack-error

Fix stack error

Author: ironaddicteddog

Anchor.toml

@@ -1,5 +1,5 @@
 [programs.localnet]
-anchor_escrow = "D3B39yETxmG29V3QPPNsdEzxQyonU5tjiwEr3svnMoRt"
+anchor_escrow = "AHnWUmyXfyRqtN3AwoRxMoyVKskyF9cS59YE2ZbqB8x6"
 
 [registry]
 url = "https://anchor.projectserum.com"
@@ -13,4 +13,4 @@ test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
 
 [toolchain]
 anchor_version = "0.29.0" # `anchor-cli` version to use
-solana_version = "1.17.0" # Solana version to use
+solana_version = "1.18.1" # Solana version to use

programs/anchor-escrow/src/contexts/exchange.rs

@@ -14,28 +14,28 @@ pub struct Exchange<'info> {
     pub taker: Signer<'info>,
     #[account(mut)]
     pub initializer: SystemAccount<'info>,
-    pub mint_a: Account<'info, Mint>,
-    pub mint_b: Account<'info, Mint>,
+    pub mint_a: Box<Account<'info, Mint>>,
+    pub mint_b: Box<Account<'info, Mint>>,
     #[account(
         init_if_needed,
         payer = taker,
         associated_token::mint = mint_a,
         associated_token::authority = taker
     )]
-    pub taker_ata_a: Account<'info, TokenAccount>,
+    pub taker_ata_a: Box<Account<'info, TokenAccount>>,
     #[account(
         mut,
         associated_token::mint = mint_b,
         associated_token::authority = taker
     )]
-    pub taker_ata_b: Account<'info, TokenAccount>,
+    pub taker_ata_b: Box<Account<'info, TokenAccount>>,
     #[account(
         init_if_needed,
         payer = taker,
         associated_token::mint = mint_b,
         associated_token::authority = initializer
     )]
-    pub initializer_ata_b: Account<'info, TokenAccount>,
+    pub initializer_ata_b: Box<Account<'info, TokenAccount>>,
     #[account(
         mut,
         has_one = mint_b,
@@ -44,13 +44,13 @@ pub struct Exchange<'info> {
         seeds=[b"state", escrow.seed.to_le_bytes().as_ref()],
         bump = escrow.bump,
     )]
-    pub escrow: Account<'info, Escrow>,
+    pub escrow: Box<Account<'info, Escrow>>,
     #[account(
         mut,
         associated_token::mint = mint_a,
         associated_token::authority = escrow
     )]
-    pub vault: Account<'info, TokenAccount>,
+    pub vault: Box<Account<'info, TokenAccount>>,
     pub associated_token_program: Program<'info, AssociatedToken>,
     pub token_program: Program<'info, Token>,
     pub system_program: Program<'info, System>,

programs/anchor-escrow/src/lib.rs

@@ -3,7 +3,7 @@ mod contexts;
 use contexts::*;
 mod states;
 
-declare_id!("D3B39yETxmG29V3QPPNsdEzxQyonU5tjiwEr3svnMoRt");
+declare_id!("AHnWUmyXfyRqtN3AwoRxMoyVKskyF9cS59YE2ZbqB8x6");
 
 #[program]
 pub mod anchor_escrow {

tests/anchor-escrow.ts

@@ -1,6 +1,6 @@
 import * as anchor from "@coral-xyz/anchor";
 import { AnchorEscrow } from "../target/types/anchor_escrow";
-import { Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction } from "@solana/web3.js";
+import { Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   MINT_SIZE,
@@ -132,5 +132,29 @@ describe("anchor-escrow", () => {
       .rpc()
       .then(confirm)
       .then(log);
+
+    // For Degugging Purpose
+
+    // const latestBlockhash = await anchor
+    //   .getProvider()
+    //   .connection.getLatestBlockhash();
+
+    // const ix = await program.methods
+    //   .exchange()
+    //   .accounts({ ...accounts })
+    //   .signers([taker])
+    //   .instruction()
+
+    // const msg = new TransactionMessage({
+    //   payerKey: provider.publicKey,
+    //   recentBlockhash: latestBlockhash.blockhash,
+    //   instructions: [ix],
+    // }).compileToV0Message();
+
+    // const tx = new VersionedTransaction(msg);
+    // tx.sign([taker]);
+
+    // console.log(Buffer.from(tx.serialize()).toString("base64"));
+    // await provider.sendAndConfirm(tx).then(log);
   });
 });