chore(toolchain): upgrade to 1.72 nightly #2149

onur-ozkan · 2024-06-25T17:07:51Z

This should greatly help for people working on solana-sdk upgrade and the stable toolchain migration work.

Should be easy to review commit-by-commit.

Signed-off-by: onur-ozkan <work@onurozkan.dev>

mariocynicys

Bless you 👼, LGTM!

I only skimmed over clippy and fmt changes. I guess we don't really have a choice with these but to follow them until another toolchain upgrade.

mm2src/mm2_main/tests/docker_tests/qrc20_tests.rs

mm2src/mm2_main/src/database/stats_nodes.rs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

shamardy · 2024-06-26T00:52:08Z

Cargo.toml

mocktopus should be a dev only dependency, but since TestCoin is used outside coins crate I will use for-tests feature instead. Will push a commit that fixes that.

Fixed here db8aedc

In the future, we should move TestCoin to mm2_test_helpers or another test only crate that we import as a dev only dependency.

I will revert the last commit for now, I thought everything was fine because clippy for all targets and features worked locally, same for tests but for CI jobs it's different. It will need a bigger refactor.

IMO we should just get rid of that outdated/dead dependency.

BTW I made mocktopus optional in my PR #2112 too.
But I had to add it also as dev-dependencies as some tests in mm2_main rely on mocks in coins: f3625e5 (otherwise mocks did not do anything)

BTW I made mocktopus optional in my PR #2112 too.
But I had to add it also as dev-dependencies as some tests in mm2_main rely on mocks in coins: f3625e5 (otherwise mocks did not do anything)

Thanks @dimxy for this note, I guess we can merge this PR with [profile.release.package.mocktopus] and you can remove it in your PR if you can to not duplicate the effort.

shamardy

Thank you for the update! Only one comment from my side.

mm2src/adex_cli/Cargo.lock

Signed-off-by: onur-ozkan <work@onurozkan.dev>

mariocynicys · 2024-06-26T09:10:17Z

mm2src/mm2_main/tests/docker_tests/qrc20_tests.rs

    debug!("total_available: {}", available);
+    #[allow(clippy::redundant_clone)] // This is a false-possitive bug from clippy
    let min_tx_amount = qtum_min_tx_amount.clone();
    let expected_max_taker_vol =
        max_taker_vol_from_available(MmNumber::from(available), "QTUM", "MYCOIN", &min_tx_amount)


Suggested change

debug!("total_available: {}", available);

#[allow(clippy::redundant_clone)] // This is a false-possitive bug from clippy

let min_tx_amount = qtum_min_tx_amount.clone();

let expected_max_taker_vol =

max_taker_vol_from_available(MmNumber::from(available), "QTUM", "MYCOIN", &min_tx_amount)

debug!("total_available: {}", available);

let expected_max_taker_vol =

max_taker_vol_from_available(MmNumber::from(available), "QTUM", "MYCOIN", &qtum_min_tx_amount)

.expect("max_taker_vol_from_available");

I kind of liked the way we explicitly defined the minimum transaction amount. The change in suggestion is not really clear at first glance (to figure out the min tx amount, we need to look at max_taker_vol_from_available and check what the last argument stands for). Considering that this is just a test function, I am not sure if this change is worth applying. These are my thoughts, if you still think we should apply this change, please feel completely free to do that!

laruh · 2024-06-27T04:05:17Z

Thanks for the toolchain upgrade. Now wasm-bindgen-cli does not conflict with the toolchain version on macOS.

Note: wasm-pack downloads wasm-bindgen-cli automatically when you run the build command, as wasm-pack itself does not have some binaries for macOS.

Could you please write for OSX users (Apple Silicon): instead of for OSX users (M1):, so we don't need to repeat all new M chip versions

https://github.com/KomodoPlatform/komodo-defi-framework/blob/update-nightly-toolchain/docs/WASM_BUILD.md?plain=1#L28

https://github.com/KomodoPlatform/komodo-defi-framework/blob/update-nightly-toolchain/docs/DEV_ENVIRONMENT.md?plain=1#L64

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2024-06-27T05:46:14Z

Thanks for the toolchain upgrade. Now wasm-bindgen-cli does not conflict with the toolchain version on macOS.

Note: wasm-pack downloads wasm-bindgen-cli automatically when you run the build command, as wasm-pack itself does not have some binaries for macOS.

Could you please write for OSX users (Apple Silicon): instead of for OSX users (M1):, so we don't need to repeat all new M chip versions

https://github.com/KomodoPlatform/komodo-defi-framework/blob/update-nightly-toolchain/docs/WASM_BUILD.md?plain=1#L28

https://github.com/KomodoPlatform/komodo-defi-framework/blob/update-nightly-toolchain/docs/DEV_ENVIRONMENT.md?plain=1#L64

Done 058afa0

shamardy

🔥

* dev: fix(restrictions): remove wallet-only restriction from max_maker_vol (#2153) feat(tendermint): support unsigned txs for ledger's keplr extension (#2148) chore(toolchain): upgrade to 1.72 nightly (#2149) feat(solana-swap): solana swap protocol v1 POC (#2091) fix(docs): update cargo test command (#2144)

onur-ozkan added 3 commits June 25, 2024 20:05

update toolchain to 1.72 nightly

a39ed47

Signed-off-by: onur-ozkan <work@onurozkan.dev>

update libp2p

3bb8152

Signed-off-by: onur-ozkan <work@onurozkan.dev>

properly handle the windows seh linkage

cb5774f

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan added enhancement New feature or request under review labels Jun 25, 2024

onur-ozkan force-pushed the update-nightly-toolchain branch from d3778d0 to 1646505 Compare June 25, 2024 17:48

onur-ozkan added 5 commits June 25, 2024 20:51

bless clippy

676baa0

Signed-off-by: onur-ozkan <work@onurozkan.dev>

fix broken adex_cli packages

6959149

Signed-off-by: onur-ozkan <work@onurozkan.dev>

bless fmt

1646505

Signed-off-by: onur-ozkan <work@onurozkan.dev>

fix chrono problem

794c5b8

Signed-off-by: onur-ozkan <work@onurozkan.dev>

fix mm2 build

14389b1

Signed-off-by: onur-ozkan <work@onurozkan.dev>

mariocynicys reviewed Jun 25, 2024

View reviewed changes

mm2src/mm2_main/tests/docker_tests/qrc20_tests.rs Show resolved Hide resolved

mm2src/mm2_main/src/database/stats_nodes.rs Outdated Show resolved Hide resolved

workaround on MIR issue

af1ea90

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the update-nightly-toolchain branch from b9f9550 to da7cb8a Compare June 25, 2024 19:16

shamardy reviewed Jun 26, 2024

View reviewed changes

shamardy force-pushed the update-nightly-toolchain branch from db8aedc to da7cb8a Compare June 26, 2024 01:30

shamardy reviewed Jun 26, 2024

View reviewed changes

mm2src/adex_cli/Cargo.lock Outdated Show resolved Hide resolved

update rustup toolchain versions

5b9646a

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the update-nightly-toolchain branch 2 times, most recently from 7864eaf to ece8b26 Compare June 26, 2024 04:34

make less change on the adex_cli dependencies

b2d9e52

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the update-nightly-toolchain branch from ece8b26 to b2d9e52 Compare June 26, 2024 04:43

mariocynicys reviewed Jun 26, 2024

View reviewed changes

use the term Apple Silicon instead of outdated M1

058afa0

Signed-off-by: onur-ozkan <work@onurozkan.dev>

shamardy approved these changes Jun 27, 2024

View reviewed changes

shamardy merged commit 6db5b9f into dev Jun 27, 2024
22 of 25 checks passed

shamardy deleted the update-nightly-toolchain branch June 27, 2024 21:24

shamardy mentioned this pull request Aug 1, 2024

chore(release): v2.1.0-beta #2043

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(toolchain): upgrade to 1.72 nightly #2149

chore(toolchain): upgrade to 1.72 nightly #2149

onur-ozkan commented Jun 25, 2024 •

edited

Loading

mariocynicys left a comment

shamardy Jun 26, 2024

shamardy Jun 26, 2024

shamardy Jun 26, 2024 •

edited

Loading

onur-ozkan Jun 26, 2024

dimxy Jun 27, 2024

shamardy Jun 27, 2024 •

edited

Loading

shamardy left a comment

mariocynicys Jun 26, 2024

onur-ozkan Jun 26, 2024

laruh commented Jun 27, 2024

onur-ozkan commented Jun 27, 2024

shamardy left a comment

chore(toolchain): upgrade to 1.72 nightly #2149

chore(toolchain): upgrade to 1.72 nightly #2149

Conversation

onur-ozkan commented Jun 25, 2024 • edited Loading

mariocynicys left a comment

Choose a reason for hiding this comment

shamardy Jun 26, 2024

Choose a reason for hiding this comment

shamardy Jun 26, 2024

Choose a reason for hiding this comment

shamardy Jun 26, 2024 • edited Loading

Choose a reason for hiding this comment

onur-ozkan Jun 26, 2024

Choose a reason for hiding this comment

dimxy Jun 27, 2024

Choose a reason for hiding this comment

shamardy Jun 27, 2024 • edited Loading

Choose a reason for hiding this comment

shamardy left a comment

Choose a reason for hiding this comment

mariocynicys Jun 26, 2024

Choose a reason for hiding this comment

onur-ozkan Jun 26, 2024

Choose a reason for hiding this comment

laruh commented Jun 27, 2024

onur-ozkan commented Jun 27, 2024

shamardy left a comment

Choose a reason for hiding this comment

onur-ozkan commented Jun 25, 2024 •

edited

Loading

shamardy Jun 26, 2024 •

edited

Loading

shamardy Jun 27, 2024 •

edited

Loading