Skip to content

Commit

Permalink
Upgrade to Polkadot v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jasl committed Aug 20, 2023
1 parent daac801 commit 02df825
Show file tree
Hide file tree
Showing 69 changed files with 2,751 additions and 3,155 deletions.
1,036 changes: 422 additions & 614 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ members = [
# TODO.kevin: Move back to crates.io once it released 1.0
derive_more = { version = "0.99.17", git = "https://github.com/JelteF/derive_more" }

sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-core-hashing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-core-hashing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }

# For pink-extension-runtime, it will introduce Substrate from crates-io which usually different with polkadot-branch
pink-extension = { path = "crates/pink/pink-extension" }
Expand Down
20 changes: 10 additions & 10 deletions crates/phactory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ prpc = { path = "../prpc" }
pink = { path = "../pink/runner", package = "pink-runner" }
pink-extension-runtime = { path = "../pink/pink-extension-runtime" }

sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", features = ["disable_target_static_assertions"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", features = ["disable_target_static_assertions"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
parity-scale-codec = { package = "parity-scale-codec", version = "3.3", default-features = false, features = ["derive", "full", "chain-error"] }
scopeguard = { version = "1.1", default-features = false }

Expand All @@ -56,11 +56,11 @@ derive_more = "0.99.0"
hash-db = { version = "0.16.0", default-features = false }
num = { package = "num-traits", version = "0.2", default-features = false }
finality-grandpa = { version = "0.16.1", default-features = false, features = ["derive-codec"] }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }

fixed = "1.9.0"
fixed-sqrt = "0.2.4"
Expand Down
10 changes: 5 additions & 5 deletions crates/phactory/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ phala-crypto = { path = "../../../crates/phala-crypto" }
phala-mq = { path = "../../../crates/phala-mq" }
chain = { path = "../../../standalone/runtime", default-features = false, package = "phala-node-runtime" }

sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, features = ["full_crypto"] }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, features = ["full_crypto"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["full_crypto"] }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["full_crypto"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
phala-git-revision = { path = "../../phala-git-revision" }

# for pruntime_client
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,35 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
},
{
"name": "Hash",
"type": 3
"type": null
}
],
"def": {
"composite": {
"fields": [
{
"name": "parent_hash",
"type": 4,
"type": 3,
"typeName": "Hash::Output"
},
{
"name": "number",
"type": 7,
"type": 6,
"typeName": "Number"
},
{
"name": "state_root",
"type": 4,
"type": 3,
"typeName": "Hash::Output"
},
{
"name": "extrinsics_root",
"type": 4,
"type": 3,
"typeName": "Hash::Output"
},
{
"name": "digest",
"type": 8,
"type": 7,
"typeName": "Digest"
}
]
Expand All @@ -76,19 +76,6 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
},
{
"id": 3,
"type": {
"path": [
"sp_runtime",
"traits",
"BlakeTwo256"
],
"def": {
"composite": {}
}
}
},
{
"id": 4,
"type": {
"path": [
"primitive_types",
Expand All @@ -98,7 +85,7 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
"composite": {
"fields": [
{
"type": 5,
"type": 4,
"typeName": "[u8; 32]"
}
]
Expand All @@ -107,26 +94,26 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
}
},
{
"id": 5,
"id": 4,
"type": {
"def": {
"array": {
"len": 32,
"type": 6
"type": 5
}
}
}
},
{
"id": 6,
"id": 5,
"type": {
"def": {
"primitive": "u8"
}
}
},
{
"id": 7,
"id": 6,
"type": {
"def": {
"compact": {
Expand All @@ -136,7 +123,7 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
}
},
{
"id": 8,
"id": 7,
"type": {
"path": [
"sp_runtime",
Expand All @@ -149,7 +136,7 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
"fields": [
{
"name": "logs",
"type": 9,
"type": 8,
"typeName": "Vec<DigestItem>"
}
]
Expand All @@ -158,17 +145,17 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
}
},
{
"id": 9,
"id": 8,
"type": {
"def": {
"sequence": {
"type": 10
"type": 9
}
}
}
},
{
"id": 10,
"id": 9,
"type": {
"path": [
"sp_runtime",
Expand All @@ -183,11 +170,11 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
"name": "PreRuntime",
"fields": [
{
"type": 11,
"type": 10,
"typeName": "ConsensusEngineId"
},
{
"type": 12,
"type": 11,
"typeName": "Vec<u8>"
}
],
Expand All @@ -197,11 +184,11 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
"name": "Consensus",
"fields": [
{
"type": 11,
"type": 10,
"typeName": "ConsensusEngineId"
},
{
"type": 12,
"type": 11,
"typeName": "Vec<u8>"
}
],
Expand All @@ -211,11 +198,11 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
"name": "Seal",
"fields": [
{
"type": 11,
"type": 10,
"typeName": "ConsensusEngineId"
},
{
"type": 12,
"type": 11,
"typeName": "Vec<u8>"
}
],
Expand All @@ -225,7 +212,7 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
"name": "Other",
"fields": [
{
"type": 12,
"type": 11,
"typeName": "Vec<u8>"
}
],
Expand All @@ -241,32 +228,32 @@ expression: "travel_types::<blocks::SyncParachainHeaderReq>()"
}
},
{
"id": 11,
"id": 10,
"type": {
"def": {
"array": {
"len": 4,
"type": 6
"type": 5
}
}
}
},
{
"id": 12,
"id": 11,
"type": {
"def": {
"sequence": {
"type": 6
"type": 5
}
}
}
},
{
"id": 13,
"id": 12,
"type": {
"def": {
"sequence": {
"type": 12
"type": 11
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ expression: "travel_types::<blocks::SyncCombinedHeadersReq>()"
},
{
"name": "Hash",
"type": 3
"type": null
}
],
"def": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ expression: "travel_types::<blocks::DispatchBlockReq>()"
},
{
"name": "Hash",
"type": 3
"type": null
}
],
"def": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ expression: "travel_types::<blocks::SyncHeaderReq>()"
},
{
"name": "Hash",
"type": 3
"type": null
}
],
"def": {
Expand Down
Loading

0 comments on commit 02df825

Please sign in to comment.