From 1bea1bcbfc078fb39b90df99ff5c73a007c70d29 Mon Sep 17 00:00:00 2001 From: Armani Ferrante Date: Tue, 3 Aug 2021 12:50:43 -0700 Subject: [PATCH] Prune ix and solana version pinning (#569) --- cli/Cargo.toml | 6 +++--- docker/Makefile | 2 +- docs/src/getting-started/installation.md | 2 +- .../programs/permissioned-markets-middleware/Cargo.toml | 2 +- .../programs/permissioned-markets/Cargo.toml | 2 +- lang/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- spl/src/dex/middleware.rs | 9 +++++++-- spl/src/dex/proxy.rs | 4 ++-- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7abbbd1d5..cc93f08fe 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -23,9 +23,9 @@ serde_json = "1.0" shellexpand = "2.1.0" toml = "0.5.8" serde = { version = "1.0.122", features = ["derive"] } -solana-sdk = "1.7.4" -solana-program = "1.7.4" -solana-client = "1.7.4" +solana-sdk = "=1.7.8" +solana-program = "=1.7.8" +solana-client = "=1.7.8" serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] } dirs = "3.0" heck = "0.3.1" diff --git a/docker/Makefile b/docker/Makefile index 1a5e4defd..a2d7a4b82 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,7 +6,7 @@ ANCHOR_CLI=v$(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/[\"]/, "", $$2); print # # Solana toolchain. # -SOLANA_CLI=v1.7.4 +SOLANA_CLI=v1.7.8 # # Build version should match the Anchor cli version. # diff --git a/docs/src/getting-started/installation.md b/docs/src/getting-started/installation.md index 36c102dd9..64e68a751 100644 --- a/docs/src/getting-started/installation.md +++ b/docs/src/getting-started/installation.md @@ -18,7 +18,7 @@ rustup component add rustfmt See the solana [docs](https://docs.solana.com/cli/install-solana-cli-tools) for installation instructions. On macOS and Linux, ```bash -sh -c "$(curl -sSfL https://release.solana.com/v1.7.4/install)" +sh -c "$(curl -sSfL https://release.solana.com/v1.7.8/install)" ``` ## Install Mocha diff --git a/examples/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml b/examples/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml index ac4cbba0d..e1a1241dc 100644 --- a/examples/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml +++ b/examples/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml @@ -17,4 +17,4 @@ default = [] [dependencies] anchor-lang = { path = "../../../../lang" } anchor-spl = { path = "../../../../spl" } -solana-program = "1.7.4" +solana-program = "=1.7.8" diff --git a/examples/permissioned-markets/programs/permissioned-markets/Cargo.toml b/examples/permissioned-markets/programs/permissioned-markets/Cargo.toml index 034b9d19e..e83f5a4a9 100644 --- a/examples/permissioned-markets/programs/permissioned-markets/Cargo.toml +++ b/examples/permissioned-markets/programs/permissioned-markets/Cargo.toml @@ -18,5 +18,5 @@ default = [] anchor-lang = { path = "../../../../lang" } anchor-spl = { path = "../../../../spl" } serum_dex = { path = "../../deps/serum-dex/dex", features = ["no-entrypoint"] } -solana-program = "1.7.4" +solana-program = "=1.7.8" spl-token = { version = "3.1.1", features = ["no-entrypoint"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 9b05b18b5..f98174012 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -34,7 +34,7 @@ anchor-derive-accounts = { path = "./derive/accounts", version = "0.11.1" } base64 = "0.13.0" borsh = "0.9" bytemuck = "1.4.0" -solana-program = "1.7.4" +solana-program = "=1.7.8" thiserror = "1.0.20" # diff --git a/spl/Cargo.toml b/spl/Cargo.toml index cdba200c0..722f99b0d 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -12,6 +12,6 @@ devnet = [] [dependencies] anchor-lang = { path = "../lang", version = "0.11.1", features = ["derive"] } lazy_static = "1.4.0" -serum_dex = { git = "https://github.com/project-serum/serum-dex", branch = "armani/auth", version = "0.3.1", features = ["no-entrypoint"] } -solana-program = "1.7.4" +serum_dex = { git = "https://github.com/project-serum/serum-dex", version = "0.3.1", features = ["no-entrypoint"] } +solana-program = "=1.7.8" spl-token = { version = "3.1.1", features = ["no-entrypoint"] } diff --git a/spl/src/dex/middleware.rs b/spl/src/dex/middleware.rs index 146a630d2..4eaadc68e 100644 --- a/spl/src/dex/middleware.rs +++ b/spl/src/dex/middleware.rs @@ -75,7 +75,7 @@ pub trait MarketMiddleware { Ok(()) } - fn prune(&self, _ctx: &mut Context) -> ProgramResult { + fn prune(&self, _ctx: &mut Context, _limit: u16) -> ProgramResult { Ok(()) } @@ -357,7 +357,7 @@ impl MarketMiddleware for OpenOrdersPda { /// /// 0. Discriminant. /// .. - fn prune(&self, ctx: &mut Context) -> ProgramResult { + fn prune(&self, ctx: &mut Context, _limit: u16) -> ProgramResult { // Set owner of open orders to be itself. ctx.accounts[5] = ctx.accounts[4].clone(); Ok(()) @@ -396,6 +396,11 @@ impl MarketMiddleware for Logger { msg!("proxying close open orders"); Ok(()) } + + fn prune(&self, _ctx: &mut Context, limit: u16) -> ProgramResult { + msg!("proxying prune {:?}", limit); + Ok(()) + } } /// Enforces referal fees being sent to the configured address. diff --git a/spl/src/dex/proxy.rs b/spl/src/dex/proxy.rs index 36d9b87de..c75b49246 100644 --- a/spl/src/dex/proxy.rs +++ b/spl/src/dex/proxy.rs @@ -95,10 +95,10 @@ impl<'a> MarketProxy<'a> { mw.close_open_orders(&mut ctx)?; } } - Some(MarketInstruction::Prune) => { + Some(MarketInstruction::Prune(limit)) => { require!(ctx.accounts.len() >= 7, ErrorCode::NotEnoughAccounts); for mw in &self.middlewares { - mw.prune(&mut ctx)?; + mw.prune(&mut ctx, limit)?; } } _ => {