Skip to content

Commit

Permalink
move to stable version
Browse files Browse the repository at this point in the history
  • Loading branch information
@b-yap
b-yap committed May 14, 2024
1 parent 9b715c1 commit ee26818
Show file tree
Hide file tree
Showing 21 changed files with 85 additions and 101 deletions.
2 changes: 1 addition & 1 deletion chain-extensions/price/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", default-featur
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }

# Open Runtime Module Library
orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }
Expand Down
2 changes: 1 addition & 1 deletion chain-extensions/token/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v0.9.42" }

# Custom libraries for Spacewalk
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }

# Pendulum Pallets
orml-currencies-allowance-extension = { path = "../../pallets/orml-currencies-allowance-extension", default-features = false }
Expand Down
12 changes: 6 additions & 6 deletions chain-extensions/token/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ where
"Calling transfer() sending {:?} {:?}, from {:?} to {:?}",
amount,
currency_id,
env.ext().caller().clone(),
env.ext().caller(),
recipient
);

Expand All @@ -229,7 +229,7 @@ where

<orml_currencies::Pallet<T> as MultiCurrency<T::AccountId>>::transfer(
currency_id,
&env.ext().caller().clone(),
&env.ext().caller(),
&recipient,
amount,
)?;
Expand Down Expand Up @@ -311,7 +311,7 @@ where
spender,
amount,
currency_id,
env.ext().caller().clone(),
env.ext().caller(),
);

if !orml_currencies_allowance_extension::Pallet::<T>::is_allowed_currency(currency_id) {
Expand All @@ -320,7 +320,7 @@ where

orml_currencies_allowance_extension::Pallet::<T>::do_approve_transfer(
currency_id,
&env.ext().caller().clone(),
&env.ext().caller(),
&spender,
amount,
)?;
Expand Down Expand Up @@ -358,7 +358,7 @@ where

trace!(
"Calling transfer_from() for caller {:?}, sending {:?} {:?}, from {:?} to {:?}",
env.ext().caller().clone(),
env.ext().caller(),
amount,
currency_id,
owner,
Expand All @@ -372,7 +372,7 @@ where
orml_currencies_allowance_extension::Pallet::<T>::do_transfer_approved(
currency_id,
&owner,
&env.ext().caller().clone(),
&env.ext().caller(),
&recipient,
amount,
)?;
Expand Down
12 changes: 6 additions & 6 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.145", features = ["derive"] }
jsonrpsee = { version = "0.16.2", features = ["server"] }

module-issue-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-oracle-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-redeem-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-replace-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-vault-registry-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-issue-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-oracle-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-redeem-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-replace-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-vault-registry-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-pallet-staking-rpc = { path = "../pallets/parachain-staking/rpc" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}

# Local
amplitude-runtime = { path = "../runtime/amplitude" }
Expand Down
2 changes: 1 addition & 1 deletion node/src/rpc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

use std::sync::Arc;

pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
pub use sc_rpc::DenyUnsafe;
use sc_transaction_pool_api::TransactionPool;

use bifrost_farming_rpc_api::{FarmingRpc, FarmingRpcApiServer};
Expand Down
2 changes: 1 addition & 1 deletion pallets/orml-tokens-management-extension/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.
pallet-balances = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}

# Spacewalk libraries
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}


[features]
Expand Down
2 changes: 1 addition & 1 deletion pallets/parachain-staking/rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "1.0.0"
[dependencies]
codec = {package = "parity-scale-codec", version = "3.0.0"}
jsonrpsee = {version = "0.16.0", features = ["server", "macros"]}
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-pallet-staking-rpc-runtime-api = {path = "runtime-api"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}
Expand Down
2 changes: 1 addition & 1 deletion pallets/parachain-staking/rpc/runtime-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0
sp-std = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
parity-scale-codec = {version = "3.1.5", default-features = false, features = ["derive"]}
scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}
serde = {version = "1.0.142", default-features = false, optional = true, features = ["derive"]}

[features]
Expand Down
16 changes: 3 additions & 13 deletions pallets/treasury-buyout-extension/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,15 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }
orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.42", default-features = false }

spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}

[dev-dependencies]
mocktopus = "0.8.0"
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false}
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }

pallet-balances = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42"}

spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
runtime-common = { path = "../../runtime/common", default-features = false }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597"}

[features]
default = ["std"]
Expand All @@ -54,27 +49,22 @@ std = [
"orml-currencies/std",
"orml-tokens/std",
"orml-traits/std",
"orml-asset-registry/std",
"frame-benchmarking/std",
"pallet-balances/std",
"spacewalk-primitives/std",
"xcm/std",
"runtime-common/std"
"spacewalk-primitives/std"
]

runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"runtime-common/runtime-benchmarks"
"pallet-balances/runtime-benchmarks"
]

try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"orml-currencies/try-runtime",
"orml-tokens/try-runtime",
"orml-asset-registry/try-runtime",
"pallet-balances/try-runtime"
]
2 changes: 0 additions & 2 deletions pallets/treasury-buyout-extension/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ use sp_runtime::{
use sp_std::{fmt::Debug, marker::PhantomData, vec::Vec};
use spacewalk_primitives::DecimalsLookup;

pub use pallet::*;

#[frame_support::pallet]
pub mod pallet {
use super::*;
Expand Down
40 changes: 20 additions & 20 deletions runtime/amplitude/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@ token-chain-extension = {path = "../../chain-extensions/token", default-features
price-chain-extension = {path = "../../chain-extensions/price", default-features = false }

# Custom libraries for Spacewalk
clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
clients-info = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
currency = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
security = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
staking = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
oracle = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
stellar-relay = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
fee = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
vault-registry = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
redeem = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
issue = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
nomination = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
replace = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
module-issue-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
module-redeem-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
module-replace-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
module-vault-registry-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
module-pallet-staking-rpc-runtime-api = { path = "../../pallets/parachain-staking/rpc/runtime-api", default-features = false }
pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
pooled-rewards = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }
reward-distribution = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }


# Substrate
Expand Down
1 change: 0 additions & 1 deletion runtime/amplitude/src/weights/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ pub mod rocksdb_weights;

pub use block_weights::constants::BlockExecutionWeight;
pub use extrinsic_weights::constants::ExtrinsicBaseWeight;
pub use paritydb_weights::constants::ParityDbWeight;
pub use rocksdb_weights::constants::RocksDbWeight;
2 changes: 1 addition & 1 deletion runtime/common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-modu
dia-oracle = { git = "https://github.com/pendulum-chain/oracle-pallet", default-features = false, branch = "polkadot-v0.9.42" }
zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", default-features = false, branch = "polkadot-v0.9.42" }

spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev ="e7a672ba1e21c98a70df30a6ee458317951dd597"}
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "e7a672ba1e21c98a70df30a6ee458317951dd597" }

[features]
default = [
Expand Down
2 changes: 1 addition & 1 deletion runtime/common/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use sp_runtime::{
traits::{IdentifyAccount, Verify,Convert},
DispatchError, MultiSignature,
MultiSignature,
};
use spacewalk_primitives::CurrencyId;
use xcm::v3::{MultiAsset, AssetId, MultiLocation};
Expand Down
Loading

0 comments on commit ee26818

Please sign in to comment.