From 73582d8059162c3c3e0b84f401d729f05e82422a Mon Sep 17 00:00:00 2001 From: b-yap <2826165+b-yap@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:37:25 +0800 Subject: [PATCH] Revert "Merge branch 'main' into polkadot-v1.1.0" This reverts commit 255845c61aa4eb6151acb459e8988a462a46e899, reversing changes made to 08da9d6dc130abbb42525348ccf8590b125abcca. --- .cargo/config.toml | 2 - Cargo.lock | 72 +++++++++---------- clients/README.md | 8 +-- clients/runner/Cargo.toml | 2 +- clients/runtime/Cargo.toml | 2 +- clients/runtime/client/Cargo.toml | 2 +- clients/service/Cargo.toml | 2 +- clients/service/src/lib.rs | 8 +++ clients/stellar-relay-lib/Cargo.toml | 2 +- .../stellar_relay_config_mainnet_iowa.json | 6 +- .../stellar_relay_config_sdftest1.json | 4 +- .../stellar_relay_config_sdftest2.json | 4 +- .../stellar_relay_config_sdftest3.json | 4 +- clients/stellar-relay-lib/src/overlay.rs | 4 +- clients/vault/Cargo.toml | 2 +- .../stellar_relay_config_frankfurt.json | 6 +- .../mainnet/stellar_relay_config_iowa.json | 6 +- .../stellar_relay_config_singapore.json | 6 +- .../stellar_relay_config_sdftest1.json | 4 +- .../stellar_relay_config_sdftest2.json | 4 +- .../stellar_relay_config_sdftest3.json | 4 +- clients/vault/src/oracle/agent.rs | 45 ++++++------ clients/vault/src/oracle/errors.rs | 3 - clients/vault/src/oracle/storage/impls.rs | 4 +- clients/vault/src/oracle/storage/traits.rs | 5 +- clients/vault/src/system.rs | 16 ----- clients/wallet/Cargo.toml | 2 +- clients/wallet/src/horizon/tests.rs | 12 ++-- clients/wallet/src/mock.rs | 11 +-- clients/wallet/src/operations.rs | 20 ++++-- pallets/clients-info/Cargo.toml | 2 +- pallets/currency/Cargo.toml | 2 +- pallets/fee/Cargo.toml | 2 +- pallets/issue/Cargo.toml | 2 +- pallets/issue/rpc/Cargo.toml | 2 +- pallets/issue/rpc/runtime-api/Cargo.toml | 2 +- pallets/issue/src/benchmarking.rs | 10 +-- pallets/issue/src/default_weights.rs | 38 +++++----- pallets/nomination/Cargo.toml | 2 +- pallets/oracle/Cargo.toml | 2 +- pallets/oracle/rpc/Cargo.toml | 2 +- pallets/oracle/rpc/runtime-api/Cargo.toml | 2 +- pallets/pooled-rewards/Cargo.toml | 2 +- pallets/redeem/Cargo.toml | 2 +- pallets/redeem/rpc/Cargo.toml | 2 +- pallets/redeem/rpc/runtime-api/Cargo.toml | 2 +- pallets/replace/Cargo.toml | 2 +- pallets/replace/rpc/Cargo.toml | 2 +- pallets/replace/rpc/runtime-api/Cargo.toml | 2 +- pallets/reward-distribution/Cargo.toml | 2 +- pallets/reward/Cargo.toml | 2 +- pallets/security/Cargo.toml | 2 +- pallets/staking/Cargo.toml | 2 +- pallets/stellar-relay/Cargo.toml | 2 +- pallets/vault-registry/Cargo.toml | 2 +- pallets/vault-registry/rpc/Cargo.toml | 2 +- .../vault-registry/rpc/runtime-api/Cargo.toml | 2 +- primitives/Cargo.toml | 2 +- testchain/node/Cargo.toml | 2 +- testchain/runtime/mainnet/Cargo.toml | 2 +- testchain/runtime/testnet/Cargo.toml | 2 +- 61 files changed, 176 insertions(+), 202 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index 16f1e73ac..000000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[build] -rustflags = ["--cfg", "tokio_unstable"] \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 227bdc902..38d793337 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1468,7 +1468,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clients-info" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-benchmarking", "frame-support", @@ -1895,7 +1895,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "currency" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "frame-system", @@ -2743,7 +2743,7 @@ dependencies = [ [[package]] name = "fee" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "frame-benchmarking", @@ -4323,7 +4323,7 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "issue" -version = "1.0.10" +version = "1.0.9" dependencies = [ "base64 0.13.1", "currency", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "module-issue-rpc" -version = "1.0.10" +version = "1.0.9" dependencies = [ "jsonrpsee 0.16.3", "module-issue-rpc-runtime-api", @@ -5767,7 +5767,7 @@ dependencies = [ [[package]] name = "module-issue-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "parity-scale-codec", @@ -5777,7 +5777,7 @@ dependencies = [ [[package]] name = "module-oracle-rpc" -version = "1.0.10" +version = "1.0.9" dependencies = [ "jsonrpsee 0.16.3", "module-oracle-rpc-runtime-api", @@ -5790,7 +5790,7 @@ dependencies = [ [[package]] name = "module-oracle-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "parity-scale-codec", @@ -5803,7 +5803,7 @@ dependencies = [ [[package]] name = "module-redeem-rpc" -version = "1.0.10" +version = "1.0.9" dependencies = [ "jsonrpsee 0.16.3", "module-redeem-rpc-runtime-api", @@ -5815,7 +5815,7 @@ dependencies = [ [[package]] name = "module-redeem-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "parity-scale-codec", @@ -5825,7 +5825,7 @@ dependencies = [ [[package]] name = "module-replace-rpc" -version = "1.0.10" +version = "1.0.9" dependencies = [ "jsonrpsee 0.16.3", "module-replace-rpc-runtime-api", @@ -5837,7 +5837,7 @@ dependencies = [ [[package]] name = "module-replace-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "parity-scale-codec", @@ -5847,7 +5847,7 @@ dependencies = [ [[package]] name = "module-vault-registry-rpc" -version = "1.0.10" +version = "1.0.9" dependencies = [ "jsonrpsee 0.16.3", "module-oracle-rpc-runtime-api", @@ -5860,7 +5860,7 @@ dependencies = [ [[package]] name = "module-vault-registry-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "module-oracle-rpc-runtime-api", @@ -6136,7 +6136,7 @@ dependencies = [ [[package]] name = "nomination" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "fee", @@ -6407,7 +6407,7 @@ dependencies = [ [[package]] name = "oracle" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "dia-oracle", @@ -7068,7 +7068,7 @@ dependencies = [ [[package]] name = "pooled-rewards" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "frame-benchmarking", @@ -7681,7 +7681,7 @@ dependencies = [ [[package]] name = "redeem" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "fee", @@ -7839,7 +7839,7 @@ dependencies = [ [[package]] name = "replace" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "fee", @@ -7927,7 +7927,7 @@ dependencies = [ [[package]] name = "reward" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "frame-benchmarking", @@ -7949,7 +7949,7 @@ dependencies = [ [[package]] name = "reward-distribution" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "frame-benchmarking", @@ -8079,7 +8079,7 @@ dependencies = [ [[package]] name = "runner" -version = "1.0.10" +version = "1.0.9" dependencies = [ "async-trait", "bytes", @@ -8106,7 +8106,7 @@ dependencies = [ [[package]] name = "runtime" -version = "1.0.10" +version = "1.0.9" dependencies = [ "async-trait", "backoff", @@ -9625,7 +9625,7 @@ dependencies = [ [[package]] name = "security" -version = "1.0.10" +version = "1.0.9" dependencies = [ "frame-support", "frame-system", @@ -9810,7 +9810,7 @@ dependencies = [ [[package]] name = "service" -version = "1.0.10" +version = "1.0.9" dependencies = [ "async-trait", "clap 3.2.25", @@ -11176,7 +11176,7 @@ dependencies = [ [[package]] name = "spacewalk-primitives" -version = "1.0.10" +version = "1.0.9" dependencies = [ "base58", "bstringify", @@ -11195,7 +11195,7 @@ dependencies = [ [[package]] name = "spacewalk-runtime-standalone-mainnet" -version = "1.0.10" +version = "1.0.9" dependencies = [ "cfg-if 1.0.0", "clients-info", @@ -11264,7 +11264,7 @@ dependencies = [ [[package]] name = "spacewalk-runtime-standalone-testnet" -version = "1.0.10" +version = "1.0.9" dependencies = [ "cfg-if 1.0.0", "clients-info", @@ -11333,7 +11333,7 @@ dependencies = [ [[package]] name = "spacewalk-standalone" -version = "1.0.10" +version = "1.0.9" dependencies = [ "clap 4.5.4", "frame-benchmarking", @@ -11462,7 +11462,7 @@ dependencies = [ [[package]] name = "staking" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "frame-benchmarking", @@ -11520,7 +11520,7 @@ dependencies = [ [[package]] name = "stellar-relay" -version = "1.0.10" +version = "1.0.9" dependencies = [ "base64 0.13.1", "currency", @@ -11543,7 +11543,7 @@ dependencies = [ [[package]] name = "stellar-relay-lib" -version = "1.0.10" +version = "1.0.9" dependencies = [ "async-std", "base64 0.13.1", @@ -11746,7 +11746,7 @@ dependencies = [ [[package]] name = "subxt-client" -version = "1.0.10" +version = "1.0.9" dependencies = [ "futures 0.1.31", "futures 0.3.30", @@ -12760,7 +12760,7 @@ checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "vault" -version = "1.0.10" +version = "1.0.9" dependencies = [ "async-std", "async-trait", @@ -12819,7 +12819,7 @@ dependencies = [ [[package]] name = "vault-registry" -version = "1.0.10" +version = "1.0.9" dependencies = [ "currency", "fee", @@ -12924,7 +12924,7 @@ dependencies = [ [[package]] name = "wallet" -version = "1.0.10" +version = "1.0.9" dependencies = [ "async-trait", "cached", diff --git a/clients/README.md b/clients/README.md index be2d7f345..f0ebc1f2e 100644 --- a/clients/README.md +++ b/clients/README.md @@ -219,13 +219,9 @@ 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`_**. - -> **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). - +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)!_ ``` -cargo run --bin vault --features allow-debugger +RUSTFLAGS="--cfg tokio_unstable" 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 index de4b958f1..09b23d3dc 100644 --- a/clients/runner/Cargo.toml +++ b/clients/runner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "runner" -version = "1.0.10" +version = "1.0.9" edition = "2021" diff --git a/clients/runtime/Cargo.toml b/clients/runtime/Cargo.toml index a8852bc59..77cc04786 100644 --- a/clients/runtime/Cargo.toml +++ b/clients/runtime/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum"] edition = "2018" name = "runtime" -version = "1.0.10" +version = "1.0.9" [features] default = [] diff --git a/clients/runtime/client/Cargo.toml b/clients/runtime/client/Cargo.toml index 794e29e64..541ea8b8d 100644 --- a/clients/runtime/client/Cargo.toml +++ b/clients/runtime/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subxt-client" -version = "1.0.10" +version = "1.0.9" authors = [] edition = "2018" diff --git a/clients/service/Cargo.toml b/clients/service/Cargo.toml index d2f8a3e27..2c2681fce 100644 --- a/clients/service/Cargo.toml +++ b/clients/service/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum"] edition = "2018" name = "service" -version = "1.0.10" +version = "1.0.9" [dependencies] async-trait = "0.1.40" diff --git a/clients/service/src/lib.rs b/clients/service/src/lib.rs index 141fec7b9..ebdb8714a 100644 --- a/clients/service/src/lib.rs +++ b/clients/service/src/lib.rs @@ -215,3 +215,11 @@ 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 index 5f465c8f0..481e2892c 100644 --- 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.10" +version = "1.0.9" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/clients/stellar-relay-lib/resources/config/mainnet/stellar_relay_config_mainnet_iowa.json b/clients/stellar-relay-lib/resources/config/mainnet/stellar_relay_config_mainnet_iowa.json index 4c4d575fa..f9f14f77f 100644 --- a/clients/stellar-relay-lib/resources/config/mainnet/stellar_relay_config_mainnet_iowa.json +++ b/clients/stellar-relay-lib/resources/config/mainnet/stellar_relay_config_mainnet_iowa.json @@ -4,10 +4,10 @@ "port": 11625 }, "node_info": { - "ledger_version": 21, - "overlay_version": 33, + "ledger_version": 20, + "overlay_version": 32, "overlay_min_version": 32, - "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", + "version_str": "stellar-core 20.4.0 (7fc7671b8bc1ccc3b1f16a6ab83bc9f671db8b70)", "is_pub_net": true }, "stellar_history_archive_urls": [ diff --git a/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest1.json b/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest1.json index a5b57a8c0..75d28f203 100644 --- a/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest1.json +++ b/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest1.json @@ -5,9 +5,9 @@ }, "node_info": { "ledger_version": 21, - "overlay_version": 34, + "overlay_version": 33, "overlay_min_version": 32, - "version_str": "stellar-core 21.1.0 (b3aeb14cc798f6d11deb2be913041be916f3b0cc)", + "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", "is_pub_net": false }, "stellar_history_archive_urls": [ diff --git a/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest2.json b/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest2.json index 7ad8eed70..d019f4cba 100644 --- a/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest2.json +++ b/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest2.json @@ -5,9 +5,9 @@ }, "node_info": { "ledger_version": 21, - "overlay_version": 34, + "overlay_version": 33, "overlay_min_version": 32, - "version_str": "stellar-core 21.1.0 (b3aeb14cc798f6d11deb2be913041be916f3b0cc)", + "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", "is_pub_net": false }, "stellar_history_archive_urls": [ diff --git a/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest3.json b/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest3.json index 6295f7fb5..ef8dd4748 100644 --- a/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest3.json +++ b/clients/stellar-relay-lib/resources/config/testnet/stellar_relay_config_sdftest3.json @@ -5,9 +5,9 @@ }, "node_info": { "ledger_version": 21, - "overlay_version": 34, + "overlay_version": 33, "overlay_min_version": 32, - "version_str": "stellar-core 21.1.0 (b3aeb14cc798f6d11deb2be913041be916f3b0cc)", + "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", "is_pub_net": false }, "stellar_history_archive_urls": [ diff --git a/clients/stellar-relay-lib/src/overlay.rs b/clients/stellar-relay-lib/src/overlay.rs index 3731b98bd..f8a8c844a 100644 --- a/clients/stellar-relay-lib/src/overlay.rs +++ b/clients/stellar-relay-lib/src/overlay.rs @@ -6,7 +6,7 @@ use tokio::sync::{ Sender, }, }; -use tracing::{debug, error, info}; +use tracing::{error, info}; use crate::{ connection::{poll_messages_from_stellar, ConnectionInfo, Connector}, @@ -59,7 +59,6 @@ impl StellarOverlayConnection { pub fn listen(&mut self) -> Result, Error> { loop { if !self.is_alive() { - debug!("listen(): sender half of overlay has closed."); return Err(Error::Disconnected) } @@ -97,7 +96,6 @@ impl StellarOverlayConnection { impl Drop for StellarOverlayConnection { fn drop(&mut self) { - debug!("drop(): shutting down StellarOverlayConnection"); self.stop(); } } diff --git a/clients/vault/Cargo.toml b/clients/vault/Cargo.toml index e32de9fcc..7bfb86cfd 100644 --- a/clients/vault/Cargo.toml +++ b/clients/vault/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "The Vault client intermediates between Stellar and the Spacewalk Parachain." edition = "2018" name = "vault" -version = "1.0.10" +version = "1.0.9" [features] std = [ diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_frankfurt.json b/clients/vault/resources/config/mainnet/stellar_relay_config_frankfurt.json index 3d33f9638..c43ca800b 100644 --- a/clients/vault/resources/config/mainnet/stellar_relay_config_frankfurt.json +++ b/clients/vault/resources/config/mainnet/stellar_relay_config_frankfurt.json @@ -4,10 +4,10 @@ "port": 11625 }, "node_info": { - "ledger_version": 21, - "overlay_version": 33, + "ledger_version": 20, + "overlay_version": 32, "overlay_min_version": 32, - "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", + "version_str": "stellar-core 20.4.0 (7fc7671b8bc1ccc3b1f16a6ab83bc9f671db8b70)", "is_pub_net": true }, "stellar_history_archive_urls": [ diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_iowa.json b/clients/vault/resources/config/mainnet/stellar_relay_config_iowa.json index 4c4d575fa..f9f14f77f 100644 --- a/clients/vault/resources/config/mainnet/stellar_relay_config_iowa.json +++ b/clients/vault/resources/config/mainnet/stellar_relay_config_iowa.json @@ -4,10 +4,10 @@ "port": 11625 }, "node_info": { - "ledger_version": 21, - "overlay_version": 33, + "ledger_version": 20, + "overlay_version": 32, "overlay_min_version": 32, - "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", + "version_str": "stellar-core 20.4.0 (7fc7671b8bc1ccc3b1f16a6ab83bc9f671db8b70)", "is_pub_net": true }, "stellar_history_archive_urls": [ diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_singapore.json b/clients/vault/resources/config/mainnet/stellar_relay_config_singapore.json index 32bdc7497..320462b45 100644 --- a/clients/vault/resources/config/mainnet/stellar_relay_config_singapore.json +++ b/clients/vault/resources/config/mainnet/stellar_relay_config_singapore.json @@ -4,10 +4,10 @@ "port": 11625 }, "node_info": { - "ledger_version": 21, - "overlay_version": 33, + "ledger_version": 20, + "overlay_version": 32, "overlay_min_version": 32, - "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", + "version_str": "stellar-core 20.4.0 (7fc7671b8bc1ccc3b1f16a6ab83bc9f671db8b70)", "is_pub_net": true }, "stellar_history_archive_urls": [ diff --git a/clients/vault/resources/config/testnet/stellar_relay_config_sdftest1.json b/clients/vault/resources/config/testnet/stellar_relay_config_sdftest1.json index a5b57a8c0..75d28f203 100644 --- a/clients/vault/resources/config/testnet/stellar_relay_config_sdftest1.json +++ b/clients/vault/resources/config/testnet/stellar_relay_config_sdftest1.json @@ -5,9 +5,9 @@ }, "node_info": { "ledger_version": 21, - "overlay_version": 34, + "overlay_version": 33, "overlay_min_version": 32, - "version_str": "stellar-core 21.1.0 (b3aeb14cc798f6d11deb2be913041be916f3b0cc)", + "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", "is_pub_net": false }, "stellar_history_archive_urls": [ diff --git a/clients/vault/resources/config/testnet/stellar_relay_config_sdftest2.json b/clients/vault/resources/config/testnet/stellar_relay_config_sdftest2.json index 7ad8eed70..d019f4cba 100644 --- a/clients/vault/resources/config/testnet/stellar_relay_config_sdftest2.json +++ b/clients/vault/resources/config/testnet/stellar_relay_config_sdftest2.json @@ -5,9 +5,9 @@ }, "node_info": { "ledger_version": 21, - "overlay_version": 34, + "overlay_version": 33, "overlay_min_version": 32, - "version_str": "stellar-core 21.1.0 (b3aeb14cc798f6d11deb2be913041be916f3b0cc)", + "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", "is_pub_net": false }, "stellar_history_archive_urls": [ diff --git a/clients/vault/resources/config/testnet/stellar_relay_config_sdftest3.json b/clients/vault/resources/config/testnet/stellar_relay_config_sdftest3.json index 6295f7fb5..ef8dd4748 100644 --- a/clients/vault/resources/config/testnet/stellar_relay_config_sdftest3.json +++ b/clients/vault/resources/config/testnet/stellar_relay_config_sdftest3.json @@ -5,9 +5,9 @@ }, "node_info": { "ledger_version": 21, - "overlay_version": 34, + "overlay_version": 33, "overlay_min_version": 32, - "version_str": "stellar-core 21.1.0 (b3aeb14cc798f6d11deb2be913041be916f3b0cc)", + "version_str": "stellar-core 21.0.0 (c6f474133738ae5f6d11b07963ca841909210273)", "is_pub_net": false }, "stellar_history_archive_urls": [ diff --git a/clients/vault/src/oracle/agent.rs b/clients/vault/src/oracle/agent.rs index 7a5e14f0d..591b38a5b 100644 --- a/clients/vault/src/oracle/agent.rs +++ b/clients/vault/src/oracle/agent.rs @@ -1,5 +1,6 @@ use std::{sync::Arc, time::Duration}; +use service::on_shutdown; use tokio::{ sync::{mpsc, mpsc::error::TryRecvError, RwLock}, time::{sleep, timeout}, @@ -19,12 +20,8 @@ use wallet::Slot; pub struct OracleAgent { collector: Arc>, pub is_public_network: bool, - /// sends message directly to Stellar Node message_sender: Option, - /// sends an entire Vault shutdown shutdown_sender: ShutdownSender, - /// sends a 'stop' signal to `StellarOverlayConnection` poll - overlay_conn_end_signal: mpsc::Sender<()>, } /// listens to data to collect the scp messages and txsets. @@ -80,11 +77,14 @@ pub async fn start_oracle_agent( let collector_clone = collector.clone(); let shutdown_sender_clone = shutdown_sender.clone(); + // a clone used to forcefully call a shutdown, when StellarOverlay disconnects. + let shutdown_sender_clone2 = shutdown_sender.clone(); + // disconnect signal sender tells the StellarOverlayConnection to close its TcpStream to Stellar // Node let (disconnect_signal_sender, mut disconnect_signal_receiver) = mpsc::channel::<()>(2); - tokio::spawn(async move { + service::spawn_cancelable(shutdown_sender_clone.subscribe(), async move { let sender_clone = overlay_conn.sender(); loop { match disconnect_signal_receiver.try_recv() { @@ -113,7 +113,7 @@ pub async fn start_oracle_agent( Err(e) => { tracing::error!("start_oracle_agent(): encounter error in overlay: {e:?}"); - if let Err(e) = shutdown_sender_clone.send(()) { + if let Err(e) = shutdown_sender_clone2.send(()) { tracing::error!( "start_oracle_agent(): Failed to send shutdown signal in thread: {e:?}" ); @@ -123,18 +123,24 @@ pub async fn start_oracle_agent( } } - tracing::info!("start_oracle_agent(): shutting down overlay connection"); // shutdown the overlay connection overlay_conn.stop(); }); - Ok(OracleAgent { - collector, - is_public_network, - message_sender: Some(sender), - shutdown_sender, - overlay_conn_end_signal: disconnect_signal_sender, - }) + tokio::spawn(on_shutdown(shutdown_sender.clone(), async move { + tracing::debug!("start_oracle_agent(): sending signal to shutdown overlay connection..."); + if let Err(e) = disconnect_signal_sender.send(()).await { + tracing::warn!("start_oracle_agent(): failed to send disconnect signal: {e:?}"); + } + })); + + Ok(OracleAgent { collector, is_public_network, message_sender: Some(sender), shutdown_sender }) +} + +impl Drop for OracleAgent { + fn drop(&mut self) { + self.stop(); + } } impl OracleAgent { @@ -188,13 +194,10 @@ impl OracleAgent { } /// Stops listening for new SCP messages. - pub async fn shutdown(&self) { - tracing::debug!("shutdown(): Shutting down OracleAgent..."); - if let Err(e) = self.overlay_conn_end_signal.send(()).await { - tracing::error!( - "shutdown(): Failed to send overlay conn end signal in OracleAgent: {:?}", - e - ); + pub fn stop(&self) { + tracing::debug!("stop(): Shutting down OracleAgent..."); + if let Err(e) = self.shutdown_sender.send(()) { + tracing::error!("stop(): Failed to send shutdown signal in OracleAgent: {:?}", e); } } } diff --git a/clients/vault/src/oracle/errors.rs b/clients/vault/src/oracle/errors.rs index b4c0e2643..569879dbe 100644 --- a/clients/vault/src/oracle/errors.rs +++ b/clients/vault/src/oracle/errors.rs @@ -35,9 +35,6 @@ pub enum Error { #[error(display = "{}", _0)] ArchiveError(String), - - #[error(display = "{}", _0)] - ArchiveResponseError(String), } impl From for Error { diff --git a/clients/vault/src/oracle/storage/impls.rs b/clients/vault/src/oracle/storage/impls.rs index 0af31bd4c..835798634 100644 --- a/clients/vault/src/oracle/storage/impls.rs +++ b/clients/vault/src/oracle/storage/impls.rs @@ -427,7 +427,7 @@ mod test { .expect("should have an archive url") .clone(); let scp_archive_storage = ScpArchiveStorage(testnet_archive_url); - let slot_index = 10; + let slot_index = 235001; let scp_archive = scp_archive_storage .get_archive(slot_index) @@ -487,7 +487,7 @@ mod test { let tx_archive_storage = TransactionsArchiveStorage(testnet_archive_url); //arrange - let slot_index = 10; + let slot_index = 235001; let (_url, ref filename) = tx_archive_storage.get_url_and_file_name(slot_index); //act diff --git a/clients/vault/src/oracle/storage/traits.rs b/clients/vault/src/oracle/storage/traits.rs index a48891620..c3050dbeb 100644 --- a/clients/vault/src/oracle/storage/traits.rs +++ b/clients/vault/src/oracle/storage/traits.rs @@ -163,11 +163,8 @@ pub trait ArchiveStorage { pub(crate) async fn download_file_and_save(url: &str, file_name: &str) -> Result<(), Error> { let response = reqwest::get(url).await.map_err(|e| Error::ArchiveError(e.to_string()))?; - if response.status().is_server_error() | response.status().is_client_error() { - return Err(Error::ArchiveResponseError(format!("{response:?}"))); - } - let content = response.bytes().await.map_err(|e| Error::ArchiveError(e.to_string()))?; + let mut file = File::create(&file_name).map_err(|e| Error::ArchiveError(e.to_string()))?; file.write_all(content.as_bytes_ref()) .map_err(|e| Error::ArchiveError(e.to_string()))?; diff --git a/clients/vault/src/system.rs b/clients/vault/src/system.rs index e036cca0a..2633d51a3 100644 --- a/clients/vault/src/system.rs +++ b/clients/vault/src/system.rs @@ -273,7 +273,6 @@ pub struct VaultService { shutdown: ShutdownSender, vault_id_manager: VaultIdManager, secret_key: String, - agent: Option>, } #[async_trait] @@ -293,7 +292,6 @@ impl Service for VaultService { async fn start(&mut self) -> Result<(), ServiceError> { let result = self.run_service().await; - self.try_shutdown_agent().await; self.try_shutdown_wallet().await; if let Err(error) = result { @@ -731,7 +729,6 @@ impl VaultService { shutdown, vault_id_manager: VaultIdManager::new(spacewalk_parachain, stellar_wallet), secret_key, - agent: None, }) } @@ -785,7 +782,6 @@ impl VaultService { let oracle_agent = self.create_oracle_agent(is_public_network, self.shutdown.clone()).await?; - self.agent = Some(oracle_agent.clone()); self.execute_open_requests(oracle_agent.clone()); @@ -946,16 +942,4 @@ impl VaultService { wallet.try_stop_periodic_resubmission_of_transactions().await; drop(wallet); } - - async fn try_shutdown_agent(&mut self) { - let opt_agent = self.agent.clone(); - self.agent = None; - - if let Some(arc_agent) = opt_agent { - tracing::info!("try_shutdown_agent(): shutting down agent"); - arc_agent.shutdown().await; - } else { - tracing::debug!("try_shutdown_agent(): no agent found"); - } - } } diff --git a/clients/wallet/Cargo.toml b/clients/wallet/Cargo.toml index cc67cdbe0..fddd1dd57 100644 --- a/clients/wallet/Cargo.toml +++ b/clients/wallet/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum Chain "] edition = "2021" name = "wallet" -version = "1.0.10" +version = "1.0.9" [features] default = [] diff --git a/clients/wallet/src/horizon/tests.rs b/clients/wallet/src/horizon/tests.rs index 7949f6003..e259e344b 100644 --- a/clients/wallet/src/horizon/tests.rs +++ b/clients/wallet/src/horizon/tests.rs @@ -184,14 +184,14 @@ async fn fetch_transactions_iter_success() { // the list should be empty, as the last record of this page was returned. assert_eq!(txs_iter.records.len(), 0); + // if the next page let next_page = txs_iter.next_page.clone(); + if !next_page.is_empty() { + // continue reading for transactions + assert!(txs_iter.next().await.is_some()); - // this will access the next page - match txs_iter.next().await { - // if none, then the next pages should be the same. - None => assert_eq!(next_page, txs_iter.next_page), - // the next page should be different already - Some(_) => assert_ne!(next_page, txs_iter.next_page), + // new records can be read + assert_ne!(txs_iter.records.len(), 0); } } diff --git a/clients/wallet/src/mock.rs b/clients/wallet/src/mock.rs index fb4d8d119..a3b4182e3 100644 --- a/clients/wallet/src/mock.rs +++ b/clients/wallet/src/mock.rs @@ -133,16 +133,7 @@ pub fn wallet_with_secret_key_for_storage( pub fn default_destination() -> PublicKey { let dest_secret = get_dest_secret_key_from_env(IS_PUBLIC_NETWORK); - _public_key(dest_secret) -} - -pub fn default_source() -> PublicKey { - let source_secret = get_source_secret_key_from_env(IS_PUBLIC_NETWORK); - _public_key(source_secret) -} - -fn _public_key(secret: String) -> PublicKey { - let dest_secret_key = SecretKey::from_encoding(secret).expect("should work"); + let dest_secret_key = SecretKey::from_encoding(dest_secret).expect("should work"); dest_secret_key.get_public().clone() } diff --git a/clients/wallet/src/operations.rs b/clients/wallet/src/operations.rs index 1550a60a7..a9513257e 100644 --- a/clients/wallet/src/operations.rs +++ b/clients/wallet/src/operations.rs @@ -185,9 +185,7 @@ pub fn create_basic_spacewalk_stellar_transaction( #[cfg(test)] pub mod redeem_request_tests { use super::*; - use crate::mock::{ - default_destination, default_source, default_usdc_asset, secret_key_from_encoding, - }; + use crate::mock::{default_usdc_asset, public_key_from_encoding, secret_key_from_encoding}; use primitives::{stellar::SecretKey, CurrencyId}; const INACTIVE_STELLAR_SECRET_KEY: &str = @@ -199,8 +197,16 @@ pub mod redeem_request_tests { const IS_PUBLIC_NETWORK: bool = false; + const DEFAULT_SOURCE_PUBLIC_KEY: &str = + "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN"; + const DEFAULT_DEST_PUBLIC_KEY: &str = + "GBWYDOKJT5BEYJCCBJRHL54AMLRWDALR2NLEY7CKMPSOUKWVJTCFQFYI"; + fn default_testing_stellar_pubkeys() -> (PublicKey, PublicKey) { - (default_source(), default_destination()) + ( + public_key_from_encoding(DEFAULT_SOURCE_PUBLIC_KEY), + public_key_from_encoding(DEFAULT_DEST_PUBLIC_KEY), + ) } pub fn create_account_merge_operation( @@ -303,7 +309,7 @@ pub mod redeem_request_tests { #[tokio::test] async fn test_inactive_account_and_xlm_asset_greater_than_equal_one() { let client = reqwest::Client::new(); - let source_pub_key = default_source(); + let source_pub_key = public_key_from_encoding(DEFAULT_SOURCE_PUBLIC_KEY); let destination_pub_key = inactive_stellar_secretkey().get_public().clone(); // INactive account and XLM asset of value >=1, use create account op @@ -325,7 +331,7 @@ pub mod redeem_request_tests { #[tokio::test] async fn test_inactive_account_and_xlm_asset_less_than_one() { let client = reqwest::Client::new(); - let source_pub_key = default_source(); + let source_pub_key = public_key_from_encoding(DEFAULT_SOURCE_PUBLIC_KEY); let destination_pub_key = inactive_stellar_secretkey().get_public().clone(); // INactive account but XLM asset of value < 1, use claimable balance @@ -352,7 +358,7 @@ pub mod redeem_request_tests { #[tokio::test] async fn test_inactive_account_and_usdc_asset() { let client = reqwest::Client::new(); - let source_pub_key = default_source(); + let source_pub_key = public_key_from_encoding(DEFAULT_SOURCE_PUBLIC_KEY); let destination_pub_key = inactive_stellar_secretkey().get_public().clone(); let unknown_asset = CurrencyId::try_from(( diff --git a/pallets/clients-info/Cargo.toml b/pallets/clients-info/Cargo.toml index 72b2471fb..d85564bb6 100644 --- a/pallets/clients-info/Cargo.toml +++ b/pallets/clients-info/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "clients-info" authors = ["Pendulum Chain "] -version = "1.0.10" +version = "1.0.9" edition = "2021" [dependencies] diff --git a/pallets/currency/Cargo.toml b/pallets/currency/Cargo.toml index d0519e38d..a018f479d 100644 --- a/pallets/currency/Cargo.toml +++ b/pallets/currency/Cargo.toml @@ -4,7 +4,7 @@ description = "Currency module" edition = "2021" homepage = "https://pendulumchain.org" name = "currency" -version = "1.0.10" +version = "1.0.9" [dependencies] serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } diff --git a/pallets/fee/Cargo.toml b/pallets/fee/Cargo.toml index 797998ad8..9a1c34328 100644 --- a/pallets/fee/Cargo.toml +++ b/pallets/fee/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Fee module" edition = "2021" name = "fee" -version = "1.0.10" +version = "1.0.9" [dependencies] serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } diff --git a/pallets/issue/Cargo.toml b/pallets/issue/Cargo.toml index 7217276cb..387b78cad 100644 --- a/pallets/issue/Cargo.toml +++ b/pallets/issue/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Issue module" edition = "2021" name = "issue" -version = "1.0.10" +version = "1.0.9" [dependencies] base64 = { version = '0.13.0', default-features = false, features = ['alloc'] } diff --git a/pallets/issue/rpc/Cargo.toml b/pallets/issue/rpc/Cargo.toml index 0e5250146..b520cf388 100644 --- a/pallets/issue/rpc/Cargo.toml +++ b/pallets/issue/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "module-issue-rpc" -version = "1.0.10" +version = "1.0.9" authors = ["Interlay "] edition = "2021" diff --git a/pallets/issue/rpc/runtime-api/Cargo.toml b/pallets/issue/rpc/runtime-api/Cargo.toml index 89510da17..8238824d6 100644 --- a/pallets/issue/rpc/runtime-api/Cargo.toml +++ b/pallets/issue/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "module-issue-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" authors = ["Interlay "] edition = "2021" diff --git a/pallets/issue/src/benchmarking.rs b/pallets/issue/src/benchmarking.rs index 948e15d14..695a47e07 100644 --- a/pallets/issue/src/benchmarking.rs +++ b/pallets/issue/src/benchmarking.rs @@ -29,17 +29,12 @@ fn deposit_tokens( account_id: &T::AccountId, amount: BalanceOf, ) { - assert_ok!(>::deposit(currency_id, account_id, amount)); + assert_ok!(>::deposit(currency_id, account_id, amount)); } fn mint_collateral(account_id: &T::AccountId, amount: BalanceOf) { deposit_tokens::(get_collateral_currency_id::(), account_id, amount); deposit_tokens::(get_native_currency_id::(), account_id, amount); - deposit_tokens::( - ::GetGriefingCollateralCurrencyId::get(), - account_id, - amount, - ); } fn get_currency_pair() -> DefaultVaultCurrencyPair { @@ -67,7 +62,8 @@ benchmarks! { request_issue { let origin: T::AccountId = account("Origin", 0, 0); let vault_id = get_vault_id::(); - let amount = Issue::::issue_minimum_transfer_amount(vault_id.wrapped_currency()).amount(); + let amount = 10_000_000u32.into(); + let asset = vault_id.wrapped_currency(); let relayer_id: T::AccountId = account("Relayer", 0, 0); Oracle::::_set_exchange_rate(origin.clone(), get_collateral_currency_id::(), ::UnsignedFixedPoint::one()).unwrap(); diff --git a/pallets/issue/src/default_weights.rs b/pallets/issue/src/default_weights.rs index 393fd97cd..1f83ca588 100644 --- a/pallets/issue/src/default_weights.rs +++ b/pallets/issue/src/default_weights.rs @@ -2,7 +2,7 @@ //! Autogenerated weights for issue //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-05-23, STEPS: `100`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2024-04-02, STEPS: `100`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `Bogdans-M2-MacBook-Pro.local`, CPU: `` //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 @@ -77,8 +77,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `2192` // Estimated: `5657` - // Minimum execution time: 55_000_000 picoseconds. - Weight::from_parts(58_000_000, 5657) + // Minimum execution time: 57_000_000 picoseconds. + Weight::from_parts(60_000_000, 5657) .saturating_add(T::DbWeight::get().reads(15_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -104,8 +104,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `2190` // Estimated: `71867` - // Minimum execution time: 3_926_000_000 picoseconds. - Weight::from_parts(3_982_000_000, 71867) + // Minimum execution time: 3_807_000_000 picoseconds. + Weight::from_parts(3_911_000_000, 71867) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -121,8 +121,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `1199` // Estimated: `4664` - // Minimum execution time: 23_000_000 picoseconds. - Weight::from_parts(24_000_000, 4664) + // Minimum execution time: 24_000_000 picoseconds. + Weight::from_parts(25_000_000, 4664) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -146,8 +146,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_000_000 picoseconds. - Weight::from_parts(5_000_000, 0) + // Minimum execution time: 5_000_000 picoseconds. + Weight::from_parts(6_000_000, 0) .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: Issue IssueMinimumTransferAmount (r:0 w:1) @@ -156,7 +156,7 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_000_000 picoseconds. + // Minimum execution time: 4_000_000 picoseconds. Weight::from_parts(4_000_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -200,8 +200,8 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `2192` // Estimated: `5657` - // Minimum execution time: 55_000_000 picoseconds. - Weight::from_parts(58_000_000, 5657) + // Minimum execution time: 57_000_000 picoseconds. + Weight::from_parts(60_000_000, 5657) .saturating_add(RocksDbWeight::get().reads(15_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -227,8 +227,8 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `2190` // Estimated: `71867` - // Minimum execution time: 3_926_000_000 picoseconds. - Weight::from_parts(3_982_000_000, 71867) + // Minimum execution time: 3_807_000_000 picoseconds. + Weight::from_parts(3_911_000_000, 71867) .saturating_add(RocksDbWeight::get().reads(10_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -244,8 +244,8 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `1199` // Estimated: `4664` - // Minimum execution time: 23_000_000 picoseconds. - Weight::from_parts(24_000_000, 4664) + // Minimum execution time: 24_000_000 picoseconds. + Weight::from_parts(25_000_000, 4664) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -269,8 +269,8 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_000_000 picoseconds. - Weight::from_parts(5_000_000, 0) + // Minimum execution time: 5_000_000 picoseconds. + Weight::from_parts(6_000_000, 0) .saturating_add(RocksDbWeight::get().writes(3_u64)) } /// Storage: Issue IssueMinimumTransferAmount (r:0 w:1) @@ -279,7 +279,7 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_000_000 picoseconds. + // Minimum execution time: 4_000_000 picoseconds. Weight::from_parts(4_000_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/pallets/nomination/Cargo.toml b/pallets/nomination/Cargo.toml index 7f1bcfefe..005d6fc22 100644 --- a/pallets/nomination/Cargo.toml +++ b/pallets/nomination/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nomination" -version = "1.0.10" +version = "1.0.9" authors = ["Pendulum"] edition = "2021" diff --git a/pallets/oracle/Cargo.toml b/pallets/oracle/Cargo.toml index 66c604de6..93e2305fd 100644 --- a/pallets/oracle/Cargo.toml +++ b/pallets/oracle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oracle" -version = "1.0.10" +version = "1.0.9" authors = ["Pendulum"] edition = "2021" diff --git a/pallets/oracle/rpc/Cargo.toml b/pallets/oracle/rpc/Cargo.toml index 83f8389d1..338b37858 100644 --- a/pallets/oracle/rpc/Cargo.toml +++ b/pallets/oracle/rpc/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Interlay "] edition = "2021" name = "module-oracle-rpc" -version = "1.0.10" +version = "1.0.9" [dependencies] codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"]} diff --git a/pallets/oracle/rpc/runtime-api/Cargo.toml b/pallets/oracle/rpc/runtime-api/Cargo.toml index 5d6379e81..aa5948d6b 100644 --- a/pallets/oracle/rpc/runtime-api/Cargo.toml +++ b/pallets/oracle/rpc/runtime-api/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Interlay "] edition = "2021" name = "module-oracle-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" [dependencies] codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"]} diff --git a/pallets/pooled-rewards/Cargo.toml b/pallets/pooled-rewards/Cargo.toml index 30e17e477..bd6b52061 100644 --- a/pallets/pooled-rewards/Cargo.toml +++ b/pallets/pooled-rewards/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Pooled Reward module" edition = "2021" name = "pooled-rewards" -version = "1.0.10" +version = "1.0.9" [dependencies] log = { version = "0.4.17", default-features = false } diff --git a/pallets/redeem/Cargo.toml b/pallets/redeem/Cargo.toml index 114cfff4e..710c57310 100644 --- a/pallets/redeem/Cargo.toml +++ b/pallets/redeem/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Redeem module" edition = "2021" name = "redeem" -version = "1.0.10" +version = "1.0.9" [dependencies] serde = { version = "1.0.130", default-features = false, features = ['derive'], optional = true } diff --git a/pallets/redeem/rpc/Cargo.toml b/pallets/redeem/rpc/Cargo.toml index b40c925ac..80017b51e 100644 --- a/pallets/redeem/rpc/Cargo.toml +++ b/pallets/redeem/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "module-redeem-rpc" -version = "1.0.10" +version = "1.0.9" authors = ["Interlay "] edition = "2021" diff --git a/pallets/redeem/rpc/runtime-api/Cargo.toml b/pallets/redeem/rpc/runtime-api/Cargo.toml index aa99d347c..1e6770ef7 100644 --- a/pallets/redeem/rpc/runtime-api/Cargo.toml +++ b/pallets/redeem/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "module-redeem-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" authors = ["Interlay "] edition = "2021" diff --git a/pallets/replace/Cargo.toml b/pallets/replace/Cargo.toml index a93ce3ab3..ee80b1a50 100644 --- a/pallets/replace/Cargo.toml +++ b/pallets/replace/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Replace module" edition = "2021" name = "replace" -version = "1.0.10" +version = "1.0.9" [dependencies] serde = { version = "1.0.130", default-features = false, features = ['derive'], optional = true } diff --git a/pallets/replace/rpc/Cargo.toml b/pallets/replace/rpc/Cargo.toml index 8453dcaa8..433b254cc 100644 --- a/pallets/replace/rpc/Cargo.toml +++ b/pallets/replace/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "module-replace-rpc" -version = "1.0.10" +version = "1.0.9" authors = ["Interlay "] edition = "2021" diff --git a/pallets/replace/rpc/runtime-api/Cargo.toml b/pallets/replace/rpc/runtime-api/Cargo.toml index 92e82b1ad..a88f9d33d 100644 --- a/pallets/replace/rpc/runtime-api/Cargo.toml +++ b/pallets/replace/rpc/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "module-replace-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" authors = ["Interlay "] edition = "2021" diff --git a/pallets/reward-distribution/Cargo.toml b/pallets/reward-distribution/Cargo.toml index 4eb04bdf7..0fe96cbae 100644 --- a/pallets/reward-distribution/Cargo.toml +++ b/pallets/reward-distribution/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "reward-distribution" authors = ["Pendulum Chain "] -version = "1.0.10" +version = "1.0.9" edition = "2021" [dependencies] diff --git a/pallets/reward/Cargo.toml b/pallets/reward/Cargo.toml index 4ec345951..a98806925 100644 --- a/pallets/reward/Cargo.toml +++ b/pallets/reward/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Reward module" edition = "2021" name = "reward" -version = "1.0.10" +version = "1.0.9" [dependencies] serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } diff --git a/pallets/security/Cargo.toml b/pallets/security/Cargo.toml index b25ff0363..eac6ba03e 100644 --- a/pallets/security/Cargo.toml +++ b/pallets/security/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum Chain"] edition = "2021" name = "security" -version = "1.0.10" +version = "1.0.9" [dependencies] codec = {package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"]} diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml index b97c9bd1a..b700cbb4e 100644 --- a/pallets/staking/Cargo.toml +++ b/pallets/staking/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum Chain "] description = "Staking module" edition = "2021" name = "staking" -version = "1.0.10" +version = "1.0.9" [dependencies] serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } diff --git a/pallets/stellar-relay/Cargo.toml b/pallets/stellar-relay/Cargo.toml index 4fbf09eb6..a597064d4 100644 --- a/pallets/stellar-relay/Cargo.toml +++ b/pallets/stellar-relay/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stellar-relay" -version = "1.0.10" +version = "1.0.9" description = "Spacewalk pallet for handling relayer functions" authors = ["Pendulum Chain "] homepage = "https://pendulumchain.org/" diff --git a/pallets/vault-registry/Cargo.toml b/pallets/vault-registry/Cargo.toml index a6cb658ca..b523aeb2d 100644 --- a/pallets/vault-registry/Cargo.toml +++ b/pallets/vault-registry/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum"] edition = "2021" name = "vault-registry" -version = "1.0.10" +version = "1.0.9" [dependencies] codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"]} diff --git a/pallets/vault-registry/rpc/Cargo.toml b/pallets/vault-registry/rpc/Cargo.toml index 66008ca92..8644aa013 100644 --- a/pallets/vault-registry/rpc/Cargo.toml +++ b/pallets/vault-registry/rpc/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Interlay "] edition = "2021" name = "module-vault-registry-rpc" -version = "1.0.10" +version = "1.0.9" [dependencies] codec = {package = "parity-scale-codec", version = "3.0.0"} diff --git a/pallets/vault-registry/rpc/runtime-api/Cargo.toml b/pallets/vault-registry/rpc/runtime-api/Cargo.toml index 9ef21d305..76a9ca2ff 100644 --- a/pallets/vault-registry/rpc/runtime-api/Cargo.toml +++ b/pallets/vault-registry/rpc/runtime-api/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Interlay "] edition = "2021" name = "module-vault-registry-rpc-runtime-api" -version = "1.0.10" +version = "1.0.9" [dependencies] codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"]} diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 8a07ec28f..85a73a238 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum"] edition = "2018" name = "spacewalk-primitives" -version = "1.0.10" +version = "1.0.9" [dependencies] bstringify = "0.1.2" diff --git a/testchain/node/Cargo.toml b/testchain/node/Cargo.toml index d29529307..81a32412e 100644 --- a/testchain/node/Cargo.toml +++ b/testchain/node/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Pendulum"] build = "build.rs" edition = "2018" name = "spacewalk-standalone" -version = "1.0.10" +version = "1.0.9" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/testchain/runtime/mainnet/Cargo.toml b/testchain/runtime/mainnet/Cargo.toml index 0b98e5ef9..94f1cb00e 100644 --- a/testchain/runtime/mainnet/Cargo.toml +++ b/testchain/runtime/mainnet/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum"] edition = "2021" name = 'spacewalk-runtime-standalone-mainnet' -version = "1.0.10" +version = "1.0.9" [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] diff --git a/testchain/runtime/testnet/Cargo.toml b/testchain/runtime/testnet/Cargo.toml index 8b5309a3c..18118fdb5 100644 --- a/testchain/runtime/testnet/Cargo.toml +++ b/testchain/runtime/testnet/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Pendulum"] edition = "2021" name = 'spacewalk-runtime-standalone-testnet' -version = "1.0.10" +version = "1.0.9" [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu']