Skip to content

Commit e80d712

Browse files
author
reditable
committed
Update vaults
1 parent 54cbcd1 commit e80d712

10 files changed

Lines changed: 48 additions & 37 deletions

File tree

‎sui/dca/Move.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[move]
44
version = 3
5-
manifest_digest = "38C23E3FDFEE0048CEF856892AF2EDD467D223A82F36AFE575A5DAB4185D53BA"
5+
manifest_digest = "127BFC63D86E5252AF3FC8D19135AF7C87F9FB1A950DF93867C102DB66BB9A9F"
66
deps_digest = "397E6A9F7A624706DBDFEE056CE88391A15876868FD18A88504DA74EB458D697"
77
dependencies = [
88
{ id = "Bridge", name = "Bridge" },
@@ -14,7 +14,7 @@ dependencies = [
1414

1515
[[move.package]]
1616
id = "Bridge"
17-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/bridge" }
17+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/bridge" }
1818

1919
dependencies = [
2020
{ id = "MoveStdlib", name = "MoveStdlib" },
@@ -24,7 +24,7 @@ dependencies = [
2424

2525
[[move.package]]
2626
id = "MoveSTL"
27-
source = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.48.2", subdir = "sui" }
27+
source = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.3.0", subdir = "" }
2828

2929
dependencies = [
3030
{ id = "Bridge", name = "Bridge" },
@@ -35,27 +35,27 @@ dependencies = [
3535

3636
[[move.package]]
3737
id = "MoveStdlib"
38-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/move-stdlib" }
38+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/move-stdlib" }
3939

4040
[[move.package]]
4141
id = "Sui"
42-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/sui-framework" }
42+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/sui-framework" }
4343

4444
dependencies = [
4545
{ id = "MoveStdlib", name = "MoveStdlib" },
4646
]
4747

4848
[[move.package]]
4949
id = "SuiSystem"
50-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/sui-system" }
50+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/sui-system" }
5151

5252
dependencies = [
5353
{ id = "MoveStdlib", name = "MoveStdlib" },
5454
{ id = "Sui", name = "Sui" },
5555
]
5656

5757
[move.toolchain-version]
58-
compiler-version = "1.48.2"
58+
compiler-version = "1.58.1"
5959
edition = "2024.beta"
6060
flavor = "sui"
6161

‎sui/dca/Move.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "DCA"
33
edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move
44

55
[dependencies]
6-
MoveSTL = { git = "https://github.com/CetusProtocol/move-stl.git", subdir = "sui", rev = "mainnet-v1.48.2", override = true }
6+
MoveSTL = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.3.0", override = true }
77

88
[addresses]
99
dca = "0x587614620d0d30aed66d86ffd3ba385a661a86aa573a4d579017068f561c6d8f"

‎sui/limit-order/Move.lock‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[move]
44
version = 3
5-
manifest_digest = "CFCDB106FC4B1533F60AB2D716F1C5D68F269D3D88E2C070C4731148968FD271"
5+
manifest_digest = "E233BB00E616739104DC841CDA07600EF18639E2D5460DF435D8498D0B0BDC54"
66
deps_digest = "52B406A7A21811BEF51751CF88DA0E76DAEFFEAC888D4F4060B1A72BBE7D8D35"
77
dependencies = [
88
{ id = "Bridge", name = "Bridge" },
@@ -15,7 +15,7 @@ dependencies = [
1515

1616
[[move.package]]
1717
id = "Bridge"
18-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/bridge" }
18+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/bridge" }
1919

2020
dependencies = [
2121
{ id = "MoveStdlib", name = "MoveStdlib" },
@@ -25,15 +25,18 @@ dependencies = [
2525

2626
[[move.package]]
2727
id = "IntegerMate"
28-
source = { git = "https://github.com/CetusProtocol/integer-mate.git", rev = "sui-v1.1.2", subdir = "sui" }
28+
source = { git = "https://github.com/CetusProtocol/integer-mate.git", rev = "mainnet-v1.3.0", subdir = "" }
2929

3030
dependencies = [
31+
{ id = "Bridge", name = "Bridge" },
32+
{ id = "MoveStdlib", name = "MoveStdlib" },
3133
{ id = "Sui", name = "Sui" },
34+
{ id = "SuiSystem", name = "SuiSystem" },
3235
]
3336

3437
[[move.package]]
3538
id = "MoveSTL"
36-
source = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.48.2", subdir = "sui" }
39+
source = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.3.0", subdir = "" }
3740

3841
dependencies = [
3942
{ id = "Bridge", name = "Bridge" },
@@ -44,27 +47,27 @@ dependencies = [
4447

4548
[[move.package]]
4649
id = "MoveStdlib"
47-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/move-stdlib" }
50+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/move-stdlib" }
4851

4952
[[move.package]]
5053
id = "Sui"
51-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/sui-framework" }
54+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/sui-framework" }
5255

5356
dependencies = [
5457
{ id = "MoveStdlib", name = "MoveStdlib" },
5558
]
5659

5760
[[move.package]]
5861
id = "SuiSystem"
59-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "3802482bd4e3", subdir = "crates/sui-framework/packages/sui-system" }
62+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/sui-system" }
6063

6164
dependencies = [
6265
{ id = "MoveStdlib", name = "MoveStdlib" },
6366
{ id = "Sui", name = "Sui" },
6467
]
6568

6669
[move.toolchain-version]
67-
compiler-version = "1.48.2"
70+
compiler-version = "1.58.1"
6871
edition = "2024"
6972
flavor = "sui"
7073

‎sui/limit-order/Move.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name = "LimitOrder"
33
version = "0.1.1"
44

55
[dependencies]
6-
MoveSTL = { git = "https://github.com/CetusProtocol/move-stl.git", subdir = "sui", rev = "mainnet-v1.48.2", override = true }
7-
IntegerMate = { git = "https://github.com/CetusProtocol/integer-mate.git", subdir = "sui", rev = "sui-v1.1.2", override = true }
6+
MoveSTL = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.3.0", override = true }
7+
IntegerMate = { git = "https://github.com/CetusProtocol/integer-mate.git", rev = "mainnet-v1.3.0", override = true }
88

99

1010
[addresses]

‎sui/limit-order/sources/order.move‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ module limit_order::limit_order {
202202
/// - `_rate_orders_indexers`: Reference to the rate orders indexers.
203203
/// - `_clock`: Reference to the clock.
204204
/// - `_ctx`: Reference to the transaction context.
205+
#[allow(lint(public_entry))]
205206
public entry fun create_rate_orders_indexer<PayCoin, TargetCoin>(
206207
_config: &GlobalConfig,
207208
_rate_orders_indexers: &mut RateOrdersIndexers,
@@ -221,6 +222,7 @@ module limit_order::limit_order {
221222
/// - `_expire_ts`: The expiration timestamp of the order.
222223
/// - `_clock`: Reference to the clock.
223224
/// - `_ctx`: Reference to the transaction context.
225+
#[allow(lint(public_entry))]
224226
public entry fun place_limit_order<PayCoin, TargetCoin>(
225227
_config: &GlobalConfig,
226228
_rate_orders_indexer: &mut RateOrdersIndexer<PayCoin, TargetCoin>,
@@ -244,6 +246,7 @@ module limit_order::limit_order {
244246
/// - `_expire_ts`: The expiration timestamp of the order.
245247
/// - `_clock`: Reference to the clock.
246248
/// - `_ctx`: Reference to the transaction context.
249+
#[allow(lint(public_entry))]
247250
public entry fun create_indexer_and_place_limit_order<PayCoin, TargetCoin>(
248251
_config: &GlobalConfig,
249252
_rate_orders_indexers: &mut RateOrdersIndexers,
@@ -327,6 +330,7 @@ module limit_order::limit_order {
327330
/// Parameters:
328331
/// - `_owner`: The owner address.
329332
/// - `_user_orders_indexer`: Reference to the user orders indexer.
333+
#[allow(lint(public_entry))]
330334
public entry fun get_orders_indexer_by_owner(
331335
_owner: address,
332336
_user_orders_indexer: &UserOrdersIndexer
@@ -338,6 +342,7 @@ module limit_order::limit_order {
338342
/// Parameters:
339343
/// - `_rate`: The rate at which the order is placed.
340344
/// - `_rate_orders_indexer`: Reference to the rate orders indexer.
345+
#[allow(lint(public_entry))]
341346
public entry fun get_orders_indexer_by_rate<PayCoin, TargetCoin>(
342347
_rate: u128,
343348
_rate_orders_indexer: &RateOrdersIndexer<PayCoin, TargetCoin>

‎sui/vaults/Move.lock‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[move]
44
version = 3
5-
manifest_digest = "7C1EC04877988A4B3E6DF0399DAAE723BAB51AD2C0B3A03EF6B6A583A6508F08"
5+
manifest_digest = "FCCB83CB87B718F55706921DC4C4AB07A11B2334572935A743CBF14704276A96"
66
deps_digest = "397E6A9F7A624706DBDFEE056CE88391A15876868FD18A88504DA74EB458D697"
77
dependencies = [
88
{ id = "Bridge", name = "Bridge" },
@@ -14,7 +14,7 @@ dependencies = [
1414

1515
[[move.package]]
1616
id = "Bridge"
17-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b5633abb4177", subdir = "crates/sui-framework/packages/bridge" }
17+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/bridge" }
1818

1919
dependencies = [
2020
{ id = "MoveStdlib", name = "MoveStdlib" },
@@ -24,7 +24,7 @@ dependencies = [
2424

2525
[[move.package]]
2626
id = "CetusClmm"
27-
source = { git = "https://github.com/CetusProtocol/cetus-clmm-interface.git", rev = "mainnet-v1.49.0", subdir = "sui/cetus_clmm" }
27+
source = { git = "https://github.com/CetusProtocol/cetus-contracts.git", rev = "clmm-v14", subdir = "packages/cetus_clmm/" }
2828

2929
dependencies = [
3030
{ id = "Bridge", name = "Bridge" },
@@ -37,7 +37,7 @@ dependencies = [
3737

3838
[[move.package]]
3939
id = "Farming"
40-
source = { git = "https://github.com/CetusProtocol/cetus-clmm-interface.git", rev = "mainnet-v1.49.0", subdir = "sui/stable_farming" }
40+
source = { git = "https://github.com/CetusProtocol/cetus-clmm-interface.git", rev = "mainnet-v1.52.1", subdir = "sui/stable_farming" }
4141

4242
dependencies = [
4343
{ id = "Bridge", name = "Bridge" },
@@ -49,15 +49,18 @@ dependencies = [
4949

5050
[[move.package]]
5151
id = "IntegerMate"
52-
source = { git = "https://github.com/CetusProtocol/integer-mate.git", rev = "sui-v1.2.0", subdir = "sui" }
52+
source = { git = "https://github.com/CetusProtocol/integer-mate.git", rev = "mainnet-v1.3.0", subdir = "" }
5353

5454
dependencies = [
55+
{ id = "Bridge", name = "Bridge" },
56+
{ id = "MoveStdlib", name = "MoveStdlib" },
5557
{ id = "Sui", name = "Sui" },
58+
{ id = "SuiSystem", name = "SuiSystem" },
5659
]
5760

5861
[[move.package]]
5962
id = "MoveSTL"
60-
source = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.48.2", subdir = "sui" }
63+
source = { git = "https://github.com/CetusProtocol/move-stl.git", rev = "mainnet-v1.3.0", subdir = "" }
6164

6265
dependencies = [
6366
{ id = "Bridge", name = "Bridge" },
@@ -68,27 +71,27 @@ dependencies = [
6871

6972
[[move.package]]
7073
id = "MoveStdlib"
71-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b5633abb4177", subdir = "crates/sui-framework/packages/move-stdlib" }
74+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/move-stdlib" }
7275

7376
[[move.package]]
7477
id = "Sui"
75-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b5633abb4177", subdir = "crates/sui-framework/packages/sui-framework" }
78+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/sui-framework" }
7679

7780
dependencies = [
7881
{ id = "MoveStdlib", name = "MoveStdlib" },
7982
]
8083

8184
[[move.package]]
8285
id = "SuiSystem"
83-
source = { git = "https://github.com/MystenLabs/sui.git", rev = "b5633abb4177", subdir = "crates/sui-framework/packages/sui-system" }
86+
source = { git = "https://github.com/MystenLabs/sui.git", rev = "4e8b6eda7d6411d80c62f39ac8a4f028e8d174c4", subdir = "crates/sui-framework/packages/sui-system" }
8487

8588
dependencies = [
8689
{ id = "MoveStdlib", name = "MoveStdlib" },
8790
{ id = "Sui", name = "Sui" },
8891
]
8992

9093
[move.toolchain-version]
91-
compiler-version = "1.49.1"
94+
compiler-version = "1.58.1"
9295
edition = "2024"
9396
flavor = "sui"
9497

‎sui/vaults/Move.toml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ name = "vaults"
33
version = "1.2.0"
44

55
[dependencies]
6-
# farming = { r.mvr = "@cetuspackages/farming" }
7-
# cetusclmm = { r.mvr = "@cetuspackages/clmm" }
8-
Farming = { git = "https://github.com/CetusProtocol/cetus-clmm-interface.git", subdir = "sui/stable_farming", rev = "mainnet-v1.49.0" }
9-
# CetusClmm = { git = "https://github.com/CetusProtocol/cetus-clmm-interface.git", subdir = "sui/cetus_clmm", rev = "mainnet-v1.48.3" }
6+
Farming = { git = "https://github.com/CetusProtocol/cetus-clmm-interface.git", subdir = "sui/stable_farming", rev = "mainnet-v1.52.1" }
107

118
[addresses]
129
vaults = "0xd3453d9be7e35efe222f78a810bb3af1859fd1600926afced8b4936d825c9a05"

‎sui/vaults/sources/fetcher.move‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module vaults::fetcher {
33

44
use sui::object::ID;
55

6-
use cetusclmm::pool::Pool;
6+
use cetus_clmm::pool::Pool;
77

88
use vaults::vaults::Vault;
99

@@ -18,6 +18,7 @@ module vaults::fetcher {
1818
}
1919

2020
/// Get the Coin amounts by Lp Token amount.
21+
#[allow(lint(public_entry))]
2122
public entry fun get_position_amounts<CoinTypeA, CoinTypeB, T>(
2223
_: &Vault<T>,
2324
_: &Pool<CoinTypeA, CoinTypeB>,

‎sui/vaults/sources/router.move‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module vaults::router {
55
use sui::coin::{Coin};
66
use sui::tx_context::{TxContext};
77

8-
use cetusclmm::config::GlobalConfig;
9-
use cetusclmm::pool::Pool;
8+
use cetus_clmm::config::GlobalConfig;
9+
use cetus_clmm::pool::Pool;
1010

1111
use farming::rewarder::RewarderManager;
1212
use farming::pool::Pool as SFarmingPool;
@@ -19,6 +19,7 @@ module vaults::router {
1919

2020

2121
/// User deposit Asset into `Vault`
22+
#[allow(lint(public_entry))]
2223
public entry fun deposit<CoinTypeA, CoinTypeB, T>(
2324
_: &VaultsManager,
2425
_: &mut Vault<T>,
@@ -40,6 +41,7 @@ module vaults::router {
4041
}
4142

4243
/// User Remove Asset from `Vault` by Lp Token
44+
#[allow(lint(public_entry))]
4345
public entry fun remove<CoinTypeA, CoinTypeB, T>(
4446
_: &VaultsManager,
4547
_: &mut Vault<T>,

‎sui/vaults/sources/vaults.move‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ module vaults::vaults {
1010
use sui::tx_context::{TxContext};
1111
use sui::object::{UID, ID};
1212

13-
use cetusclmm::config::GlobalConfig;
14-
use cetusclmm::pool::{Pool};
13+
use cetus_clmm::config::GlobalConfig;
14+
use cetus_clmm::pool::{Pool};
1515

1616
use farming::pool::{
1717
WrappedPositionNFT,

0 commit comments

Comments
 (0)