latest cargo-chef

Joystream · May 2, 2023 · 5a9daad · 5a9daad
1 parent 3887173
commit 5a9daad
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/utils/call-sizes/Cargo.toml b/bin/utils/call-sizes/Cargo.toml
@@ -23,5 +23,5 @@ pallet-constitution = { package = 'pallet-constitution', default-features = fals
 staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../../../runtime-modules/staking-handler'}
 bounty = { package = 'pallet-bounty', default-features = false, path = '../../../runtime-modules/bounty'}
 content = { package = 'pallet-content', default-features = false, path = '../../../runtime-modules/content'}
-joystream-utility = { package = 'pallet-utility', default-features = false, path = '../../../runtime-modules/utility'}
+joystream-utility = { package = 'pallet-joystream-utility', default-features = false, path = '../../../runtime-modules/utility'}
 project-token = { package = 'pallet-project-token', default-features = false, path = '../../../runtime-modules/project-token'}
diff --git a/joystream-node.Dockerfile b/joystream-node.Dockerfile
@@ -9,9 +9,7 @@ RUN rustup default nightly-2022-11-15
 RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2022-11-15
 RUN rustup component add --toolchain nightly-2022-11-15 clippy
 RUN rustup install nightly
-# Temporary build fix by using older version of cargo-chef
-# https://github.com/Joystream/joystream/issues/4745
-RUN cargo +nightly install cargo-chef@0.1.57
+RUN cargo +nightly install cargo-chef@0.1.59 --locked
 
 FROM rust AS planner
 LABEL description="Cargo chef prepare"

diff --git a/runtime-modules/utility/Cargo.toml b/runtime-modules/utility/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = 'pallet-utility'
+name = 'pallet-joystream-utility'
 version = '2.0.0'
 authors = ['Joystream contributors']
 edition = '2018'

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -62,7 +62,7 @@ pallet-staking = { package = 'pallet-staking', default-features = false, git = '
 pallet-timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
 pallet-balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
 pallet-im-online = { package = 'pallet-im-online', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
-substrate-utility = { package = 'pallet-utility', version = "4.0.0-dev", default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
+substrate-utility = { package = 'pallet-utility', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
 pallet-vesting = { package = 'pallet-vesting', default-features = false, git = 'https://github.com/joystream/substrate', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e' }
 pallet-multisig = { package = 'pallet-multisig', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
 pallet-staking-runtime-api = { package = 'pallet-staking-runtime-api', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '50cf239147a6f569e563bcadec6c7a1c5ad5c67e'}
@@ -90,7 +90,7 @@ pallet-constitution = { package = 'pallet-constitution', default-features = fals
 staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../runtime-modules/staking-handler'}
 bounty = { package = 'pallet-bounty', default-features = false, path = '../runtime-modules/bounty'}
 content = { package = 'pallet-content', default-features = false, path = '../runtime-modules/content'}
-joystream-utility = { package = 'pallet-utility', default-features = false, path = '../runtime-modules/utility'}
+joystream-utility = { package = 'pallet-joystream-utility', default-features = false, path = '../runtime-modules/utility'}
 project-token = { package = 'pallet-project-token', default-features = false, path = '../runtime-modules/project-token'}
 
 [dev-dependencies]