Skip to content

Commit

Permalink
+ preparing for release
Browse files Browse the repository at this point in the history 
+ set version number according to the substrate version.
+ recovered the mainnet genesis specs
+ fixed pallet -unit-testing testing workflow.
  • Loading branch information
remz committed Sep 24, 2022
1 parent 53fb89e commit 538676b
Show file tree
Hide file tree
Showing 13 changed files with 8,224 additions and 36,781 deletions.
17 changes: 6 additions & 11 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions node/cli/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "edgeware-cli"
version = "3.4.0"
version = "4.0.0"
authors = ["Commonwealth Labs <hello@commonwealth.im>"]
description = "Edgeware implementation using a substrate node."
build = "build.rs"
Expand Down Expand Up @@ -91,7 +91,7 @@ pallet-authority-discovery = { git = "https://github.com/paritytech/substrate",
pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-dynamic-fee = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false, features = [ "with-codec" ] } #
evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false, features = [ "with-codec" ] } #
fp-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
pallet-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
ethereum-types = { version = "0.13.1", default-features = false, features = ["rlp","codec", "std"] }
Expand Down
28,524 changes: 0 additions & 28,524 deletions node/cli/res/mainnet.chainspec.json
View file

This file was deleted.

16,417 changes: 8,199 additions & 8,218 deletions node/cli/res/mainnet.chainspec.raw.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion node/cli/src/command.rs
View file
Expand Up @@ -25,7 +25,7 @@ impl SubstrateCli for Cli {
}

fn impl_version() -> String {
"polkadot-v0.9.19".into()
"4.0.0".into()
}

fn description() -> String {
Expand Down
8 changes: 4 additions & 4 deletions node/executor/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "edgeware-executor"
version = "3.4.0"
version = "4.0.0"
authors = ["Commonwealth Labs <hello@commonwealth.im>"]
description = "Edgeware implementation using a substrate node."
edition = "2021"
Expand All @@ -19,9 +19,9 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19" }

edgeware-primitives = { version = "3.4.0", path = "../primitives" }
edgeware-runtime = { version = "3.4.0", path = "../runtime" }
edgeware-runtime-interface = { version = "3.4.0", path = "../runtime-interface" }
edgeware-primitives = { version = "4.0.0", path = "../primitives" }
edgeware-runtime = { version = "4.0.0", path = "../runtime" }
edgeware-runtime-interface = { version = "4.0.0", path = "../runtime-interface" }

[dev-dependencies]
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19" }
Expand Down
2 changes: 1 addition & 1 deletion node/primitives/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "edgeware-primitives"
version = "3.4.0"
version = "4.0.0"
authors = ["Commonwealth Labs <hello@commonwealth.im>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
6 changes: 3 additions & 3 deletions node/rpc/Cargo.toml
View file
@@ -1,11 +1,11 @@
[package]
name = "edgeware-rpc"
authors = [ "PureStake" ]
version = "4.0.0"
authors = [ "Edgeware", "PureStake" ]
edition = "2021"
homepage = "https://moonbeam.network"
license = "GPL-3.0-only"
repository = "https://github.com/PureStake/moonbeam/"
version = "0.1.0"

[dependencies]
futures = { version = "0.3.1", features = ["compat"] }
Expand Down Expand Up @@ -42,7 +42,7 @@ sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", bra

substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
tokio = { version = "1.10", features = ["macros", "sync"] }
evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false, features = [ "with-codec" ] } #
evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false, features = [ "with-codec" ] }
pallet-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", features = ["runtime-benchmarks"] }
fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion node/runtime-interface/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "edgeware-runtime-interface"
version = "3.4.0"
version = "4.0.0"
authors = ["Commonwealth Labs <hello@commonwealth.im>"]
description = "Edgeware runtime interface helpers and functions"
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions node/runtime/Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "edgeware-runtime"
version = "3.4.0"
version = "4.0.0"
authors = ["Commonwealth Labs <hello@commonwealth.im>"]
edition = "2018"
build = "build.rs"
Expand Down Expand Up @@ -106,7 +106,7 @@ pallet-dynamic-fee = { git = "https://github.com/paritytech/frontier", branch =
pallet-base-fee = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false, features = [ "with-codec" ] } #
evm = { git = "https://github.com/rust-blockchain/evm", branch = "master", default-features = false, features = [ "with-codec" ] }

pallet-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false }
pallet-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.19", default-features = false, features = ["runtime-benchmarks"] }
Expand Down
9 changes: 0 additions & 9 deletions pallets/edge-treasury-reward/Cargo.toml
View file
Expand Up @@ -12,39 +12,30 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
serde = { version = "1.0", default-features = false, optional = true }
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
#safe-mix = { version = "1.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }

[dev-dependencies]
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }

[features]
default = ["std"]
std = [
"serde",
# "safe-mix/std",
"scale-info/std",
"codec/std",
"sp-std/std",
# "sp-io/std",
"sp-runtime/std",
"pallet-authorship/std",
"pallet-balances/std",
"frame-support/std",
"frame-system/std",
# "pallet-staking/std",
"pallet-treasury/std",
]
8 changes: 4 additions & 4 deletions pallets/edge-treasury-reward/src/mock.rs
View file
Expand Up @@ -28,10 +28,10 @@ construct_runtime!(
NodeBlock = Block,
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
TreasuryReward: treasury_reward::{Pallet, Call, Storage, Config<T>, Event<T>},
System: frame_system,
Balances: pallet_balances,
Treasury: pallet_treasury,
TreasuryReward: treasury_reward,
}
);

Expand Down
2 changes: 1 addition & 1 deletion utils/frame/generate-bags/node-runtime/Cargo.toml
View file
Expand Up @@ -10,7 +10,7 @@ description = "Bag threshold generation script for pallet-bag-list and node-runt
readme = "README.md"

[dependencies]
edgeware-runtime = { version = "3.4.0", path = "../../../../node/runtime" }
edgeware-runtime = { version = "4.0.0", path = "../../../../node/runtime" }
generate-bags = { version = "4.0.0-dev", path = "../" }

# third-party
Expand Down

0 comments on commit 538676b

Please sign in to comment.