Skip to content

Commit e5a8063

Browse files
committed
Update to Polkadot-SDK 1.6.0
1 parent f2ecc51 commit e5a8063

File tree

11 files changed

+898
-766
lines changed

11 files changed

+898
-766
lines changed

Cargo.lock

Lines changed: 795 additions & 666 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 89 additions & 89 deletions
Large diffs are not rendered by default.

docker/gha-runner.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ RUN \
3434
ENV PATH=$CARGO_HOME/bin:$PATH
3535

3636
RUN rustup target add wasm32-unknown-unknown
37+
RUN rustup component add rust-src
3738

3839
# Install cargo binstall, using it install cargo-risczero, and using it install risc0 toolchain.
3940
RUN curl \

sugondat/chain/node/src/cli.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ pub enum Subcommand {
3333
#[allow(missing_docs)]
3434
ExportGenesisMetadata(export_genesis_metadata::ExportGenesisMetadataCmd),
3535

36-
/// Export the genesis state of the parachain.
37-
ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand),
36+
/// Export the genesis head-data of the parachain.
37+
ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand),
3838

3939
/// Export the genesis wasm of the parachain.
4040
ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand),

sugondat/chain/node/src/command.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ pub fn run() -> Result<()> {
177177
Ok(())
178178
})
179179
},
180-
Some(Subcommand::ExportGenesisState(cmd)) => {
180+
Some(Subcommand::ExportGenesisHead(cmd)) => {
181181
let runner = cli.create_runner(cmd)?;
182182
runner.sync_run(|config| {
183183
let partials = new_partial(&config)?;
184184

185-
cmd.run(&*config.chain_spec, &*partials.client)
185+
cmd.run(partials.client)
186186
})
187187
},
188188
Some(Subcommand::ExportGenesisWasm(cmd)) => {

sugondat/chain/node/src/proposer.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
//!
1010
//! If any of these conditions are met, then the block is authored.
1111
12-
use anyhow::anyhow;
13-
1412
use sc_transaction_pool_api::TransactionPool;
1513
use sp_api::StorageProof;
1614
use sp_consensus::Proposal;
@@ -61,7 +59,7 @@ impl<P: ProposerInterface<Block> + Send> ProposerInterface<Block> for BlockLimit
6159
inherent_digests: Digest,
6260
max_duration: Duration,
6361
block_size_limit: Option<usize>,
64-
) -> Result<Proposal<Block, StorageProof>, ProposerError> {
62+
) -> Result<Option<Proposal<Block, StorageProof>>, ProposerError> {
6563
let has_downward_message = !paras_inherent_data.downward_messages.is_empty();
6664
let has_transactions = self.transaction_pool.status().ready > 0;
6765
let has_go_ahead = {
@@ -102,9 +100,7 @@ impl<P: ProposerInterface<Block> + Send> ProposerInterface<Block> for BlockLimit
102100
)
103101
.await
104102
} else {
105-
Err(ProposerError::proposing(anyhow!(
106-
"no need to create a block"
107-
)))
103+
Ok(None)
108104
}
109105
}
110106
}

sugondat/chain/pallets/blobs/src/mock.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ impl frame_system::Config for Test {
3131
type DbWeight = ();
3232
type RuntimeOrigin = RuntimeOrigin;
3333
type RuntimeCall = RuntimeCall;
34+
type RuntimeTask = RuntimeTask;
3435
type Nonce = u64;
3536
type Hash = H256;
3637
type Hashing = BlakeTwo256;

sugondat/chain/pallets/length-fee-adjustment/src/mock.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ impl frame_system::Config for Test {
3535
type DbWeight = ();
3636
type RuntimeOrigin = RuntimeOrigin;
3737
type RuntimeCall = RuntimeCall;
38+
type RuntimeTask = RuntimeTask;
3839
type Nonce = u64;
3940
type Hash = H256;
4041
type Hashing = BlakeTwo256;

sugondat/chain/runtimes/sugondat-kusama/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ impl frame_system::Config for Runtime {
189189
type AccountId = AccountId;
190190
/// The aggregated dispatch type that is available for extrinsics.
191191
type RuntimeCall = RuntimeCall;
192+
/// The overarching task type.
193+
type RuntimeTask = RuntimeTask;
192194
/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
193195
type Lookup = AccountIdLookup<AccountId, ()>;
194196
/// The index type for storing how many extrinsics an account has signed.

sugondat/chain/runtimes/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ parachain-info = { workspace = true }
7878
parachains-common = { workspace = true }
7979

8080
[dev-dependencies]
81-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.4.0"}
81+
sp-io = { workspace = true }
8282

8383
[features]
8484
default = [ "std" ]

0 commit comments

Comments
 (0)