Merge pull request #28 from mikemaccana-edwardbot/chore/escrow-naming-alignment

chore(escrow): align Quasar and Anchor escrow naming for side-by-side comparison

Author: mikemaccana

tokens/escrow/quasar/src/instructions/cancel_offer.rs

@@ -0,0 +1,55 @@
+use {
+    crate::state::Offer,
+    quasar_lang::prelude::*,
+    quasar_spl::prelude::*,
+};
+
+#[derive(Accounts)]
+pub struct CancelOffer {
+    #[account(mut)]
+    pub maker: Signer,
+    #[account(
+        mut,
+        has_one(maker),
+        close(dest = maker),
+        address = Offer::seeds(maker.address())
+    )]
+    pub offer: Account<Offer>,
+    pub token_mint_a: Account<Mint>,
+    #[account(
+        mut,
+        init(idempotent),
+        payer = maker,
+        token(mint = token_mint_a, authority = maker, token_program = token_program),
+    )]
+    pub maker_token_account_a: Account<Token>,
+    #[account(mut)]
+    pub vault: Account<Token>,
+    pub rent: Sysvar<Rent>,
+    pub token_program: Program<TokenProgram>,
+    pub system_program: Program<SystemProgram>,
+}
+
+#[inline(always)]
+pub fn handle_withdraw_tokens_and_close_cancel_offer(accounts: &mut CancelOffer, bumps: &CancelOfferBumps) -> Result<(), ProgramError> {
+    let bump = [bumps.offer];
+    let seeds = [
+        Seed::from(b"offer" as &[u8]),
+        Seed::from(accounts.maker.address().as_ref()),
+        Seed::from(bump.as_ref()),
+    ];
+
+    accounts.token_program
+        .transfer(
+            &accounts.vault,
+            &accounts.maker_token_account_a,
+            &accounts.offer,
+            accounts.vault.amount(),
+        )
+        .invoke_signed(&seeds)?;
+
+    accounts.token_program
+        .close_account(&accounts.vault, &accounts.maker, &accounts.offer)
+        .invoke_signed(&seeds)?;
+    Ok(())
+}

tokens/escrow/quasar/src/instructions/make.rs

@@ -0,0 +1,54 @@
+use {
+    crate::state::{Offer, OfferInner},
+    quasar_lang::prelude::*,
+    quasar_spl::prelude::*,
+};
+
+#[derive(Accounts)]
+pub struct MakeOffer {
+    #[account(mut)]
+    pub maker: Signer,
+    #[account(mut, init, payer = maker, address = Offer::seeds(maker.address()))]
+    pub offer: Account<Offer>,
+    pub token_mint_a: Account<Mint>,
+    pub token_mint_b: Account<Mint>,
+    #[account(mut)]
+    pub maker_token_account_a: Account<Token>,
+    #[account(
+        mut,
+        init(idempotent),
+        payer = maker,
+        token(mint = token_mint_b, authority = maker, token_program = token_program),
+    )]
+    pub maker_token_account_b: Account<Token>,
+    #[account(
+        mut,
+        init(idempotent),
+        payer = maker,
+        token(mint = token_mint_a, authority = offer, token_program = token_program),
+    )]
+    pub vault: Account<Token>,
+    pub rent: Sysvar<Rent>,
+    pub token_program: Program<TokenProgram>,
+    pub system_program: Program<SystemProgram>,
+}
+
+#[inline(always)]
+pub fn handle_make_offer(accounts: &mut MakeOffer, receive: u64, bumps: &MakeOfferBumps) -> Result<(), ProgramError> {
+    accounts.offer.set_inner(OfferInner {
+        maker: *accounts.maker.address(),
+        token_mint_a: *accounts.token_mint_a.address(),
+        token_mint_b: *accounts.token_mint_b.address(),
+        maker_token_account_b: *accounts.maker_token_account_b.address(),
+        receive,
+        bump: bumps.offer,
+    });
+    Ok(())
+}
+
+#[inline(always)]
+pub fn handle_deposit_tokens(accounts: &mut MakeOffer, amount: u64) -> Result<(), ProgramError> {
+    accounts.token_program
+        .transfer(&accounts.maker_token_account_a, &accounts.vault, &accounts.maker, amount)
+        .invoke()
+}

tokens/escrow/quasar/src/instructions/make_offer.rs

@@ -1,8 +1,8 @@
-pub mod make;
-pub use make::*;
+pub mod make_offer;
+pub use make_offer::*;
 
-pub mod take;
-pub use take::*;
+pub mod take_offer;
+pub use take_offer::*;
 
-pub mod refund;
-pub use refund::*;
+pub mod cancel_offer;
+pub use cancel_offer::*;