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-1902: update to 0.9.33 #923

Merged
merged 13 commits into from
Feb 17, 2023
Merged

A0-1902: update to 0.9.33 #923

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9d006de
change fork version to 0.9.33
maciejnems Feb 13, 2023
fffd55f
update dependencies
maciejnems Feb 13, 2023
b065526
no longer block id
maciejnems Feb 13, 2023
5b787e7
add max winners bound to elections
maciejnems Feb 13, 2023
2c7de0f
fix lint
maciejnems Feb 13, 2023
4cf3f6d
fix pallets contract and nomination pools
maciejnems Feb 13, 2023
9a0f825
subxt code gen
maciejnems Feb 14, 2023
b51fe0a
determinism arg in cliain and aleph-client
maciejnems Feb 14, 2023
b927ef2
update other cargo.locks
maciejnems Feb 14, 2023
d74e01d
substrate uses try-runtime in Cargo.toml like that
maciejnems Feb 14, 2023
a9a32c1
Merge branch 'main' into A0-1902-update-to-0.9.33
maciejnems Feb 14, 2023
ed0c417
bump spec version
maciejnems Feb 15, 2023
c75419c
Merge branch 'main' into A0-1902-update-to-0.9.33
maciejnems Feb 17, 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
454 changes: 219 additions & 235 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

153 changes: 77 additions & 76 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.32" }
sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.32" }
pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.32" }
frame-support = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.33" }
sp-runtime = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.33" }
pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.33" }
primitives = { path = "../primitives" }

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

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions aleph-client/src/pallets/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ use pallet_contracts_primitives::ContractExecResult;
use subxt::{ext::sp_core::Bytes, rpc_params};

use crate::{
api, pallet_contracts::wasm::OwnerInfo, sp_weights::weight_v2::Weight, AccountId, Balance,
BlockHash, CodeHash, ConnectionApi, SignedConnectionApi, TxInfo, TxStatus,
api,
pallet_contracts::wasm::{Determinism, OwnerInfo},
sp_weights::weight_v2::Weight,
AccountId, Balance, BlockHash, CodeHash, ConnectionApi, SignedConnectionApi, TxInfo, TxStatus,
};

/// Arguments to [`ContractRpc::call_and_get`].
Expand Down Expand Up @@ -42,6 +44,7 @@ pub trait ContractsUserApi {
&self,
code: Vec<u8>,
storage_limit: Option<Compact<Balance>>,
determinism: Determinism,
status: TxStatus,
) -> anyhow::Result<TxInfo>;

Expand Down Expand Up @@ -115,9 +118,12 @@ impl<S: SignedConnectionApi> ContractsUserApi for S {
&self,
code: Vec<u8>,
storage_limit: Option<Compact<Balance>>,
determinism: Determinism,
status: TxStatus,
) -> anyhow::Result<TxInfo> {
let tx = api::tx().contracts().upload_code(code, storage_limit);
let tx = api::tx()
.contracts()
.upload_code(code, storage_limit, determinism);

self.send_tx(tx, status).await
}
Expand Down
Loading