Skip to content

Commit

Permalink
Upgrade frame 0.9.42 (#236)
Browse files Browse the repository at this point in the history 
* refactor: upgrade to 0.9.42

* refactor: upgrade frame and evm version
  • Loading branch information
@ytqaljn
ytqaljn authored Oct 9, 2023
1 parent dc2e341 commit 3de648b
Show file tree
Hide file tree
Showing 44 changed files with 7,053 additions and 3,570 deletions.
4,973 changes: 3,498 additions & 1,475 deletions Cargo.lock
View file

Large diffs are not rendered by default.

65 changes: 31 additions & 34 deletions c-pallets/audit/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ readme = "README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
serde = { version = "1.0.101", optional = true }
# serde = { version = "1.0.136", optional = true }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { default-features = false, features = ['derive'], version = "2.0.1" }
log = { version = "0.4.14", default-features = false }
pallet-cess-staking = { path = '../staking', version = '4.0.0-dev', default-features = false }
pallet-preimage = { version = "4.0.0-dev", default-features = false, git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36" }
pallet-preimage = { version = "4.0.0-dev", default-features = false, git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42" }

# local pallet
cp-bloom-filter = { path = '../../primitives/bloom-filter', version = '0.1.0', default-features = false }
Expand All @@ -26,57 +26,57 @@ cp-enclave-verify = { path = '../../primitives/enclave-verify', version = '0.1.0

[dependencies.frame-benchmarking]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'
optional = true

[dependencies.frame-support]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.frame-system]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.sp-io]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '7.0.0'

[dependencies.sp-std]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '5.0.0'

[dependencies.pallet-balances]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.sp-core]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '7.0.0'

[dev-dependencies.pallet-timestamp]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.sp-runtime]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '7.0.0'

# local dependencies
Expand Down Expand Up @@ -105,31 +105,29 @@ version = '0.7.0'

[dev-dependencies.frame-support-test]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '3.0.0'

[dev-dependencies.pallet-balances]
#default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dev-dependencies.pallet-scheduler]
#default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dev-dependencies]
pallet-cess-staking = { path = '../staking', version = '4.0.0-dev', default-features = false}
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-session = { version = "4.0.0-dev", default-features = false, features = [
"historical",
], git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-session = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-scheduler-credit = { version = "0.1.0", default-features = false, path = '../scheduler-credit'}
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
pallet-oss = { path = '../oss', version = '0.7.0', default-features = false }
Expand All @@ -141,7 +139,6 @@ std = [
"frame-support/std",
"frame-system/std",
"scale-info/std",
"serde",
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
Expand Down
17 changes: 9 additions & 8 deletions c-pallets/cacher/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ edition = "2021"
log = { version = "0.4.14", default-features = false }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
frame-benchmarking = { version = '4.0.0-dev', default-features = false, git = 'https://github.com/CESSProject/substrate.git', branch = 'cess-polkadot-v0.9.36', optional = true}
frame-benchmarking = { version = '4.0.0-dev', default-features = false, git = 'https://github.com/CESSProject/substrate', branch = 'cess-polkadot-v0.9.42', optional = true}

[dev-dependencies]
sp-core = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate.git', default-features = false, branch = 'cess-polkadot-v0.9.36'}
pallet-balances = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-io = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate.git', default-features = false, branch = 'cess-polkadot-v0.9.36'}
sp-core = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate', default-features = false, branch = 'cess-polkadot-v0.9.42'}
pallet-balances = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
sp-io = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate', default-features = false, branch = 'cess-polkadot-v0.9.42'}

[features]
default = ["std"]
Expand All @@ -36,3 +36,4 @@ std = [
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
]

63 changes: 30 additions & 33 deletions c-pallets/file-bank/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,62 +23,61 @@ cp-scheduler-credit = { path = '../../primitives/scheduler-credit', version = '0
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
cp-enclave-verify = { path = '../../primitives/enclave-verify', version = '0.1.0', default-features = false }
pallet-oss = { path = '../oss', version = '0.7.0', default-features = false }
pallet-rrsc = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-grandpa = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-session = { version = "4.0.0-dev", default-features = false, features = ["historical"], git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
cessp-consensus-rrsc = { version = "0.10.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-rrsc = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-grandpa = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
# cessp-consensus-rrsc = { version = "0.10.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }

# substrate pallet
pallet-scheduler = { version = '4.0.0-dev', git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", default-features = false }
# sc-network = { version = "0.10.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-scheduler = { version = '4.0.0-dev', git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", default-features = false }
# sc-network = { version = "0.10.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }

[dependencies.frame-benchmarking]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'
optional = true

[dependencies.frame-support]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.frame-system]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.sp-io]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '7.0.0'

[dependencies.sp-std]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '5.0.0'

[dependencies.pallet-balances]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '4.0.0-dev'

[dependencies.sp-core]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '7.0.0'

[dependencies.sp-runtime]
default-features = false
git = 'https://github.com/CESSProject/substrate.git'
branch = "cess-polkadot-v0.9.36"
git = 'https://github.com/CESSProject/substrate'
branch = "cess-polkadot-v0.9.42"
version = '7.0.0'

# local dependencies
Expand All @@ -100,18 +99,16 @@ version = '0.7.0'
# dev dependencies
[dev-dependencies]
pallet-cess-staking = { path = '../staking', version = '4.0.0-dev', default-features = false}
frame-support-test = { git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", version = '3.0.0' }
pallet-scheduler = { git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", version = '4.0.0-dev' }
pallet-timestamp = { git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", version = '4.0.0-dev' }
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-session = { version = "4.0.0-dev", default-features = false, features = [
"historical",
], git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
frame-support-test = { git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", version = '3.0.0' }
pallet-scheduler = { git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", version = '4.0.0-dev' }
pallet-timestamp = { git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", version = '4.0.0-dev' }
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-session = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
pallet-scheduler-credit = { version = "0.1.0", default-features = false, path = '../scheduler-credit'}
pallet-preimage = { version = "4.0.0-dev", default-features = false, git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36" }
pallet-preimage = { version = "4.0.0-dev", default-features = false, git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42" }

[features]
default = ["std"]
Expand Down
16 changes: 8 additions & 8 deletions c-pallets/oss/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ edition = "2021"
log = { version = "0.4.14", default-features = false }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
frame-benchmarking = { version = '4.0.0-dev', default-features = false, git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", optional = true}
frame-benchmarking = { version = '4.0.0-dev', default-features = false, git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", optional = true}

[dev-dependencies]
sp-core = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate.git', default-features = false, branch = "cess-polkadot-v0.9.36"}
pallet-balances = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-io = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate.git', default-features = false, branch = "cess-polkadot-v0.9.36"}
sp-core = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate', default-features = false, branch = "cess-polkadot-v0.9.42"}
pallet-balances = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
sp-io = {version = '7.0.0', git = 'https://github.com/CESSProject/substrate', default-features = false, branch = "cess-polkadot-v0.9.42"}

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit 3de648b

Please sign in to comment.