Merge branch 'main' into polkadot-v1.1.0

pendulum-chain · Jul 24, 2024 · 255845c · 255845c
2 parents 08da9d6 + a70480c
commit 255845c
Show file tree

Hide file tree

Showing 61 changed files with 202 additions and 176 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg", "tokio_unstable"]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/README.md b/clients/README.md
@@ -219,9 +219,13 @@ due to the converted destination account not having trustlines set up for the re
 The destination account is derived automatically from the account that called the extrinsic on-chain.
 
 ### Debugging with `tokio-console`
-The vault is `tokio-console` ready, with the feature **_`allow-debugger`_**. _Remember to [set the rustflags](https://github.com/tokio-rs/console?tab=readme-ov-file#instrumenting-your-program)!_
+The vault is `tokio-console` ready, with the feature **_`allow-debugger`_**. 
+
+> **Note**: [Rustflags are required](https://github.com/tokio-rs/console?tab=readme-ov-file#instrumenting-your-program) to make `tokio-console` work.
+It has been defined directly in [.cargo/config.toml](../.cargo/config.toml). 
+
 ```
-RUSTFLAGS="--cfg tokio_unstable" cargo run --bin vault --features allow-debugger
+cargo run --bin vault --features allow-debugger
 ```
 [Install tokio-console](https://github.com/tokio-rs/console?tab=readme-ov-file#running-the-console)
 and connect to the vault.  

diff --git a/clients/runner/Cargo.toml b/clients/runner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runner"
-version = "1.0.9"
+version = "1.0.10"
 edition = "2021"
 
 

diff --git a/clients/runtime/Cargo.toml b/clients/runtime/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Pendulum"]
 edition = "2018"
 name = "runtime"
-version = "1.0.9"
+version = "1.0.10"
 
 [features]
 default = []

diff --git a/clients/runtime/client/Cargo.toml b/clients/runtime/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subxt-client"
-version = "1.0.9"
+version = "1.0.10"
 authors = []
 edition = "2018"
 

diff --git a/clients/service/Cargo.toml b/clients/service/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Pendulum"]
 edition = "2018"
 name = "service"
-version = "1.0.9"
+version = "1.0.10"
 
 [dependencies]
 async-trait = "0.1.40"

diff --git a/clients/service/src/lib.rs b/clients/service/src/lib.rs
@@ -215,11 +215,3 @@ where
 {
 	tokio::spawn(run_cancelable(shutdown_rx, future));
 }
-
-pub async fn on_shutdown(shutdown_tx: ShutdownSender, future2: impl Future) {
-	let mut shutdown_rx = shutdown_tx.subscribe();
-	let future1 = shutdown_rx.recv().fuse();
-
-	let _ = future1.await;
-	future2.await;
-}
diff --git a/clients/stellar-relay-lib/Cargo.toml b/clients/stellar-relay-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stellar-relay-lib"
-version = "1.0.9"
+version = "1.0.10"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[build]
		rustflags = ["--cfg", "tokio_unstable"]