Skip to content

address 0x feedback #32

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

Open
moodysalem wants to merge 1 commit into
base: main
Choose a base branch
from
Open

address 0x feedback #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 3 additions & 52 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ readme = "README.md"
keywords = ["crypto", "ekubo", "protocol", "defi", "no_std"]

[dependencies]
alloy-primitives-0_6 = { package = "alloy-primitives", version = "0.6", optional = true, default-features = false }
alloy-primitives-1 = { package = "alloy-primitives", version = "1", optional = true, default-features = false }
alloy-primitives = { version = "1", optional = true, default-features = false }
derive_more = { version = "2", features = [
"add",
"add_assign",
Expand All @@ -35,8 +34,7 @@ thiserror = { version = "2", default-features = false }
[features]
default = ["std"]
std = [
"alloy-primitives-0_6?/std",
"alloy-primitives-1?/std",
"alloy-primitives?/std",
"derive_more/std",
"num-traits/std",
"ruint/std",
Expand All @@ -47,12 +45,9 @@ std = [
no_std = ["dep:libm"]
serde = [
"dep:serde",
"alloy-primitives-0_6?/serde",
"alloy-primitives-1?/serde",
"alloy-primitives?/serde",
"starknet-types-core?/serde",
"ruint/serde",
]
starknet = ["starknet-types-core"]
evm = ["evm-alloy-1"]
evm-alloy-0_6 = ["dep:alloy-primitives-0_6"]
evm-alloy-1 = ["dep:alloy-primitives-1"]
evm = ["dep:alloy-primitives"]
52 changes: 9 additions & 43 deletions src/chain/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ use thiserror::Error;

use crate::chain::Chain;

#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
type U96 = ruint::Uint<96, 2>;
#[cfg(feature = "evm-alloy-1")]
use crate::alloy_primitives::aliases::U96;
use crate::private;
use crate::quoting::pools::boosted_fees::concentrated::{
Expand Down Expand Up @@ -197,15 +194,9 @@ pub enum EvmPoolTypeConfig {
Concentrated(ConcentratedPoolTypeConfig),
}

#[cfg(feature = "evm-alloy-1")]
const EVM_POOL_TYPE_CONFIG_CONCENTRATED_MASK: B32 = fixed_bytes!("0x80000000");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const EVM_POOL_TYPE_CONFIG_CONCENTRATED_MASK: B32 = fixed_bytes!("80000000");

#[cfg(feature = "evm-alloy-1")]
const EVM_POOL_TYPE_CONFIG_TICK_SPACING_MASK: B32 = fixed_bytes!("0x7fffffff");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const EVM_POOL_TYPE_CONFIG_TICK_SPACING_MASK: B32 = fixed_bytes!("7fffffff");

/// Order identifier emitted by the TWAMM extension.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
Expand Down Expand Up @@ -312,19 +303,12 @@ impl Chain for Evm {
active_liquidity: u128,
) -> Result<Self::FullRangePool, Self::FullRangePoolConstructionError> {
FullRangePool::new(
PoolKey {
PoolKey::new(
token0,
token1,
config: PoolConfig {
fee,
pool_type_config: FullRangePoolTypeConfig,
extension,
},
},
FullRangePoolState {
sqrt_ratio,
liquidity: active_liquidity,
},
PoolConfig::new(extension, fee, FullRangePoolTypeConfig),
),
FullRangePoolState::new(sqrt_ratio, active_liquidity),
)
}
}
Expand Down Expand Up @@ -469,13 +453,16 @@ impl TryFrom<B256> for EvmPoolConfig {

impl private::Sealed for Evm {}

/// Converts a compressed sqrt ratio into a fixed-point sqrt ratio.
/// 96-bit contract `sqrtPrice` to canonical SDK `U256 sqrt_ratio`.
///
/// The on-chain value is a compact float-like encoding (`uint96` payload) used for calldata/storage
/// efficiency. All quote logic in the SDK uses the expanded fixed `U256` representation.
pub fn float_sqrt_ratio_to_fixed(sqrt_ratio_float: U96) -> U256 {
U256::from(sqrt_ratio_float & NOT_BIT_MASK)
<< u8::try_from(uint!(2_U96) + ((sqrt_ratio_float & BIT_MASK) >> 89_u8)).unwrap()
}

/// Converts a fixed-point sqrt ratio into the compressed contract representation.
/// Canonical SDK `U256 sqrt_ratio` to compact contract `sqrtPrice` payload.
pub fn fixed_sqrt_ratio_to_contract_sqrt_ratio(sqrt_ratio: U256) -> U256 {
if sqrt_ratio >= TWO_POW_192 {
panic!("failed to convert sqrt ratio limit");
Expand All @@ -498,41 +485,20 @@ mod tests {

use super::*;

#[cfg(feature = "evm-alloy-1")]
const ONE_ADDRESS: Address = address!("0x0000000000000000000000000000000000000001");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const ONE_ADDRESS: Address = address!("0000000000000000000000000000000000000001");

#[cfg(feature = "evm-alloy-1")]
const ORDER_CONFIG_RAW: B256 =
fixed_bytes!("0x01020304050607080100000000000000112233445566778899aabbccddeeff00");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const ORDER_CONFIG_RAW: B256 =
fixed_bytes!("01020304050607080100000000000000112233445566778899aabbccddeeff00");

#[cfg(feature = "evm-alloy-1")]
const POOL_TOKEN0: Address = address!("0x37c8671A16E257eC501711Cc1d7eb8AF8544A69f");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const POOL_TOKEN0: Address = address!("37c8671A16E257eC501711Cc1d7eb8AF8544A69f");

#[cfg(feature = "evm-alloy-1")]
const POOL_TOKEN1: Address = address!("0xeE8F2aA3e6864493BEae55E27bb5d8a7B57021F8");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const POOL_TOKEN1: Address = address!("eE8F2aA3e6864493BEae55E27bb5d8a7B57021F8");

#[cfg(feature = "evm-alloy-1")]
const POOL_CONFIG_RAW: B256 =
fixed_bytes!("0x000000000000000000000000000000000000000040000000000000000d000000");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const POOL_CONFIG_RAW: B256 =
fixed_bytes!("000000000000000000000000000000000000000040000000000000000d000000");

#[cfg(feature = "evm-alloy-1")]
const POOL_ID: B256 =
fixed_bytes!("0xa7dfc779e04825212b0daf2a2272e9574a1cc54cd3ff26f590a1b2789677b3c9");
#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
const POOL_ID: B256 =
fixed_bytes!("a7dfc779e04825212b0daf2a2272e9574a1cc54cd3ff26f590a1b2789677b3c9");

impl ChainTest for Evm {
fn zero_address() -> Self::Address {
Expand Down
2 changes: 1 addition & 1 deletion src/chain/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use core::{
use num_traits::Zero;
use ruint::aliases::U256;

#[cfg(any(feature = "evm", feature = "evm-alloy-0_6", feature = "evm-alloy-1"))]
#[cfg(feature = "evm")]
pub mod evm;
#[cfg(feature = "starknet")]
pub mod starknet;
Expand Down
12 changes: 2 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,14 @@ compile_error!(r#"Features "std" and "no_std" are mutually exclusive."#);
#[cfg(not(any(feature = "std", feature = "no_std")))]
compile_error!(r#"Either feature "std" or "no_std" must be enabled."#);

#[cfg(all(
feature = "evm",
not(any(feature = "evm-alloy-0_6", feature = "evm-alloy-1"))
))]
compile_error!(r#"Feature "evm" requires either "evm-alloy-0_6" or "evm-alloy-1"."#);

extern crate alloc;
#[cfg(any(test, feature = "std"))]
extern crate std;

pub use ruint::aliases::U256;

#[cfg(all(feature = "evm-alloy-0_6", not(feature = "evm-alloy-1")))]
pub use alloy_primitives_0_6 as alloy_primitives;
#[cfg(feature = "evm-alloy-1")]
pub use alloy_primitives_1 as alloy_primitives;
#[cfg(feature = "evm")]
pub use alloy_primitives;

pub mod chain;
pub mod math;
Expand Down
Loading