Skip to content
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

Jump to bottom

chore: upgrade parachain to 1.25.0-rc1 #491

Merged
merged 1 commit into from
Jul 17, 2023
Merged

chore: upgrade parachain to 1.25.0-rc1 #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3,415 changes: 1,920 additions & 1,495 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

435 changes: 218 additions & 217 deletions Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bitcoin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ serde = "1.0.139"
serde_json = "1.0.82"

# Substrate dependencies
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

[dev-dependencies]
mockall = "0.8.1"
Expand Down
3 changes: 1 addition & 2 deletions faucet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ service = { path = "../service" }
runtime = { path = "../runtime", features = ["testing-utils"] }

# Substrate dependencies
# needs to agree with subxt's version
sp-keyring = { version = "7.0.0" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
2 changes: 1 addition & 1 deletion runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ clap = { version = "4.0.17", features = ["derive"]}
hex = "0.4.3"
tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
thiserror = "1.0.0"
log = "0.4.0"
env_logger = "0.7.1"
Expand Down
21 changes: 10 additions & 11 deletions runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ prometheus = { version = "0.12.0", features = ["process"] }
lazy_static = "1.4.0"

# Substrate dependencies
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
# needs to agree with subxt's version
sp-keyring = { version = "7.0.0", default_features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

# Subxt dependencies
subxt = "0.25.0"
Expand All @@ -48,28 +47,28 @@ bitcoin = { path = "../bitcoin" }

# Dependencies for the testing utils for integration tests
tempdir = { version = "0.3.7", optional = true }
interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "dad0db930dce16070e921c1d9f05b5244be6a995", optional = true }
interbtc-runtime = { package = "kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "dad0db930dce16070e921c1d9f05b5244be6a995", optional = true }
interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "2ec5b959a547f28d7bab7799568321c9cff40343", optional = true }
interbtc-runtime = { package = "kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "2ec5b959a547f28d7bab7799568321c9cff40343", optional = true }
rand = { version = "0.7", optional = true }

[dependencies.primitives]
git = "https://github.com/interlay/interbtc"
rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
rev = "2ec5b959a547f28d7bab7799568321c9cff40343"
package = "interbtc-primitives"

[dependencies.module-bitcoin]
git = "https://github.com/interlay/interbtc"
rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
rev = "2ec5b959a547f28d7bab7799568321c9cff40343"
package = "bitcoin"

[dependencies.module-btc-relay]
git = "https://github.com/interlay/interbtc"
rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
rev = "2ec5b959a547f28d7bab7799568321c9cff40343"
package = "btc-relay"

[dependencies.module-oracle-rpc-runtime-api]
git = "https://github.com/interlay/interbtc"
rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
rev = "2ec5b959a547f28d7bab7799568321c9cff40343"
package = "oracle-rpc-runtime-api"

[dev-dependencies]
Expand Down
11 changes: 5 additions & 6 deletions runtime/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ log = "0.4.13"
serde_json = "1.0.61"
thiserror = "1.0.23"

sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
# needs to agree with subxt's version
sp-keyring = { version = "7.0.0" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

subxt = "0.25.0"
2 changes: 0 additions & 2 deletions runtime/client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ impl<C: ChainSpec + 'static> SubxtClientConfig<C> {
disable_grandpa: Default::default(),
execution_strategies: Default::default(),
force_authoring: Default::default(),
keystore_remote: Default::default(),
offchain_worker: Default::default(),
prometheus_config: Default::default(),
rpc_cors: Default::default(),
Expand All @@ -262,7 +261,6 @@ impl<C: ChainSpec + 'static> SubxtClientConfig<C> {
base_path: Default::default(),
informant_output_format: Default::default(),
state_pruning: Default::default(),
// transaction_storage: sc_client_db::TransactionStorageMode::BlockBody,
wasm_runtime_overrides: Default::default(),
rpc_max_payload: Default::default(),
ws_max_out_buffer_capacity: Default::default(),
Expand Down
Binary file modified runtime/metadata-parachain-interlay.scale
View file
Open in desktop
Binary file not shown.
Binary file modified runtime/metadata-parachain-kintsugi.scale
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions runtime/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ compile_error!("Tests are only supported for the kintsugi runtime");

cfg_if::cfg_if! {
if #[cfg(feature = "parachain-metadata-interlay")] {
const DEFAULT_SPEC_VERSION: Range<u32> = 1024000..1025000;
const DEFAULT_SPEC_VERSION: Range<u32> = 1025000..1026000;
pub const DEFAULT_SPEC_NAME: &str = "interlay-parachain";
pub const SS58_PREFIX: u16 = 2032;
} else if #[cfg(feature = "parachain-metadata-kintsugi")] {
const DEFAULT_SPEC_VERSION: Range<u32> = 1024000..1025000;
const DEFAULT_SPEC_VERSION: Range<u32> = 1025000..1026000;
pub const DEFAULT_SPEC_NAME: &str = "kintsugi-parachain";
pub const SS58_PREFIX: u16 = 2092;
}
Expand Down
6 changes: 4 additions & 2 deletions runtime/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,15 @@ mod dispatch_error {
convert_enum!(
RichTokenError,
TokenError,
NoFunds,
WouldDie,
FundsUnavailable,
OnlyProvider,
BelowMinimum,
CannotCreate,
UnknownAsset,
Frozen,
Unsupported,
CannotCreateHold,
NotExpendable,
);

convert_enum!(
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2022-12-15"
channel = "nightly-2023-03-01"
components = [ "rustfmt", "rls" ]
targets = [ "wasm32-unknown-unknown" ]
7 changes: 3 additions & 4 deletions vault/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ lazy_static = "1.4"
governor = "0.5.0"
nonzero_ext = "0.3.0"

rocksdb = { version = "0.19.0", features = ["snappy"], default-features = false }
rocksdb = { version = "0.20.0", features = ["snappy"], default-features = false }

tracing = { version = "0.1", features = ["log"] }
tracing-subscriber = { version = "0.2.12", features = ["registry", "env-filter", "fmt"] }
Expand All @@ -49,8 +49,7 @@ service = { path = "../service" }
faucet-rpc = { package = "faucet", path = "../faucet" }

# Substrate dependencies
# needs to agree with subxt's version
sp-keyring = { version = "7.0.0" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

[dev-dependencies]
mockall = "0.8.1"
Expand All @@ -61,4 +60,4 @@ runtime = { path = "../runtime", features = ["testing-utils"] }
bitcoin = { path = "../bitcoin", features = ["cli", "regtest-manual-mining"] }

# Substrate dependencies
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }