Merge pull request #170 from grooviegermanikus/update-fixed-library

Update fixed library
openbook-dex · Sep 25, 2023 · 4a91be3 · 4a91be3
2 parents 6808285 + 2a8061b
commit 4a91be3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "3rdparty/fixed"]
-	path = 3rdparty/fixed
-	url = https://gitlab.com/ckamm/fixed.git
 [submodule "3rdparty/anchor"]
 	path = 3rdparty/anchor
 	url = https://github.com/openbook-dex/anchor.git

diff --git a/3rdparty/fixed b/3rdparty/fixed
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 anchor-client = "0.28.0"
 anchor-lang = "0.28.0"
 anchor-spl = "0.28.0"
-fixed = {path = "./3rdparty/fixed", version = "1.11.0"}
+fixed = { git = "https://github.com/blockworks-foundation/fixed.git", branch = "v1.11.0-borsh0_10-mango" }
 pyth-sdk-solana = "0.8.0"
 solana-account-decoder = "~1.16.1"
 solana-client = "~1.16.1"

diff --git a/programs/openbook-v2/src/i80f48.rs b/programs/openbook-v2/src/i80f48.rs
@@ -0,0 +1,10 @@
+use fixed::types::I80F48;
+
+// regression test for https://gitlab.com/tspiteri/fixed/-/issues/57
+// see https://github.com/blockworks-foundation/fixed/issues/1
+#[test]
+fn bug_fixed_comparison_u64() {
+    let a: u64 = 66000;
+    let b: u64 = 1000;
+    assert!(I80F48::from(a) > b); // fails!
+}
diff --git a/programs/openbook-v2/src/lib.rs b/programs/openbook-v2/src/lib.rs
@@ -18,6 +18,7 @@ pub mod pubkey_option;
 pub mod state;
 pub mod token_utils;
 pub mod types;
+mod i80f48;
 
 #[cfg(feature = "enable-gpl")]
 pub mod instructions;