Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A0-1906: bump substrate to 0.9.37 #941

Merged
merged 43 commits into from
Feb 24, 2023
Merged

A0-1906: bump substrate to 0.9.37 #941

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
250eae7
change fork version to 0.9.34
maciejnems Feb 14, 2023
bf47d0d
pallet contracts UnsafeUnstableInterface set to false
maciejnems Feb 14, 2023
1ff0190
subxt code gen
maciejnems Feb 14, 2023
98958ac
temporarily remove fee calculation test
maciejnems Feb 14, 2023
130896a
fix build
maciejnems Feb 15, 2023
f59cee4
change fork version to aleph-0.9.34
maciejnems Feb 15, 2023
66b2a01
bump spec version to 52
maciejnems Feb 17, 2023
a288e3d
move comment up
maciejnems Feb 17, 2023
bd40a42
change fork version to wip-0.9.35
maciejnems Feb 17, 2023
4c9566d
fix pruning arguments
maciejnems Feb 17, 2023
78842be
fix weight changes
maciejnems Feb 17, 2023
7dca2ba
update jsonspree
maciejnems Feb 17, 2023
c49e44c
fix compiler error
kostekIV Feb 20, 2023
bdeed39
Merge remote-tracking branch 'origin/main' into A0-1904-update-to-0.9.35
kostekIV Feb 20, 2023
710598a
rm wip
kostekIV Feb 20, 2023
44add86
lock
kostekIV Feb 21, 2023
eee48c4
Merge branch 'main' into A0-1904-update-to-0.9.35
kostekIV Feb 21, 2023
860f57e
spec
kostekIV Feb 21, 2023
1626c4b
aleph
kostekIV Feb 21, 2023
d4193d2
lint
kostekIV Feb 21, 2023
38d90a9
lint
kostekIV Feb 21, 2023
d65e8e5
Merge remote-tracking branch 'origin/main' into A0-1904-update-to-0.9.35
kostekIV Feb 21, 2023
cdbcd5a
cleanup
kostekIV Feb 21, 2023
425c551
update
kostekIV Feb 21, 2023
80fad0e
Merge remote-tracking branch 'origin/main' into A0-1905
kostekIV Feb 22, 2023
11fe455
bump spec
kostekIV Feb 22, 2023
29c34c3
set contracts-transcode version
kostekIV Feb 22, 2023
5f7f542
locks
kostekIV Feb 22, 2023
71077d3
fix try-runtime
kostekIV Feb 22, 2023
82f040a
bump substrate
kostekIV Feb 22, 2023
ed89f90
adjust runtime
kostekIV Feb 22, 2023
840d500
fix node
kostekIV Feb 22, 2023
8b1f444
Merge remote-tracking branch 'origin/main' into A0-1906
kostekIV Feb 22, 2023
0cdba55
update aleph-client
kostekIV Feb 22, 2023
ceb5452
update adder toolchain
kostekIV Feb 23, 2023
03d9d30
fix tests
kostekIV Feb 23, 2023
4d6c4b2
dont panic
kostekIV Feb 23, 2023
9b055e2
Merge branch 'main' into A0-1906
kostekIV Feb 23, 2023
9d3fb26
revert toolchain
kostekIV Feb 23, 2023
e3f56ca
Merge remote-tracking branch 'origin/A0-1906' into A0-1906
kostekIV Feb 23, 2023
b8d3304
nightly
kostekIV Feb 23, 2023
37c6f8e
skip adder
kostekIV Feb 23, 2023
618cbbe
...
kostekIV Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,724 changes: 1,354 additions & 370 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

271 changes: 145 additions & 126 deletions aleph-client/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions aleph-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ subxt = "0.25.0"
futures = "0.3.25"
serde = { version = "1.0", features = ["derive"] }

frame-support = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
frame-support = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
primitives = { path = "../primitives" }

[dev-dependencies]
Expand Down
452 changes: 284 additions & 168 deletions aleph-client/src/aleph_zero.rs
View file
Open in desktop

Large diffs are not rendered by default.

279 changes: 149 additions & 130 deletions benches/payout-stakers/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions benches/payout-stakers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ log = "0.4"
futures = "0.3.25"
rand = "0.8.5"

sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36", features = ["full_crypto"] }
sp-keyring = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37", features = ["full_crypto"] }
sp-keyring = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }

subxt = "0.25.0"
tokio = { version = "1.21.2", features = ["full"] }
Expand Down
380 changes: 199 additions & 181 deletions bin/cliain/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bin/cliain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ env_logger = "0.8"
hex = "0.4.3"
ink_metadata = { version = "4.0.0-beta", features = ["derive"] }
log = "0.4"
pallet-staking = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
pallet-staking = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
primitives = { path = "../../primitives" }
serde = { version = "1.0.137", features = ["derive"] }
serde_json = "1.0.81"
sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36", features = ["full_crypto"] }
sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37", features = ["full_crypto"] }
tokio = { version = "1.21.2", features = ["full"] }
subxt = "0.25.0"

Expand Down
72 changes: 36 additions & 36 deletions bin/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,51 +26,51 @@ hex-literal = "0.3"
libp2p = "0.49.0"
thiserror = "1.0"

sp-application-crypto = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-block-builder = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-chain-spec = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36"}
sc-cli = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-executor = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-service = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-telemetry = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-keystore = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-keystore = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-inherents = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-basic-authorship = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-network = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-transaction-pool = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-transaction-pool = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-transaction-pool-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-consensus-aura = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-consensus-aura = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-consensus = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-consensus = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-client-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-timestamp = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
pallet-staking = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
try-runtime-cli = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36", optional = true }
sc-consensus-slots = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-arithmetic = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-io = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-application-crypto = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-block-builder = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-chain-spec = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37"}
sc-cli = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-core = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-executor = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-service = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-telemetry = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-keystore = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-keystore = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-inherents = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-basic-authorship = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-network = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-transaction-pool = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-transaction-pool = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-transaction-pool-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-consensus-aura = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-consensus-aura = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-consensus = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-consensus = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-client-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-timestamp = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
pallet-staking = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
try-runtime-cli = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37", optional = true }
sc-consensus-slots = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-arithmetic = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-io = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }

aleph-runtime = { path = "../runtime" }
finality-aleph = { path = "../../finality-aleph" }
aleph-primitives = { package = "primitives", path = "../../primitives" }

# These dependencies are used for the node's RPCs
jsonrpsee = { version = "0.16.2", features = ["server"] }
sc-rpc = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-rpc-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-blockchain = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sp-block-builder = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
substrate-frame-rpc-system = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
pallet-transaction-payment-rpc = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
sc-rpc = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sc-rpc-api = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-blockchain = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
sp-block-builder = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
substrate-frame-rpc-system = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }
pallet-transaction-payment-rpc = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.36" }
substrate-build-script-utils = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.37" }

[features]
default = []
Expand Down
4 changes: 2 additions & 2 deletions bin/node/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use sc_cli::{clap::Parser, CliConfiguration, DatabasePruningMode, PruningParams,
use sc_network::config::Role;
use sc_service::{Configuration, PartialComponents};

fn default_state_pruning() -> DatabasePruningMode {
DatabasePruningMode::Archive
fn default_state_pruning() -> Option<DatabasePruningMode> {
Some(DatabasePruningMode::Archive)
}

fn default_blocks_pruning() -> DatabasePruningMode {
Expand Down
12 changes: 10 additions & 2 deletions bin/node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,16 @@ impl finality_aleph::BlockchainBackend<Block> for BlockchainBackendImpl {
}
fn header(
&self,
block_id: sp_api::BlockId<Block>,
block_id: BlockId<Block>,
) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
self.backend.blockchain().header(block_id)
let hash = match block_id {
BlockId::Hash(h) => h,
BlockId::Number(n) => self
.backend
.blockchain()
.hash(n)?
.expect(&format!("Hash should be known for block #{:?}", n)),
DamianStraszak marked this conversation as resolved.
Show resolved Hide resolved
};
self.backend.blockchain().header(hash)
}
}
Loading