Skip to content

Commit

Permalink
Merge pull request #306 from gregdhill/chore/runtime-v1.15.0
Browse files Browse the repository at this point in the history 
chore: upgrade to parachain v1.15.0
  • Loading branch information
@gregdhill
gregdhill authored Jun 21, 2022
2 parents 5209b1c + 6ec853c commit f6543fd
Show file tree
Hide file tree
Showing 17 changed files with 1,574 additions and 1,356 deletions.
2,689 changes: 1,394 additions & 1,295 deletions Cargo.lock
View file

Large diffs are not rendered by default.

110 changes: 110 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,113 @@ members = [
"faucet",
"service"
]

[patch.crates-io]
# TODO: https://github.com/paritytech/substrate/pull/11707
syn = { git = "https://github.com/dtolnay/syn", rev = "19b3f0b53525ac7ab0882882a822adbd874dbe8c" }

[patch."https://github.com/paritytech/substrate"]
frame-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-executive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-support-procedural = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-system = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-balances = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-identity = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-membership = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-multisig = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-scheduler = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-society = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-sudo = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-timestamp = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-treasury = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
pallet-utility = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-basic-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-block-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-chain-spec = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-client-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-client-db = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-consensus = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-executor = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-executor-common = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-informant = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-network = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-network-gossip = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-offchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-rpc-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-rpc-server = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-service = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-telemetry = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sc-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-application-crypto = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-arithmetic = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-block-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-blockchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-consensus = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-debug-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-externalities = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-inherents = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-offchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-runtime-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-serializer = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-std = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-storage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-timestamp = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-trie = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-version = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
sp-wasm-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }
substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.24" }

[patch."https://github.com/paritytech/polkadot"]
pallet-xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.24" }
polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.24" }
xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.24" }
xcm-builder = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.24" }
xcm-executor = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.24" }
4 changes: 2 additions & 2 deletions bitcoin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ hyper = "0.10"
esplora-btc-api = "1.0.3"

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

[dependencies.interbtc-bitcoin]
git = "https://github.com/interlay/interbtc"
rev = "3af3ea377be94c4fdcf3c31cda13c9fbe2eb5234"
rev = "9bb83764669fed277a218e6a82876eb7f9028a94"
package = "bitcoin"
optional = true

Expand Down
2 changes: 1 addition & 1 deletion faucet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ service = { path = "../service" }
runtime = { path = "../runtime", features = ["testing-utils"] }

# Substrate dependencies
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
12 changes: 6 additions & 6 deletions faucet/src/http.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ mod tests {
.expect("Unable to set exchange rate");
}

#[tokio::test]
#[tokio::test(flavor = "multi_thread")]
async fn test_fund_user_once_succeeds() {
let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
set_exchange_rate(client.clone()).await;
Expand Down Expand Up @@ -400,7 +400,7 @@ mod tests {
assert_eq!(bob_funds_before + expected_amount_planck, bob_funds_after);
}

#[tokio::test]
#[tokio::test(flavor = "multi_thread")]
async fn test_fund_rich_user_fails() {
let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
set_exchange_rate(client.clone()).await;
Expand Down Expand Up @@ -430,7 +430,7 @@ mod tests {
);
}

#[tokio::test]
#[tokio::test(flavor = "multi_thread")]
async fn test_fund_user_immediately_after_registering_as_vault_succeeds() {
let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
set_exchange_rate(client.clone()).await;
Expand Down Expand Up @@ -505,7 +505,7 @@ mod tests {
assert_eq!(bob_funds_before + expected_amount_planck, bob_funds_after);
}

#[tokio::test]
#[tokio::test(flavor = "multi_thread")]
async fn test_fund_user_twice_in_a_row_fails() {
let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
set_exchange_rate(client.clone()).await;
Expand Down Expand Up @@ -555,7 +555,7 @@ mod tests {
);
}

#[tokio::test]
#[tokio::test(flavor = "multi_thread")]
async fn test_fund_vault_once_succeeds() {
let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
set_exchange_rate(client.clone()).await;
Expand Down Expand Up @@ -618,7 +618,7 @@ mod tests {
}
}

#[tokio::test]
#[tokio::test(flavor = "multi_thread")]
async fn test_fund_vault_twice_in_a_row_fails() {
let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
set_exchange_rate(client.clone()).await;
Expand Down
30 changes: 13 additions & 17 deletions runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,49 +34,45 @@ cfg-if = "1.0"
prometheus = { version = "0.12.0", features = ["process"] }

# Substrate dependencies
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }

# Subxt dependencies
# https://github.com/interlay/subxt/tree/polkadot-v0.9.20
subxt = { package = "subxt", git = "https://github.com/interlay/subxt", rev = "fdd9de15681c0cc715b147d30b2dc2c995fc70b6" }
# https://github.com/interlay/subxt/tree/polkadot-v0.9.24
subxt = { package = "subxt", git = "https://github.com/interlay/subxt", rev = "cad1564b487f59c53840894607debf1aaae7a2f7" }
subxt-client = { package = "subxt-client", path = "./client", optional = true }

jsonrpsee = { version = "0.10.1", features = ["macros", "jsonrpsee-types", "client", "jsonrpsee-ws-client", "jsonrpsee-client-transport"] }

# Polkadot dependencies
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" }

bitcoin = { path = "../bitcoin"}

# Dependencies for the testing utils for integration tests
tempdir = { version = "0.3.7", optional = true }
interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "3af3ea377be94c4fdcf3c31cda13c9fbe2eb5234", optional = true }
interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "9bb83764669fed277a218e6a82876eb7f9028a94", optional = true }
rand = { version = "0.7", optional = true }

[dependencies.primitives]
git = "https://github.com/interlay/interbtc"
rev = "3af3ea377be94c4fdcf3c31cda13c9fbe2eb5234"
rev = "9bb83764669fed277a218e6a82876eb7f9028a94"
package = "interbtc-primitives"

[dependencies.module-bitcoin]
git = "https://github.com/interlay/interbtc"
rev = "3af3ea377be94c4fdcf3c31cda13c9fbe2eb5234"
rev = "9bb83764669fed277a218e6a82876eb7f9028a94"
package = "bitcoin"

[dependencies.module-btc-relay]
git = "https://github.com/interlay/interbtc"
rev = "3af3ea377be94c4fdcf3c31cda13c9fbe2eb5234"
rev = "9bb83764669fed277a218e6a82876eb7f9028a94"
package = "btc-relay"

[dependencies.module-oracle-rpc-runtime-api]
git = "https://github.com/interlay/interbtc"
rev = "3af3ea377be94c4fdcf3c31cda13c9fbe2eb5234"
rev = "9bb83764669fed277a218e6a82876eb7f9028a94"
package = "module-oracle-rpc-runtime-api"

[dev-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions runtime/client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ 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.20" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false }

[target.'cfg(target_arch="x86_64")'.dependencies]
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, features = [
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24", default-features = false, features = [
"wasmtime",
] }
Loading

0 comments on commit f6543fd

Please sign in to comment.