Skip to content

Commit 7a6ad96

Browse files
clangenbbrenzi
andauthored
Support Extrinsiv V5 (#1724)
* update api-client and integrate extrinsic v5 (service compiles) * integritee-cli compiles * bump api-client to fix no-std issue * fix deprecated warning * fmt * fix clippy * Revert Unnecessary change * bump integritee-node in CI * add unit tests for parsing the extrinsics * add rountrip test for opaque xt v5 * Fix: use correct signature type in parentc * typo * add unit test for extrinsic factory * fix registration * fix clippy * fmt * change branch of the api-client * more unit tests * add unit tests for handling general transaction * remove obsolete commented logs * bump v0.17.0 * add unit test showcasing how we can identify the xt version * add unit test for bare_extrinsic of integritee * cargo fmt --------- Co-authored-by: Alain Brenzikofer <alain@integritee.network>
1 parent f4a2b32 commit 7a6ad96

File tree

28 files changed

+447
-207
lines changed

28 files changed

+447
-207
lines changed

.github/workflows/build_and_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ jobs:
315315
echo "PROJECT=${{ matrix.flavor_id }}-${{ matrix.demo_name }}" >> $GITHUB_ENV
316316
echo "VERSION=dev.$version" >> $GITHUB_ENV
317317
echo "WORKER_IMAGE_TAG=integritee-worker:dev.$version" >> $GITHUB_ENV
318-
echo "INTEGRITEE_NODE=integritee-node:1.13.0.$version" >> $GITHUB_ENV
318+
echo "INTEGRITEE_NODE=integritee-node:1.18.8.$version" >> $GITHUB_ENV
319319
echo "CLIENT_IMAGE_TAG=integritee-cli:dev.$version" >> $GITHUB_ENV
320320
if [[ ${{ matrix.sgx_mode }} == 'HW' ]]; then
321321
echo "SGX_PROVISION=/dev/sgx/provision" >> $GITHUB_ENV
@@ -360,8 +360,8 @@ jobs:
360360
fi
361361
docker tag integritee-worker-${{ env.IMAGE_SUFFIX }} ${{ env.WORKER_IMAGE_TAG }}
362362
docker tag integritee-cli-client-${{ env.IMAGE_SUFFIX }} ${{ env.CLIENT_IMAGE_TAG }}
363-
docker pull integritee/integritee-node:1.13.0
364-
docker tag integritee/integritee-node:1.13.0 ${{ env.INTEGRITEE_NODE }}
363+
docker pull integritee/integritee-node:1.18.8
364+
docker tag integritee/integritee-node:1.18.8 ${{ env.INTEGRITEE_NODE }}
365365
docker images --all
366366
367367
##

Cargo.lock

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies = [
1515
[[package]]
1616
name = "ac-compose-macros"
1717
version = "0.4.2"
18-
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#84655ae1c4cf0ea7f45aee7ce7935dae027f9ae6"
18+
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-integritee-patch#946f3ae82c5d48023107c1890728582561e94725"
1919
dependencies = [
2020
"ac-primitives",
2121
"log 0.4.22",
@@ -25,7 +25,7 @@ dependencies = [
2525
[[package]]
2626
name = "ac-node-api"
2727
version = "0.5.1"
28-
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#84655ae1c4cf0ea7f45aee7ce7935dae027f9ae6"
28+
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-integritee-patch#946f3ae82c5d48023107c1890728582561e94725"
2929
dependencies = [
3030
"ac-primitives",
3131
"bitvec",
@@ -50,10 +50,11 @@ dependencies = [
5050
[[package]]
5151
name = "ac-primitives"
5252
version = "0.9.0"
53-
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#84655ae1c4cf0ea7f45aee7ce7935dae027f9ae6"
53+
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-integritee-patch#946f3ae82c5d48023107c1890728582561e94725"
5454
dependencies = [
5555
"frame-system",
5656
"impl-serde",
57+
"impl-trait-for-tuples",
5758
"pallet-assets",
5859
"pallet-balances",
5960
"parity-scale-codec",
@@ -235,7 +236,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
235236
dependencies = [
236237
"proc-macro2",
237238
"quote",
238-
"syn 2.0.32",
239+
"syn 2.0.106",
239240
]
240241

241242
[[package]]
@@ -1717,7 +1718,7 @@ dependencies = [
17171718
"proc-macro-warning",
17181719
"proc-macro2",
17191720
"quote",
1720-
"syn 2.0.32",
1721+
"syn 2.0.106",
17211722
]
17221723

17231724
[[package]]
@@ -1729,7 +1730,7 @@ dependencies = [
17291730
"proc-macro-crate",
17301731
"proc-macro2",
17311732
"quote",
1732-
"syn 2.0.32",
1733+
"syn 2.0.106",
17331734
]
17341735

17351736
[[package]]
@@ -1739,7 +1740,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.4
17391740
dependencies = [
17401741
"proc-macro2",
17411742
"quote",
1742-
"syn 2.0.32",
1743+
"syn 2.0.106",
17431744
]
17441745

17451746
[[package]]
@@ -1908,7 +1909,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
19081909
dependencies = [
19091910
"proc-macro2",
19101911
"quote",
1911-
"syn 2.0.32",
1912+
"syn 2.0.106",
19121913
]
19131914

19141915
[[package]]
@@ -2520,13 +2521,13 @@ dependencies = [
25202521

25212522
[[package]]
25222523
name = "impl-trait-for-tuples"
2523-
version = "0.2.2"
2524+
version = "0.2.3"
25242525
source = "registry+https://github.com/rust-lang/crates.io-index"
2525-
checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
2526+
checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
25262527
dependencies = [
25272528
"proc-macro2",
25282529
"quote",
2529-
"syn 1.0.109",
2530+
"syn 2.0.106",
25302531
]
25312532

25322533
[[package]]
@@ -2580,7 +2581,7 @@ dependencies = [
25802581

25812582
[[package]]
25822583
name = "integritee-cli"
2583-
version = "0.16.7"
2584+
version = "0.17.0"
25842585
dependencies = [
25852586
"array-bytes 6.1.0",
25862587
"base58",
@@ -2639,7 +2640,7 @@ dependencies = [
26392640

26402641
[[package]]
26412642
name = "integritee-service"
2642-
version = "0.16.7"
2643+
version = "0.17.0"
26432644
dependencies = [
26442645
"anyhow",
26452646
"async-trait",
@@ -5157,7 +5158,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
51575158
dependencies = [
51585159
"proc-macro2",
51595160
"quote",
5160-
"syn 2.0.32",
5161+
"syn 2.0.106",
51615162
]
51625163

51635164
[[package]]
@@ -5685,7 +5686,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
56855686
dependencies = [
56865687
"proc-macro2",
56875688
"quote",
5688-
"syn 2.0.32",
5689+
"syn 2.0.106",
56895690
]
56905691

56915692
[[package]]
@@ -5841,14 +5842,14 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
58415842
dependencies = [
58425843
"proc-macro2",
58435844
"quote",
5844-
"syn 2.0.32",
5845+
"syn 2.0.106",
58455846
]
58465847

58475848
[[package]]
58485849
name = "proc-macro2"
5849-
version = "1.0.66"
5850+
version = "1.0.101"
58505851
source = "registry+https://github.com/rust-lang/crates.io-index"
5851-
checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
5852+
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
58525853
dependencies = [
58535854
"unicode-ident",
58545855
]
@@ -5934,9 +5935,9 @@ dependencies = [
59345935

59355936
[[package]]
59365937
name = "quote"
5937-
version = "1.0.33"
5938+
version = "1.0.40"
59385939
source = "registry+https://github.com/rust-lang/crates.io-index"
5939-
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
5940+
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
59405941
dependencies = [
59415942
"proc-macro2",
59425943
]
@@ -6162,7 +6163,7 @@ checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa"
61626163
dependencies = [
61636164
"proc-macro2",
61646165
"quote",
6165-
"syn 2.0.32",
6166+
"syn 2.0.106",
61666167
]
61676168

61686169
[[package]]
@@ -6859,7 +6860,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
68596860
dependencies = [
68606861
"proc-macro2",
68616862
"quote",
6862-
"syn 2.0.32",
6863+
"syn 2.0.106",
68636864
]
68646865

68656866
[[package]]
@@ -7323,7 +7324,7 @@ dependencies = [
73237324
"proc-macro-crate",
73247325
"proc-macro2",
73257326
"quote",
7326-
"syn 2.0.32",
7327+
"syn 2.0.106",
73277328
]
73287329

73297330
[[package]]
@@ -7482,7 +7483,7 @@ dependencies = [
74827483
"proc-macro2",
74837484
"quote",
74847485
"sp-core-hashing",
7485-
"syn 2.0.32",
7486+
"syn 2.0.106",
74867487
]
74877488

74887489
[[package]]
@@ -7492,7 +7493,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.4
74927493
dependencies = [
74937494
"proc-macro2",
74947495
"quote",
7495-
"syn 2.0.32",
7496+
"syn 2.0.106",
74967497
]
74977498

74987499
[[package]]
@@ -7654,7 +7655,7 @@ dependencies = [
76547655
"proc-macro-crate",
76557656
"proc-macro2",
76567657
"quote",
7657-
"syn 2.0.32",
7658+
"syn 2.0.106",
76587659
]
76597660

76607661
[[package]]
@@ -7783,7 +7784,7 @@ dependencies = [
77837784
"parity-scale-codec",
77847785
"proc-macro2",
77857786
"quote",
7786-
"syn 2.0.32",
7787+
"syn 2.0.106",
77877788
]
77887789

77897790
[[package]]
@@ -7911,7 +7912,7 @@ dependencies = [
79117912
[[package]]
79127913
name = "substrate-api-client"
79137914
version = "0.14.0"
7914-
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#84655ae1c4cf0ea7f45aee7ce7935dae027f9ae6"
7915+
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-integritee-patch#946f3ae82c5d48023107c1890728582561e94725"
79157916
dependencies = [
79167917
"ac-compose-macros",
79177918
"ac-node-api",
@@ -7949,7 +7950,7 @@ dependencies = [
79497950
[[package]]
79507951
name = "substrate-client-keystore"
79517952
version = "0.9.1"
7952-
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#84655ae1c4cf0ea7f45aee7ce7935dae027f9ae6"
7953+
source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-integritee-patch#946f3ae82c5d48023107c1890728582561e94725"
79537954
dependencies = [
79547955
"array-bytes 4.2.0",
79557956
"async-trait",
@@ -7992,9 +7993,9 @@ dependencies = [
79927993

79937994
[[package]]
79947995
name = "syn"
7995-
version = "2.0.32"
7996+
version = "2.0.106"
79967997
source = "registry+https://github.com/rust-lang/crates.io-index"
7997-
checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
7998+
checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
79987999
dependencies = [
79998000
"proc-macro2",
80008001
"quote",
@@ -8136,7 +8137,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
81368137
dependencies = [
81378138
"proc-macro2",
81388139
"quote",
8139-
"syn 2.0.32",
8140+
"syn 2.0.106",
81408141
]
81418142

81428143
[[package]]
@@ -8231,7 +8232,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
82318232
dependencies = [
82328233
"proc-macro2",
82338234
"quote",
8234-
"syn 2.0.32",
8235+
"syn 2.0.106",
82358236
]
82368237

82378238
[[package]]
@@ -8351,7 +8352,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
83518352
dependencies = [
83528353
"proc-macro2",
83538354
"quote",
8354-
"syn 2.0.32",
8355+
"syn 2.0.106",
83558356
]
83568357

83578358
[[package]]
@@ -8540,7 +8541,7 @@ version = "1.6.3"
85408541
source = "registry+https://github.com/rust-lang/crates.io-index"
85418542
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
85428543
dependencies = [
8543-
"cfg-if 1.0.0",
8544+
"cfg-if 0.1.10",
85448545
"digest 0.10.7",
85458546
"rand 0.8.5",
85468547
"static_assertions",
@@ -8829,7 +8830,7 @@ dependencies = [
88298830
"once_cell 1.18.0",
88308831
"proc-macro2",
88318832
"quote",
8832-
"syn 2.0.32",
8833+
"syn 2.0.106",
88338834
"wasm-bindgen-shared",
88348835
]
88358836

@@ -8863,7 +8864,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
88638864
dependencies = [
88648865
"proc-macro2",
88658866
"quote",
8866-
"syn 2.0.32",
8867+
"syn 2.0.106",
88678868
"wasm-bindgen-backend",
88688869
"wasm-bindgen-shared",
88698870
]
@@ -9477,7 +9478,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
94779478
dependencies = [
94789479
"proc-macro2",
94799480
"quote",
9480-
"syn 2.0.32",
9481+
"syn 2.0.106",
94819482
]
94829483

94839484
[[package]]

app-libs/parentchain-interface/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ hex-literal = "0.4.1"
2727
log = { version = "0.4", default-features = false }
2828
regex = { optional = true, version = "1.9.5" }
2929

30-
substrate-api-client = { default-features = false, git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" }
30+
substrate-api-client = { default-features = false, git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-integritee-patch" }
3131

3232
# substrate dep
3333
sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

0 commit comments

Comments
 (0)