Add empty ata check (#19)

project-serum · Nov 23, 2021 · 60b3f4c · 60b3f4c
1 parent 4ac6e64
commit 60b3f4c
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ env:
   global:
     - NODE_VERSION="v14.7.0"
     - SOLANA_VERSION="v1.7.8"
-    - ANCHOR_VERSION="v0.13.0"
+    - ANCHOR_VERSION="v0.17.0"
 git:
   submodules: true
 

diff --git a/Anchor.toml b/Anchor.toml
@@ -1,16 +1,11 @@
-anchor_version = "0.13.0"
-
-[workspace]
-members = [
-    "programs/swap",
-]
+anchor_version = "0.17.0"
 
 [provider]
 cluster = "localnet"
 wallet = "~/.config/solana/id.json"
 
 [programs.mainnet]
-serum_swap = { address = "22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD", path = "./target/deploy/serum_swap.so", idl = "./target/idl/serum_swap.json" }
+serum_swap = "22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD"
 serum_dex = { address = "9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin", path = "./deps/serum-dex/dex/target/deploy/serum_dex.so" }
 
 [[test.genesis]]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/swap/Cargo.toml b/programs/swap/Cargo.toml
@@ -18,6 +18,15 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.13.0"
-anchor-spl = "0.13.0"
-solana-program = "=1.7.8"
+anchor-lang = "0.17.0"
+anchor-spl = "0.17.0"
+solana-program = "=1.7.11"
+
+[profile.release]
+lto = "fat"
+codegen-units = 1
+
+[profile.release.build-override]
+opt-level = 3
+incremental = false
+codegen-units = 1
diff --git a/programs/swap/src/lib.rs b/programs/swap/src/lib.rs
@@ -18,6 +18,12 @@ use std::num::NonZeroU64;
 
 declare_id!("22Y43yTVxuUkoRKdm9thyRhQ3SdgQS7c7kB6UNCiaczD");
 
+// Associated token account for Pubkey::default.
+mod empty {
+    use super::*;
+    declare_id!("HJt8Tjdsc9ms9i4WCZEzhzr4oyf3ANcdzXrNdLPFqm3M");
+}
+
 #[program]
 pub mod serum_swap {
     use super::*;
@@ -370,7 +376,7 @@ pub struct Swap<'info> {
     pub market: MarketAccounts<'info>,
     #[account(signer)]
     pub authority: AccountInfo<'info>,
-    #[account(mut)]
+    #[account(mut, constraint = pc_wallet.key != &empty::ID)]
     pub pc_wallet: AccountInfo<'info>,
     // Programs.
     pub dex_program: AccountInfo<'info>,
@@ -403,7 +409,7 @@ pub struct SwapTransitive<'info> {
     // Must be the authority over all open orders accounts used.
     #[account(signer)]
     pub authority: AccountInfo<'info>,
-    #[account(mut)]
+    #[account(mut, constraint = pc_wallet.key != &empty::ID)]
     pub pc_wallet: AccountInfo<'info>,
     // Programs.
     pub dex_program: AccountInfo<'info>,
@@ -599,7 +605,7 @@ pub struct MarketAccounts<'info> {
     // from the user into the market's vault.
     //
     // For bids, this is the base currency. For asks, the quote.
-    #[account(mut)]
+    #[account(mut, constraint = order_payer_token_account.key != &empty::ID)]
     pub order_payer_token_account: AccountInfo<'info>,
     // Also known as the "base" currency. For a given A/B market,
     // this is the vault for the A mint.
@@ -612,7 +618,7 @@ pub struct MarketAccounts<'info> {
     // PDA owner of the DEX's token accounts for base + quote currencies.
     pub vault_signer: AccountInfo<'info>,
     // User wallets.
-    #[account(mut)]
+    #[account(mut, constraint = coin_wallet.key != &empty::ID)]
     pub coin_wallet: AccountInfo<'info>,
 }