Extract spl-math-utils from spl-math

Cargo.toml

@@ -36,6 +36,7 @@ members = [
   "libraries/discriminator",
   "libraries/concurrent-merkle-tree",
   "libraries/math",
+  "libraries/math-utils",
   "libraries/merkle-tree-reference",
   "libraries/pod",
   "libraries/program-error",

libraries/math-utils/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "spl-math-utils"
+version = "0.1.0"
+description = "Solana Program Library Math Utils"
+authors = ["Solana Labs Maintainers <[email protected]>"]
+repository = "https://github.com/solana-labs/solana-program-library"
+license = "Apache-2.0"
+edition = "2021"
+
+[dependencies]
+num-traits = "0.2"
+uint = "0.10"
+
+[dev-dependencies]
+proptest = "1.5.0"
+libm = "0.2.11"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

libraries/math-utils/README.md

@@ -0,0 +1,8 @@
+# Math
+
+Library with utilities for on-chain math.
+
+## Audit
+
+The repository [README](https://github.com/solana-labs/solana-program-library#audits)
+contains information about program audits.

libraries/math-utils/src/lib.rs

@@ -0,0 +1,6 @@
+//! Math utilities.
+
+pub mod approximations;
+pub mod checked_ceil_div;
+pub mod precise_number;
+pub mod uint;

libraries/math/Cargo.toml

@@ -16,14 +16,12 @@ borsh = "1.5.1"
 num-derive = "0.4"
 num-traits = "0.2"
 solana-program = "2.1.0"
+spl-math-utils = { path = "../math-utils", version = "0.1.0" }
 thiserror = "1.0"
-uint = "0.10"
 
 [dev-dependencies]
-proptest = "1.5.0"
 solana-program-test = "2.1.0"
 solana-sdk = "2.1.0"
-libm = "0.2.11"
 
 [lib]
 crate-type = ["cdylib", "lib"]

libraries/math/README.md

@@ -1,6 +1,6 @@
 # Math
 
-Library with utilities for on-chain math.
+Program wrapper around the spl-math-utils crate. The program exists for testing purposes.
 
 ## Audit
 

libraries/math/src/lib.rs

@@ -3,13 +3,11 @@
 #![deny(missing_docs)]
 #![forbid(unsafe_code)]
 
-pub mod approximations;
-pub mod checked_ceil_div;
 mod entrypoint;
 pub mod error;
 pub mod instruction;
-pub mod precise_number;
 pub mod processor;
-pub mod uint;
+
+pub use spl_math_utils::{approximations, checked_ceil_div, precise_number, uint};
 
 solana_program::declare_id!("Math111111111111111111111111111111111111111");

stake-pool/program/Cargo.toml

@@ -22,9 +22,6 @@ serde = "1.0.214"
 serde_derive = "1.0.103"
 solana-program = "2.1.0"
 solana-security-txt = "1.1.1"
-spl-math = { version = "0.3", path = "../../libraries/math", features = [
-  "no-entrypoint",
-] }
 spl-pod = { version = "0.4.0", path = "../../libraries/pod", features = [
   "borsh",
 ] }

token-swap/program/Cargo.toml

@@ -18,7 +18,7 @@ enum_dispatch = "0.3.13"
 num-derive = "0.4"
 num-traits = "0.2"
 solana-program = "2.1.0"
-spl-math = { version = "0.3", path = "../../libraries/math", features = [ "no-entrypoint" ] }
+spl-math-utils = { version = "0.1", path = "../../libraries/math-utils" }
 spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] }
 spl-token-2022 = { version = "5.0.2", path = "../../token/program-2022", features = [ "no-entrypoint" ] }
 thiserror = "1.0"

token-swap/program/fuzz/Cargo.toml

@@ -12,7 +12,7 @@ publish = false
 honggfuzz = { version = "0.5.56" }
 arbitrary = { version = "1.3", features = ["derive"] }
 solana-program = "2.1.0"
-spl-math = { version = "0.3", path = "../../../libraries/math", features = [ "no-entrypoint" ] }
+spl-math-utils = { version = "0.1", path = "../../../libraries/math-utils" }
 spl-token = { version = "6.0", path = "../../../token/program", features = [ "no-entrypoint" ] }
 spl-token-swap = { path = "..", features = ["fuzz", "no-entrypoint"] }
 

token-swap/program/fuzz/src/instructions.rs

@@ -2,7 +2,7 @@
 use {
     arbitrary::Arbitrary,
     honggfuzz::fuzz,
-    spl_math::precise_number::PreciseNumber,
+    spl_math_utils::precise_number::PreciseNumber,
     spl_token::error::TokenError,
     spl_token_swap::{
         curve::{

token-swap/program/src/curve/calculator.rs

@@ -2,7 +2,7 @@
 
 #[cfg(feature = "fuzz")]
 use arbitrary::Arbitrary;
-use {crate::error::SwapError, spl_math::precise_number::PreciseNumber, std::fmt::Debug};
+use {crate::error::SwapError, spl_math_utils::precise_number::PreciseNumber, std::fmt::Debug};
 
 /// Initial amount of pool tokens for swap contract, hard-coded to something
 /// "sensible" given a maximum of u128.
@@ -194,7 +194,7 @@ pub trait CurveCalculator: Debug + DynPack {
 /// Test helpers for curves
 #[cfg(test)]
 pub mod test {
-    use {super::*, proptest::prelude::*, spl_math::uint::U256};
+    use {super::*, proptest::prelude::*, spl_math_utils::uint::U256};
 
     /// The epsilon for most curves when performing the conversion test,
     /// comparing a one-sided deposit to a swap + deposit.

token-swap/program/src/curve/constant_price.rs

@@ -12,7 +12,7 @@ use {
         program_error::ProgramError,
         program_pack::{IsInitialized, Pack, Sealed},
     },
-    spl_math::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber, uint::U256},
+    spl_math_utils::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber, uint::U256},
 };
 
 /// Get the amount of pool tokens for the given amount of token A or B.

token-swap/program/src/curve/constant_product.rs

@@ -12,7 +12,7 @@ use {
         program_error::ProgramError,
         program_pack::{IsInitialized, Pack, Sealed},
     },
-    spl_math::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber},
+    spl_math_utils::{checked_ceil_div::CheckedCeilDiv, precise_number::PreciseNumber},
 };
 
 /// ConstantProductCurve struct implementing CurveCalculator

token-swap/program/src/curve/offset.rs

@@ -19,7 +19,7 @@ use {
         program_error::ProgramError,
         program_pack::{IsInitialized, Pack, Sealed},
     },
-    spl_math::precise_number::PreciseNumber,
+    spl_math_utils::precise_number::PreciseNumber,
 };
 
 /// Offset curve, uses ConstantProduct under the hood, but adds an offset to