Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Continuum Release 0.0.2 std packages fix #303

Merged
merged 3 commits into from
Jan 7, 2024
Merged

Continuum Release 0.0.2 std packages fix #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f41a2c6
Fix and update assert match issue on build release
justinphamnz Jan 7, 2024
a41bd96
Update latest assert_matches library use
justinphamnz Jan 7, 2024
3af7db0
Import std to all packages
justinphamnz Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ members = [
[workspace.dependencies]
# General
codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }
serde_json = "1.0.92"
serde_json = "1.0.92"
serde = { version = "1.0.151" }
scale-info = { version = "2.5.0", features = ["derive"], default-features = false }
hex-literal = { version = "0.3.4" }
Expand All @@ -38,7 +38,7 @@ similar-asserts = { version = "1.1.0" }

# General (ethereum)
ethabi = { version = "18.0.0", default-features = false }
evm = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false, features = [ "with-codec" ] }
evm = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false, features = ["with-codec"] }

# General (precompile macro)
proc-macro2 = "1.0"
Expand All @@ -60,7 +60,7 @@ frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'p
frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false}
frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }

Expand All @@ -84,7 +84,7 @@ sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43"}
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
Expand All @@ -99,24 +99,24 @@ sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkad
# Substrate Primitive Dependencies (general)
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-application-crypto = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-application-crypto = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
sp-arithmetic = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }

# Substrate Utilities
node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43"}
node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" }

# Node template RPCs
Expand All @@ -125,13 +125,13 @@ sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkad
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43"}
pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }

# Substrate Pallets
pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
pallet-collective = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false}
pallet-collective = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
pallet-democracy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
pallet-insecure-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }
Expand All @@ -152,7 +152,7 @@ pallet-preimage = { git = 'https://github.com/paritytech/substrate', branch = 'p
pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.43', default-features = false }

# Cumulus (node -only)
# Cumulus (node-only)
cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.43' }
cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.43' }
cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.43' }
Expand Down Expand Up @@ -183,40 +183,40 @@ pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', bra
# Polkadot
polkadot-cli = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" }
polkadot-service = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" }
polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43" , default-features = false }
polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
polkadot-runtime-parachains = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', branch = "release-v0.9.43", default-features = false }
kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }

# ORML
orml-currencies = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-rewards = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-tokens = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-traits = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-nft = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-unknown-tokens = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-xtokens = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-xcm = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-xcm-support = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-oracle = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-currencies = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-rewards = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-tokens = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-traits = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-nft = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-unknown-tokens = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-xtokens = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-xcm = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-xcm-support = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-oracle = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }
orml-benchmarking = { git = "https://github.com/chexware/open-runtime-module-library", branch = "v-9.43", default-features = false }

# EVM
pallet-dynamic-fee = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fp-consensus = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fp-consensus = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fp-storage = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-storage = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-cli = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fc-rpc = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fc-rpc-core = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fc-consensus = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fc-mapping-sync = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fc-db = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43"}
fc-cli = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-rpc = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-rpc-core = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-consensus = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-mapping-sync = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fc-db = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43" }
fp-self-contained = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43", default-features = false }
fp-rpc = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43", default-features = false }
fp-evm = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43", default-features = false }
Expand All @@ -231,15 +231,15 @@ pallet-evm-precompile-ed25519 = { git = "https://github.com/justinphamnz/frontie
pallet-evm-precompile-modexp = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43", default-features = false }
pallet-evm-precompile-sha3fips = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43", default-features = false }
pallet-evm-precompile-simple = { git = "https://github.com/justinphamnz/frontier", branch = "polkadot-v0.9.43", default-features = false }
libsecp256k1 = { version = "0.7.0", default-features = false, features = ["hmac", "static-context"]}
libsecp256k1 = { version = "0.7.0", default-features = false, features = ["hmac", "static-context"] }

# ink!
pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }

# try-runtime
frame-try-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
try-runtime-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
try-runtime-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }

# Metaverse Network Traits
auction-manager = { default-features = false, package = 'auction-manager', path = '../../traits/auction-manager' }
Expand Down
20 changes: 10 additions & 10 deletions primitives/precompiles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ log = { workspace = true, default-features = true }
num_enum = { workspace = true }
sha3 = { version = "0.9", default-features = false }
similar-asserts = { workspace = true, optional = true }

# Moonbeam
precompile-utils-macro = { path = "macro" }

Expand All @@ -32,17 +31,18 @@ xcm = { workspace = true }

[dev-dependencies]
hex-literal = { workspace = true }
#assert_matches = { workspace = true }

[features]
default = [ "std" ]
default = ["std"]
std = [
"codec/std",
"fp-evm/std",
"frame-support/std",
"frame-system/std",
"pallet-evm/std",
"sp-core/std",
"sp-io/std",
"sp-std/std",
"codec/std",
"fp-evm/std",
"frame-support/std",
"frame-system/std",
"pallet-evm/std",
"sp-core/std",
"sp-io/std",
"sp-std/std",
]
#testing = [ "similar-asserts", "std" ]
9 changes: 5 additions & 4 deletions primitives/precompiles/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,25 @@
// along with Utils. If not, see <http://www.gnu.org/licenses/>.

#![cfg_attr(not(feature = "std"), no_std)]
#![feature(assert_matches)]

extern crate alloc;

use fp_evm::{ExitError, ExitRevert, ExitSucceed, PrecompileFailure, PrecompileHandle, PrecompileOutput};

use crate::alloc::borrow::ToOwned;

pub mod costs;
pub mod handle;
pub mod logs;
pub mod modifier;
pub mod precompile_set;
pub mod substrate;
#[cfg(feature = "testing")]
pub mod testing;

#[cfg(test)]
mod tests;

use crate::alloc::borrow::ToOwned;
use fp_evm::{ExitError, ExitRevert, ExitSucceed, PrecompileFailure, PrecompileHandle, PrecompileOutput};

pub mod data;

// pub use data::{Address, Bytes, EvmData, EvmDataReader, EvmDataWriter};
Expand Down
2 changes: 1 addition & 1 deletion primitives/precompiles/src/testing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use {
alloc::format,
alloc::string::String,
core::assert_matches::assert_matches,
assert_matches::assert_matches,
fp_evm::{
Context, ExitError, ExitReason, ExitSucceed, Log, PrecompileFailure, PrecompileHandle, PrecompileOutput,
PrecompileResult, PrecompileSet, Transfer,
Expand Down
Loading
Loading