Skip to content

Commit 3de648b

Browse files
ytqaljnytqaljn
authored
Upgrade frame 0.9.42 (#236)
* refactor: upgrade to 0.9.42 * refactor: upgrade frame and evm version
1 parent dc2e341 commit 3de648b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+7053
-3570
lines changed

‎Cargo.lock

+3,498-1,475
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎c-pallets/audit/Cargo.toml

+31-34
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ readme = "README.md"
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

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

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

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

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

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

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

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

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

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

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

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

8282
# local dependencies
@@ -105,31 +105,29 @@ version = '0.7.0'
105105

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

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

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

124124
[dev-dependencies]
125125
pallet-cess-staking = { path = '../staking', version = '4.0.0-dev', default-features = false}
126-
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
127-
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
128-
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" }
129-
pallet-session = { version = "4.0.0-dev", default-features = false, features = [
130-
"historical",
131-
], git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
132-
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
126+
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
127+
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
128+
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
129+
pallet-session = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
130+
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
133131
pallet-scheduler-credit = { version = "0.1.0", default-features = false, path = '../scheduler-credit'}
134132
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
135133
pallet-oss = { path = '../oss', version = '0.7.0', default-features = false }
@@ -141,7 +139,6 @@ std = [
141139
"frame-support/std",
142140
"frame-system/std",
143141
"scale-info/std",
144-
"serde",
145142
"sp-io/std",
146143
"sp-runtime/std",
147144
"sp-std/std",

‎c-pallets/cacher/Cargo.toml

+9-8
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ edition = "2021"
77
log = { version = "0.4.14", default-features = false }
88
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
99
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
10-
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
11-
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
12-
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
13-
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
10+
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
11+
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
12+
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
13+
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
1414
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
15-
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}
15+
frame-benchmarking = { version = '4.0.0-dev', default-features = false, git = 'https://github.com/CESSProject/substrate', branch = 'cess-polkadot-v0.9.42', optional = true}
1616

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

2222
[features]
2323
default = ["std"]
@@ -36,3 +36,4 @@ std = [
3636
runtime-benchmarks = [
3737
"frame-benchmarking/runtime-benchmarks",
3838
]
39+

‎c-pallets/file-bank/Cargo.toml

+30-33
Original file line numberDiff line numberDiff line change
@@ -23,62 +23,61 @@ cp-scheduler-credit = { path = '../../primitives/scheduler-credit', version = '0
2323
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
2424
cp-enclave-verify = { path = '../../primitives/enclave-verify', version = '0.1.0', default-features = false }
2525
pallet-oss = { path = '../oss', version = '0.7.0', default-features = false }
26-
pallet-rrsc = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
27-
pallet-grandpa = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
28-
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" }
29-
cessp-consensus-rrsc = { version = "0.10.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
26+
pallet-rrsc = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
27+
pallet-grandpa = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
28+
# cessp-consensus-rrsc = { version = "0.10.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
3029

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

3534
[dependencies.frame-benchmarking]
3635
default-features = false
37-
git = 'https://github.com/CESSProject/substrate.git'
38-
branch = "cess-polkadot-v0.9.36"
36+
git = 'https://github.com/CESSProject/substrate'
37+
branch = "cess-polkadot-v0.9.42"
3938
version = '4.0.0-dev'
4039
optional = true
4140

4241
[dependencies.frame-support]
4342
default-features = false
44-
git = 'https://github.com/CESSProject/substrate.git'
45-
branch = "cess-polkadot-v0.9.36"
43+
git = 'https://github.com/CESSProject/substrate'
44+
branch = "cess-polkadot-v0.9.42"
4645
version = '4.0.0-dev'
4746

4847
[dependencies.frame-system]
4948
default-features = false
50-
git = 'https://github.com/CESSProject/substrate.git'
51-
branch = "cess-polkadot-v0.9.36"
49+
git = 'https://github.com/CESSProject/substrate'
50+
branch = "cess-polkadot-v0.9.42"
5251
version = '4.0.0-dev'
5352

5453
[dependencies.sp-io]
5554
default-features = false
56-
git = 'https://github.com/CESSProject/substrate.git'
57-
branch = "cess-polkadot-v0.9.36"
55+
git = 'https://github.com/CESSProject/substrate'
56+
branch = "cess-polkadot-v0.9.42"
5857
version = '7.0.0'
5958

6059
[dependencies.sp-std]
6160
default-features = false
62-
git = 'https://github.com/CESSProject/substrate.git'
63-
branch = "cess-polkadot-v0.9.36"
61+
git = 'https://github.com/CESSProject/substrate'
62+
branch = "cess-polkadot-v0.9.42"
6463
version = '5.0.0'
6564

6665
[dependencies.pallet-balances]
6766
default-features = false
68-
git = 'https://github.com/CESSProject/substrate.git'
69-
branch = "cess-polkadot-v0.9.36"
67+
git = 'https://github.com/CESSProject/substrate'
68+
branch = "cess-polkadot-v0.9.42"
7069
version = '4.0.0-dev'
7170

7271
[dependencies.sp-core]
7372
default-features = false
74-
git = 'https://github.com/CESSProject/substrate.git'
75-
branch = "cess-polkadot-v0.9.36"
73+
git = 'https://github.com/CESSProject/substrate'
74+
branch = "cess-polkadot-v0.9.42"
7675
version = '7.0.0'
7776

7877
[dependencies.sp-runtime]
7978
default-features = false
80-
git = 'https://github.com/CESSProject/substrate.git'
81-
branch = "cess-polkadot-v0.9.36"
79+
git = 'https://github.com/CESSProject/substrate'
80+
branch = "cess-polkadot-v0.9.42"
8281
version = '7.0.0'
8382

8483
# local dependencies
@@ -100,18 +99,16 @@ version = '0.7.0'
10099
# dev dependencies
101100
[dev-dependencies]
102101
pallet-cess-staking = { path = '../staking', version = '4.0.0-dev', default-features = false}
103-
frame-support-test = { git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", version = '3.0.0' }
104-
pallet-scheduler = { git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", version = '4.0.0-dev' }
105-
pallet-timestamp = { git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36", version = '4.0.0-dev' }
106-
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
107-
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
108-
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" }
109-
pallet-session = { version = "4.0.0-dev", default-features = false, features = [
110-
"historical",
111-
], git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
112-
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
102+
frame-support-test = { git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", version = '3.0.0' }
103+
pallet-scheduler = { git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", version = '4.0.0-dev' }
104+
pallet-timestamp = { git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", version = '4.0.0-dev' }
105+
sp-staking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
106+
sp-npos-elections = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
107+
frame-election-provider-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
108+
pallet-session = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
109+
pallet-bags-list = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
113110
pallet-scheduler-credit = { version = "0.1.0", default-features = false, path = '../scheduler-credit'}
114-
pallet-preimage = { version = "4.0.0-dev", default-features = false, git = 'https://github.com/CESSProject/substrate.git', branch = "cess-polkadot-v0.9.36" }
111+
pallet-preimage = { version = "4.0.0-dev", default-features = false, git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42" }
115112

116113
[features]
117114
default = ["std"]

‎c-pallets/oss/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ edition = "2021"
77
log = { version = "0.4.14", default-features = false }
88
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
99
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
10-
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
11-
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
12-
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
13-
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.36" }
10+
sp-std = { version = "5.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
11+
sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
12+
frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
13+
frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate", branch = "cess-polkadot-v0.9.42" }
1414
cp-cess-common = { path = '../../primitives/common', version = '0.1.0', default-features = false }
15-
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}
15+
frame-benchmarking = { version = '4.0.0-dev', default-features = false, git = 'https://github.com/CESSProject/substrate', branch = "cess-polkadot-v0.9.42", optional = true}
1616

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

2222
[features]
2323
default = ["std"]

0 commit comments

Comments
 (0)