difftreelog
Merge branch 'develop' into feature/evm-collection-calls
in: master
26 files changed
.maintain/frame-weight-template.hbsdiffbeforeafterboth--- /dev/null
+++ b/.maintain/frame-weight-template.hbs
@@ -0,0 +1,95 @@
+// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
+
+//! Autogenerated weights for {{pallet}}
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
+//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: {{cmd.repeat}}, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
+//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}
+
+// Executed Command:
+{{#each args as |arg|~}}
+// {{arg}}
+{{/each}}
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for {{pallet}}.
+pub trait WeightInfo {
+ {{~#each benchmarks as |benchmark|}}
+ fn {{benchmark.name~}}
+ (
+ {{~#each benchmark.components as |c| ~}}
+ {{c.name}}: u32, {{/each~}}
+ ) -> Weight;
+ {{~/each}}
+}
+
+/// Weights for {{pallet}} using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ {{~#each benchmarks as |benchmark|}}
+ {{~#each benchmark.comments as |comment|}}
+ // {{comment}}
+ {{~/each}}
+ fn {{benchmark.name~}}
+ (
+ {{~#each benchmark.components as |c| ~}}
+ {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+ ) -> Weight {
+ ({{underscore benchmark.base_weight}} as Weight)
+ {{~#each benchmark.component_weight as |cw|}}
+ // Standard Error: {{underscore cw.error}}
+ .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+ {{~/each}}
+ {{~#if (ne benchmark.base_reads "0")}}
+ .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
+ {{~/if}}
+ {{~#each benchmark.component_reads as |cr|}}
+ .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+ {{~/each}}
+ {{~#if (ne benchmark.base_writes "0")}}
+ .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
+ {{~/if}}
+ {{~#each benchmark.component_writes as |cw|}}
+ .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+ {{~/each}}
+ }
+ {{~/each}}
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+ {{~#each benchmarks as |benchmark|}}
+ {{~#each benchmark.comments as |comment|}}
+ // {{comment}}
+ {{~/each}}
+ fn {{benchmark.name~}}
+ (
+ {{~#each benchmark.components as |c| ~}}
+ {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
+ ) -> Weight {
+ ({{underscore benchmark.base_weight}} as Weight)
+ {{~#each benchmark.component_weight as |cw|}}
+ // Standard Error: {{underscore cw.error}}
+ .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
+ {{~/each}}
+ {{~#if (ne benchmark.base_reads "0")}}
+ .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
+ {{~/if}}
+ {{~#each benchmark.component_reads as |cr|}}
+ .saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
+ {{~/each}}
+ {{~#if (ne benchmark.base_writes "0")}}
+ .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
+ {{~/if}}
+ {{~#each benchmark.component_writes as |cw|}}
+ .saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
+ {{~/each}}
+ }
+ {{~/each}}
+}
\ No newline at end of file
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -704,6 +704,117 @@
]
[[package]]
+name = "bp-header-chain"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "finality-grandpa",
+ "frame-support",
+ "parity-scale-codec",
+ "serde",
+ "sp-core",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-messages"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "bitvec 0.20.4",
+ "bp-runtime",
+ "frame-support",
+ "frame-system",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "serde",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-polkadot-core"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "bp-messages",
+ "bp-runtime",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
+]
+
+[[package]]
+name = "bp-rococo"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "bp-messages",
+ "bp-polkadot-core",
+ "bp-runtime",
+ "frame-support",
+ "parity-scale-codec",
+ "smallvec 1.6.1",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+ "sp-version",
+]
+
+[[package]]
+name = "bp-runtime"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "frame-support",
+ "hash-db",
+ "num-traits",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
+ "sp-trie",
+]
+
+[[package]]
+name = "bp-test-utils"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "bp-header-chain",
+ "ed25519-dalek",
+ "finality-grandpa",
+ "parity-scale-codec",
+ "sp-application-crypto",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "bp-wococo"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "bp-messages",
+ "bp-polkadot-core",
+ "bp-rococo",
+ "bp-runtime",
+ "parity-scale-codec",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
name = "bs58"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3779,6 +3890,91 @@
]
[[package]]
+name = "kusama-runtime"
+version = "0.9.8"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "beefy-primitives",
+ "bitvec 0.20.4",
+ "frame-benchmarking",
+ "frame-election-provider-support",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal",
+ "log",
+ "max-encoded-len",
+ "pallet-authority-discovery",
+ "pallet-authorship",
+ "pallet-babe",
+ "pallet-balances",
+ "pallet-bounties",
+ "pallet-collective",
+ "pallet-democracy",
+ "pallet-election-provider-multi-phase",
+ "pallet-elections-phragmen",
+ "pallet-gilt",
+ "pallet-grandpa",
+ "pallet-identity",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-mmr-primitives",
+ "pallet-multisig",
+ "pallet-nicks",
+ "pallet-offences",
+ "pallet-offences-benchmarking",
+ "pallet-proxy",
+ "pallet-recovery",
+ "pallet-scheduler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8)",
+ "pallet-session",
+ "pallet-session-benchmarking",
+ "pallet-society",
+ "pallet-staking",
+ "pallet-staking-reward-fn",
+ "pallet-timestamp",
+ "pallet-tips",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
+ "pallet-utility",
+ "pallet-vesting",
+ "pallet-xcm",
+ "parity-scale-codec",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
+ "rustc-hex",
+ "serde",
+ "serde_derive",
+ "smallvec 1.6.1",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-npos-elections",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "static_assertions",
+ "substrate-wasm-builder 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8)",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
+[[package]]
name = "kv-log-macro"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5019,6 +5215,7 @@
"pallet-evm",
"pallet-evm-coder-substrate",
"pallet-evm-contract-helpers",
+ "pallet-evm-migration",
"pallet-evm-transaction-payment",
"pallet-inflation",
"pallet-nft",
@@ -5321,6 +5518,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"pallet-treasury",
@@ -5330,10 +5528,32 @@
]
[[package]]
+name = "pallet-bridge-grandpa"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "bp-header-chain",
+ "bp-runtime",
+ "bp-test-utils",
+ "finality-grandpa",
+ "frame-support",
+ "frame-system",
+ "log",
+ "num-traits",
+ "parity-scale-codec",
+ "serde",
+ "sp-finality-grandpa",
+ "sp-runtime",
+ "sp-std",
+ "sp-trie",
+]
+
+[[package]]
name = "pallet-collective"
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"log",
@@ -5423,11 +5643,13 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-election-provider-support",
"frame-support",
"frame-system",
"log",
"parity-scale-codec",
+ "rand 0.7.3",
"sp-arithmetic",
"sp-core",
"sp-io",
@@ -5442,6 +5664,7 @@
version = "4.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"log",
@@ -5542,6 +5765,22 @@
]
[[package]]
+name = "pallet-evm-migration"
+version = "0.1.0"
+dependencies = [
+ "fp-evm",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-evm",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
name = "pallet-evm-transaction-payment"
version = "0.1.0"
dependencies = [
@@ -5559,6 +5798,20 @@
]
[[package]]
+name = "pallet-gilt"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "sp-arithmetic",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
name = "pallet-grandpa"
version = "3.1.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
@@ -5600,6 +5853,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"log",
@@ -5618,6 +5872,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
@@ -5717,6 +5972,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
@@ -5822,10 +6078,33 @@
]
[[package]]
+name = "pallet-offences-benchmarking"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
+dependencies = [
+ "frame-benchmarking",
+ "frame-election-provider-support",
+ "frame-support",
+ "frame-system",
+ "pallet-babe",
+ "pallet-balances",
+ "pallet-grandpa",
+ "pallet-im-online",
+ "pallet-offences",
+ "pallet-session",
+ "pallet-staking",
+ "parity-scale-codec",
+ "sp-runtime",
+ "sp-staking",
+ "sp-std",
+]
+
+[[package]]
name = "pallet-proxy"
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"max-encoded-len",
@@ -5850,6 +6129,20 @@
]
[[package]]
+name = "pallet-recovery"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
+dependencies = [
+ "enumflags2",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
name = "pallet-scheduler"
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
@@ -5903,10 +6196,40 @@
]
[[package]]
+name = "pallet-session-benchmarking"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "pallet-session",
+ "pallet-staking",
+ "rand 0.7.3",
+ "sp-runtime",
+ "sp-session",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-society"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "rand_chacha 0.2.2",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
name = "pallet-staking"
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-election-provider-support",
"frame-support",
"frame-system",
@@ -5915,6 +6238,7 @@
"pallet-session",
"parity-scale-codec",
"paste",
+ "rand_chacha 0.2.2",
"serde",
"sp-application-crypto",
"sp-io",
@@ -5936,6 +6260,15 @@
]
[[package]]
+name = "pallet-staking-reward-fn"
+version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
+dependencies = [
+ "log",
+ "sp-arithmetic",
+]
+
+[[package]]
name = "pallet-sudo"
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
@@ -5971,6 +6304,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"pallet-treasury",
@@ -6029,6 +6363,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"impl-trait-for-tuples",
@@ -6044,6 +6379,7 @@
version = "3.0.0"
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
@@ -6059,6 +6395,7 @@
source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8#74101dc21cfffb4c2d014fcc28edc166d5ca1b16"
dependencies = [
"enumflags2",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"parity-scale-codec",
@@ -6074,6 +6411,7 @@
"frame-support",
"frame-system",
"parity-scale-codec",
+ "serde",
"sp-runtime",
"sp-std",
"xcm",
@@ -7149,12 +7487,15 @@
dependencies = [
"beefy-primitives",
"bitvec 0.20.4",
+ "frame-benchmarking",
"frame-election-provider-support",
"frame-executive",
"frame-support",
"frame-system",
+ "frame-system-benchmarking",
"frame-system-rpc-runtime-api",
"frame-try-runtime",
+ "hex-literal",
"log",
"max-encoded-len",
"pallet-authority-discovery",
@@ -7175,9 +7516,11 @@
"pallet-multisig",
"pallet-nicks",
"pallet-offences",
+ "pallet-offences-benchmarking",
"pallet-proxy",
"pallet-scheduler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8)",
"pallet-session",
+ "pallet-session-benchmarking",
"pallet-staking",
"pallet-staking-reward-curve",
"pallet-timestamp",
@@ -7220,12 +7563,14 @@
dependencies = [
"beefy-primitives",
"bitvec 0.20.4",
+ "frame-benchmarking",
"frame-support",
"frame-system",
"impl-trait-for-tuples",
"libsecp256k1 0.3.5",
"log",
"pallet-authorship",
+ "pallet-babe",
"pallet-balances",
"pallet-beefy",
"pallet-election-provider-multi-phase",
@@ -7263,8 +7608,10 @@
dependencies = [
"bitvec 0.20.4",
"derive_more",
+ "frame-benchmarking",
"frame-support",
"frame-system",
+ "libsecp256k1 0.3.5",
"log",
"pallet-authority-discovery",
"pallet-authorship",
@@ -7304,6 +7651,7 @@
"frame-system-rpc-runtime-api",
"futures 0.3.16",
"hex-literal",
+ "kusama-runtime",
"kvdb",
"kvdb-rocksdb",
"pallet-babe",
@@ -7339,6 +7687,7 @@
"polkadot-runtime",
"polkadot-runtime-parachains",
"polkadot-statement-distribution",
+ "rococo-runtime",
"sc-authority-discovery",
"sc-basic-authorship",
"sc-block-builder",
@@ -7380,6 +7729,7 @@
"substrate-prometheus-endpoint",
"thiserror",
"tracing",
+ "westend-runtime",
]
[[package]]
@@ -8144,6 +8494,73 @@
]
[[package]]
+name = "rococo-runtime"
+version = "0.9.8"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "beefy-primitives",
+ "bp-rococo",
+ "bp-wococo",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-rpc-runtime-api",
+ "hex-literal",
+ "log",
+ "max-encoded-len",
+ "pallet-authority-discovery",
+ "pallet-authorship",
+ "pallet-babe",
+ "pallet-balances",
+ "pallet-beefy",
+ "pallet-bridge-grandpa",
+ "pallet-collective",
+ "pallet-grandpa",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-mmr",
+ "pallet-mmr-primitives",
+ "pallet-offences",
+ "pallet-proxy",
+ "pallet-session",
+ "pallet-staking",
+ "pallet-staking-reward-curve",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-utility",
+ "pallet-xcm",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
+ "serde",
+ "serde_derive",
+ "smallvec 1.6.1",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "substrate-wasm-builder 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8)",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
+[[package]]
name = "rpassword"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -12044,6 +12461,89 @@
]
[[package]]
+name = "westend-runtime"
+version = "0.9.8"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.8#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
+dependencies = [
+ "beefy-primitives",
+ "bitvec 0.20.4",
+ "frame-benchmarking",
+ "frame-election-provider-support",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal",
+ "log",
+ "max-encoded-len",
+ "pallet-authority-discovery",
+ "pallet-authorship",
+ "pallet-babe",
+ "pallet-balances",
+ "pallet-collective",
+ "pallet-democracy",
+ "pallet-election-provider-multi-phase",
+ "pallet-elections-phragmen",
+ "pallet-grandpa",
+ "pallet-identity",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-membership",
+ "pallet-mmr-primitives",
+ "pallet-multisig",
+ "pallet-nicks",
+ "pallet-offences",
+ "pallet-offences-benchmarking",
+ "pallet-proxy",
+ "pallet-recovery",
+ "pallet-scheduler 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8)",
+ "pallet-session",
+ "pallet-session-benchmarking",
+ "pallet-society",
+ "pallet-staking",
+ "pallet-staking-reward-curve",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-treasury",
+ "pallet-utility",
+ "pallet-vesting",
+ "pallet-xcm",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
+ "rustc-hex",
+ "serde",
+ "serde_derive",
+ "smallvec 1.6.1",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-npos-elections",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "static_assertions",
+ "substrate-wasm-builder 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.8)",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
+[[package]]
name = "which"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -22,3 +22,18 @@
INPUT=$< OUTPUT=$@ ./.maintain/scripts/compile_stub.sh
evm_stubs: $(NFT_EVM_STUBS)/UniqueFungible.raw $(NFT_EVM_STUBS)/UniqueNFT.raw $(CONTRACT_HELPERS_STUBS)/ContractHelpers.raw
+
+.PHONY: _bench
+_bench:
+ cargo run --release --features runtime-benchmarks -- \
+ benchmark --pallet pallet-$(PALLET) \
+ --wasm-execution compiled --extrinsic '*' \
+ --template .maintain/frame-weight-template.hbs --steps=50 --repeat=20 \
+ --output=./pallets/$(PALLET)/src/weights.rs
+
+.PHONY: bench-evm-migration
+bench-evm-migration:
+ make _bench PALLET=evm-migration
+
+.PHONY: bench
+bench: bench-evm-migration
crates/evm-coder/tests/a.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/a.rs
+++ b/crates/evm-coder/tests/a.rs
@@ -2,6 +2,7 @@
use evm_coder::{solidity_interface, types::*, ToLog, execution::Result};
use evm_coder_macros::solidity;
+use std as sp_std;
struct Impls;
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -317,4 +317,7 @@
[features]
default = []
-runtime-benchmarks = ['nft-runtime/runtime-benchmarks']
+runtime-benchmarks = [
+ 'nft-runtime/runtime-benchmarks',
+ 'polkadot-service/runtime-benchmarks',
+]
pallets/evm-migration/Cargo.tomldiffbeforeafterboth--- /dev/null
+++ b/pallets/evm-migration/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "pallet-evm-migration"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+frame-support = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+frame-system = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+frame-benchmarking = { default-features = false, version = '3.0.0', optional = true, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+sp-runtime = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+sp-std = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+sp-io = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+sp-core = { default-features = false, version = '3.0.0', git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+pallet-evm = { default-features = false, version = "5.0.0-dev", git = "https://github.com/uniquenetwork/frontier.git", branch = "injected-transactions-parachain" }
+fp-evm = { default-features = false, version = "2.0.0", git = "https://github.com/uniquenetwork/frontier.git", branch = "injected-transactions-parachain" }
+
+[dependencies.codec]
+default-features = false
+features = ['derive']
+package = 'parity-scale-codec'
+version = '2.0.0'
+
+[features]
+default = ["std", "runtime-benchmarks"]
+std = [
+ "frame-support/std",
+ "frame-system/std",
+ "frame-benchmarking/std",
+ "sp-runtime/std",
+ "sp-std/std",
+ "sp-io/std",
+ "sp-core/std",
+ "pallet-evm/std",
+ "fp-evm/std",
+]
+runtime-benchmarks = ["frame-benchmarking"]
pallets/evm-migration/src/benchmarking.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/evm-migration/src/benchmarking.rs
@@ -0,0 +1,30 @@
+use super::{Call, Config, Pallet};
+use frame_benchmarking::benchmarks;
+use frame_system::RawOrigin;
+use sp_core::{H160, H256};
+use sp_std::vec::Vec;
+
+benchmarks! {
+ begin {
+ }: _(RawOrigin::Root, H160::default())
+
+ set_data {
+ let b in 0..80;
+ let address = H160::from_low_u64_be(b as u64);
+ let mut data = Vec::new();
+ for i in 0..b {
+ data.push((
+ H256::from_low_u64_be(i as u64),
+ H256::from_low_u64_be(i as u64),
+ ));
+ }
+ <Pallet<T>>::begin(RawOrigin::Root.into(), address)?;
+ }: _(RawOrigin::Root, address, data)
+
+ finish {
+ let b in 0..80;
+ let address = H160::from_low_u64_be(b as u64);
+ let data: Vec<u8> = (0..b as u8).collect();
+ <Pallet<T>>::begin(RawOrigin::Root.into(), address)?;
+ }: _(RawOrigin::Root, address, data)
+}
pallets/evm-migration/src/lib.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/evm-migration/src/lib.rs
@@ -0,0 +1,111 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub use pallet::*;
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarking;
+pub mod weights;
+
+#[frame_support::pallet]
+pub mod pallet {
+ use frame_support::{pallet_prelude::*, transactional};
+ use frame_system::pallet_prelude::*;
+ use sp_core::{H160, H256};
+ use sp_std::vec::Vec;
+ use super::weights::WeightInfo;
+
+ #[pallet::config]
+ pub trait Config: frame_system::Config + pallet_evm::Config {
+ type WeightInfo: WeightInfo;
+ }
+
+ type SelfWeightOf<T> = <T as Config>::WeightInfo;
+
+ #[pallet::pallet]
+ #[pallet::generate_store(pub(super) trait Store)]
+ pub struct Pallet<T>(_);
+
+ #[pallet::error]
+ pub enum Error<T> {
+ AccountNotEmpty,
+ AccountIsNotMigrating,
+ }
+
+ #[pallet::storage]
+ pub(super) type MigrationPending<T: Config> =
+ StorageMap<Hasher = Twox64Concat, Key = H160, Value = bool, QueryKind = ValueQuery>;
+
+ #[pallet::call]
+ impl<T: Config> Pallet<T> {
+ #[pallet::weight(<SelfWeightOf<T>>::begin())]
+ pub fn begin(origin: OriginFor<T>, address: H160) -> DispatchResult {
+ ensure_root(origin)?;
+ ensure!(
+ <pallet_evm::Pallet<T>>::is_account_empty(&address)
+ && !<MigrationPending<T>>::get(&address),
+ <Error<T>>::AccountNotEmpty,
+ );
+
+ <MigrationPending<T>>::insert(address, true);
+ Ok(())
+ }
+
+ #[pallet::weight(<SelfWeightOf<T>>::set_data(data.len() as u32))]
+ pub fn set_data(
+ origin: OriginFor<T>,
+ address: H160,
+ data: Vec<(H256, H256)>,
+ ) -> DispatchResult {
+ use frame_support::StorageDoubleMap;
+ ensure_root(origin)?;
+ ensure!(
+ <MigrationPending<T>>::get(&address),
+ <Error<T>>::AccountIsNotMigrating,
+ );
+
+ for (k, v) in data {
+ pallet_evm::AccountStorages::insert(&address, k, v);
+ }
+ Ok(())
+ }
+
+ #[pallet::weight(<SelfWeightOf<T>>::finish(code.len() as u32))]
+ #[transactional]
+ pub fn finish(origin: OriginFor<T>, address: H160, code: Vec<u8>) -> DispatchResult {
+ use frame_support::StorageMap;
+ ensure_root(origin)?;
+ ensure!(
+ <MigrationPending<T>>::get(&address),
+ <Error<T>>::AccountIsNotMigrating,
+ );
+
+ pallet_evm::AccountCodes::insert(&address, code);
+ <MigrationPending<T>>::remove(address);
+ Ok(())
+ }
+ }
+
+ pub struct OnMethodCall<T>(PhantomData<T>);
+ impl<T: Config> pallet_evm::OnMethodCall<T> for OnMethodCall<T> {
+ fn is_reserved(contract: &H160) -> bool {
+ <MigrationPending<T>>::get(&contract)
+ }
+
+ fn is_used(_contract: &H160) -> bool {
+ false
+ }
+
+ fn call(
+ _source: &H160,
+ _arget: &H160,
+ _gas_left: u64,
+ _input: &[u8],
+ _value: sp_core::U256,
+ ) -> Option<pallet_evm::PrecompileOutput> {
+ None
+ }
+
+ fn get_code(_contract: &H160) -> Option<Vec<u8>> {
+ None
+ }
+ }
+}
pallets/evm-migration/src/weights.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/evm-migration/src/weights.rs
@@ -0,0 +1,80 @@
+// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
+
+//! Autogenerated weights for pallet_evm_migration
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-08-12, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 128
+
+// Executed Command:
+// target/release/nft
+// benchmark
+// --pallet
+// pallet-evm-migration
+// --wasm-execution
+// compiled
+// --extrinsic
+// *
+// --template
+// .maintain/frame-weight-template.hbs
+// --steps=50
+// --repeat=20
+// --output=./pallets/evm-migration/src/weights.rs
+
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use sp_std::marker::PhantomData;
+
+/// Weight functions needed for pallet_evm_migration.
+pub trait WeightInfo {
+ fn begin() -> Weight;
+ fn set_data(b: u32, ) -> Weight;
+ fn finish(b: u32, ) -> Weight;
+}
+
+/// Weights for pallet_evm_migration using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ fn begin() -> Weight {
+ (6_210_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ fn set_data(b: u32, ) -> Weight {
+ (2_926_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((649_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
+ }
+ fn finish(_b: u32, ) -> Weight {
+ (4_309_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ }
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+ fn begin() -> Weight {
+ (6_210_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(3 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
+ }
+ fn set_data(b: u32, ) -> Weight {
+ (2_926_000 as Weight)
+ // Standard Error: 4_000
+ .saturating_add((649_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
+ }
+ fn finish(_b: u32, ) -> Weight {
+ (4_309_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(2 as Weight))
+ }
+}
\ No newline at end of file
pallets/nft-transaction-payment/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nft-transaction-payment/src/benchmarking.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#![cfg(feature = "runtime-benchmarks")]
-
-use super::*;
-
-use sp_std::prelude::*;
-use frame_system::RawOrigin;
-use frame_benchmarking::{benchmarks};
-use frame_support::traits::OnInitialize;
-
-benchmarks! {
-
- // on_initialize {
- // let block1: T::BlockNumber = T::BlockNumber::from(1u32);
- // let block2: T::BlockNumber = T::BlockNumber::from(2u32);
- // Inflation::<T>::on_initialize(block1); // Create Treasury account
- // }: { Inflation::<T>::on_initialize(block2); } // Benchmark deposit_into_existing path
-
-}
pallets/nft-transaction-payment/src/lib.rsdiffbeforeafterboth--- a/pallets/nft-transaction-payment/src/lib.rs
+++ b/pallets/nft-transaction-payment/src/lib.rs
@@ -11,9 +11,6 @@
#[cfg(feature = "std")]
pub use serde::*;
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking;
-
use frame_support::{decl_module, decl_storage};
use sp_std::prelude::*;
use up_sponsorship::SponsorshipHandler;
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -1399,6 +1399,11 @@
item_id: TokenId,
amount: u128,
) -> DispatchResult {
+ if sender == from {
+ // Transfer by `from`, because it is either equal to sender, or derived from him
+ return Self::transfer_internal(from, recipient, collection, item_id, amount);
+ }
+
// Check approval
collection.consume_sload()?;
let approval: u128 =
pallets/nft/src/mock.rsdiffbeforeafterboth--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -129,8 +129,11 @@
fn as_sub(&self) -> &u64 {
&self.0
}
- fn from_eth(_eth: sp_core::H160) -> Self {
- unimplemented!()
+ fn from_eth(eth: sp_core::H160) -> Self {
+ let mut sub_raw = [0; 8];
+ sub_raw.copy_from_slice(ð.0[0..8]);
+ let sub = u64::from_be_bytes(sub_raw);
+ Self(sub, eth)
}
fn as_eth(&self) -> &sp_core::H160 {
&self.1
runtime/Cargo.tomldiffbeforeafterboth--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -23,11 +23,14 @@
'frame-support/runtime-benchmarks',
'frame-system-benchmarking',
'frame-system/runtime-benchmarks',
+ 'pallet-evm-migration/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
'pallet-nft/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
+ 'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
+ 'xcm-builder/runtime-benchmarks',
]
std = [
'codec/std',
@@ -56,6 +59,7 @@
'pallet-treasury/std',
'pallet-vesting/std',
'pallet-evm/std',
+ 'pallet-evm-migration/std',
'pallet-evm-contract-helpers/std',
'pallet-evm-transaction-payment/std',
'pallet-evm-coder-substrate/std',
@@ -392,6 +396,7 @@
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }
pallet-nft-charge-transaction = { path = '../pallets/nft-charge-transaction', default-features = false, version = '3.0.0' }
+pallet-evm-migration = { path = '../pallets/evm-migration', default-features = false }
pallet-evm-contract-helpers = { path = '../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../pallets/evm-transaction-payment', default-features = false }
pallet-evm-coder-substrate = { default-features = false, path = "../pallets/evm-coder-substrate" }
runtime/src/lib.rsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.78#![cfg_attr(not(feature = "std"), no_std)]9// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.10#![recursion_limit = "1024"]11#![allow(clippy::from_over_into, clippy::identity_op)]12#![allow(clippy::fn_to_numeric_cast_with_truncation)]13// Make the WASM binary available.14#[cfg(feature = "std")]15include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1617use sp_api::impl_runtime_apis;18use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};19// #[cfg(any(feature = "std", test))]20// pub use sp_runtime::BuildStorage;2122use sp_runtime::{23 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,24 traits::{25 AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify,26 AccountIdConversion,27 },28 transaction_validity::{TransactionSource, TransactionValidity},29 ApplyExtrinsicResult, MultiSignature,30};3132use sp_std::prelude::*;3334#[cfg(feature = "std")]35use sp_version::NativeVersion;36use sp_version::RuntimeVersion;37pub use pallet_transaction_payment::{38 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,39};40// A few exports that help ease life for downstream crates.41pub use pallet_balances::Call as BalancesCall;42pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};43pub use frame_support::{44 construct_runtime, match_type,45 dispatch::DispatchResult,46 PalletId, parameter_types, StorageValue, ConsensusEngineId,47 traits::{48 All, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,49 OnUnbalanced, Randomness, FindAuthor,50 },51 weights::{52 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},53 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,54 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,55 },56};57use nft_data_structs::*;58// use pallet_contracts::weights::WeightInfo;59// #[cfg(any(feature = "std", test))]60use frame_system::{61 self as system, EnsureRoot, EnsureSigned,62 limits::{BlockWeights, BlockLength},63};64use sp_arithmetic::{65 traits::{BaseArithmetic, Unsigned},66};67use smallvec::smallvec;68use codec::{Encode, Decode};69use pallet_evm::{Account as EVMAccount, FeeCalculator, OnMethodCall};70use fp_rpc::TransactionStatus;71use sp_core::crypto::Public;72use sp_runtime::{73 traits::{Dispatchable},74};7576// pub use pallet_timestamp::Call as TimestampCall;77pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;7879// Polkadot imports80use pallet_xcm::XcmPassthrough;81use polkadot_parachain::primitives::Sibling;82use xcm::v0::Xcm;83use xcm::v0::{BodyId, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId};84use xcm_builder::{85 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,86 EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,87 ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative,88 SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,89 SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,90};91use xcm_executor::{Config, XcmExecutor};9293// mod chain_extension;94// use crate::chain_extension::{NFTExtension, Imbalance};9596/// An index to a block.97pub type BlockNumber = u32;9899/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.100pub type Signature = MultiSignature;101102/// Some way of identifying an account on the chain. We intentionally make it equivalent103/// to the public key of our transaction signing scheme.104pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;105106/// The type for looking up accounts. We don't expect more than 4 billion of them, but you107/// never know...108pub type AccountIndex = u32;109110/// Balance of an account.111pub type Balance = u128;112113/// Index of a transaction in the chain.114pub type Index = u32;115116/// A hash of some data used by the chain.117pub type Hash = sp_core::H256;118119/// Digest item type.120pub type DigestItem = generic::DigestItem<Hash>;121122mod nft_weights;123124/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know125/// the specifics of the runtime. They can then be made to be agnostic over specific formats126/// of data like extrinsics, allowing for them to continue syncing the network through upgrades127/// to even the core data structures.128pub mod opaque {129 use super::*;130131 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;132133 /// Opaque block type.134 pub type Block = generic::Block<Header, UncheckedExtrinsic>;135136 pub type SessionHandlers = ();137138 impl_opaque_keys! {139 pub struct SessionKeys {140 pub aura: Aura,141 }142 }143}144145/// This runtime version.146pub const VERSION: RuntimeVersion = RuntimeVersion {147 spec_name: create_runtime_str!("nft"),148 impl_name: create_runtime_str!("nft"),149 authoring_version: 1,150 spec_version: 3,151 impl_version: 1,152 apis: RUNTIME_API_VERSIONS,153 transaction_version: 1,154};155156pub const MILLISECS_PER_BLOCK: u64 = 12000;157158pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;159160// These time units are defined in number of blocks.161pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);162pub const HOURS: BlockNumber = MINUTES * 60;163pub const DAYS: BlockNumber = HOURS * 24;164165parameter_types! {166 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;167}168169#[derive(codec::Encode, codec::Decode)]170pub enum XCMPMessage<XAccountId, XBalance> {171 /// Transfer tokens to the given account from the Parachain account.172 TransferToken(XAccountId, XBalance),173}174175/// The version information used to identify this runtime when compiled natively.176#[cfg(feature = "std")]177pub fn native_version() -> NativeVersion {178 NativeVersion {179 runtime_version: VERSION,180 can_author_with: Default::default(),181 }182}183184type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;185186pub struct DealWithFees;187impl OnUnbalanced<NegativeImbalance> for DealWithFees {188 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {189 if let Some(fees) = fees_then_tips.next() {190 // for fees, 100% to treasury191 let mut split = fees.ration(100, 0);192 if let Some(tips) = fees_then_tips.next() {193 // for tips, if any, 100% to treasury194 tips.ration_merge_into(100, 0, &mut split);195 }196 Treasury::on_unbalanced(split.0);197 // Author::on_unbalanced(split.1);198 }199 }200}201202/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.203/// This is used to limit the maximal weight of a single extrinsic.204const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);205/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used206/// by Operational extrinsics.207const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);208/// We allow for 2 seconds of compute with a 6 second average block time.209const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;210211parameter_types! {212 pub const BlockHashCount: BlockNumber = 2400;213 pub RuntimeBlockLength: BlockLength =214 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);215 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);216 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;217 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()218 .base_block(BlockExecutionWeight::get())219 .for_class(DispatchClass::all(), |weights| {220 weights.base_extrinsic = ExtrinsicBaseWeight::get();221 })222 .for_class(DispatchClass::Normal, |weights| {223 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);224 })225 .for_class(DispatchClass::Operational, |weights| {226 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);227 // Operational transactions have some extra reserved space, so that they228 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.229 weights.reserved = Some(230 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT231 );232 })233 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)234 .build_or_panic();235 pub const Version: RuntimeVersion = VERSION;236 pub const SS58Prefix: u8 = 42;237}238239parameter_types! {240 pub const ChainId: u64 = 8888;241}242243impl pallet_evm::Config for Runtime {244 type BlockGasLimit = BlockGasLimit;245 type FeeCalculator = ();246 type GasWeightMapping = ();247 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping;248 type CallOrigin = EnsureAddressTruncated;249 type WithdrawOrigin = EnsureAddressTruncated;250 type AddressMapping = HashedAddressMapping<Self::Hashing>;251 type Precompiles = ();252 type Currency = Balances;253 type Event = Event;254 type OnMethodCall = (255 pallet_nft::NftErcSupport<Self>,256 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,257 );258 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;259 type ChainId = ChainId;260 type Runner = pallet_evm::runner::stack::Runner<Self>;261 type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;262 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;263 type FindAuthor = EthereumFindAuthor<Aura>;264}265266pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);267impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {268 fn find_author<'a, I>(digests: I) -> Option<H160>269 where270 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,271 {272 if let Some(author_index) = F::find_author(digests) {273 let authority_id = Aura::authorities()[author_index as usize].clone();274 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));275 }276 None277 }278}279280parameter_types! {281 pub BlockGasLimit: U256 = U256::from(u32::max_value());282}283284impl pallet_ethereum::Config for Runtime {285 type Event = Event;286 type StateRoot = pallet_ethereum::IntermediateStateRoot;287 type EvmSubmitLog = pallet_evm::Pallet<Self>;288}289290impl pallet_randomness_collective_flip::Config for Runtime {}291292impl system::Config for Runtime {293 /// The data to be stored in an account.294 type AccountData = pallet_balances::AccountData<Balance>;295 /// The identifier used to distinguish between accounts.296 type AccountId = AccountId;297 /// The basic call filter to use in dispatchable.298 type BaseCallFilter = ();299 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).300 type BlockHashCount = BlockHashCount;301 /// The maximum length of a block (in bytes).302 type BlockLength = RuntimeBlockLength;303 /// The index type for blocks.304 type BlockNumber = BlockNumber;305 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.306 type BlockWeights = RuntimeBlockWeights;307 /// The aggregated dispatch type that is available for extrinsics.308 type Call = Call;309 /// The weight of database operations that the runtime can invoke.310 type DbWeight = RocksDbWeight;311 /// The ubiquitous event type.312 type Event = Event;313 /// The type for hashing blocks and tries.314 type Hash = Hash;315 /// The hashing algorithm used.316 type Hashing = BlakeTwo256;317 /// The header type.318 type Header = generic::Header<BlockNumber, BlakeTwo256>;319 /// The index type for storing how many extrinsics an account has signed.320 type Index = Index;321 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.322 type Lookup = AccountIdLookup<AccountId, ()>;323 /// What to do if an account is fully reaped from the system.324 type OnKilledAccount = ();325 /// What to do if a new account is created.326 type OnNewAccount = ();327 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;328 /// The ubiquitous origin type.329 type Origin = Origin;330 /// This type is being generated by `construct_runtime!`.331 type PalletInfo = PalletInfo;332 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.333 type SS58Prefix = SS58Prefix;334 /// Weight information for the extrinsics of this pallet.335 type SystemWeightInfo = system::weights::SubstrateWeight<Self>;336 /// Version of the runtime.337 type Version = Version;338}339340parameter_types! {341 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;342}343344impl pallet_timestamp::Config for Runtime {345 /// A timestamp: milliseconds since the unix epoch.346 type Moment = u64;347 type OnTimestampSet = ();348 type MinimumPeriod = MinimumPeriod;349 type WeightInfo = ();350}351352parameter_types! {353 // pub const ExistentialDeposit: u128 = 500;354 pub const ExistentialDeposit: u128 = 0;355 pub const MaxLocks: u32 = 50;356}357358impl pallet_balances::Config for Runtime {359 type MaxLocks = MaxLocks;360 type MaxReserves = ();361 type ReserveIdentifier = [u8; 8];362 /// The type for recording an account's balance.363 type Balance = Balance;364 /// The ubiquitous event type.365 type Event = Event;366 type DustRemoval = Treasury;367 type ExistentialDeposit = ExistentialDeposit;368 type AccountStore = System;369 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;370}371372pub const MICROUNIQUE: Balance = 1_000_000_000;373pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;374pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;375pub const UNIQUE: Balance = 100 * CENTIUNIQUE;376377pub const fn deposit(items: u32, bytes: u32) -> Balance {378 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE379}380381/*382parameter_types! {383 pub TombstoneDeposit: Balance = deposit(384 1,385 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,386 );387 pub DepositPerContract: Balance = TombstoneDeposit::get();388 pub const DepositPerStorageByte: Balance = deposit(0, 1);389 pub const DepositPerStorageItem: Balance = deposit(1, 0);390 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);391 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;392 pub const SignedClaimHandicap: u32 = 2;393 pub const MaxDepth: u32 = 32;394 pub const MaxValueSize: u32 = 16 * 1024;395 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb396 // The lazy deletion runs inside on_initialize.397 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *398 RuntimeBlockWeights::get().max_block;399 // The weight needed for decoding the queue should be less or equal than a fifth400 // of the overall weight dedicated to the lazy deletion.401 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (402 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -403 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)404 )) / 5) as u32;405 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();406}407408impl pallet_contracts::Config for Runtime {409 type Time = Timestamp;410 type Randomness = RandomnessCollectiveFlip;411 type Currency = Balances;412 type Event = Event;413 type RentPayment = ();414 type SignedClaimHandicap = SignedClaimHandicap;415 type TombstoneDeposit = TombstoneDeposit;416 type DepositPerContract = DepositPerContract;417 type DepositPerStorageByte = DepositPerStorageByte;418 type DepositPerStorageItem = DepositPerStorageItem;419 type RentFraction = RentFraction;420 type SurchargeReward = SurchargeReward;421 type WeightPrice = pallet_transaction_payment::Pallet<Self>;422 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;423 type ChainExtension = NFTExtension;424 type DeletionQueueDepth = DeletionQueueDepth;425 type DeletionWeightLimit = DeletionWeightLimit;426 type Schedule = Schedule;427 type CallStack = [pallet_contracts::Frame<Self>; 31];428}429*/430431parameter_types! {432 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer433}434435/// Linear implementor of `WeightToFeePolynomial`436pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);437438impl<T> WeightToFeePolynomial for LinearFee<T>439where440 T: BaseArithmetic + From<u32> + Copy + Unsigned,441{442 type Balance = T;443444 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {445 smallvec!(WeightToFeeCoefficient {446 coeff_integer: 146_700u32.into(), // Targeting 0.1 Unique per NFT transfer447 coeff_frac: Perbill::zero(),448 negative: false,449 degree: 1,450 })451 }452}453454impl pallet_transaction_payment::Config for Runtime {455 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;456 type TransactionByteFee = TransactionByteFee;457 type WeightToFee = LinearFee<Balance>;458 type FeeMultiplierUpdate = ();459}460461parameter_types! {462 pub const ProposalBond: Permill = Permill::from_percent(5);463 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;464 pub const SpendPeriod: BlockNumber = 5 * MINUTES;465 pub const Burn: Permill = Permill::from_percent(0);466 pub const TipCountdown: BlockNumber = 1 * DAYS;467 pub const TipFindersFee: Percent = Percent::from_percent(20);468 pub const TipReportDepositBase: Balance = 1 * UNIQUE;469 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;470 pub const BountyDepositBase: Balance = 1 * UNIQUE;471 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;472 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");473 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;474 pub const MaximumReasonLength: u32 = 16384;475 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);476 pub const BountyValueMinimum: Balance = 5 * UNIQUE;477 pub const MaxApprovals: u32 = 100;478}479480impl pallet_treasury::Config for Runtime {481 type PalletId = TreasuryModuleId;482 type Currency = Balances;483 type ApproveOrigin = EnsureRoot<AccountId>;484 type RejectOrigin = EnsureRoot<AccountId>;485 type Event = Event;486 type OnSlash = ();487 type ProposalBond = ProposalBond;488 type ProposalBondMinimum = ProposalBondMinimum;489 type SpendPeriod = SpendPeriod;490 type Burn = Burn;491 type BurnDestination = ();492 type SpendFunds = ();493 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;494 type MaxApprovals = MaxApprovals;495}496497impl pallet_sudo::Config for Runtime {498 type Event = Event;499 type Call = Call;500}501502parameter_types! {503 pub const MinVestedTransfer: Balance = 10 * UNIQUE;504}505506impl pallet_vesting::Config for Runtime {507 type Event = Event;508 type Currency = Balances;509 type BlockNumberToBalance = ConvertInto;510 type MinVestedTransfer = MinVestedTransfer;511 type WeightInfo = ();512}513514parameter_types! {515 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;516 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;517}518519impl cumulus_pallet_parachain_system::Config for Runtime {520 type Event = Event;521 type OnValidationData = ();522 type SelfParaId = parachain_info::Pallet<Self>;523 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<524 // MaxDownwardMessageWeight,525 // XcmExecutor<XcmConfig>,526 // Call,527 // >;528 type OutboundXcmpMessageSource = XcmpQueue;529 type DmpMessageHandler = DmpQueue;530 type ReservedDmpWeight = ReservedDmpWeight;531 type ReservedXcmpWeight = ReservedXcmpWeight;532 type XcmpMessageHandler = XcmpQueue;533}534535impl parachain_info::Config for Runtime {}536537impl cumulus_pallet_aura_ext::Config for Runtime {}538539parameter_types! {540 pub const RelayLocation: MultiLocation = X1(Parent);541 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;542 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();543 pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into()));544}545546/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used547/// when determining ownership of accounts for asset transacting and when attempting to use XCM548/// `Transact` in order to determine the dispatch Origin.549pub type LocationToAccountId = (550 // The parent (Relay-chain) origin converts to the default `AccountId`.551 ParentIsDefault<AccountId>,552 // Sibling parachain origins convert to AccountId via the `ParaId::into`.553 SiblingParachainConvertsVia<Sibling, AccountId>,554 // Straight up local `AccountId32` origins just alias directly to `AccountId`.555 AccountId32Aliases<RelayNetwork, AccountId>,556);557558/// Means for transacting assets on this chain.559pub type LocalAssetTransactor = CurrencyAdapter<560 // Use this currency:561 Balances,562 // Use this currency when it is a fungible asset matching the given location or name:563 IsConcrete<RelayLocation>,564 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:565 LocationToAccountId,566 // Our chain's account ID type (we can't get away without mentioning it explicitly):567 AccountId,568 // We don't track any teleports.569 (),570>;571572/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,573/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can574/// biases the kind of local `Origin` it will become.575pub type XcmOriginToTransactDispatchOrigin = (576 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location577 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for578 // foreign chains who want to have a local sovereign account on this chain which they control.579 SovereignSignedViaLocation<LocationToAccountId, Origin>,580 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when581 // recognised.582 RelayChainAsNative<RelayOrigin, Origin>,583 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when584 // recognised.585 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,586 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a587 // transaction from the Root origin.588 ParentAsSuperuser<Origin>,589 // Native signed account converter; this just converts an `AccountId32` origin into a normal590 // `Origin::Signed` origin of the same 32-byte value.591 SignedAccountId32AsNative<RelayNetwork, Origin>,592 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.593 XcmPassthrough<Origin>,594);595596parameter_types! {597 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.598 pub UnitWeightCost: Weight = 1_000_000;599 // 1200 UNIQUEs buy 1 second of weight.600 pub const WeightPrice: (MultiLocation, u128) = (X1(Parent), 1_200 * UNIQUE);601}602603match_type! {604 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {605 X1(Parent) | X2(Parent, Plurality { id: BodyId::Unit, .. })606 };607}608609pub type Barrier = (610 TakeWeightCredit,611 AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,612 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,613 // ^^^ Parent & its unit plurality gets free execution614);615616pub struct XcmConfig;617impl Config for XcmConfig {618 type Call = Call;619 type XcmSender = XcmRouter;620 // How to withdraw and deposit an asset.621 type AssetTransactor = LocalAssetTransactor;622 type OriginConverter = XcmOriginToTransactDispatchOrigin;623 type IsReserve = NativeAsset;624 type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC625 type LocationInverter = LocationInverter<Ancestry>;626 type Barrier = Barrier;627 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;628 type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;629 type ResponseHandler = (); // Don't handle responses for now.630}631632// parameter_types! {633// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;634// }635636/// No local origins on this chain are allowed to dispatch XCM sends/executions.637pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);638639/// The means for routing XCM messages which are not for local execution into the right message640/// queues.641pub type XcmRouter = (642 // Two routers - use UMP to communicate with the relay chain:643 cumulus_primitives_utility::ParentAsUmp<ParachainSystem>,644 // ..and XCMP to communicate with the sibling chains.645 XcmpQueue,646);647648impl pallet_evm_coder_substrate::Config for Runtime {649 type EthereumTransactionSender = pallet_ethereum::Module<Self>;650}651652impl pallet_xcm::Config for Runtime {653 type Event = Event;654 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;655 type XcmRouter = XcmRouter;656 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;657 type XcmExecuteFilter = All<(MultiLocation, Xcm<Call>)>;658 type XcmExecutor = XcmExecutor<XcmConfig>;659 type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;660 type XcmReserveTransferFilter = ();661 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;662}663664impl cumulus_pallet_xcm::Config for Runtime {665 type Event = Event;666 type XcmExecutor = XcmExecutor<XcmConfig>;667}668669impl cumulus_pallet_xcmp_queue::Config for Runtime {670 type Event = Event;671 type XcmExecutor = XcmExecutor<XcmConfig>;672 type ChannelInfo = ParachainSystem;673}674675impl cumulus_pallet_dmp_queue::Config for Runtime {676 type Event = Event;677 type XcmExecutor = XcmExecutor<XcmConfig>;678 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;679}680681impl pallet_aura::Config for Runtime {682 type AuthorityId = AuraId;683}684685parameter_types! {686 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();687 pub const CollectionCreationPrice: Balance = 100 * UNIQUE;688}689690/// Used for the pallet nft in `./nft.rs`691impl pallet_nft::Config for Runtime {692 type Event = Event;693 type WeightInfo = nft_weights::WeightInfo;694695 type EvmBackwardsAddressMapping = pallet_nft::MapBackwardsAddressTruncated;696 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;697 type CrossAccountId = pallet_nft::BasicCrossAccountId<Self>;698699 type Currency = Balances;700 type CollectionCreationPrice = CollectionCreationPrice;701 type TreasuryAccountId = TreasuryAccountId;702}703704parameter_types! {705 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied706}707708/// Used for the pallet inflation709impl pallet_inflation::Config for Runtime {710 type Currency = Balances;711 type TreasuryAccountId = TreasuryAccountId;712 type InflationBlockInterval = InflationBlockInterval;713}714715parameter_types! {716 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *717 RuntimeBlockWeights::get().max_block;718 pub const MaxScheduledPerBlock: u32 = 50;719}720721pub struct Sponsoring;722impl SponsoringResolve<AccountId, Call> for Sponsoring {723 fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>724 where725 Call: Dispatchable<Info = DispatchInfo>,726 AccountId: AsRef<[u8]>,727 {728 pallet_nft_transaction_payment::Module::<Runtime>::withdraw_type(who, call)729 }730}731732type SponsorshipHandler = (733 pallet_nft::NftSponsorshipHandler<Runtime>,734 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,735);736737impl pallet_scheduler::Config for Runtime {738 type Event = Event;739 type Origin = Origin;740 type PalletsOrigin = OriginCaller;741 type Call = Call;742 type MaximumWeight = MaximumSchedulerWeight;743 type ScheduleOrigin = EnsureSigned<AccountId>;744 type MaxScheduledPerBlock = MaxScheduledPerBlock;745 type SponsorshipHandler = SponsorshipHandler;746 type WeightInfo = ();747}748749impl pallet_nft_transaction_payment::Config for Runtime {750 type SponsorshipHandler = SponsorshipHandler;751}752753impl pallet_evm_transaction_payment::Config for Runtime {754 type SponsorshipHandler = (755 pallet_nft::NftEthSponsorshipHandler<Self>,756 pallet_evm_contract_helpers::HelpersContractSponsoring<Self>,757 );758 type Currency = Balances;759}760761impl pallet_nft_charge_transaction::Config for Runtime {}762763// impl pallet_contract_helpers::Config for Runtime {764// type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;765// }766767parameter_types! {768 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049769 pub const HelpersContractAddress: H160 = H160([770 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,771 ]);772}773774impl pallet_evm_contract_helpers::Config for Runtime {775 type ContractAddress = HelpersContractAddress;776 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;777}778779construct_runtime!(780 pub enum Runtime where781 Block = Block,782 NodeBlock = opaque::Block,783 UncheckedExtrinsic = UncheckedExtrinsic784 {785 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>} = 20,786 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,787788 Aura: pallet_aura::{Pallet, Config<T>} = 22,789 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,790791 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,792 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,793 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,794 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,795 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,796 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,797 System: system::{Pallet, Call, Storage, Config, Event<T>} = 36,798 Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,799 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,800801 // XCM helpers.802 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,803 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,804 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,805 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,806807 // Unique Pallets808 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,809 Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>} = 61,810 Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 62,811 NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,812 Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,813 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,814815 // Frontier816 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,817 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, ValidateUnsigned} = 101,818819 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,820 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,821 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,822 }823);824825pub struct TransactionConverter;826827impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {828 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {829 UncheckedExtrinsic::new_unsigned(830 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),831 )832 }833}834835impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {836 fn convert_transaction(837 &self,838 transaction: pallet_ethereum::Transaction,839 ) -> opaque::UncheckedExtrinsic {840 let extrinsic = UncheckedExtrinsic::new_unsigned(841 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),842 );843 let encoded = extrinsic.encode();844 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])845 .expect("Encoded extrinsic is always valid")846 }847}848849/// The address format for describing accounts.850pub type Address = sp_runtime::MultiAddress<AccountId, ()>;851/// Block header type as expected by this runtime.852pub type Header = generic::Header<BlockNumber, BlakeTwo256>;853/// Block type as expected by this runtime.854pub type Block = generic::Block<Header, UncheckedExtrinsic>;855/// A Block signed with a Justification856pub type SignedBlock = generic::SignedBlock<Block>;857/// BlockId type as expected by this runtime.858pub type BlockId = generic::BlockId<Block>;859/// The SignedExtension to the basic transaction logic.860pub type SignedExtra = (861 system::CheckSpecVersion<Runtime>,862 // system::CheckTxVersion<Runtime>,863 system::CheckGenesis<Runtime>,864 system::CheckEra<Runtime>,865 system::CheckNonce<Runtime>,866 system::CheckWeight<Runtime>,867 pallet_nft_charge_transaction::ChargeTransactionPayment<Runtime>,868 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,869);870/// Unchecked extrinsic type as expected by this runtime.871pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;872/// Extrinsic type that has already been checked.873pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;874/// Executive: handles dispatch to the various modules.875pub type Executive = frame_executive::Executive<876 Runtime,877 Block,878 frame_system::ChainContext<Runtime>,879 Runtime,880 AllPallets,881>;882883impl_opaque_keys! {884 pub struct SessionKeys {885 pub aura: Aura,886 }887}888889impl_runtime_apis! {890 impl pallet_nft::NftApi<Block>891 for Runtime892 {893 fn eth_contract_code(account: H160) -> Option<Vec<u8>> {894 <pallet_nft::NftErcSupport<Runtime>>::get_code(&account)895 }896 }897898 impl sp_api::Core<Block> for Runtime {899 fn version() -> RuntimeVersion {900 VERSION901 }902903 fn execute_block(block: Block) {904 Executive::execute_block(block)905 }906907 fn initialize_block(header: &<Block as BlockT>::Header) {908 Executive::initialize_block(header)909 }910 }911912 impl sp_api::Metadata<Block> for Runtime {913 fn metadata() -> OpaqueMetadata {914 Runtime::metadata().into()915 }916 }917918 impl sp_block_builder::BlockBuilder<Block> for Runtime {919 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {920 Executive::apply_extrinsic(extrinsic)921 }922923 fn finalize_block() -> <Block as BlockT>::Header {924 Executive::finalize_block()925 }926927 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {928 data.create_extrinsics()929 }930931 fn check_inherents(932 block: Block,933 data: sp_inherents::InherentData,934 ) -> sp_inherents::CheckInherentsResult {935 data.check_extrinsics(&block)936 }937938 // fn random_seed() -> <Block as BlockT>::Hash {939 // RandomnessCollectiveFlip::random_seed().0940 // }941 }942943 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {944 fn validate_transaction(945 source: TransactionSource,946 tx: <Block as BlockT>::Extrinsic,947 hash: <Block as BlockT>::Hash,948 ) -> TransactionValidity {949 Executive::validate_transaction(source, tx, hash)950 }951 }952953 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {954 fn offchain_worker(header: &<Block as BlockT>::Header) {955 Executive::offchain_worker(header)956 }957 }958959 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {960 fn chain_id() -> u64 {961 <Runtime as pallet_evm::Config>::ChainId::get()962 }963964 fn account_basic(address: H160) -> EVMAccount {965 EVM::account_basic(&address)966 }967968 fn gas_price() -> U256 {969 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()970 }971972 fn account_code_at(address: H160) -> Vec<u8> {973 EVM::account_codes(address)974 }975976 fn author() -> H160 {977 <pallet_evm::Module<Runtime>>::find_author()978 }979980 fn storage_at(address: H160, index: U256) -> H256 {981 let mut tmp = [0u8; 32];982 index.to_big_endian(&mut tmp);983 EVM::account_storages(address, H256::from_slice(&tmp[..]))984 }985986 fn call(987 from: H160,988 to: H160,989 data: Vec<u8>,990 value: U256,991 gas_limit: U256,992 gas_price: Option<U256>,993 nonce: Option<U256>,994 estimate: bool,995 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {996 let config = if estimate {997 let mut config = <Runtime as pallet_evm::Config>::config().clone();998 config.estimate = true;999 Some(config)1000 } else {1001 None1002 };10031004 <Runtime as pallet_evm::Config>::Runner::call(1005 from,1006 to,1007 data,1008 value,1009 gas_limit.low_u64(),1010 gas_price,1011 nonce,1012 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1013 ).map_err(|err| err.into())1014 }10151016 fn create(1017 from: H160,1018 data: Vec<u8>,1019 value: U256,1020 gas_limit: U256,1021 gas_price: Option<U256>,1022 nonce: Option<U256>,1023 estimate: bool,1024 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {1025 let config = if estimate {1026 let mut config = <Runtime as pallet_evm::Config>::config().clone();1027 config.estimate = true;1028 Some(config)1029 } else {1030 None1031 };10321033 <Runtime as pallet_evm::Config>::Runner::create(1034 from,1035 data,1036 value,1037 gas_limit.low_u64(),1038 gas_price,1039 nonce,1040 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1041 ).map_err(|err| err.into())1042 }10431044 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {1045 Ethereum::current_transaction_statuses()1046 }10471048 fn current_block() -> Option<pallet_ethereum::Block> {1049 Ethereum::current_block()1050 }10511052 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {1053 Ethereum::current_receipts()1054 }10551056 fn current_all() -> (1057 Option<pallet_ethereum::Block>,1058 Option<Vec<pallet_ethereum::Receipt>>,1059 Option<Vec<TransactionStatus>>1060 ) {1061 (1062 Ethereum::current_block(),1063 Ethereum::current_receipts(),1064 Ethereum::current_transaction_statuses()1065 )1066 }10671068 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {1069 xts.into_iter().filter_map(|xt| match xt.function {1070 Call::Ethereum(pallet_ethereum::Call::transact(t)) => Some(t),1071 _ => None1072 }).collect()1073 }1074 }10751076 impl sp_session::SessionKeys<Block> for Runtime {1077 fn decode_session_keys(1078 encoded: Vec<u8>,1079 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {1080 SessionKeys::decode_into_raw_public_keys(&encoded)1081 }10821083 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {1084 SessionKeys::generate(seed)1085 }1086 }10871088 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {1089 fn slot_duration() -> sp_consensus_aura::SlotDuration {1090 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())1091 }10921093 fn authorities() -> Vec<AuraId> {1094 Aura::authorities()1095 }1096 }10971098 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {1099 fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {1100 ParachainSystem::collect_collation_info()1101 }1102 }11031104 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {1105 fn account_nonce(account: AccountId) -> Index {1106 System::account_nonce(account)1107 }1108 }11091110 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {1111 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {1112 TransactionPayment::query_info(uxt, len)1113 }1114 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {1115 TransactionPayment::query_fee_details(uxt, len)1116 }1117 }11181119 /*1120 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>1121 for Runtime1122 {1123 fn call(1124 origin: AccountId,1125 dest: AccountId,1126 value: Balance,1127 gas_limit: u64,1128 input_data: Vec<u8>,1129 ) -> pallet_contracts_primitives::ContractExecResult {1130 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)1131 }11321133 fn instantiate(1134 origin: AccountId,1135 endowment: Balance,1136 gas_limit: u64,1137 code: pallet_contracts_primitives::Code<Hash>,1138 data: Vec<u8>,1139 salt: Vec<u8>,1140 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>1141 {1142 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)1143 }11441145 fn get_storage(1146 address: AccountId,1147 key: [u8; 32],1148 ) -> pallet_contracts_primitives::GetStorageResult {1149 Contracts::get_storage(address, key)1150 }11511152 fn rent_projection(1153 address: AccountId,1154 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {1155 Contracts::rent_projection(address)1156 }1157 }1158 */11591160 #[cfg(feature = "runtime-benchmarks")]1161 impl frame_benchmarking::Benchmark<Block> for Runtime {1162 fn dispatch_benchmark(1163 config: frame_benchmarking::BenchmarkConfig1164 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {1165 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};11661167 let whitelist: Vec<TrackedStorageKey> = vec![1168 // Alice account1169 hex_literal::hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d").to_vec().into(),1170 // // Total Issuance1171 // hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),1172 // // Execution Phase1173 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),1174 // // Event Count1175 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),1176 // // System Events1177 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),1178 ];11791180 let mut batches = Vec::<BenchmarkBatch>::new();1181 let params = (&config, &whitelist);11821183 add_benchmark!(params, batches, pallet_nft, Nft);1184 add_benchmark!(params, batches, pallet_inflation, Inflation);11851186 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }1187 Ok(batches)1188 }1189 }1190}11911192struct CheckInherents;11931194impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1195 fn check_inherents(1196 block: &Block,1197 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1198 ) -> sp_inherents::CheckInherentsResult {1199 let relay_chain_slot = relay_state_proof1200 .read_slot()1201 .expect("Could not read the relay chain slot from the proof");12021203 let inherent_data =1204 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1205 relay_chain_slot,1206 sp_std::time::Duration::from_secs(6),1207 )1208 .create_inherent_data()1209 .expect("Could not create the timestamp inherent data");12101211 inherent_data.check_extrinsics(block)1212 }1213}12141215cumulus_pallet_parachain_system::register_validate_block!(1216 Runtime = Runtime,1217 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1218 CheckInherents = CheckInherents,1219);1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.78#![cfg_attr(not(feature = "std"), no_std)]9// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.10#![recursion_limit = "1024"]11#![allow(clippy::from_over_into, clippy::identity_op)]12#![allow(clippy::fn_to_numeric_cast_with_truncation)]13// Make the WASM binary available.14#[cfg(feature = "std")]15include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1617use sp_api::impl_runtime_apis;18use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};19// #[cfg(any(feature = "std", test))]20// pub use sp_runtime::BuildStorage;2122use sp_runtime::{23 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,24 traits::{25 AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify,26 AccountIdConversion,27 },28 transaction_validity::{TransactionSource, TransactionValidity},29 ApplyExtrinsicResult, MultiSignature,30};3132use sp_std::prelude::*;3334#[cfg(feature = "std")]35use sp_version::NativeVersion;36use sp_version::RuntimeVersion;37pub use pallet_transaction_payment::{38 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,39};40// A few exports that help ease life for downstream crates.41pub use pallet_balances::Call as BalancesCall;42pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};43pub use frame_support::{44 construct_runtime, match_type,45 dispatch::DispatchResult,46 PalletId, parameter_types, StorageValue, ConsensusEngineId,47 traits::{48 All, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,49 OnUnbalanced, Randomness, FindAuthor,50 },51 weights::{52 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},53 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,54 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,55 },56};57use nft_data_structs::*;58// use pallet_contracts::weights::WeightInfo;59// #[cfg(any(feature = "std", test))]60use frame_system::{61 self as system, EnsureRoot, EnsureSigned,62 limits::{BlockWeights, BlockLength},63};64use sp_arithmetic::{65 traits::{BaseArithmetic, Unsigned},66};67use smallvec::smallvec;68use codec::{Encode, Decode};69use pallet_evm::{Account as EVMAccount, FeeCalculator, OnMethodCall};70use fp_rpc::TransactionStatus;71use sp_core::crypto::Public;72use sp_runtime::{73 traits::{Dispatchable},74};7576// pub use pallet_timestamp::Call as TimestampCall;77pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;7879// Polkadot imports80use pallet_xcm::XcmPassthrough;81use polkadot_parachain::primitives::Sibling;82use xcm::v0::Xcm;83use xcm::v0::{BodyId, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId};84use xcm_builder::{85 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,86 EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,87 ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative,88 SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,89 SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,90};91use xcm_executor::{Config, XcmExecutor};9293// mod chain_extension;94// use crate::chain_extension::{NFTExtension, Imbalance};9596/// An index to a block.97pub type BlockNumber = u32;9899/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.100pub type Signature = MultiSignature;101102/// Some way of identifying an account on the chain. We intentionally make it equivalent103/// to the public key of our transaction signing scheme.104pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;105106/// The type for looking up accounts. We don't expect more than 4 billion of them, but you107/// never know...108pub type AccountIndex = u32;109110/// Balance of an account.111pub type Balance = u128;112113/// Index of a transaction in the chain.114pub type Index = u32;115116/// A hash of some data used by the chain.117pub type Hash = sp_core::H256;118119/// Digest item type.120pub type DigestItem = generic::DigestItem<Hash>;121122mod nft_weights;123124/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know125/// the specifics of the runtime. They can then be made to be agnostic over specific formats126/// of data like extrinsics, allowing for them to continue syncing the network through upgrades127/// to even the core data structures.128pub mod opaque {129 use super::*;130131 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;132133 /// Opaque block type.134 pub type Block = generic::Block<Header, UncheckedExtrinsic>;135136 pub type SessionHandlers = ();137138 impl_opaque_keys! {139 pub struct SessionKeys {140 pub aura: Aura,141 }142 }143}144145/// This runtime version.146pub const VERSION: RuntimeVersion = RuntimeVersion {147 spec_name: create_runtime_str!("nft"),148 impl_name: create_runtime_str!("nft"),149 authoring_version: 1,150 spec_version: 3,151 impl_version: 1,152 apis: RUNTIME_API_VERSIONS,153 transaction_version: 1,154};155156pub const MILLISECS_PER_BLOCK: u64 = 12000;157158pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;159160// These time units are defined in number of blocks.161pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);162pub const HOURS: BlockNumber = MINUTES * 60;163pub const DAYS: BlockNumber = HOURS * 24;164165parameter_types! {166 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;167}168169#[derive(codec::Encode, codec::Decode)]170pub enum XCMPMessage<XAccountId, XBalance> {171 /// Transfer tokens to the given account from the Parachain account.172 TransferToken(XAccountId, XBalance),173}174175/// The version information used to identify this runtime when compiled natively.176#[cfg(feature = "std")]177pub fn native_version() -> NativeVersion {178 NativeVersion {179 runtime_version: VERSION,180 can_author_with: Default::default(),181 }182}183184type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;185186pub struct DealWithFees;187impl OnUnbalanced<NegativeImbalance> for DealWithFees {188 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {189 if let Some(fees) = fees_then_tips.next() {190 // for fees, 100% to treasury191 let mut split = fees.ration(100, 0);192 if let Some(tips) = fees_then_tips.next() {193 // for tips, if any, 100% to treasury194 tips.ration_merge_into(100, 0, &mut split);195 }196 Treasury::on_unbalanced(split.0);197 // Author::on_unbalanced(split.1);198 }199 }200}201202/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.203/// This is used to limit the maximal weight of a single extrinsic.204const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);205/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used206/// by Operational extrinsics.207const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);208/// We allow for 2 seconds of compute with a 6 second average block time.209const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;210211parameter_types! {212 pub const BlockHashCount: BlockNumber = 2400;213 pub RuntimeBlockLength: BlockLength =214 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);215 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);216 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;217 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()218 .base_block(BlockExecutionWeight::get())219 .for_class(DispatchClass::all(), |weights| {220 weights.base_extrinsic = ExtrinsicBaseWeight::get();221 })222 .for_class(DispatchClass::Normal, |weights| {223 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);224 })225 .for_class(DispatchClass::Operational, |weights| {226 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);227 // Operational transactions have some extra reserved space, so that they228 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.229 weights.reserved = Some(230 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT231 );232 })233 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)234 .build_or_panic();235 pub const Version: RuntimeVersion = VERSION;236 pub const SS58Prefix: u8 = 42;237}238239parameter_types! {240 pub const ChainId: u64 = 8888;241}242243impl pallet_evm::Config for Runtime {244 type BlockGasLimit = BlockGasLimit;245 type FeeCalculator = ();246 type GasWeightMapping = ();247 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping;248 type CallOrigin = EnsureAddressTruncated;249 type WithdrawOrigin = EnsureAddressTruncated;250 type AddressMapping = HashedAddressMapping<Self::Hashing>;251 type Precompiles = ();252 type Currency = Balances;253 type Event = Event;254 type OnMethodCall = (255 pallet_evm_migration::OnMethodCall<Self>,256 pallet_nft::NftErcSupport<Self>,257 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,258 );259 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;260 type ChainId = ChainId;261 type Runner = pallet_evm::runner::stack::Runner<Self>;262 type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;263 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;264 type FindAuthor = EthereumFindAuthor<Aura>;265}266267impl pallet_evm_migration::Config for Runtime {268 type WeightInfo = pallet_evm_migration::weights::SubstrateWeight<Self>;269}270271pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);272impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {273 fn find_author<'a, I>(digests: I) -> Option<H160>274 where275 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,276 {277 if let Some(author_index) = F::find_author(digests) {278 let authority_id = Aura::authorities()[author_index as usize].clone();279 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));280 }281 None282 }283}284285parameter_types! {286 pub BlockGasLimit: U256 = U256::from(u32::max_value());287}288289impl pallet_ethereum::Config for Runtime {290 type Event = Event;291 type StateRoot = pallet_ethereum::IntermediateStateRoot;292 type EvmSubmitLog = pallet_evm::Pallet<Self>;293}294295impl pallet_randomness_collective_flip::Config for Runtime {}296297impl system::Config for Runtime {298 /// The data to be stored in an account.299 type AccountData = pallet_balances::AccountData<Balance>;300 /// The identifier used to distinguish between accounts.301 type AccountId = AccountId;302 /// The basic call filter to use in dispatchable.303 type BaseCallFilter = ();304 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).305 type BlockHashCount = BlockHashCount;306 /// The maximum length of a block (in bytes).307 type BlockLength = RuntimeBlockLength;308 /// The index type for blocks.309 type BlockNumber = BlockNumber;310 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.311 type BlockWeights = RuntimeBlockWeights;312 /// The aggregated dispatch type that is available for extrinsics.313 type Call = Call;314 /// The weight of database operations that the runtime can invoke.315 type DbWeight = RocksDbWeight;316 /// The ubiquitous event type.317 type Event = Event;318 /// The type for hashing blocks and tries.319 type Hash = Hash;320 /// The hashing algorithm used.321 type Hashing = BlakeTwo256;322 /// The header type.323 type Header = generic::Header<BlockNumber, BlakeTwo256>;324 /// The index type for storing how many extrinsics an account has signed.325 type Index = Index;326 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.327 type Lookup = AccountIdLookup<AccountId, ()>;328 /// What to do if an account is fully reaped from the system.329 type OnKilledAccount = ();330 /// What to do if a new account is created.331 type OnNewAccount = ();332 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;333 /// The ubiquitous origin type.334 type Origin = Origin;335 /// This type is being generated by `construct_runtime!`.336 type PalletInfo = PalletInfo;337 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.338 type SS58Prefix = SS58Prefix;339 /// Weight information for the extrinsics of this pallet.340 type SystemWeightInfo = system::weights::SubstrateWeight<Self>;341 /// Version of the runtime.342 type Version = Version;343}344345parameter_types! {346 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;347}348349impl pallet_timestamp::Config for Runtime {350 /// A timestamp: milliseconds since the unix epoch.351 type Moment = u64;352 type OnTimestampSet = ();353 type MinimumPeriod = MinimumPeriod;354 type WeightInfo = ();355}356357parameter_types! {358 // pub const ExistentialDeposit: u128 = 500;359 pub const ExistentialDeposit: u128 = 0;360 pub const MaxLocks: u32 = 50;361}362363impl pallet_balances::Config for Runtime {364 type MaxLocks = MaxLocks;365 type MaxReserves = ();366 type ReserveIdentifier = [u8; 8];367 /// The type for recording an account's balance.368 type Balance = Balance;369 /// The ubiquitous event type.370 type Event = Event;371 type DustRemoval = Treasury;372 type ExistentialDeposit = ExistentialDeposit;373 type AccountStore = System;374 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;375}376377pub const MICROUNIQUE: Balance = 1_000_000_000;378pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;379pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;380pub const UNIQUE: Balance = 100 * CENTIUNIQUE;381382pub const fn deposit(items: u32, bytes: u32) -> Balance {383 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE384}385386/*387parameter_types! {388 pub TombstoneDeposit: Balance = deposit(389 1,390 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,391 );392 pub DepositPerContract: Balance = TombstoneDeposit::get();393 pub const DepositPerStorageByte: Balance = deposit(0, 1);394 pub const DepositPerStorageItem: Balance = deposit(1, 0);395 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);396 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;397 pub const SignedClaimHandicap: u32 = 2;398 pub const MaxDepth: u32 = 32;399 pub const MaxValueSize: u32 = 16 * 1024;400 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb401 // The lazy deletion runs inside on_initialize.402 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *403 RuntimeBlockWeights::get().max_block;404 // The weight needed for decoding the queue should be less or equal than a fifth405 // of the overall weight dedicated to the lazy deletion.406 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (407 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -408 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)409 )) / 5) as u32;410 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();411}412413impl pallet_contracts::Config for Runtime {414 type Time = Timestamp;415 type Randomness = RandomnessCollectiveFlip;416 type Currency = Balances;417 type Event = Event;418 type RentPayment = ();419 type SignedClaimHandicap = SignedClaimHandicap;420 type TombstoneDeposit = TombstoneDeposit;421 type DepositPerContract = DepositPerContract;422 type DepositPerStorageByte = DepositPerStorageByte;423 type DepositPerStorageItem = DepositPerStorageItem;424 type RentFraction = RentFraction;425 type SurchargeReward = SurchargeReward;426 type WeightPrice = pallet_transaction_payment::Pallet<Self>;427 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;428 type ChainExtension = NFTExtension;429 type DeletionQueueDepth = DeletionQueueDepth;430 type DeletionWeightLimit = DeletionWeightLimit;431 type Schedule = Schedule;432 type CallStack = [pallet_contracts::Frame<Self>; 31];433}434*/435436parameter_types! {437 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer438}439440/// Linear implementor of `WeightToFeePolynomial`441pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);442443impl<T> WeightToFeePolynomial for LinearFee<T>444where445 T: BaseArithmetic + From<u32> + Copy + Unsigned,446{447 type Balance = T;448449 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {450 smallvec!(WeightToFeeCoefficient {451 coeff_integer: 146_700u32.into(), // Targeting 0.1 Unique per NFT transfer452 coeff_frac: Perbill::zero(),453 negative: false,454 degree: 1,455 })456 }457}458459impl pallet_transaction_payment::Config for Runtime {460 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;461 type TransactionByteFee = TransactionByteFee;462 type WeightToFee = LinearFee<Balance>;463 type FeeMultiplierUpdate = ();464}465466parameter_types! {467 pub const ProposalBond: Permill = Permill::from_percent(5);468 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;469 pub const SpendPeriod: BlockNumber = 5 * MINUTES;470 pub const Burn: Permill = Permill::from_percent(0);471 pub const TipCountdown: BlockNumber = 1 * DAYS;472 pub const TipFindersFee: Percent = Percent::from_percent(20);473 pub const TipReportDepositBase: Balance = 1 * UNIQUE;474 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;475 pub const BountyDepositBase: Balance = 1 * UNIQUE;476 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;477 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");478 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;479 pub const MaximumReasonLength: u32 = 16384;480 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);481 pub const BountyValueMinimum: Balance = 5 * UNIQUE;482 pub const MaxApprovals: u32 = 100;483}484485impl pallet_treasury::Config for Runtime {486 type PalletId = TreasuryModuleId;487 type Currency = Balances;488 type ApproveOrigin = EnsureRoot<AccountId>;489 type RejectOrigin = EnsureRoot<AccountId>;490 type Event = Event;491 type OnSlash = ();492 type ProposalBond = ProposalBond;493 type ProposalBondMinimum = ProposalBondMinimum;494 type SpendPeriod = SpendPeriod;495 type Burn = Burn;496 type BurnDestination = ();497 type SpendFunds = ();498 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;499 type MaxApprovals = MaxApprovals;500}501502impl pallet_sudo::Config for Runtime {503 type Event = Event;504 type Call = Call;505}506507parameter_types! {508 pub const MinVestedTransfer: Balance = 10 * UNIQUE;509}510511impl pallet_vesting::Config for Runtime {512 type Event = Event;513 type Currency = Balances;514 type BlockNumberToBalance = ConvertInto;515 type MinVestedTransfer = MinVestedTransfer;516 type WeightInfo = ();517}518519parameter_types! {520 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;521 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;522}523524impl cumulus_pallet_parachain_system::Config for Runtime {525 type Event = Event;526 type OnValidationData = ();527 type SelfParaId = parachain_info::Pallet<Self>;528 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<529 // MaxDownwardMessageWeight,530 // XcmExecutor<XcmConfig>,531 // Call,532 // >;533 type OutboundXcmpMessageSource = XcmpQueue;534 type DmpMessageHandler = DmpQueue;535 type ReservedDmpWeight = ReservedDmpWeight;536 type ReservedXcmpWeight = ReservedXcmpWeight;537 type XcmpMessageHandler = XcmpQueue;538}539540impl parachain_info::Config for Runtime {}541542impl cumulus_pallet_aura_ext::Config for Runtime {}543544parameter_types! {545 pub const RelayLocation: MultiLocation = X1(Parent);546 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;547 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();548 pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into()));549}550551/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used552/// when determining ownership of accounts for asset transacting and when attempting to use XCM553/// `Transact` in order to determine the dispatch Origin.554pub type LocationToAccountId = (555 // The parent (Relay-chain) origin converts to the default `AccountId`.556 ParentIsDefault<AccountId>,557 // Sibling parachain origins convert to AccountId via the `ParaId::into`.558 SiblingParachainConvertsVia<Sibling, AccountId>,559 // Straight up local `AccountId32` origins just alias directly to `AccountId`.560 AccountId32Aliases<RelayNetwork, AccountId>,561);562563/// Means for transacting assets on this chain.564pub type LocalAssetTransactor = CurrencyAdapter<565 // Use this currency:566 Balances,567 // Use this currency when it is a fungible asset matching the given location or name:568 IsConcrete<RelayLocation>,569 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:570 LocationToAccountId,571 // Our chain's account ID type (we can't get away without mentioning it explicitly):572 AccountId,573 // We don't track any teleports.574 (),575>;576577/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,578/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can579/// biases the kind of local `Origin` it will become.580pub type XcmOriginToTransactDispatchOrigin = (581 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location582 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for583 // foreign chains who want to have a local sovereign account on this chain which they control.584 SovereignSignedViaLocation<LocationToAccountId, Origin>,585 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when586 // recognised.587 RelayChainAsNative<RelayOrigin, Origin>,588 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when589 // recognised.590 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,591 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a592 // transaction from the Root origin.593 ParentAsSuperuser<Origin>,594 // Native signed account converter; this just converts an `AccountId32` origin into a normal595 // `Origin::Signed` origin of the same 32-byte value.596 SignedAccountId32AsNative<RelayNetwork, Origin>,597 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.598 XcmPassthrough<Origin>,599);600601parameter_types! {602 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.603 pub UnitWeightCost: Weight = 1_000_000;604 // 1200 UNIQUEs buy 1 second of weight.605 pub const WeightPrice: (MultiLocation, u128) = (X1(Parent), 1_200 * UNIQUE);606}607608match_type! {609 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {610 X1(Parent) | X2(Parent, Plurality { id: BodyId::Unit, .. })611 };612}613614pub type Barrier = (615 TakeWeightCredit,616 AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,617 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,618 // ^^^ Parent & its unit plurality gets free execution619);620621pub struct XcmConfig;622impl Config for XcmConfig {623 type Call = Call;624 type XcmSender = XcmRouter;625 // How to withdraw and deposit an asset.626 type AssetTransactor = LocalAssetTransactor;627 type OriginConverter = XcmOriginToTransactDispatchOrigin;628 type IsReserve = NativeAsset;629 type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC630 type LocationInverter = LocationInverter<Ancestry>;631 type Barrier = Barrier;632 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;633 type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;634 type ResponseHandler = (); // Don't handle responses for now.635}636637// parameter_types! {638// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;639// }640641/// No local origins on this chain are allowed to dispatch XCM sends/executions.642pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);643644/// The means for routing XCM messages which are not for local execution into the right message645/// queues.646pub type XcmRouter = (647 // Two routers - use UMP to communicate with the relay chain:648 cumulus_primitives_utility::ParentAsUmp<ParachainSystem>,649 // ..and XCMP to communicate with the sibling chains.650 XcmpQueue,651);652653impl pallet_evm_coder_substrate::Config for Runtime {654 type EthereumTransactionSender = pallet_ethereum::Module<Self>;655}656657impl pallet_xcm::Config for Runtime {658 type Event = Event;659 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;660 type XcmRouter = XcmRouter;661 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;662 type XcmExecuteFilter = All<(MultiLocation, Xcm<Call>)>;663 type XcmExecutor = XcmExecutor<XcmConfig>;664 type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;665 type XcmReserveTransferFilter = ();666 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;667}668669impl cumulus_pallet_xcm::Config for Runtime {670 type Event = Event;671 type XcmExecutor = XcmExecutor<XcmConfig>;672}673674impl cumulus_pallet_xcmp_queue::Config for Runtime {675 type Event = Event;676 type XcmExecutor = XcmExecutor<XcmConfig>;677 type ChannelInfo = ParachainSystem;678}679680impl cumulus_pallet_dmp_queue::Config for Runtime {681 type Event = Event;682 type XcmExecutor = XcmExecutor<XcmConfig>;683 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;684}685686impl pallet_aura::Config for Runtime {687 type AuthorityId = AuraId;688}689690parameter_types! {691 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();692 pub const CollectionCreationPrice: Balance = 100 * UNIQUE;693}694695/// Used for the pallet nft in `./nft.rs`696impl pallet_nft::Config for Runtime {697 type Event = Event;698 type WeightInfo = nft_weights::WeightInfo;699700 type EvmBackwardsAddressMapping = pallet_nft::MapBackwardsAddressTruncated;701 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;702 type CrossAccountId = pallet_nft::BasicCrossAccountId<Self>;703704 type Currency = Balances;705 type CollectionCreationPrice = CollectionCreationPrice;706 type TreasuryAccountId = TreasuryAccountId;707}708709parameter_types! {710 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied711}712713/// Used for the pallet inflation714impl pallet_inflation::Config for Runtime {715 type Currency = Balances;716 type TreasuryAccountId = TreasuryAccountId;717 type InflationBlockInterval = InflationBlockInterval;718}719720parameter_types! {721 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *722 RuntimeBlockWeights::get().max_block;723 pub const MaxScheduledPerBlock: u32 = 50;724}725726pub struct Sponsoring;727impl SponsoringResolve<AccountId, Call> for Sponsoring {728 fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>729 where730 Call: Dispatchable<Info = DispatchInfo>,731 AccountId: AsRef<[u8]>,732 {733 pallet_nft_transaction_payment::Module::<Runtime>::withdraw_type(who, call)734 }735}736737type SponsorshipHandler = (738 pallet_nft::NftSponsorshipHandler<Runtime>,739 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,740);741742impl pallet_scheduler::Config for Runtime {743 type Event = Event;744 type Origin = Origin;745 type PalletsOrigin = OriginCaller;746 type Call = Call;747 type MaximumWeight = MaximumSchedulerWeight;748 type ScheduleOrigin = EnsureSigned<AccountId>;749 type MaxScheduledPerBlock = MaxScheduledPerBlock;750 type SponsorshipHandler = SponsorshipHandler;751 type WeightInfo = ();752}753754impl pallet_nft_transaction_payment::Config for Runtime {755 type SponsorshipHandler = SponsorshipHandler;756}757758impl pallet_evm_transaction_payment::Config for Runtime {759 type SponsorshipHandler = (760 pallet_nft::NftEthSponsorshipHandler<Self>,761 pallet_evm_contract_helpers::HelpersContractSponsoring<Self>,762 );763 type Currency = Balances;764}765766impl pallet_nft_charge_transaction::Config for Runtime {}767768// impl pallet_contract_helpers::Config for Runtime {769// type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;770// }771772parameter_types! {773 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049774 pub const HelpersContractAddress: H160 = H160([775 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,776 ]);777}778779impl pallet_evm_contract_helpers::Config for Runtime {780 type ContractAddress = HelpersContractAddress;781 type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;782}783784construct_runtime!(785 pub enum Runtime where786 Block = Block,787 NodeBlock = opaque::Block,788 UncheckedExtrinsic = UncheckedExtrinsic789 {790 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>} = 20,791 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,792793 Aura: pallet_aura::{Pallet, Config<T>} = 22,794 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,795796 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,797 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,798 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,799 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,800 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,801 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,802 System: system::{Pallet, Call, Storage, Config, Event<T>} = 36,803 Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,804 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,805806 // XCM helpers.807 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,808 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,809 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,810 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,811812 // Unique Pallets813 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,814 Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>} = 61,815 Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 62,816 NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,817 Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,818 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,819820 // Frontier821 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,822 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, ValidateUnsigned} = 101,823824 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,825 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,826 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,827 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,828 }829);830831pub struct TransactionConverter;832833impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {834 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {835 UncheckedExtrinsic::new_unsigned(836 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),837 )838 }839}840841impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {842 fn convert_transaction(843 &self,844 transaction: pallet_ethereum::Transaction,845 ) -> opaque::UncheckedExtrinsic {846 let extrinsic = UncheckedExtrinsic::new_unsigned(847 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),848 );849 let encoded = extrinsic.encode();850 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])851 .expect("Encoded extrinsic is always valid")852 }853}854855/// The address format for describing accounts.856pub type Address = sp_runtime::MultiAddress<AccountId, ()>;857/// Block header type as expected by this runtime.858pub type Header = generic::Header<BlockNumber, BlakeTwo256>;859/// Block type as expected by this runtime.860pub type Block = generic::Block<Header, UncheckedExtrinsic>;861/// A Block signed with a Justification862pub type SignedBlock = generic::SignedBlock<Block>;863/// BlockId type as expected by this runtime.864pub type BlockId = generic::BlockId<Block>;865/// The SignedExtension to the basic transaction logic.866pub type SignedExtra = (867 system::CheckSpecVersion<Runtime>,868 // system::CheckTxVersion<Runtime>,869 system::CheckGenesis<Runtime>,870 system::CheckEra<Runtime>,871 system::CheckNonce<Runtime>,872 system::CheckWeight<Runtime>,873 pallet_nft_charge_transaction::ChargeTransactionPayment<Runtime>,874 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,875);876/// Unchecked extrinsic type as expected by this runtime.877pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;878/// Extrinsic type that has already been checked.879pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;880/// Executive: handles dispatch to the various modules.881pub type Executive = frame_executive::Executive<882 Runtime,883 Block,884 frame_system::ChainContext<Runtime>,885 Runtime,886 AllPallets,887>;888889impl_opaque_keys! {890 pub struct SessionKeys {891 pub aura: Aura,892 }893}894895impl_runtime_apis! {896 impl pallet_nft::NftApi<Block>897 for Runtime898 {899 fn eth_contract_code(account: H160) -> Option<Vec<u8>> {900 <pallet_nft::NftErcSupport<Runtime>>::get_code(&account)901 }902 }903904 impl sp_api::Core<Block> for Runtime {905 fn version() -> RuntimeVersion {906 VERSION907 }908909 fn execute_block(block: Block) {910 Executive::execute_block(block)911 }912913 fn initialize_block(header: &<Block as BlockT>::Header) {914 Executive::initialize_block(header)915 }916 }917918 impl sp_api::Metadata<Block> for Runtime {919 fn metadata() -> OpaqueMetadata {920 Runtime::metadata().into()921 }922 }923924 impl sp_block_builder::BlockBuilder<Block> for Runtime {925 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {926 Executive::apply_extrinsic(extrinsic)927 }928929 fn finalize_block() -> <Block as BlockT>::Header {930 Executive::finalize_block()931 }932933 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {934 data.create_extrinsics()935 }936937 fn check_inherents(938 block: Block,939 data: sp_inherents::InherentData,940 ) -> sp_inherents::CheckInherentsResult {941 data.check_extrinsics(&block)942 }943944 // fn random_seed() -> <Block as BlockT>::Hash {945 // RandomnessCollectiveFlip::random_seed().0946 // }947 }948949 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {950 fn validate_transaction(951 source: TransactionSource,952 tx: <Block as BlockT>::Extrinsic,953 hash: <Block as BlockT>::Hash,954 ) -> TransactionValidity {955 Executive::validate_transaction(source, tx, hash)956 }957 }958959 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {960 fn offchain_worker(header: &<Block as BlockT>::Header) {961 Executive::offchain_worker(header)962 }963 }964965 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {966 fn chain_id() -> u64 {967 <Runtime as pallet_evm::Config>::ChainId::get()968 }969970 fn account_basic(address: H160) -> EVMAccount {971 EVM::account_basic(&address)972 }973974 fn gas_price() -> U256 {975 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()976 }977978 fn account_code_at(address: H160) -> Vec<u8> {979 EVM::account_codes(address)980 }981982 fn author() -> H160 {983 <pallet_evm::Module<Runtime>>::find_author()984 }985986 fn storage_at(address: H160, index: U256) -> H256 {987 let mut tmp = [0u8; 32];988 index.to_big_endian(&mut tmp);989 EVM::account_storages(address, H256::from_slice(&tmp[..]))990 }991992 fn call(993 from: H160,994 to: H160,995 data: Vec<u8>,996 value: U256,997 gas_limit: U256,998 gas_price: Option<U256>,999 nonce: Option<U256>,1000 estimate: bool,1001 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {1002 let config = if estimate {1003 let mut config = <Runtime as pallet_evm::Config>::config().clone();1004 config.estimate = true;1005 Some(config)1006 } else {1007 None1008 };10091010 <Runtime as pallet_evm::Config>::Runner::call(1011 from,1012 to,1013 data,1014 value,1015 gas_limit.low_u64(),1016 gas_price,1017 nonce,1018 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1019 ).map_err(|err| err.into())1020 }10211022 fn create(1023 from: H160,1024 data: Vec<u8>,1025 value: U256,1026 gas_limit: U256,1027 gas_price: Option<U256>,1028 nonce: Option<U256>,1029 estimate: bool,1030 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {1031 let config = if estimate {1032 let mut config = <Runtime as pallet_evm::Config>::config().clone();1033 config.estimate = true;1034 Some(config)1035 } else {1036 None1037 };10381039 <Runtime as pallet_evm::Config>::Runner::create(1040 from,1041 data,1042 value,1043 gas_limit.low_u64(),1044 gas_price,1045 nonce,1046 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1047 ).map_err(|err| err.into())1048 }10491050 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {1051 Ethereum::current_transaction_statuses()1052 }10531054 fn current_block() -> Option<pallet_ethereum::Block> {1055 Ethereum::current_block()1056 }10571058 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {1059 Ethereum::current_receipts()1060 }10611062 fn current_all() -> (1063 Option<pallet_ethereum::Block>,1064 Option<Vec<pallet_ethereum::Receipt>>,1065 Option<Vec<TransactionStatus>>1066 ) {1067 (1068 Ethereum::current_block(),1069 Ethereum::current_receipts(),1070 Ethereum::current_transaction_statuses()1071 )1072 }10731074 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {1075 xts.into_iter().filter_map(|xt| match xt.function {1076 Call::Ethereum(pallet_ethereum::Call::transact(t)) => Some(t),1077 _ => None1078 }).collect()1079 }1080 }10811082 impl sp_session::SessionKeys<Block> for Runtime {1083 fn decode_session_keys(1084 encoded: Vec<u8>,1085 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {1086 SessionKeys::decode_into_raw_public_keys(&encoded)1087 }10881089 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {1090 SessionKeys::generate(seed)1091 }1092 }10931094 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {1095 fn slot_duration() -> sp_consensus_aura::SlotDuration {1096 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())1097 }10981099 fn authorities() -> Vec<AuraId> {1100 Aura::authorities()1101 }1102 }11031104 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {1105 fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {1106 ParachainSystem::collect_collation_info()1107 }1108 }11091110 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {1111 fn account_nonce(account: AccountId) -> Index {1112 System::account_nonce(account)1113 }1114 }11151116 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {1117 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {1118 TransactionPayment::query_info(uxt, len)1119 }1120 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {1121 TransactionPayment::query_fee_details(uxt, len)1122 }1123 }11241125 /*1126 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>1127 for Runtime1128 {1129 fn call(1130 origin: AccountId,1131 dest: AccountId,1132 value: Balance,1133 gas_limit: u64,1134 input_data: Vec<u8>,1135 ) -> pallet_contracts_primitives::ContractExecResult {1136 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)1137 }11381139 fn instantiate(1140 origin: AccountId,1141 endowment: Balance,1142 gas_limit: u64,1143 code: pallet_contracts_primitives::Code<Hash>,1144 data: Vec<u8>,1145 salt: Vec<u8>,1146 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>1147 {1148 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)1149 }11501151 fn get_storage(1152 address: AccountId,1153 key: [u8; 32],1154 ) -> pallet_contracts_primitives::GetStorageResult {1155 Contracts::get_storage(address, key)1156 }11571158 fn rent_projection(1159 address: AccountId,1160 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {1161 Contracts::rent_projection(address)1162 }1163 }1164 */11651166 #[cfg(feature = "runtime-benchmarks")]1167 impl frame_benchmarking::Benchmark<Block> for Runtime {1168 fn dispatch_benchmark(1169 config: frame_benchmarking::BenchmarkConfig1170 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {1171 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};11721173 let whitelist: Vec<TrackedStorageKey> = vec![1174 // Alice account1175 hex_literal::hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d").to_vec().into(),1176 // // Total Issuance1177 // hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),1178 // // Execution Phase1179 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),1180 // // Event Count1181 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),1182 // // System Events1183 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),1184 ];11851186 let mut batches = Vec::<BenchmarkBatch>::new();1187 let params = (&config, &whitelist);11881189 add_benchmark!(params, batches, pallet_evm_migration, EvmMigration);1190 add_benchmark!(params, batches, pallet_nft, Nft);1191 add_benchmark!(params, batches, pallet_inflation, Inflation);11921193 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }1194 Ok(batches)1195 }1196 }1197}11981199struct CheckInherents;12001201impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1202 fn check_inherents(1203 block: &Block,1204 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1205 ) -> sp_inherents::CheckInherentsResult {1206 let relay_chain_slot = relay_state_proof1207 .read_slot()1208 .expect("Could not read the relay chain slot from the proof");12091210 let inherent_data =1211 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1212 relay_chain_slot,1213 sp_std::time::Duration::from_secs(6),1214 )1215 .create_inherent_data()1216 .expect("Could not create the timestamp inherent data");12171218 inherent_data.check_extrinsics(block)1219 }1220}12211222cumulus_pallet_parachain_system::register_validate_block!(1223 Runtime = Runtime,1224 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1225 CheckInherents = CheckInherents,1226);tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -24,8 +24,8 @@
"lint": "eslint --ext .ts,.js src/",
"fix": "eslint --ext .ts,.js src/ --fix",
"test": "mocha --timeout 9999999 -r ts-node/register './**/*.test.ts'",
- "testEth": "mocha --timeout 9999999 -r ts-node/register ./**/eth/**/*.test.ts",
- "load": "mocha --timeout 9999999 -r ts-node/register ./**/*.load.ts",
+ "testEth": "mocha --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",
+ "load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",
"loadTransfer": "ts-node src/transfer.nload.ts",
"testCollision": "mocha --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",
"testAddCollectionAdmin": "mocha --timeout 9999999 -r ts-node/register ./**/addCollectionAdmin.test.ts",
@@ -85,4 +85,4 @@
"artifacts"
]
}
-}
\ No newline at end of file
+}
tests/src/eth/marketplace/MarketPlaceKSM.abidiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/MarketPlaceKSM.abi
@@ -0,0 +1 @@
+[{"inputs":[{"internalType":"address","name":"_escrow","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"asks","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"asksbySeller","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"balanceKSM","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_idCollection","type":"address"},{"internalType":"uint256","name":"_idNFT","type":"uint256"}],"name":"buy","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"},{"internalType":"uint256","name":"_currencyCode","type":"uint256"},{"internalType":"address","name":"_sender","type":"address"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_currencyCode","type":"uint256"},{"internalType":"address","name":"_sender","type":"address"}],"name":"escrowBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"offers","outputs":[{"internalType":"uint256","name":"idNFT","type":"uint256"},{"internalType":"uint256","name":"currencyCode","type":"uint256"},{"internalType":"uint256","name":"price","type":"uint256"},{"internalType":"uint256","name":"time","type":"uint256"},{"internalType":"address","name":"idCollection","type":"address"},{"internalType":"address","name":"userAddr","type":"address"},{"internalType":"uint8","name":"flagActive","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_price","type":"uint256"},{"internalType":"uint256","name":"_currencyCode","type":"uint256"},{"internalType":"address","name":"_idCollection","type":"address"},{"internalType":"uint256","name":"_idNFT","type":"uint256"},{"internalType":"uint8","name":"_active","type":"uint8"}],"name":"setAsk","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_newEscrow","type":"address"}],"name":"setEscrow","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_newEscrow","type":"address"}],"name":"setowner","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"},{"internalType":"uint256","name":"_currencyCode","type":"uint256"},{"internalType":"address","name":"_sender","type":"address"}],"name":"withdraw","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
tests/src/eth/marketplace/MarketPlaceKSM.bindiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/MarketPlaceKSM.bin
@@ -0,0 +1 @@
+608060405234801561001057600080fd5b50604051610e27380380610e2783398101604081905261002f9161005d565b600480546001600160a01b039092166001600160a01b0319928316179055600580549091163317905561008d565b60006020828403121561006f57600080fd5b81516001600160a01b038116811461008657600080fd5b9392505050565b610d8b8061009c6000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c806399f2d4eb1161007157806399f2d4eb1461018e5780639df55f52146101a1578063c10c35461461010f578063cce7ec13146101b4578063db87db52146101c7578063e22d4f7d146101fa57600080fd5b80630ad58d2f146100ae57806310a5ff17146100d6578063592bd7051461010f5780638a72ea6a146101245780638dbdbe6d1461017b575b600080fd5b6100c16100bc366004610c4d565b610225565b60405190151581526020015b60405180910390f35b6101016100e4366004610bd8565b600160209081526000928352604080842090915290825290205481565b6040519081526020016100cd565b61012261011d366004610b97565b6102d8565b005b610137610132366004610c04565b610345565b6040805197885260208801969096529486019390935260608501919091526001600160a01b0390811660808501521660a083015260ff1660c082015260e0016100cd565b610122610189366004610c4d565b6103a4565b61010161019c366004610bd8565b610449565b6101226101af366004610c86565b61047a565b6101226101c2366004610bd8565b610984565b6101016101d5366004610c1d565b6001600160a01b03166000908152600160209081526040808320938352929052205490565b610101610208366004610bd8565b600260209081526000928352604080842090915290825290205481565b6004546000906001600160a01b031633146102795760405162461bcd60e51b815260206004820152600f60248201526e27b7363c9032b9b1b937bb9031b0b760891b60448201526064015b60405180910390fd5b6001600160a01b03821660009081526001602090815260408083208684529091529020546102a8908590610cfa565b6001600160a01b039290921660009081526001602081815260408084209684529590529390209190915550919050565b6005546001600160a01b031633146103235760405162461bcd60e51b815260206004820152600e60248201526d27b7363c9037bbb732b91031b0b760911b6044820152606401610270565b600480546001600160a01b0319166001600160a01b0392909216919091179055565b6000818154811061035557600080fd5b6000918252602090912060069091020180546001820154600283015460038401546004850154600590950154939550919390926001600160a01b0391821691811690600160a01b900460ff1687565b6004546001600160a01b031633146103f05760405162461bcd60e51b815260206004820152600f60248201526e27b7363c9032b9b1b937bb9031b0b760891b6044820152606401610270565b6001600160a01b038116600090815260016020908152604080832085845290915290205461041f908490610ce2565b6001600160a01b039091166000908152600160209081526040808320948352939052919091205550565b6003602052816000526040600020818154811061046557600080fd5b90600052602060002001600091509150505481565b6040516331a9108f60e11b81526004810183905233906001600160a01b03851690636352211e9060240160206040518083038186803b1580156104bc57600080fd5b505afa1580156104d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104f49190610bbb565b6001600160a01b0316146105425760405162461bcd60e51b81526020600482015260156024820152742737ba103934b3b43a103a37b5b2b71037bbb732b960591b6044820152606401610270565b6001600160a01b0383166000908152600260209081526040808320858452909152812054905415806105ac575060006001600160a01b03166000828154811061058d5761058d610d27565b60009182526020909120600460069092020101546001600160a01b0316145b15610793576040805160e0810182528481526020810187815291810188815242606083019081526001600160a01b03808916608085019081523360a0860190815260ff808a1660c088019081526000805460018181018355828052995160069091027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56381019190915599517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5648b015596517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5658a015594517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56689015591517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e567880180549185166001600160a01b0319909216919091179055517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56890960180549351909116600160a01b026001600160a81b031990931695909116949094171790925590546107399190610cfa565b6001600160a01b038516600090815260026020908152604080832087845282528083209390935533825260039052908120905461077890600190610cfa565b81546001810183556000928352602090922090910155610916565b6040805160e0810182526001600160a01b03861660009081526002602090815283822087835290529182205482549192839290919081106107d6576107d6610d27565b60009182526020808320600690920290910154835282810189905260408084018b90524260608501526001600160a01b0389168352600282528083208884529091528120548154608090930192811061083157610831610d27565b60009182526020808320600460069093020191909101546001600160a01b039081168452338483015260ff871660409485015288168252600281528282208783529052908120548154811061088857610888610d27565b60009182526020918290208351600690920201908155908201516001820155604082015160028201556060820151600382015560808201516004820180546001600160a01b039283166001600160a01b031990911617905560a08301516005909201805460c09094015160ff16600160a01b026001600160a81b031990941692909116919091179190911790555b6040516323b872dd60e01b8152336004820152306024820152604481018490526001600160a01b038516906323b872dd90606401600060405180830381600087803b15801561096457600080fd5b505af1158015610978573d6000803e3d6000fd5b50505050505050505050565b6001600160a01b0382166000908152600260209081526040808320848452909152812054815482919081106109bb576109bb610d27565b600091825260208083206040805160e0810182526006949094029091018054845260018082015485850190815260028301548685018190526003840154606088015260048401546001600160a01b03908116608089015260059094015493841660a0880152600160a01b90930460ff1660c08701523387529084528286209051865290925290922054909250610a519190610cfa565b33600090815260016020818152604080842086830180518652908352818520959095558581015160a08701516001600160a01b031685529282528084209451845293905291902054610aa39190610ce2565b60a08201516001600160a01b0390811660009081526001602090815260408083208287015184528252808320949094559186168152600282528281208582529091529081205481548291908110610afc57610afc610d27565b60009182526020909120600560069092020101805460ff92909216600160a01b0260ff60a01b199092169190911790556040516323b872dd60e01b8152306004820152336024820152604481018390526001600160a01b038416906323b872dd90606401600060405180830381600087803b158015610b7a57600080fd5b505af1158015610b8e573d6000803e3d6000fd5b50505050505050565b600060208284031215610ba957600080fd5b8135610bb481610d3d565b9392505050565b600060208284031215610bcd57600080fd5b8151610bb481610d3d565b60008060408385031215610beb57600080fd5b8235610bf681610d3d565b946020939093013593505050565b600060208284031215610c1657600080fd5b5035919050565b60008060408385031215610c3057600080fd5b823591506020830135610c4281610d3d565b809150509250929050565b600080600060608486031215610c6257600080fd5b83359250602084013591506040840135610c7b81610d3d565b809150509250925092565b600080600080600060a08688031215610c9e57600080fd5b85359450602086013593506040860135610cb781610d3d565b925060608601359150608086013560ff81168114610cd457600080fd5b809150509295509295909350565b60008219821115610cf557610cf5610d11565b500190565b600082821015610d0c57610d0c610d11565b500390565b634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6001600160a01b0381168114610d5257600080fd5b5056fea2646970667358221220d098ae4e0cc7bdbb7de1061c03402a667836f903122c1c606ca2c65db1ab78e964736f6c63430008070033
\ No newline at end of file
tests/src/eth/marketplace/MarketPlaceKSM.soldiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/MarketPlaceKSM.sol
@@ -0,0 +1,179 @@
+// SPDX-License-Identifier: Apache License
+pragma solidity >=0.8.0;
+
+interface IERC721 {
+ event Transfer(
+ address indexed from,
+ address indexed to,
+ uint256 indexed tokenId
+ );
+ event Approval(
+ address indexed owner,
+ address indexed approved,
+ uint256 indexed tokenId
+ );
+
+ function ownerOf(uint256 tokenId) external view returns (address owner);
+
+ function transferFrom(
+ address from,
+ address to,
+ uint256 tokenId
+ ) external;
+
+ function debug(string memory value) external;
+}
+
+interface IERC20 {
+ event Transfer(address indexed from, address indexed to, uint256 value);
+ event Approval(
+ address indexed owner,
+ address indexed spender,
+ uint256 value
+ );
+
+ function transfer(address recipient, uint256 amount)
+ external
+ returns (bool);
+
+ function transferFrom(
+ address sender,
+ address recipient,
+ uint256 amount
+ ) external returns (bool);
+}
+
+contract MarketPlaceKSM {
+ struct Offer {
+ uint256 idNFT;
+ uint256 currencyCode;
+ uint256 price;
+ uint256 time;
+ address idCollection;
+ address userAddr;
+ uint8 flagActive;
+ }
+ Offer[] public offers;
+
+ mapping(address => mapping(uint256 => uint256)) public balanceKSM; // [userAddr] => [KSMs]
+ mapping(address => mapping(uint256 => uint256)) public asks; // [buyer][idCollection][idNFT] => idOffer
+
+ mapping(address => uint256[]) public asksbySeller; // [addressSeller] =>idOffer
+
+ address escrow;
+ address owner;
+
+ constructor(address _escrow) {
+ escrow = _escrow;
+ owner = msg.sender;
+ }
+
+ function setowner(address _newEscrow) public onlyOwner {
+ escrow = _newEscrow;
+ }
+
+ function setEscrow(address _newEscrow) public onlyOwner {
+ escrow = _newEscrow;
+ }
+
+ modifier onlyEscrow() {
+ require(msg.sender == escrow, "Only escrow can");
+ _;
+ }
+
+ modifier onlyOwner() {
+ require(msg.sender == owner, "Only owner can");
+ _;
+ }
+
+ /**
+ * Make bids (offers) to sell NFTs
+ */
+ function setAsk(
+ uint256 _price,
+ uint256 _currencyCode,
+ address _idCollection,
+ uint256 _idNFT,
+ uint8 _active
+ ) public {
+ require(
+ IERC721(_idCollection).ownerOf(_idNFT) == msg.sender,
+ "Not right token owner"
+ );
+ uint256 offerID = asks[_idCollection][_idNFT];
+ if (offers.length == 0 || offers[offerID].idCollection == address(0)) {
+ offers.push(
+ Offer(
+ _idNFT,
+ _currencyCode,
+ _price,
+ block.timestamp,
+ _idCollection,
+ msg.sender,
+ _active
+ )
+ );
+ asks[_idCollection][_idNFT] = offers.length - 1;
+ asksbySeller[msg.sender].push(offers.length - 1);
+ }
+ //edit existing offer
+ else {
+ offers[asks[_idCollection][_idNFT]] = Offer(
+ offers[asks[_idCollection][_idNFT]].idNFT,
+ _currencyCode,
+ _price,
+ block.timestamp,
+ offers[asks[_idCollection][_idNFT]].idCollection,
+ msg.sender,
+ _active
+ );
+ }
+
+ IERC721(_idCollection).transferFrom(msg.sender, address(this), _idNFT);
+ }
+
+ function deposit(
+ uint256 _amount,
+ uint256 _currencyCode,
+ address _sender
+ ) public onlyEscrow {
+ balanceKSM[_sender][_currencyCode] =
+ balanceKSM[_sender][_currencyCode] +
+ _amount;
+ }
+
+ function buy(address _idCollection, uint256 _idNFT) public {
+ Offer memory offer = offers[asks[_idCollection][_idNFT]];
+ // 1. reduce balance
+ balanceKSM[msg.sender][offer.currencyCode] =
+ balanceKSM[msg.sender][offer.currencyCode] -
+ offer.price;
+ // 2. increase balance
+ balanceKSM[offer.userAddr][offer.currencyCode] =
+ balanceKSM[offer.userAddr][offer.currencyCode] +
+ offer.price;
+ // 3. close offer
+ offers[asks[_idCollection][_idNFT]].flagActive = 0;
+ // 4. transfer NFT to buyer
+ IERC721(_idCollection).transferFrom(address(this), msg.sender, _idNFT);
+ }
+
+ function withdraw(
+ uint256 _amount,
+ uint256 _currencyCode,
+ address _sender
+ ) public onlyEscrow returns (bool) {
+ balanceKSM[_sender][_currencyCode] =
+ balanceKSM[_sender][_currencyCode] -
+ _amount;
+ return true;
+ }
+
+ function escrowBalance(uint256 _currencyCode, address _sender)
+ public
+ view
+ returns (uint256)
+ {
+ return balanceKSM[_sender][_currencyCode];
+ }
+}
tests/src/eth/marketplace/MarketPlaceUNQ.abidiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/MarketPlaceUNQ.abi
@@ -0,0 +1 @@
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"asks","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"asksbySeller","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_idCollection","type":"address"},{"internalType":"uint256","name":"_idNFT","type":"uint256"},{"internalType":"address","name":"_currencyCode","type":"address"},{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"buy","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"_idCollection","type":"address"},{"internalType":"uint256","name":"_idNFT","type":"uint256"}],"name":"buy","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"offers","outputs":[{"internalType":"uint256","name":"idNFT","type":"uint256"},{"internalType":"address","name":"currencyCode","type":"address"},{"internalType":"uint256","name":"price","type":"uint256"},{"internalType":"uint256","name":"time","type":"uint256"},{"internalType":"address","name":"idCollection","type":"address"},{"internalType":"address","name":"userAddr","type":"address"},{"internalType":"uint8","name":"flagActive","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_price","type":"uint256"},{"internalType":"address","name":"_currencyCode","type":"address"},{"internalType":"address","name":"_idCollection","type":"address"},{"internalType":"uint256","name":"_idNFT","type":"uint256"},{"internalType":"uint8","name":"_active","type":"uint8"}],"name":"setAsk","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"setowner","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
tests/src/eth/marketplace/MarketPlaceUNQ.bindiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/MarketPlaceUNQ.bin
@@ -0,0 +1 @@
+608060405234801561001057600080fd5b50600380546001600160a01b03191633179055610f2d806100326000396000f3fe6080604052600436106100705760003560e01c806399f2d4eb1161004e57806399f2d4eb14610120578063b3ffb7601461014e578063cce7ec1314610161578063e22d4f7d1461017457600080fd5b8063592bd705146100755780637b1d6001146100975780638a72ea6a146100b7575b600080fd5b34801561008157600080fd5b50610095610090366004610d2b565b6101ac565b005b3480156100a357600080fd5b506100956100b2366004610e1b565b61021e565b3480156100c357600080fd5b506100d76100d2366004610e02565b61073d565b604080519788526001600160a01b03968716602089015287019490945260608601929092528316608085015290911660a083015260ff1660c082015260e0015b60405180910390f35b34801561012c57600080fd5b5061014061013b366004610d6c565b6107a0565b604051908152602001610117565b61009561015c366004610d98565b6107d1565b61009561016f366004610d6c565b610b0b565b34801561018057600080fd5b5061014061018f366004610d6c565b600160209081526000928352604080842090915290825290205481565b6003546001600160a01b031633146101fc5760405162461bcd60e51b815260206004820152600e60248201526d27b7363c9037bbb732b91031b0b760911b60448201526064015b60405180910390fd5b600380546001600160a01b0319166001600160a01b0392909216919091179055565b6040516331a9108f60e11b81526004810183905233906001600160a01b03851690636352211e9060240160206040518083038186803b15801561026057600080fd5b505afa158015610274573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102989190610d4f565b6001600160a01b0316146102e65760405162461bcd60e51b81526020600482015260156024820152742737ba103934b3b43a103a37b5b2b71037bbb732b960591b60448201526064016101f3565b6001600160a01b038316600090815260016020908152604080832085845290915281205490541580610350575060006001600160a01b03166000828154811061033157610331610ec9565b60009182526020909120600460069092020101546001600160a01b0316145b15610542576040805160e0810182528481526001600160a01b03878116602083019081529282018981524260608401908152888316608085019081523360a0860190815260ff89811660c08801908152600080546001808201835582805299517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56360069092029182015599517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5648b0180546001600160a01b0319908116928b1692909217905596517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5658b015594517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5668a015592517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5678901805490961690871617909455517f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56890960180549151969094166001600160a81b031990911617600160a01b959092169490940217905590546104e99190610ea4565b6001600160a01b0385166000908152600160208181526040808420888552825280842094909455338352600290529181209054909161052791610ea4565b815460018101835560009283526020909220909101556106d3565b6040805160e0810182526001600160a01b038616600090815260016020908152838220878352905291822054825491928392909190811061058557610585610ec9565b6000918252602080832060069092029091015483526001600160a01b03808a168483015260408085018c9052426060860152908916835260018252808320888452909152812054815460809093019281106105e2576105e2610ec9565b60009182526020808320600460069093020191909101546001600160a01b039081168452338483015260ff871660409485015288168252600181528282208783529052908120548154811061063957610639610ec9565b60009182526020918290208351600690920201908155908201516001820180546001600160a01b039283166001600160a01b031991821617909155604084015160028401556060840151600384015560808401516004840180549184169190921617905560a08301516005909201805460c09094015160ff16600160a01b026001600160a81b031990941692909116919091179190911790555b6040516323b872dd60e01b81526001600160a01b038516906323b872dd9061070390339030908890600401610e80565b600060405180830381600087803b15801561071d57600080fd5b505af1158015610731573d6000803e3d6000fd5b50505050505050505050565b6000818154811061074d57600080fd5b60009182526020909120600690910201805460018201546002830154600384015460048501546005909501549395506001600160a01b03928316949193909291821691811690600160a01b900460ff1687565b600260205281600052604060002081815481106107bc57600080fd5b90600052602060002001600091509150505481565b6001600160a01b03841660009081526001602090815260408083208684529091528120548154829190811061080857610808610ec9565b60009182526020918290206040805160e0810182526006939093029091018054835260018101546001600160a01b03908116948401949094526002810154918301829052600381015460608401526004810154841660808401526005015492831660a0830152600160a01b90920460ff1660c08201529150821480156108a35750826001600160a01b031681602001516001600160a01b0316145b6109245760405162461bcd60e51b815260206004820152604660248201527f4e6f7420726967687420616d6f756e74206f722063757272656e63792073656e60448201527f742c206861766520746f20626520657175616c2063757272656e637920616e6460648201526520707269636560d01b608482015260a4016101f3565b80602001516001600160a01b03166323b872dd333084604001516040518463ffffffff1660e01b815260040161095c93929190610e80565b602060405180830381600087803b15801561097657600080fd5b505af115801561098a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109ae9190610de0565b50602081015160a0820151604080840151905163a9059cbb60e01b81526001600160a01b039283166004820152602481019190915291169063a9059cbb90604401602060405180830381600087803b158015610a0957600080fd5b505af1158015610a1d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a419190610de0565b506001600160a01b038516600090815260016020908152604080832087845290915281205481548291908110610a7957610a79610ec9565b906000526020600020906006020160050160146101000a81548160ff021916908360ff160217905550846001600160a01b03166323b872dd3033876040518463ffffffff1660e01b8152600401610ad293929190610e80565b600060405180830381600087803b158015610aec57600080fd5b505af1158015610b00573d6000803e3d6000fd5b505050505050505050565b6001600160a01b038216600090815260016020908152604080832084845290915281205481548291908110610b4257610b42610ec9565b60009182526020918290206040805160e0810182526006939093029091018054835260018101546001600160a01b03908116948401949094526002810154918301829052600381015460608401526004810154841660808401526005015492831660a0830152600160a01b90920460ff1660c082015291503414610c225760405162461bcd60e51b815260206004820152603160248201527f4e6f7420726967687420616d6f756e7420554e512073656e742c206861766520604482015270746f20626520657175616c20707269636560781b60648201526084016101f3565b8060a001516001600160a01b03166108fc82604001519081150290604051600060405180830381858888f19350505050158015610c63573d6000803e3d6000fd5b506001600160a01b038316600090815260016020908152604080832085845290915281205481548291908110610c9b57610c9b610ec9565b906000526020600020906006020160050160146101000a81548160ff021916908360ff160217905550826001600160a01b03166323b872dd3033856040518463ffffffff1660e01b8152600401610cf493929190610e80565b600060405180830381600087803b158015610d0e57600080fd5b505af1158015610d22573d6000803e3d6000fd5b50505050505050565b600060208284031215610d3d57600080fd5b8135610d4881610edf565b9392505050565b600060208284031215610d6157600080fd5b8151610d4881610edf565b60008060408385031215610d7f57600080fd5b8235610d8a81610edf565b946020939093013593505050565b60008060008060808587031215610dae57600080fd5b8435610db981610edf565b9350602085013592506040850135610dd081610edf565b9396929550929360600135925050565b600060208284031215610df257600080fd5b81518015158114610d4857600080fd5b600060208284031215610e1457600080fd5b5035919050565b600080600080600060a08688031215610e3357600080fd5b853594506020860135610e4581610edf565b93506040860135610e5581610edf565b925060608601359150608086013560ff81168114610e7257600080fd5b809150509295509295909350565b6001600160a01b039384168152919092166020820152604081019190915260600190565b600082821015610ec457634e487b7160e01b600052601160045260246000fd5b500390565b634e487b7160e01b600052603260045260246000fd5b6001600160a01b0381168114610ef457600080fd5b5056fea2646970667358221220fbf33eb1e471c428b86ad6d948b8699fd08a127b923d5fe27ec1e1ec5f59627564736f6c63430008070033
\ No newline at end of file
tests/src/eth/marketplace/MarketPlaceUNQ.soldiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/MarketPlaceUNQ.sol
@@ -0,0 +1,163 @@
+// SPDX-License-Identifier: Apache License
+pragma solidity >=0.8.0;
+
+interface IERC721 {
+ event Transfer(
+ address indexed from,
+ address indexed to,
+ uint256 indexed tokenId
+ );
+ event Approval(
+ address indexed owner,
+ address indexed approved,
+ uint256 indexed tokenId
+ );
+
+ function ownerOf(uint256 tokenId) external view returns (address owner);
+
+ function transferFrom(
+ address from,
+ address to,
+ uint256 tokenId
+ ) external;
+
+ function debug(string memory value) external;
+}
+
+interface IERC20 {
+ event Transfer(address indexed from, address indexed to, uint256 value);
+ event Approval(
+ address indexed owner,
+ address indexed spender,
+ uint256 value
+ );
+
+ function transfer(address recipient, uint256 amount)
+ external
+ returns (bool);
+
+ function transferFrom(
+ address sender,
+ address recipient,
+ uint256 amount
+ ) external returns (bool);
+}
+
+contract MarketPlaceUNQ {
+ struct Offer {
+ uint256 idNFT;
+ address currencyCode; //address of currency token, = address(0) for UNQ
+ uint256 price;
+ uint256 time;
+ address idCollection;
+ address userAddr;
+ uint8 flagActive;
+ }
+ Offer[] public offers;
+
+ mapping(address => mapping(uint256 => uint256)) public asks; // [idCollection][idNFT] => idOffer
+
+ mapping(address => uint256[]) public asksbySeller; // [addressSeller] =>idOffer
+
+ address owner;
+
+ constructor() {
+ owner = msg.sender;
+ }
+
+ function setowner(address _newOwner) public onlyOwner {
+ owner = _newOwner;
+ }
+
+ modifier onlyOwner() {
+ require(msg.sender == owner, "Only owner can");
+ _;
+ }
+
+ /**
+ * Make bids (offers) to sell NFTs
+ */
+ function setAsk(
+ uint256 _price,
+ address _currencyCode,
+ address _idCollection,
+ uint256 _idNFT,
+ uint8 _active
+ ) public {
+ require(
+ IERC721(_idCollection).ownerOf(_idNFT) == msg.sender,
+ "Not right token owner"
+ );
+ uint256 offerID = asks[_idCollection][_idNFT];
+ if (offers.length == 0 || offers[offerID].idCollection == address(0)) {
+ offers.push(
+ Offer(
+ _idNFT,
+ _currencyCode,
+ _price,
+ block.timestamp,
+ _idCollection,
+ msg.sender,
+ _active
+ )
+ );
+ asks[_idCollection][_idNFT] = offers.length - 1;
+ asksbySeller[msg.sender].push(offers.length - 1);
+ }
+ //edit existing offer
+ else {
+ offers[asks[_idCollection][_idNFT]] = Offer(
+ offers[asks[_idCollection][_idNFT]].idNFT,
+ _currencyCode,
+ _price,
+ block.timestamp,
+ offers[asks[_idCollection][_idNFT]].idCollection,
+ msg.sender,
+ _active
+ );
+ }
+
+ IERC721(_idCollection).transferFrom(msg.sender, address(this), _idNFT);
+ }
+
+ function buy(address _idCollection, uint256 _idNFT) public payable {
+ //buing for UNQ like as ethers
+ Offer memory offer = offers[asks[_idCollection][_idNFT]];
+ //1. check sent amount and send to seller
+ require(
+ msg.value == offer.price,
+ "Not right amount UNQ sent, have to be equal price"
+ );
+ payable(offer.userAddr).transfer(offer.price);
+ // 2. close offer
+ offers[asks[_idCollection][_idNFT]].flagActive = 0;
+ // 3. transfer NFT to buyer
+ IERC721(_idCollection).transferFrom(address(this), msg.sender, _idNFT);
+ }
+
+ function buy(
+ address _idCollection,
+ uint256 _idNFT,
+ address _currencyCode,
+ uint256 _amount
+ ) public payable {
+ Offer memory offer = offers[asks[_idCollection][_idNFT]];
+ //1. check sent amount and transfer from buyer to seller
+ require(
+ offer.price == _amount && offer.currencyCode == _currencyCode,
+ "Not right amount or currency sent, have to be equal currency and price"
+ );
+ // !!! transfer have to be approved to marketplace!
+ IERC20(offer.currencyCode).transferFrom(
+ msg.sender,
+ address(this),
+ offer.price
+ );
+ //to not disclojure buyer's address
+ IERC20(offer.currencyCode).transfer(offer.userAddr, offer.price);
+ // 2. close offer
+ offers[asks[_idCollection][_idNFT]].flagActive = 0;
+ // 3. transfer NFT to buyer
+ IERC721(_idCollection).transferFrom(address(this), msg.sender, _idNFT);
+ }
+}
tests/src/eth/marketplace/marketplace.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/marketplace/marketplace.test.ts
@@ -0,0 +1,198 @@
+import { readFile } from 'fs/promises';
+import { getBalanceSingle, transferBalanceExpectSuccess } from '../../substrate/get-balance';
+import privateKey from '../../substrate/privateKey';
+import { createCollectionExpectSuccess, createFungibleItemExpectSuccess, createItemExpectSuccess, queryNftOwner, transferExpectSuccess, transferFromExpectSuccess } from '../../util/helpers';
+import { collectionIdToAddress, createEthAccountWithBalance, executeEthTxOnSub, GAS_ARGS, itWeb3, subToEth, subToEthLowercase } from '../util/helpers';
+import { evmToAddress } from '@polkadot/util-crypto';
+import nonFungibleAbi from '../nonFungibleAbi.json';
+import fungibleAbi from '../fungibleAbi.json';
+import waitNewBlocks from '../../substrate/wait-new-blocks';
+import { expect } from 'chai';
+
+const PRICE = 2000n;
+
+describe('Matcher contract usage', () => {
+ itWeb3('With UNQ', async ({api, web3}) => {
+ const matcherOwner = await createEthAccountWithBalance(api, web3);
+ const Matcher = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlaceUNQ.abi`)).toString()), undefined, {
+ from: matcherOwner,
+ ...GAS_ARGS,
+ });
+ const matcher = await Matcher.deploy({ data: (await readFile(`${__dirname}/MarketPlaceUNQ.bin`)).toString() }).send({ from: matcherOwner });
+
+ const alice = privateKey('//Alice');
+ const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), { from: matcherOwner });
+
+ const seller = privateKey('//Bob');
+
+ const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
+
+ // To transfer item to matcher it first needs to be transfered to EVM account of bob
+ await transferExpectSuccess(collectionId, tokenId, seller, {ethereum: subToEth(seller.address)});
+ // Fees will be paid from EVM account, so we should have some balance here
+ await transferBalanceExpectSuccess(api, seller, evmToAddress(subToEth(seller.address)), 10n ** 18n);
+ await transferBalanceExpectSuccess(api, alice, evmToAddress(subToEth(alice.address)), 10n ** 18n);
+ await waitNewBlocks(api, 1);
+
+ // Token is owned by seller initially
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: subToEthLowercase(seller.address) });
+
+ // Ask
+ {
+ await executeEthTxOnSub(api, seller, evmCollection, m => m.approve(matcher.options.address, tokenId));
+ await executeEthTxOnSub(api, seller, matcher, m => m.setAsk(PRICE, '0x0000000000000000000000000000000000000000', evmCollection.options.address, tokenId, 1));
+ }
+
+ // Token is transferred to matcher
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: matcher.options.address.toLowerCase() });
+
+ // Buy
+ {
+ const sellerBalanceBeforePurchase = await getBalanceSingle(api, seller.address);
+ // There is two functions named 'buy', so we should provide full signature
+ await executeEthTxOnSub(api, alice, matcher, m => m['buy(address,uint256)'](evmCollection.options.address, tokenId), { value: PRICE });
+ expect(await getBalanceSingle(api, seller.address) - sellerBalanceBeforePurchase === PRICE);
+ }
+
+ // Token is transferred to evm account of alice
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: subToEthLowercase(alice.address) });
+
+
+ // Transfer token to substrate side of alice
+ await transferFromExpectSuccess(collectionId, tokenId, alice, { ethereum: subToEth(alice.address) }, { substrate: alice.address });
+
+ // Token is transferred to substrate account of alice, seller received funds
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ substrate: alice.address });
+ });
+
+ itWeb3('With custom ERC20', async ({api, web3}) => {
+ const matcherOwner = await createEthAccountWithBalance(api, web3);
+ const Matcher = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlaceUNQ.abi`)).toString()), undefined, {
+ from: matcherOwner,
+ ...GAS_ARGS,
+ });
+ const matcher = await Matcher.deploy({ data: (await readFile(`${__dirname}/MarketPlaceUNQ.bin`)).toString() }).send({ from: matcherOwner });
+
+ const alice = privateKey('//Alice');
+ const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), { from: matcherOwner });
+
+ const fungibleId = await createCollectionExpectSuccess({ mode: { type: 'Fungible', decimalPoints: 0 } });
+ const evmFungible = new web3.eth.Contract(fungibleAbi as any, collectionIdToAddress(fungibleId), { from: matcherOwner, ...GAS_ARGS });
+ await createFungibleItemExpectSuccess(alice, fungibleId, { Value: PRICE }, { ethereum: subToEth(alice.address) });
+
+ const seller = privateKey('//Bob');
+
+ const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
+
+ // To transfer item to matcher it first needs to be transfered to EVM account of bob
+ await transferExpectSuccess(collectionId, tokenId, seller, {ethereum: subToEth(seller.address)});
+ // Fees will be paid from EVM account, so we should have some balance here
+ await transferBalanceExpectSuccess(api, seller, evmToAddress(subToEth(seller.address)), 10n ** 18n);
+ await transferBalanceExpectSuccess(api, alice, evmToAddress(subToEth(alice.address)), 10n ** 18n);
+ await waitNewBlocks(api, 1);
+
+ // Token is owned by seller initially
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: subToEthLowercase(seller.address) });
+
+ // Ask
+ {
+ await executeEthTxOnSub(api, seller, evmCollection, m => m.approve(matcher.options.address, tokenId));
+ await executeEthTxOnSub(api, seller, matcher, m => m.setAsk(PRICE, evmFungible.options.address, evmCollection.options.address, tokenId, 1));
+ }
+
+ // Token is transferred to matcher
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: matcher.options.address.toLowerCase() });
+
+ // Buy
+ {
+ const sellerBalanceBeforePurchase = BigInt(await evmFungible.methods.balanceOf(subToEth(seller.address)).call());
+ const buyerBalanceBeforePurchase = BigInt(await evmFungible.methods.balanceOf(subToEth(alice.address)).call());
+
+ await executeEthTxOnSub(api, alice, evmFungible, m => m.approve(matcher.options.address, PRICE));
+ // There is two functions named 'buy', so we should provide full signature
+ await executeEthTxOnSub(api, alice, matcher, m =>
+ m['buy(address,uint256,address,uint256)'](evmCollection.options.address, tokenId, evmFungible.options.address, PRICE));
+
+ // Approved price is removed from buyer balance, and added to seller
+ expect(BigInt(await evmFungible.methods.balanceOf(subToEth(seller.address)).call()) - sellerBalanceBeforePurchase === PRICE);
+ expect(buyerBalanceBeforePurchase - BigInt(await evmFungible.methods.balanceOf(subToEth(alice.address)).call()) === PRICE);
+ }
+
+ // Token is transferred to evm account of alice
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: subToEthLowercase(alice.address) });
+
+
+ // Transfer token to substrate side of alice
+ await transferFromExpectSuccess(collectionId, tokenId, alice, { ethereum: subToEth(alice.address) }, { substrate: alice.address });
+
+ // Token is transferred to substrate account of alice
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ substrate: alice.address });
+ });
+
+ itWeb3('With escrow', async ({ api, web3 }) => {
+ const matcherOwner = await createEthAccountWithBalance(api, web3);
+ const escrow = await createEthAccountWithBalance(api, web3);
+ const Matcher = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlaceKSM.abi`)).toString()), undefined, {
+ from: matcherOwner,
+ ...GAS_ARGS,
+ });
+ const matcher = await Matcher.deploy({ data: (await readFile(`${__dirname}/MarketPlaceKSM.bin`)).toString(), arguments: [escrow] }).send({ from: matcherOwner });
+
+ const ksmToken = 11;
+
+ const alice = privateKey('//Alice');
+ const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ const evmCollection = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collectionId), { from: matcherOwner });
+
+ const seller = privateKey('//Bob');
+
+ const tokenId = await createItemExpectSuccess(alice, collectionId, 'NFT', seller.address);
+
+ // To transfer item to matcher it first needs to be transfered to EVM account of bob
+ await transferExpectSuccess(collectionId, tokenId, seller, {ethereum: subToEth(seller.address)});
+ // Fees will be paid from EVM account, so we should have some balance here
+ await transferBalanceExpectSuccess(api, seller, evmToAddress(subToEth(seller.address)), 10n ** 18n);
+ await transferBalanceExpectSuccess(api, alice, evmToAddress(subToEth(alice.address)), 10n ** 18n);
+ await waitNewBlocks(api, 1);
+
+ // Token is owned by seller initially
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: subToEthLowercase(seller.address) });
+
+ // Ask
+ {
+ await executeEthTxOnSub(api, seller, evmCollection, m => m.approve(matcher.options.address, tokenId));
+ await executeEthTxOnSub(api, seller, matcher, m => m.setAsk(PRICE, ksmToken, evmCollection.options.address, tokenId, 1));
+ }
+
+ // Token is transferred to matcher
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: matcher.options.address.toLowerCase() });
+
+ // Give buyer KSM
+ await matcher.methods.deposit(PRICE, ksmToken, subToEth(alice.address)).send({ from: escrow });
+ await waitNewBlocks(api, 1);
+
+ // Buy
+ {
+ expect(await matcher.methods.escrowBalance(ksmToken, subToEth(seller.address)).call()).to.be.equal('0');
+ expect(await matcher.methods.escrowBalance(ksmToken, subToEth(alice.address)).call()).to.be.equal(PRICE.toString());
+
+ await executeEthTxOnSub(api, alice, matcher, m => m.buy(evmCollection.options.address, tokenId));
+ await waitNewBlocks(api, 1);
+
+ // Price is removed from buyer balance, and added to seller
+ expect(await matcher.methods.escrowBalance(ksmToken, subToEth(alice.address)).call()).to.be.equal('0');
+ expect(await matcher.methods.escrowBalance(ksmToken, subToEth(seller.address)).call()).to.be.equal(PRICE.toString());
+ }
+
+ // Token is transferred to evm account of alice
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ ethereum: subToEthLowercase(alice.address) });
+
+ // Transfer token to substrate side of alice
+ await transferFromExpectSuccess(collectionId, tokenId, alice, { ethereum: subToEth(alice.address) }, { substrate: alice.address });
+
+ // Token is transferred to substrate account of alice, seller received funds
+ expect(await queryNftOwner(api, collectionId, tokenId)).to.be.deep.equal({ substrate: alice.address });
+ });
+});
tests/src/eth/migration.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/migration.test.ts
@@ -0,0 +1,82 @@
+import { expect } from 'chai';
+import privateKey from '../substrate/privateKey';
+import { submitTransactionAsync } from '../substrate/substrate-api';
+import { createEthAccountWithBalance, GAS_ARGS, itWeb3 } from './util/helpers';
+
+describe('EVM Migrations', () => {
+ itWeb3('Deploy contract saved state', async ({ web3, api }) => {
+ /*
+ contract StatefulContract {
+ uint counter;
+ mapping (uint => uint) kv;
+
+ function inc() public {
+ counter = counter + 1;
+ }
+ function counterValue() public view returns (uint) {
+ return counter;
+ }
+
+ function set(uint key, uint value) public {
+ kv[key] = value;
+ }
+
+ function get(uint key) public view returns (uint) {
+ return kv[key];
+ }
+ }
+ */
+ const ADDRESS = '0x4956bf52ef9ed8789f21bc600e915e0d961079f6';
+ const CODE = '0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80631ab06ee514610051578063371303c01461006d5780637bfdec3b146100775780639507d39a14610095575b600080fd5b61006b60048036038101906100669190610160565b6100c5565b005b6100756100e1565b005b61007f6100f8565b60405161008c91906101af565b60405180910390f35b6100af60048036038101906100aa9190610133565b610101565b6040516100bc91906101af565b60405180910390f35b8060016000848152602001908152602001600020819055505050565b60016000546100f091906101ca565b600081905550565b60008054905090565b600060016000838152602001908152602001600020549050919050565b60008135905061012d8161025e565b92915050565b60006020828403121561014957610148610259565b5b60006101578482850161011e565b91505092915050565b6000806040838503121561017757610176610259565b5b60006101858582860161011e565b92505060206101968582860161011e565b9150509250929050565b6101a981610220565b82525050565b60006020820190506101c460008301846101a0565b92915050565b60006101d582610220565b91506101e083610220565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff038211156102155761021461022a565b5b828201905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600080fd5b61026781610220565b811461027257600080fd5b5056fea26469706673582212206a02d2fb5c244105ab884961479c1aee3b4c1011e4b5530ab483eb22344a865664736f6c63430008060033';
+ const DATA = [
+ // counter = 10
+ ['0x0000000000000000000000000000000000000000000000000000000000000000', '0x000000000000000000000000000000000000000000000000000000000000000a'],
+ // kv = {1: 1, 2: 2, 3: 3, 4: 4},
+ ['0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f', '0x0000000000000000000000000000000000000000000000000000000000000001'],
+ ['0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f', '0x0000000000000000000000000000000000000000000000000000000000000002'],
+ ['0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b', '0x0000000000000000000000000000000000000000000000000000000000000003'],
+ ['0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643', '0x0000000000000000000000000000000000000000000000000000000000000004'],
+ ];
+
+ const alice = privateKey('//Alice');
+ const caller = await createEthAccountWithBalance(api, web3);
+
+ await submitTransactionAsync(alice, api.tx.sudo.sudo(api.tx.evmMigration.begin(ADDRESS)));
+ await submitTransactionAsync(alice, api.tx.sudo.sudo(api.tx.evmMigration.setData(ADDRESS, DATA)));
+ await submitTransactionAsync(alice, api.tx.sudo.sudo(api.tx.evmMigration.finish(ADDRESS, CODE)));
+
+ const contract = new web3.eth.Contract([
+ {
+ inputs: [],
+ name: 'counterValue',
+ outputs: [{
+ internalType: 'uint256',
+ name: '',
+ type: 'uint256',
+ }],
+ stateMutability: 'view',
+ type: 'function',
+ },
+ {
+ inputs: [{
+ internalType: 'uint256',
+ name: 'key',
+ type: 'uint256',
+ }],
+ name: 'get',
+ outputs: [{
+ internalType: 'uint256',
+ name: '',
+ type: 'uint256',
+ }],
+ stateMutability: 'view',
+ type: 'function',
+ },
+ ], ADDRESS, { from: caller, ...GAS_ARGS });
+
+ expect(await contract.methods.counterValue().call()).to.be.equal('10');
+ for (let i = 1; i <= 4; i++) {
+ expect(await contract.methods.get(i).call()).to.be.equal(i.toString());
+ }
+ });
+});
\ No newline at end of file
tests/src/eth/util/helpers.tsdiffbeforeafterboth--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -143,10 +143,13 @@
return normalizeEvents(out);
}
+export function subToEthLowercase(eth: string): string {
+ const bytes = addressToEvm(eth);
+ return '0x' + Buffer.from(bytes).toString('hex');
+}
+
export function subToEth(eth: string): string {
- const bytes = addressToEvm(eth);
- const string = '0x' + Buffer.from(bytes).toString('hex');
- return Web3.utils.toChecksumAddress(string);
+ return Web3.utils.toChecksumAddress(subToEthLowercase(eth));
}
export function compileContract(name: string, src: string) {
@@ -236,6 +239,20 @@
return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, ...GAS_ARGS});
}
+export async function executeEthTxOnSub(api: ApiPromise, from: IKeyringPair, to: any, mkTx: (methods: any) => any, { value = 0 }: {value?: bigint | number} = { }) {
+ const tx = api.tx.evm.call(
+ subToEth(from.address),
+ to.options.address,
+ mkTx(to.methods).encodeABI(),
+ value,
+ GAS_ARGS.gas,
+ GAS_ARGS.gasPrice,
+ null,
+ );
+ const events = await submitTransactionAsync(from, tx);
+ expect(events.find(({ event: {section, method}})=>section === 'evm' && method === 'Executed')).to.be.not.undefined;
+}
+
export async function ethBalanceViaSub(api: ApiPromise, address: string): Promise<bigint> {
return (await getBalance(api, [evmToAddress(address)]))[0];
}
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -1168,3 +1168,7 @@
return (await api.query.nft.collectionById(collectionId)).toJSON() as unknown as ICollectionInterface;
});
}
+
+export async function queryNftOwner(api: ApiPromise, collectionId: number, tokenId: number): Promise<CrossAccountId> {
+ return normalizeAccountId((await api.query.nft.nftItemList(collectionId, tokenId) as any).toJSON().Owner);
+}
\ No newline at end of file