Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F/injective-math improvements #186

Merged
merged 27 commits into from
Nov 2, 2023
+2,789 −1,639
Merged

F/injective-math improvements #186

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4f0b4dc
cleaned up codes
Oct 19, 2023
15368fe
clean up arithmetic
Oct 20, 2023
2783831
clean up
Oct 20, 2023
2c36fa0
wip ln
Oct 20, 2023
8d1694a
fix a bug in must_from_str, add _ln_robust which has a smaller error …
Oct 23, 2023
aa5a5ea
wip
Oct 23, 2023
dccca32
wip
Oct 23, 2023
64dc6fc
wip on improving exp
Oct 23, 2023
6c4deb1
wip
Oct 23, 2023
a48f26d
exp is consistent with numpy
Oct 25, 2023
16d3426
wip
Oct 25, 2023
83320ec
fixed lint
Oct 25, 2023
4a6cadd
wip
Oct 25, 2023
576b86d
added newton, discrete newton
Oct 25, 2023
a36dde2
added newton, discrete newon, halley methods
Oct 26, 2023
1da69d9
cleaned up comments
Oct 26, 2023
57ee5f5
bumped version to 0.2.0
Oct 26, 2023
84c4bd0
improved visibility
Oct 26, 2023
2ff258d
minor improvement
Oct 26, 2023
4a980fe
improved common checks
Oct 27, 2023
e4c7ed1
minor improvements
Oct 27, 2023
70d56ee
fixed lint
Oct 27, 2023
e123c1f
minor improvements
Oct 27, 2023
04b4e6e
add more unit tests
Oct 30, 2023
bc61143
add more constants
Oct 30, 2023
8d6104f
log, power return FPDecimalError now
Oct 31, 2023
90f2a04
Merge branch 'dev' into f/improvements
DrunkenRandomWalker Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
253 changes: 241 additions & 12 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/injective-cosmwasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cosmwasm-std = { version = "1.4.1" }
cw-storage-plus = { version = "0.15.0" }
ethereum-types = "0.5.2"
hex = { version = "0.4.3", features = [ "serde" ] }
injective-math = { path = "../injective-math", version = "0.1.4" }
injective-math = { path = "../injective-math", version = "0.2.0" }
schemars = "0.8.8"
serde = { version = "1.0.136", default-features = false, features = [ "derive" ] }
serde_repr = "0.1"
Expand Down
16 changes: 8 additions & 8 deletions packages/injective-cosmwasm/src/exchange_mock_querier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fn default_derivative_market_response_handler(market_id: MarketId) -> QuerierRes
min_quantity_tick_size: FPDecimal::from_str("0.0001").unwrap(),
}),
info: None,
mark_price: FPDecimal::one(),
mark_price: FPDecimal::ONE,
}),
};
SystemResult::Ok(ContractResult::from(to_binary(&response)))
Expand Down Expand Up @@ -153,7 +153,7 @@ fn default_perpetual_market_funding_response_handler() -> QuerierResult {

fn default_market_volatility_response_handler() -> QuerierResult {
let response = MarketVolatilityResponse {
volatility: Some(FPDecimal::one()),
volatility: Some(FPDecimal::ONE),
history_metadata: None,
raw_history: None,
};
Expand Down Expand Up @@ -222,7 +222,7 @@ fn default_denom_decimals_handler() -> QuerierResult {

fn default_oracle_volatility_response_handler() -> QuerierResult {
let response = OracleVolatilityResponse {
volatility: Some(FPDecimal::one()),
volatility: Some(FPDecimal::ONE),
history_metadata: None,
raw_history: None,
};
Expand All @@ -233,13 +233,13 @@ fn default_pyth_price_response_handler() -> QuerierResult {
let response = PythPriceResponse {
price_state: Some(PythPriceState {
price_id: "0xff0ec26442c57d7456695b843694e7379b15cf1b250b27e0e47e657f1955aaff".to_string(),
ema_price: FPDecimal::one(),
ema_conf: FPDecimal::one(),
conf: FPDecimal::one(),
ema_price: FPDecimal::ONE,
ema_conf: FPDecimal::ONE,
conf: FPDecimal::ONE,
publish_time: 1i64,
price_state: PriceState {
price: FPDecimal::one(),
cumulative_price: FPDecimal::one(),
price: FPDecimal::ONE,
cumulative_price: FPDecimal::ONE,
timestamp: 1i64,
},
}),
Expand Down
4 changes: 2 additions & 2 deletions packages/injective-math/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
name = "injective-math"
readme = "README.md"
repository = "https://github.com/InjectiveLabs/cw-injective/tree/master/packages/injective-math"
version = "0.1.23"
version = "0.2.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -15,7 +15,7 @@ version = "0.1.23"
backtraces = [ "cosmwasm-std/backtraces" ]

[dependencies]
bigint = "4"
primitive-types = "0.12.2"
cosmwasm-std = { version = "1.4.1" }
ethereum-types = "0.5.2"
schemars = "0.8.8"
Expand Down
Loading
Loading