Skip to content

Commit

Permalink
WIP fixing std issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@gianfra-t
gianfra-t committed Aug 7, 2024
1 parent bed37c5 commit 991f411
Show file tree
Hide file tree
Showing 14 changed files with 3,296 additions and 3,507 deletions.
6,636 changes: 3,203 additions & 3,433 deletions Cargo.lock
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ members = [

# need this because of bifrost farming dependency in runtime
# bifrost farming uses different orml-traits for orml-currencies
[patch."https://github.com/open-web3-stack/open-runtime-module-library"]
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
#[patch."https://github.com/open-web3-stack/open-runtime-module-library"]
#orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }

# TODO do we still need this? after using both from bifrost
# need this because of bifrost farming dependency in runtime
# bifrost uses :
# orml packages { version = "0.4.1-dev" }
# zenlink packages { version = "*" }
[patch.crates-io]
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }
zenlink-protocol-runtime-api = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }
#[patch.crates-io]
#orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
#orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
#orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v1.1.0" }
#zenlink-protocol = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }
#zenlink-protocol-runtime-api = { git = "https://github.com/bifrost-finance/Zenlink-DEX-Module", branch = "release-polkadot-v1.1.0" }

[patch."https://github.com/polkadot-fellows/runtimes"]
substrate-wasm-builder = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", version = "5.0.0-dev" } # fix this version used in polkadto-sdk, due to different one (14) used from polkadot-fellows/runtimes.

# fix to a new version of that used in polkadto-sdk 1.1.0 (5.0.0), due to different one (14.0.0) used from polkadot-fellows/runtimes.
[patch."https://github.com/paritytech/polkadot-sdk"]
substrate-wasm-builder = {version = "14.0.0" }
#[patch."https://github.com/polkadot-fellows/runtimes"]
#substrate-wasm-builder = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", version = "5.0.0-dev" } # fix this version used in polkadto-sdk, due to different one (14) used from polkadot-fellows/runtimes.
#
## fix to a new version of that used in polkadto-sdk 1.1.0 (5.0.0), due to different one (14.0.0) used from polkadot-fellows/runtimes.
#[patch."https://github.com/paritytech/polkadot-sdk"]
#substrate-wasm-builder = {version = "14.0.0" }
4 changes: 3 additions & 1 deletion chain-extensions/price/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-featu
sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "a518fb489f3121983af182e337797d9704f88fe6" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "d74009bf1d8c27fbd1f314c4fe486cd230e8b73f" }

# Open Runtime Module Library
orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v1.1.0" }
Expand Down Expand Up @@ -52,6 +52,8 @@ std = [
"orml-tokens/std",
"sp-core/std",
"sp-runtime/std",
"sp-tracing/std",
"sp-weights/std",
"vesting-manager/std",
"dia-oracle/std",
"pallet-contracts/std",
Expand Down
4 changes: 3 additions & 1 deletion chain-extensions/token/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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-v1.1.0" }

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

# Pendulum Pallets
orml-currencies-allowance-extension = { path = "../../pallets/orml-currencies-allowance-extension", default-features = false }
Expand All @@ -48,6 +48,8 @@ std = [
"orml-tokens/std",
"sp-core/std",
"sp-runtime/std",
"sp-tracing/std",
"sp-weights/std",
"orml-currencies-allowance-extension/std",
"pallet-contracts/std",
"frame-system/std",
Expand Down
5 changes: 3 additions & 2 deletions pallets/orml-currencies-allowance-extension/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch =
[dev-dependencies]
mocktopus = "0.8.0"
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

pallet-balances = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}

Expand All @@ -36,6 +36,7 @@ pallet-balances = {git = "https://github.com/paritytech/polkadot-sdk", branch =
default = ["std"]
std = [
"serde",
"scale-info/std",
"codec/std",
"sha2/std",
"sp-core/std",
Expand All @@ -53,7 +54,7 @@ runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"pallet-balances"
"pallet-balances/runtime-benchmarks"
]

try-runtime = [
Expand Down
5 changes: 3 additions & 2 deletions pallets/orml-tokens-management-extension/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,19 @@ orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-li
[dev-dependencies]
mocktopus = "0.8.0"
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}

pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

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


[features]
default = ["std"]
std = [
"serde",
"scale-info/std",
"codec/std",
"sha2/std",
"sp-core/std",
Expand Down
6 changes: 4 additions & 2 deletions pallets/parachain-staking/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "relea
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}

[dependencies]
log = "0.4.17"
log = { version = "0.4.17", 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"]}
serde = {version = "1.0.142", optional = true}
serde = {version = "1.0.142", default-features = false, optional = true}
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
module-pallet-staking-rpc-runtime-api = { path = "./rpc/runtime-api", default-features = false }

Expand Down Expand Up @@ -45,6 +45,7 @@ runtime-benchmarks = [
std = [
"frame-support/std",
"frame-system/std",
"frame-benchmarking/std",
"log/std",
"module-pallet-staking-rpc-runtime-api/std",
"pallet-authorship/std",
Expand All @@ -57,6 +58,7 @@ std = [
"sp-runtime/std",
"sp-staking/std",
"sp-std/std",
"sp-arithmetic/std"
]
try-runtime = [
"frame-support/try-runtime",
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 = "a518fb489f3121983af182e337797d9704f88fe6" }
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "d74009bf1d8c27fbd1f314c4fe486cd230e8b73f" }
module-pallet-staking-rpc-runtime-api = { path = "runtime-api" }
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
Expand Down
3 changes: 2 additions & 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/polkadot-sdk", branch = "release
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", 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 = "a518fb489f3121983af182e337797d9704f88fe6" }
module-oracle-rpc-runtime-api = { git = "https://github.com/pendulum-chain/spacewalk", default-features = false, rev = "d74009bf1d8c27fbd1f314c4fe486cd230e8b73f" }
serde = { version = "1.0.142", default-features = false, optional = true, features = ["derive"] }
sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

Expand All @@ -24,4 +24,5 @@ std = [
"sp-std/std",
"parity-scale-codec/std",
"module-oracle-rpc-runtime-api/std",
"sp-arithmetic/std"
]
6 changes: 4 additions & 2 deletions pallets/treasury-buyout-extension/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-modul
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v1.1.0" }
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", default-features = false, branch = "polkadot-v1.1.0" }

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

[dev-dependencies]
mocktopus = "0.8.0"
Expand All @@ -35,13 +35,14 @@ xcm = { git = "https://github.com/paritytech/polkadot-sdk", package = "staging-x

pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0"}

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

[features]
default = ["std"]
std = [
"serde",
"scale-info/std",
"codec/std",
"sha2/std",
"sp-core/std",
Expand All @@ -55,6 +56,7 @@ std = [
"orml-traits/std",
"frame-benchmarking/std",
"pallet-balances/std",
"pallet-treasury/std",
"spacewalk-primitives/std",
"xcm/std",
"runtime-common/std"
Expand Down
5 changes: 3 additions & 2 deletions pallets/vesting-manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name = "vesting-manager"
version = "0.0.1"

[dependencies]
log = "0.4.17"
log = { version = "0.4.17", 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"]}
serde = {version = "1.0.142", optional = true}
serde = {version = "1.0.142" ,default-features = false, optional = true}
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }

frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
Expand All @@ -32,6 +32,7 @@ runtime-benchmarks = [
std = [
"frame-support/std",
"frame-system/std",
"frame-benchmarking/std",
"log/std",
"parity-scale-codec/std",
"pallet-vesting/std",
Expand Down
Loading

0 comments on commit 991f411

Please sign in to comment.