Skip to content

Feature/replace deprecated type_name function #120

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

Merged
avernikoz merged 7 commits into from
Oct 1, 2025
Merged

Feature/replace deprecated type_name function #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87db53c
Use type_name::with_original_ids instead of type_name::get
bathord Sep 18, 2025
84c45bc
Upd sui version for move test CI
bathord Sep 18, 2025
8305b90
Upd sui version for move test CI
bathord Sep 18, 2025
cc52da4
Use 1.55.0 sui in move test CI
bathord Sep 18, 2025
1350d41
Merge branch 'main' into feature/replace-deprecated-type-name-function
avernikoz Oct 1, 2025
62abb28
update Move.lock: use 1.56.2 version
avernikoz Oct 1, 2025
678ee0a
update move_test ci
avernikoz Oct 1, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/move_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
test:
runs-on: ubuntu-latest
env:
SUI_VERSION: "1.54.2" # Parameterized Sui version
SUI_VERSION: "1.56.2" # Parameterized Sui version

steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions packages/deeptrade-core/Move.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies = [

[[move.package]]
id = "Bridge"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b448b1d971bd6c1aac8ef4eee4305943806d5d5b", subdir = "crates/sui-framework/packages/bridge" }
source = { git = "https://github.com/MystenLabs/sui.git", rev = "664b05b3b047c5bb03979d093660176176ea6175", subdir = "crates/sui-framework/packages/bridge" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
Expand All @@ -26,7 +26,7 @@ dependencies = [

[[move.package]]
id = "MoveStdlib"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b448b1d971bd6c1aac8ef4eee4305943806d5d5b", subdir = "crates/sui-framework/packages/move-stdlib" }
source = { git = "https://github.com/MystenLabs/sui.git", rev = "664b05b3b047c5bb03979d093660176176ea6175", subdir = "crates/sui-framework/packages/move-stdlib" }

[[move.package]]
id = "Pyth"
Expand All @@ -39,15 +39,15 @@ dependencies = [

[[move.package]]
id = "Sui"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b448b1d971bd6c1aac8ef4eee4305943806d5d5b", subdir = "crates/sui-framework/packages/sui-framework" }
source = { git = "https://github.com/MystenLabs/sui.git", rev = "664b05b3b047c5bb03979d093660176176ea6175", subdir = "crates/sui-framework/packages/sui-framework" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
]

[[move.package]]
id = "SuiSystem"
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b448b1d971bd6c1aac8ef4eee4305943806d5d5b", subdir = "crates/sui-framework/packages/sui-system" }
source = { git = "https://github.com/MystenLabs/sui.git", rev = "664b05b3b047c5bb03979d093660176176ea6175", subdir = "crates/sui-framework/packages/sui-system" }

dependencies = [
{ id = "MoveStdlib", name = "MoveStdlib" },
Expand Down Expand Up @@ -91,7 +91,7 @@ dependencies = [
]

[move.toolchain-version]
compiler-version = "1.53.2"
compiler-version = "1.56.2"
edition = "2024.beta"
flavor = "sui"

Expand Down
8 changes: 4 additions & 4 deletions packages/deeptrade-core/sources/helper.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ public(package) fun get_sui_per_deep_from_reference_pool<ReferenceBaseAsset, Ref
);
let reference_pool_price = get_pool_first_ask_price(reference_pool, clock);

let reference_base_type = type_name::get<ReferenceBaseAsset>();
let reference_quote_type = type_name::get<ReferenceQuoteAsset>();
let deep_type = type_name::get<DEEP>();
let sui_type = type_name::get<SUI>();
let reference_base_type = type_name::with_original_ids<ReferenceBaseAsset>();
let reference_quote_type = type_name::with_original_ids<ReferenceQuoteAsset>();
let deep_type = type_name::with_original_ids<DEEP>();
let sui_type = type_name::with_original_ids<SUI>();
let is_deep_sui_pool = reference_base_type == deep_type && reference_quote_type == sui_type;
let is_sui_deep_pool = reference_base_type == sui_type && reference_quote_type == deep_type;

Expand Down
10 changes: 6 additions & 4 deletions packages/deeptrade-core/sources/order.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,10 +1430,12 @@ public(package) fun prepare_order_execution<
.max_deep_fee_coverage_discount_rate();

// Determine input coin type
let input_coin_is_sui = if (is_bid) type_name::get<QuoteToken>() == type_name::get<SUI>()
else type_name::get<BaseToken>() == type_name::get<SUI>();
let input_coin_is_deep = if (is_bid) type_name::get<QuoteToken>() == type_name::get<DEEP>()
else type_name::get<BaseToken>() == type_name::get<DEEP>();
let input_coin_is_sui = if (is_bid)
type_name::with_original_ids<QuoteToken>() == type_name::with_original_ids<SUI>()
else type_name::with_original_ids<BaseToken>() == type_name::with_original_ids<SUI>();
let input_coin_is_deep = if (is_bid)
type_name::with_original_ids<QuoteToken>() == type_name::with_original_ids<DEEP>()
else type_name::with_original_ids<BaseToken>() == type_name::with_original_ids<DEEP>();

let (deep_plan, coverage_fee_plan, input_coin_deposit_plan) = create_order_core(
is_pool_whitelisted,
Expand Down