chore: unify dependencies to root cargo.toml #5333

syan095 · 2024-10-16T03:12:23Z

Pull Request

Closes: PRO-1720

Checklist

Please conduct a thorough self-review before opening the PR.

I am confident that the code works.
I have written sufficient tests.
I have written and tested the required migrations.
I have updated documentation where appropriate.

Summary

Dependencies are defined in the root cargo.toml. In other cargol.tomls, use
crate = {workspace = true }

Refactored single quotes into double quotes in all cargo.toml.

Updated crates that involve code changes

secp256k1 0.27 -> 0.29.1 (coupled with Bitcoin 0.32.3)
Bitcoin to 0.32.3
Sha2 to 0.10.7
Tokio to 1.40.0
Subxt to 0.37

codecov · 2024-10-16T03:23:05Z

Codecov Report

Attention: Patch coverage is 56.09756% with 18 lines in your changes missing coverage. Please review.

Project coverage is 71%. Comparing base (09f7507) to head (ff7b39c).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
engine/src/state_chain_observer/client.rs	14%	6 Missing ⚠️
engine/src/lib.rs	0%	3 Missing ⚠️
engine/src/witness/common/epoch_source.rs	0%	2 Missing ⚠️
engine/src/btc/rpc.rs	0%	1 Missing ⚠️
engine/src/dot/http_rpc.rs	0%	1 Missing ⚠️
engine/src/elections.rs	0%	1 Missing ⚠️
...tate_chain_observer/client/extrinsic_api/signed.rs	0%	1 Missing ⚠️
engine/src/witness/arb.rs	0%	1 Missing ⚠️
...d_chain_source/chunked_by_vault/monitored_items.rs	0%	1 Missing ⚠️
engine/src/witness/dot.rs	0%	1 Missing ⚠️

Additional details and impacted files

@@          Coverage Diff           @@
##            main   #5333    +/-   ##
======================================
- Coverage     71%     71%    -0%     
======================================
  Files        494     494            
  Lines      86142   86009   -133     
  Branches   86142   86009   -133     
======================================
- Hits       61164   60968   -196     
- Misses     22245   22302    +57     
- Partials    2733    2739     +6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Reverted unintended changes to `workflow/*.yml`s Formated `cargo.toml`s * origin/main: fix: don't exit if we can't remove a file that already doesn't exist (#5328)

…PolkadotSdk Updated

dandanlen · 2024-10-17T13:07:42Z

Nice work - why did you leave out the substrate dependencies?

syan095 · 2024-10-18T04:55:16Z

Nice work - why did you leave out the substrate dependencies?

Initially, I thought PolkadotSdk only list third party dependencies in the root, but upon closer inspections, it looks like they have all dependencies listed in the root, including their own sub-crates within the same repository.
I'll make the additional changes.

cargo.toml Updated some crates to later versions for compatibility.

…ions) Formatted all the cargo.toml

dandanlen · 2024-10-22T16:16:23Z

api/lib/Cargo.toml

+chainflip-node = { workspace = true }
+custom-rpc = { workspace = true }
+pallet-cf-account-roles = { workspace = true }
+pallet-cf-environment = { workspace = true }


Strictly speaking, I think these should activate default features when it's in a std context (and to remain consistent with the previous dependency declaration).

The way it's done in the polkadot repo is:

pallet-xx.workspace = true pallet-xx.default-fetaures = true

I think we should follow the same convention.

This is true in a few places, not just here. For example in the node, the engine, etc. Anywhere were we previously didn't explicitly set default-features = false we now need to override our workspace default and set default-features = true.

Right.
I've added default-features = true for al the non- no-std crates, as well as dev-dependencies.

Refactored all single quote into double quote in cargo.tomls

* origin/main: feat: broker can encode btc smart contract call (#5329) chore: localnet recreate script can use defaults (#5338) feat: witnessing btc smart contract swaps (#5331) feat: Solana CCM fallback (#5316) fix: scale types for pending ceremonies (#5286) chore: Prune historical values in Validator pallet (#5292) feat: expose deposit transaction hash from ingress-egress-tracker (#5320) # Conflicts: # Cargo.lock # engine/src/witness/btc/smart_contract.rs

* origin/main: feat: Submit a slot number alongside nonce (#5297) chore: use node version from `.nvmrc` 📌 (#5336) chore: add engine account_info logging (#5347) chore: replace manual scale encoding for ts-scale (#5335) chore: more consistent params in Broker API (#5342) # Conflicts: # engine/src/witness/sol.rs # state-chain/pallets/cf-elections/Cargo.toml # state-chain/runtime/Cargo.toml

…tartups

…waps-close-accounts * origin/main: (44 commits) fix: expire all previous epochs (#5279) feat: add/update contract swaps parameters (#5343) chore: add address to solana logging (#5353) fix: ignore dust underflows in order fills rpc (#5352) chore: consistent naming prewitnessed (#5351) feat: engine-runner verifies gpg signature of old dylib when downloaded (#5339) feat: tainted transaction reporting (#5310) bug: change_utxo not always present (#5340) feat: structured error return types for rpcs (#5346) chore: unify dependencies to root cargo.toml (#5333) feat: Submit a slot number alongside nonce (#5297) chore: use node version from `.nvmrc` 📌 (#5336) chore: add engine account_info logging (#5347) chore: replace manual scale encoding for ts-scale (#5335) chore: more consistent params in Broker API (#5342) feat: broker can encode btc smart contract call (#5329) chore: localnet recreate script can use defaults (#5338) feat: witnessing btc smart contract swaps (#5331) feat: Solana CCM fallback (#5316) fix: scale types for pending ceremonies (#5286) ... # Conflicts: # Cargo.lock # state-chain/chains/src/sol/api.rs # state-chain/pallets/cf-broadcast/src/migrations.rs # state-chain/pallets/cf-environment/Cargo.toml

* WIP: unified some dependencies to the root cargo.toml * Unified the rest of of dependencies into the root cargo.toml * Reverted unintended change. * Updated out dependencies to the (or later than the) versions used by PolkadotSdk Updated * Centralized pokadotSdk dependencies and our own packages into the root cargo.toml Updated some crates to later versions for compatibility. * Ordered everything in the root Cargo.toml alphabetically (within sections) Formatted all the cargo.toml * Added default-features = true for all crates that isn't no-std. Refactored all single quote into double quote in cargo.tomls * Fixed release build * Fixed storage key decoding for Engine. This will fix bouncer/engine startups

syan095 added 2 commits October 15, 2024 17:59

WIP: unified some dependencies to the root cargo.toml

55c5328

Unified the rest of of dependencies into the root cargo.toml

b294046

syan095 requested review from msgmaxim, dandanlen, a team and kylezs as code owners October 16, 2024 03:12

syan095 requested review from jerryafr and GabrielBuragev and removed request for a team October 16, 2024 03:12

syan095 added 2 commits October 16, 2024 16:27

Merge remote-tracking branch 'origin/main' into chore/unify-dependencies

ae6acef

Reverted unintended changes to `workflow/*.yml`s Formated `cargo.toml`s * origin/main: fix: don't exit if we can't remove a file that already doesn't exist (#5328)

Reverted unintended change.

fbf5e92

syan095 marked this pull request as draft October 16, 2024 04:12

syan095 marked this pull request as ready for review October 16, 2024 04:12

msgmaxim approved these changes Oct 17, 2024

View reviewed changes

Updated out dependencies to the (or later than the) versions used by …

9932a54

…PolkadotSdk Updated

syan095 requested a review from albert-llimos October 17, 2024 07:22

syan095 added 2 commits October 22, 2024 19:25

Centralized pokadotSdk dependencies and our own packages into the root

d357e66

cargo.toml Updated some crates to later versions for compatibility.

Ordered everything in the root Cargo.toml alphabetically (within sect…

4027d9d

…ions) Formatted all the cargo.toml

dandanlen reviewed Oct 22, 2024

View reviewed changes

syan095 added 2 commits October 23, 2024 15:58

Added default-features = true for all crates that isn't no-std.

b8cd08a

Refactored all single quote into double quote in cargo.tomls

dandanlen approved these changes Oct 23, 2024

View reviewed changes

syan095 enabled auto-merge October 23, 2024 22:19

syan095 added 2 commits October 24, 2024 16:35

Fixed release build

28d7ef4

Fixed storage key decoding for Engine. This will fix bouncer/engine s…

ff7b39c

…tartups

syan095 added this pull request to the merge queue Oct 24, 2024

Merged via the queue into main with commit 106de29 Oct 24, 2024
48 of 49 checks passed

syan095 deleted the chore/unify-dependencies branch October 24, 2024 06:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: unify dependencies to root cargo.toml #5333

chore: unify dependencies to root cargo.toml #5333

syan095 commented Oct 16, 2024 •

edited

Loading

codecov bot commented Oct 16, 2024 •

edited

Loading

dandanlen commented Oct 17, 2024

syan095 commented Oct 18, 2024 •

edited

Loading

dandanlen Oct 22, 2024

syan095 Oct 23, 2024

chore: unify dependencies to root cargo.toml #5333

chore: unify dependencies to root cargo.toml #5333

Conversation

syan095 commented Oct 16, 2024 • edited Loading

Pull Request

Checklist

Summary

Updated crates that involve code changes

codecov bot commented Oct 16, 2024 • edited Loading

Codecov Report

dandanlen commented Oct 17, 2024

syan095 commented Oct 18, 2024 • edited Loading

dandanlen Oct 22, 2024

Choose a reason for hiding this comment

syan095 Oct 23, 2024

Choose a reason for hiding this comment

syan095 commented Oct 16, 2024 •

edited

Loading

codecov bot commented Oct 16, 2024 •

edited

Loading

syan095 commented Oct 18, 2024 •

edited

Loading