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.

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-3513: bump #1497

Merged
merged 3 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
578 changes: 287 additions & 291 deletions Cargo.lock

Large diffs are not rendered by default.

160 changes: 80 additions & 80 deletions Cargo.toml

Large diffs are not rendered by default.

267 changes: 133 additions & 134 deletions aleph-client/Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion aleph-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ subxt = { version = "0.30.1", features = ["substrate-compat"] }
futures = "0.3.25"
serde = { version = "1.0", features = ["derive"] }

pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/polkadot-sdk.git", branch = "aleph-v1.1.0", default-features = false }
pallet-contracts-primitives = { git = "https://github.com/Cardinal-Cryptography/polkadot-sdk.git", branch = "aleph-v1.2.0", default-features = false }

primitives = { path = "../primitives" }

Expand Down
314 changes: 106 additions & 208 deletions aleph-client/src/aleph_zero.rs

Large diffs are not rendered by default.

312 changes: 105 additions & 207 deletions aleph-client/src/aleph_zero_liminal.rs

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions aleph-client/src/pallets/balances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use subxt::utils::{MultiAddress, Static};
use crate::{
aleph_zero::{self, api},
connections::TxInfo,
pallet_balances::{pallet::Call::transfer, types::BalanceLock},
pallet_balances::{pallet::Call::transfer_keep_alive, types::BalanceLock},
pallets::utility::UtilityApi,
AccountId, AsConnection, Balance, BlockHash,
Call::Balances,
Expand Down Expand Up @@ -41,17 +41,17 @@ pub trait BalanceApi {
/// Pallet balances API
#[async_trait::async_trait]
pub trait BalanceUserApi {
/// API for [`transfer`](https://paritytech.github.io/substrate/master/pallet_balances/pallet/struct.Pallet.html#method.transfer) call.
async fn transfer(
/// API for [`transfer_keep_alive`](https://paritytech.github.io/polkadot-sdk/master/pallet_balances/pallet/struct.Pallet.html#method.transfer_keep_alive) call.
async fn transfer_keep_alive(
&self,
dest: AccountId,
amount: Balance,
status: TxStatus,
) -> anyhow::Result<TxInfo>;

/// API for [`transfer`](https://paritytech.github.io/substrate/master/pallet_balances/pallet/struct.Pallet.html#method.transfer) call.
/// API for [`transfer_keep_alive`](https://paritytech.github.io/polkadot-sdk/master/pallet_balances/pallet/struct.Pallet.html#method.transfer_keep_alive) call.
/// Include tip in the tx.
async fn transfer_with_tip(
async fn transfer_keep_alive_with_tip(
&self,
dest: AccountId,
amount: Balance,
Expand All @@ -63,7 +63,7 @@ pub trait BalanceUserApi {
/// Pallet balances logic not directly related to any pallet call.
#[async_trait::async_trait]
pub trait BalanceUserBatchExtApi {
/// Performs batch of `balances.transfer` calls.
/// Performs batch of `balances.transfer_keep_alive` calls.
/// * `dest` - a list of accounts to send tokens to
/// * `amount` - an amount to transfer
/// * `status` - a [`TxStatus`] for a tx to wait for
Expand All @@ -72,12 +72,12 @@ pub trait BalanceUserBatchExtApi {
/// ```ignore
/// for chunk in stash_accounts.chunks(1024) {
/// connection
/// .batch_transfer(chunk, 1_000_000_000_000u128, TxStatus::InBlock)
/// .batch_transfer_keep_alive(chunk, 1_000_000_000_000u128, TxStatus::InBlock)
/// .await
/// .unwrap();
/// }
/// ```
async fn batch_transfer(
async fn batch_transfer_keep_alive(
&self,
dest: &[AccountId],
amount: Balance,
Expand Down Expand Up @@ -129,19 +129,19 @@ impl<C: ConnectionApi + AsConnection> BalanceApi for C {

#[async_trait::async_trait]
impl<S: SignedConnectionApi> BalanceUserApi for S {
async fn transfer(
async fn transfer_keep_alive(
&self,
dest: AccountId,
amount: Balance,
status: TxStatus,
) -> anyhow::Result<TxInfo> {
let tx = api::tx()
.balances()
.transfer(MultiAddress::Id(dest.into()), amount);
.transfer_keep_alive(MultiAddress::Id(dest.into()), amount);
self.send_tx(tx, status).await
}

async fn transfer_with_tip(
async fn transfer_keep_alive_with_tip(
&self,
dest: AccountId,
amount: Balance,
Expand All @@ -150,7 +150,7 @@ impl<S: SignedConnectionApi> BalanceUserApi for S {
) -> anyhow::Result<TxInfo> {
let tx = api::tx()
.balances()
.transfer(MultiAddress::Id(dest.into()), amount);
.transfer_keep_alive(MultiAddress::Id(dest.into()), amount);

self.send_tx_with_params(tx, ParamsBuilder::new().tip(tip), status)
.await
Expand All @@ -159,7 +159,7 @@ impl<S: SignedConnectionApi> BalanceUserApi for S {

#[async_trait::async_trait]
impl<S: SignedConnectionApi> BalanceUserBatchExtApi for S {
async fn batch_transfer(
async fn batch_transfer_keep_alive(
&self,
dests: &[AccountId],
amount: Balance,
Expand All @@ -168,7 +168,7 @@ impl<S: SignedConnectionApi> BalanceUserBatchExtApi for S {
let calls = dests
.iter()
.map(|dest| {
Balances(transfer {
Balances(transfer_keep_alive {
dest: MultiAddress::Id(dest.clone().into()),
value: amount,
})
Expand Down
2 changes: 1 addition & 1 deletion baby-liminal-extension/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ scale = { package = "parity-scale-codec", version = "3", default-features = fals
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }

obce = { git = "https://github.com/727-Ventures/obce", rev = "5e3da417c2189ddd4e9ef82cd586f8ec94b8952a", default-features = false }
sp-io = { git = "https://github.com/Cardinal-Cryptography/polkadot-sdk.git", branch = "aleph-v1.1.0", default-features = false, features = ["disable_panic_handler", "disable_oom"] }
sp-io = { git = "https://github.com/Cardinal-Cryptography/polkadot-sdk.git", branch = "aleph-v1.2.0", default-features = false, features = ["disable_panic_handler", "disable_oom"] }

pallet-baby-liminal = { path = "../pallets/baby-liminal", default-features = false, optional = true }

Expand Down
Loading
Loading