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-2730: bump subxt to 0.28 #1335

Merged
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d714d22
Bumb subxt to 0.26
ggawryal Aug 4, 2023
7a9eb7c
Bump subxt to 0.29 - dirty
ggawryal Aug 4, 2023
f12ed1e
Bump to 0.29 - cd
ggawryal Aug 4, 2023
26cb32a
Revert to 0.28
ggawryal Aug 4, 2023
3a87911
Update subxt in another crates
ggawryal Aug 7, 2023
4f3f0be
Update cliain
ggawryal Aug 7, 2023
05e7260
Update e2e tests
ggawryal Aug 8, 2023
361288c
Update locks
ggawryal Aug 8, 2023
1bd13fe
Cleanup
ggawryal Aug 8, 2023
c964e77
Remove substrate-compat feature from some crates
ggawryal Aug 8, 2023
47b3078
Clippy
ggawryal Aug 8, 2023
565f93e
More clippy
ggawryal Aug 8, 2023
ca1fb62
Clippy x3
ggawryal Aug 8, 2023
8a67c12
Fmt
ggawryal Aug 9, 2023
6c07858
Merge branch 'main' into a0-2730-bump-subxt-to-0.28
ggawryal Aug 11, 2023
16af8c0
Replace subxt::utils::AccountId with substrate's one
ggawryal Aug 16, 2023
6b19eff
Update aleph-client dependencies
ggawryal Aug 16, 2023
7965537
Liminal interface
ggawryal Aug 16, 2023
521c54a
Small polishing
ggawryal Aug 16, 2023
488d064
Fmt
ggawryal Aug 16, 2023
4e8c923
Rollback PolkadotExtrinsicParamsBuilder instead of substrate's one
ggawryal Aug 17, 2023
fe91e7c
Merge branch 'main' into a0-2730-bump-subxt-to-0.28
ggawryal Aug 17, 2023
b1f05de
Remove codegen script
ggawryal Aug 17, 2023
c7f805a
Update subxt-integration-entrypoint.sh
ggawryal Aug 17, 2023
3b0635d
Update subxt-integration-entrypoint.sh cd
ggawryal Aug 17, 2023
12d5353
Stress differences between AlephConfig and PolkadotConfig
ggawryal Aug 17, 2023
2a714fa
Merge branch 'main' into a0-2730-bump-subxt-to-0.28
ggawryal Aug 17, 2023
25550e0
Fix build and push cliain workflow
ggawryal Aug 17, 2023
95dc4df
Proper type sub
ggawryal Aug 17, 2023
4725bf1
Upd liminal
ggawryal Aug 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
790 changes: 330 additions & 460 deletions aleph-client/Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions aleph-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "aleph_client"
version = "3.4.2"
version = "3.5.0"
edition = "2021"
authors = ["Cardinal"]
documentation = "https://docs.rs/aleph_client"
Expand All @@ -20,7 +20,7 @@ thiserror = "1.0"
serde_json = { version = "1.0.94" }
contract-transcode = "2.1.0"
ink_metadata = { version = "=4.0.1" }
subxt = "0.25.0"
subxt = { version = "0.28.0", features = ["substrate-compat"] }
pmikolajczyk41 marked this conversation as resolved.
Show resolved Hide resolved
futures = "0.3.25"
serde = { version = "1.0", features = ["derive"] }

Expand Down
9 changes: 5 additions & 4 deletions aleph-client/docker/subxt-integration-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#!/usr/bin/env bash

subxt codegen --derive Clone --derive Debug --derive Eq --derive PartialEq | rustfmt --edition=2021 --config-path aleph-node/rustfmt.toml > aleph_zero.rs
subxt codegen --derive Clone --derive Debug --derive PartialEq --derive Eq \
| sed 's/::[ ]*subxt[ ]*::[ ]*utils[ ]*::[ ]*AccountId32/::subxt::utils::Static<::subxt::ext::sp_core::crypto::AccountId32>/g' \
pmikolajczyk41 marked this conversation as resolved.
Show resolved Hide resolved
| rustfmt --edition=2021 --config-path aleph-node/rustfmt.toml > aleph_zero.rs;

diff -y -W 200 --suppress-common-lines aleph_zero.rs aleph-node/aleph-client/src/aleph_zero.rs
diff_exit_code=$?
if [[ ! $diff_exit_code -eq 0 ]]; then
echo "Current runtime metadata is different than versioned in git!"
echo "Run subxt codegen --derive Clone --derive Debug --derive Eq --derive PartialEq | rustfmt --edition=2021 >" \
"src/aleph_zero.rs from aleph-client directory and commit to git."
exit 1
echo "Run subxt codegen command as in $(basename $0) from aleph-client directory and commit to git."
exit 1
fi
echo "Current runtime metadata and versioned in git matches."
Loading
Loading