cleanup

Cargo.lock

@@ -1110,18 +1110,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "meteora-pools-sdk"
-version = "0.1.1"
-source = "git+https://github.com/regolith-labs/meteora-pools-sdk?branch=master#6f5a7eab4a460435591765a7d278f117a946b3bd"
-dependencies = [
- "borsh 0.10.4",
- "num-derive 0.4.2",
- "num-traits",
- "solana-program",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "mpl-token-metadata"
 version = "5.1.0"
@@ -1282,7 +1270,6 @@ version = "3.7.0"
 dependencies = [
  "bytemuck",
  "const-crypto",
- "meteora-pools-sdk",
  "mpl-token-metadata",
  "num_enum",
  "solana-program",
@@ -1317,7 +1304,6 @@ name = "ore-program"
 version = "3.7.0"
 dependencies = [
  "bincode",
- "meteora-pools-sdk",
  "mpl-token-metadata",
  "ore-api 3.7.0",
  "ore-boost-api",

Cargo.toml

@@ -19,7 +19,6 @@ bincode = "1.3.3"
 bytemuck = "1.14.3"
 bytemuck_derive = "1.7.0"
 const-crypto = "0.1.0"
-meteora-pools-sdk = "0.1"
 mpl-token-metadata = "5.1"
 num_enum = "0.7.2"
 ore-api = { path = "api" }
@@ -36,7 +35,7 @@ thiserror = "1.0.57"
 tokio = { version = "1.37.0", features = ["full"] }
 
 [patch.crates-io]
-meteora-pools-sdk = { git = "https://github.com/regolith-labs/meteora-pools-sdk", branch = "master" }
+
 
 [profile.release]
 overflow-checks = true

api/Cargo.toml

@@ -12,7 +12,6 @@ keywords.workspace = true
 [dependencies]
 bytemuck.workspace = true
 const-crypto.workspace = true
-meteora-pools-sdk.workspace = true
 mpl-token-metadata.workspace = true
 num_enum.workspace = true
 solana-program.workspace = true

api/src/sdk.rs

@@ -1,9 +1,8 @@
-use meteora_pools_sdk::instructions::Swap;
 use spl_token::native_mint;
 use steel::*;
 
 use crate::{
-    consts::{MINT_ADDRESS, TREASURY_ADDRESS, TREASURY_TOKENS_ADDRESS},
+    consts::{MINT_ADDRESS, TREASURY_ADDRESS},
     instruction::*,
     state::*,
 };

program/Cargo.toml

@@ -19,7 +19,6 @@ default = []
 
 [dependencies]
 bincode.workspace = true
-meteora-pools-sdk.workspace = true
 mpl-token-metadata.workspace = true
 ore-api.workspace = true
 ore-boost-api.workspace = true

program/src/close.rs

@@ -45,7 +45,7 @@ pub fn process_close(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResul
         mint_base_info,
         market_info,
         token_program,
-        market_hash.amount(),
+        vault_base.amount(),
         &[MARKET, &market.id.to_le_bytes()],
     )?;
 

program/src/swap.rs

@@ -24,11 +24,11 @@ pub fn process_swap(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
         .as_account_mut::<Market>(&ore_api::ID)?
         .assert_mut(|m| m.id == block.id)?
         .assert_mut_err(
-            |m| m.base.reserves() > 0,
+            |m| m.base.liquidity() > 0,
             OreError::InsufficientLiquidity.into(),
         )?
         .assert_mut_err(
-            |m| m.quote.reserves() > 0,
+            |m| m.quote.liquidity() > 0,
             OreError::InsufficientLiquidity.into(),
         )?;
     mint_base_info.has_address(&market.base.mint)?.as_mint()?;