Skip to content

Commit

Permalink
Switch polkadot dependencies to crates.io
Browse files Browse the repository at this point in the history
  • Loading branch information
@Niederb
Niederb committed Oct 31, 2024
1 parent b33a676 commit 31a4921
Show file tree
Hide file tree
Showing 11 changed files with 1,911 additions and 905 deletions.
2,682 changes: 1,844 additions & 838 deletions Cargo.lock
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ tungstenite = { version = "0.23", optional = true, features = ["native-tls", "ur
ws = { version = "0.9.2", optional = true, features = ["ssl"] }

# Substrate no_std dependencies
sp-core = { default-features = false, features = ["full_crypto", "serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-crypto-hashing = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-inherents = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime-interface = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-storage = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-version = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { default-features = false, features = ["full_crypto", "serde"], version = "34.0.0" }
sp-crypto-hashing = { default-features = false, version = "0.1.0" }
sp-inherents = { default-features = false, version = "34.0.0" }
sp-runtime = { default-features = false, features = ["serde"], version = "39.0.1" }
sp-runtime-interface = { default-features = false, version = "28.0.0" }
sp-storage = { default-features = false, features = ["serde"], version = "21.0.0" }
sp-version = { default-features = false, features = ["serde"], version = "37.0.0" }

# substrate std / wasm only
frame-support = { optional = true, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
frame-support = { optional = true, version = "38.0.0" }

# local deps
ac-compose-macros = { path = "compose-macros", version = "0.18", default-features = false }
Expand All @@ -67,7 +67,7 @@ ac-primitives = { path = "primitives", version = "0.18", default-features = fals

[dev-dependencies]
ac-node-api = { path = "node-api", version = "0.18", features = ["mocks"] }
rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
rococo-runtime = { version = "18.0.0" }
scale-info = { version = "2.1.1", features = ["derive"] }
test-case = "3.1.0"

Expand Down
22 changes: 11 additions & 11 deletions examples/async/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ tokio-util = "0.7.8"
wabt = "0.10.0"

# Substrate dependencies
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-recovery = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
frame-support = { version = "38.0.0" }
frame-system = { version = "38.0.0" }
rococo-runtime = { version = "18.0.0" }
pallet-balances = { version = "39.0.0" }
pallet-identity = { version = "38.0.0" }
pallet-recovery = { version = "38.0.0" }
pallet-staking = { version = "38.0.0" }
sp-core = { version = "34.0.0" }
sp-keyring = { version = "39.0.0" }
sp-runtime = { version = "39.0.1" }
sp-weights = { version = "31.0.0" }

# local deps
substrate-api-client = { path = "../..", version = "0.18", features = ["staking-xt", "contracts-xt", "disable-metadata-hash-check"] }
8 changes: 4 additions & 4 deletions examples/sync/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ env_logger = "0.11"
log = "0.4.14"

# Substrate dependencies
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { version = "34.0.0" }
sp-keyring = { version = "39.0.0" }
sp-runtime = { version = "39.0.1" }
sp-weights = { version = "31.0.0" }

# local deps
substrate-api-client = { path = "../..", version = "0.18", default-features = false, features = ["tungstenite-client", "ws-client", "disable-metadata-hash-check"] }
6 changes: 3 additions & 3 deletions examples/wasm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "Apache-2.0"
edition = "2021"

[dev-dependencies]
sp-core = { default-features = false, features = ["full_crypto", "serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] }
sp-runtime = { version = "39.0.1", default-features = false }
substrate-api-client = { path = "../..", version = "0.18", default-features = false }
pallet-balances = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-balances = { version = "39.0.0", default-features = false }
10 changes: 5 additions & 5 deletions keystore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ parking_lot = "0.12.0"
serde_json = "1.0.79"

# Substrate dependencies
sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sc-keystore = { version = "33.0.0" }
sp-application-crypto = { version = "38.0.0" }
sp-core = { version = "34.0.0" }
sp-keyring = { version = "39.0.0" }
sp-keystore = { version = "0.40.0" }

[dev-dependencies]
tempfile = "3.3.0"
12 changes: 6 additions & 6 deletions node-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ serde = { version = "1.0.136", features = ["derive"], default-features = false }
serde_json = { version = "1.0.79", default-features = false, features = ["alloc"] }

# substrate
sp-core = { default-features = false, features = ["full_crypto", "serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-crypto-hashing = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-storage = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] }
sp-crypto-hashing = { version = "0.1.0", default-features = false }
sp-runtime = { version = "39.0.1", default-features = false, features = ["serde"] }
sp-storage = { version = "21.0.0", default-features = false, features = ["serde"] }

# need to add this for `no_std`
sp-application-crypto = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime-interface = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-application-crypto = { version = "38.0.0", default-features = false, features = ["full_crypto"] }
sp-runtime-interface = { version = "28.0.0", default-features = false }

# local
ac-primitives = { path = "../primitives", version = "0.18", default-features = false }
Expand Down
32 changes: 16 additions & 16 deletions primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }

# substrate no_std
sp-core = { default-features = false, features = ["full_crypto", "serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-crypto-hashing = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime-interface = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-staking = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-version = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-weights = { default-features = false, features = ["serde"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { version = "34.0.0", default-features = false, features = ["full_crypto", "serde"] }
sp-crypto-hashing = { version = "0.1.0", default-features = false }
sp-runtime = { version = "39.0.1", default-features = false, features = ["serde"] }
sp-runtime-interface = { version = "28.0.0", default-features = false }
sp-staking = { version = "36.0.0", default-features = false, features = ["serde"] }
sp-version = { version = "37.0.0", default-features = false, features = ["serde"] }
sp-weights = { version = "31.0.0", default-features = false, features = ["serde"] }
# need to add this for the app_crypto macro
sp-application-crypto = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-application-crypto = { version = "38.0.0", default-features = false, features = ["full_crypto"] }

# substrate std / wasm only
frame-system = { optional = true, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-assets = { optional = true, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-balances = { optional = true, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-contracts = { optional = true, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-staking = { optional = true, git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
frame-system = { version = "38.0.0", optional = true }
pallet-assets = { version = "40.0.0", optional = true }
pallet-balances = { version = "39.0.0", optional = true }
pallet-contracts = { version = "38.0.0", optional = true }
pallet-staking = { version = "38.0.0", optional = true }

[dev-dependencies]
frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
frame-metadata-hash-extension = { version = "0.6.0" }
solochain-template-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keyring = { version = "39.0.0" }
pallet-transaction-payment = { version = "38.0.0" }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion test-no-std/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ac-primitives = { path = "../primitives", version = "0.18", default-features = f
substrate-api-client = { path = "..", version = "0.18", default-features = false, optional = true, features = ["disable_target_static_assertions", "sync-api"] }

# substrate dependencies
sp-io = { default-features = false, features = ["disable_oom", "disable_panic_handler"], git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-io = { version = "38.0.0", default-features = false, features = ["disable_oom", "disable_panic_handler"] }

[features]
# It is better to test the no-std crates standalone (don't enable both features at the same time) because dependency
Expand Down
18 changes: 9 additions & 9 deletions testing/async/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jsonrpsee = { version = "0.24", features = ["async-client", "client-ws-transport


# Substrate dependencies
frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
pallet-society = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
frame-support = { version = "38.0.0" }
rococo-runtime = { version = "18.0.0" }
sp-core = { version = "34.0.0" }
sp-crypto-hashing = { version = "0.1.0" }
sp-keyring = { version = "39.0.0" }
sp-runtime = { version = "39.0.1" }
sp-staking = { version = "36.0.0" }
pallet-balances = { version = "39.0.0" }
pallet-society = { version = "38.0.0" }

# local deps
substrate-api-client = { path = "../..", version = "0.18", features = ["staking-xt", "contracts-xt", "disable-metadata-hash-check"] }
6 changes: 3 additions & 3 deletions testing/sync/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ edition = "2021"

[dev-dependencies]
# Substrate dependencies
sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "master" }
sp-application-crypto = { version = "38.0.0" }
sp-core = { version = "34.0.0" }
sp-runtime = { version = "39.0.1" }

# local deps
substrate-api-client = { path = "../..", version = "0.18", default-features = false, features = ["tungstenite-client", "ws-client", "disable-metadata-hash-check"] }
Expand Down

0 comments on commit 31a4921

Please sign in to comment.