Skip to content

Commit

Permalink
chore: bump parachain and metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
sander2 committed Feb 22, 2023
1 parent 1f871fd commit a279c37
Show file tree
Hide file tree
Showing 12 changed files with 2,136 additions and 1,389 deletions.
3,052 changes: 1,898 additions & 1,154 deletions Cargo.lock

Large diffs are not rendered by default.

434 changes: 217 additions & 217 deletions Cargo.toml

Large diffs are not rendered by default.

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

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

[dev-dependencies]
mockall = "0.8.1"
Expand Down
2 changes: 1 addition & 1 deletion runner/Cargo.toml
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.36" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
thiserror = "1.0.0"
log = "0.4.0"
env_logger = "0.7.1"
Expand Down
18 changes: 9 additions & 9 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ 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.36" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
# 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.36" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }

# Subxt dependencies
subxt = "0.25.0"
Expand All @@ -50,28 +50,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 = "1f7533459a654d745002d1e519cf4fe9ecc4dfe2", optional = true }
interbtc-runtime = { package = "testnet-kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "1f7533459a654d745002d1e519cf4fe9ecc4dfe2", optional = true }
interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "fdc136ba10d2eafd7de171b6a44f739643b5aa67", optional = true }
interbtc-runtime = { package = "testnet-kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "fdc136ba10d2eafd7de171b6a44f739643b5aa67", optional = true }
rand = { version = "0.7", optional = true }

[dependencies.primitives]
git = "https://github.com/interlay/interbtc"
rev = "1f7533459a654d745002d1e519cf4fe9ecc4dfe2"
rev = "fdc136ba10d2eafd7de171b6a44f739643b5aa67"
package = "interbtc-primitives"

[dependencies.module-bitcoin]
git = "https://github.com/interlay/interbtc"
rev = "1f7533459a654d745002d1e519cf4fe9ecc4dfe2"
rev = "fdc136ba10d2eafd7de171b6a44f739643b5aa67"
package = "bitcoin"

[dependencies.module-btc-relay]
git = "https://github.com/interlay/interbtc"
rev = "1f7533459a654d745002d1e519cf4fe9ecc4dfe2"
rev = "fdc136ba10d2eafd7de171b6a44f739643b5aa67"
package = "btc-relay"

[dependencies.module-oracle-rpc-runtime-api]
git = "https://github.com/interlay/interbtc"
rev = "1f7533459a654d745002d1e519cf4fe9ecc4dfe2"
rev = "fdc136ba10d2eafd7de171b6a44f739643b5aa67"
package = "oracle-rpc-runtime-api"

[dev-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions runtime/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +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.36" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false }
# needs to agree with subxt's version
sp-keyring = { version = "7.0.0" }

Expand Down
Binary file modified runtime/metadata-parachain-interlay-testnet.scale
Binary file not shown.
Binary file modified runtime/metadata-parachain-interlay.scale
Binary file not shown.
Binary file modified runtime/metadata-parachain-kintsugi-testnet.scale
Binary file not shown.
Binary file modified runtime/metadata-parachain-kintsugi.scale
Binary file not shown.
7 changes: 5 additions & 2 deletions runtime/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,15 @@ mod h256_le {

mod dispatch_error {
use crate::metadata::{
runtime_types::sp_runtime::{ArithmeticError, ModuleError, TokenError, TransactionalError},
runtime_types::{
sp_arithmetic::ArithmeticError,
sp_runtime::{ModuleError, TokenError, TransactionalError},
},
DispatchError,
};

type RichTokenError = sp_runtime::TokenError;
type RichArithmeticError = sp_runtime::ArithmeticError;
type RichArithmeticError = sp_arithmetic::ArithmeticError;
type RichDispatchError = sp_runtime::DispatchError;
type RichModuleError = sp_runtime::ModuleError;
type RichTransactionalError = sp_runtime::TransactionalError;
Expand Down
2 changes: 1 addition & 1 deletion vault/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,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.36" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }

0 comments on commit a279c37

Please sign in to comment.