Skip to content

Commit 468e0b7

Browse files
authored
Merge pull request #7 from Zondax/type_updates
Updates
2 parents 9c5a138 + 0120f64 commit 468e0b7

9 files changed

Lines changed: 17865 additions & 18226 deletions

File tree

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
cd ~/project/app/rust
2929
cargo clippy --version
3030
cargo clippy --all-features --all-targets || true
31-
- run:
32-
name: audit
33-
command: |
34-
cd ~/project/app/rust
35-
cargo audit --version
36-
cargo audit
31+
# - run:
32+
# name: audit
33+
# command: |
34+
# cd ~/project/app/rust
35+
# cargo audit --version
36+
# cargo audit
3737
- run:
3838
name: run tests
3939
command: |

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
cd ./app/rust
4646
cargo clippy --version
4747
cargo clippy --all-features --all-targets || true
48-
- name: audit
49-
run: |
50-
cd ./app/rust
51-
cargo audit --version
52-
cargo audit
48+
# - name: audit
49+
# run: |
50+
# cd ./app/rust
51+
# cargo audit --version
52+
# cargo audit
5353
- name: run tests
5454
run: |
5555
cd ./app/rust

app/src/substrate_dispatch_V1.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ __Z_INLINE parser_error_t _readMethod_utility_as_derivative_V1(
106106
__Z_INLINE parser_error_t _readMethod_babe_report_equivocation_V1(
107107
parser_context_t* c, pd_babe_report_equivocation_V1_t* m)
108108
{
109-
CHECK_ERROR(_readEquivocationProof_V1(c, &m->equivocation_proof))
109+
CHECK_ERROR(_readBabeEquivocationProof_V1(c, &m->equivocation_proof))
110110
CHECK_ERROR(_readKeyOwnerProof_V1(c, &m->key_owner_proof))
111111
return parser_ok;
112112
}
113113

114114
__Z_INLINE parser_error_t _readMethod_babe_report_equivocation_unsigned_V1(
115115
parser_context_t* c, pd_babe_report_equivocation_unsigned_V1_t* m)
116116
{
117-
CHECK_ERROR(_readEquivocationProof_V1(c, &m->equivocation_proof))
117+
CHECK_ERROR(_readBabeEquivocationProof_V1(c, &m->equivocation_proof))
118118
CHECK_ERROR(_readKeyOwnerProof_V1(c, &m->key_owner_proof))
119119
return parser_ok;
120120
}
@@ -634,15 +634,15 @@ __Z_INLINE parser_error_t _readMethod_finalitytracker_final_hint_V1(
634634
__Z_INLINE parser_error_t _readMethod_grandpa_report_equivocation_V1(
635635
parser_context_t* c, pd_grandpa_report_equivocation_V1_t* m)
636636
{
637-
CHECK_ERROR(_readEquivocationProof_V1(c, &m->equivocation_proof))
637+
CHECK_ERROR(_readGrandpaEquivocationProof_V1(c, &m->equivocation_proof))
638638
CHECK_ERROR(_readKeyOwnerProof_V1(c, &m->key_owner_proof))
639639
return parser_ok;
640640
}
641641

642642
__Z_INLINE parser_error_t _readMethod_grandpa_report_equivocation_unsigned_V1(
643643
parser_context_t* c, pd_grandpa_report_equivocation_unsigned_V1_t* m)
644644
{
645-
CHECK_ERROR(_readEquivocationProof_V1(c, &m->equivocation_proof))
645+
CHECK_ERROR(_readGrandpaEquivocationProof_V1(c, &m->equivocation_proof))
646646
CHECK_ERROR(_readKeyOwnerProof_V1(c, &m->key_owner_proof))
647647
return parser_ok;
648648
}
@@ -833,7 +833,7 @@ __Z_INLINE parser_error_t _readMethod_identity_provide_judgement_V1(
833833
{
834834
CHECK_ERROR(_readCompactRegistrarIndex_V1(c, &m->reg_index))
835835
CHECK_ERROR(_readLookupSource_V1(c, &m->target))
836-
CHECK_ERROR(_readJudgement_V1(c, &m->judgement))
836+
CHECK_ERROR(_readIdentityJudgement_V1(c, &m->judgement))
837837
return parser_ok;
838838
}
839839

@@ -4050,7 +4050,7 @@ parser_error_t _getMethod_ItemValue_V1(
40504050
case 512: /* module 2 call 0 */
40514051
switch (itemIdx) {
40524052
case 0: /* babe_report_equivocation_V1 - equivocation_proof */;
4053-
return _toStringEquivocationProof_V1(
4053+
return _toStringBabeEquivocationProof_V1(
40544054
&m->basic.babe_report_equivocation_V1.equivocation_proof,
40554055
outValue, outValueLen,
40564056
pageIdx, pageCount);
@@ -4065,7 +4065,7 @@ parser_error_t _getMethod_ItemValue_V1(
40654065
case 513: /* module 2 call 1 */
40664066
switch (itemIdx) {
40674067
case 0: /* babe_report_equivocation_unsigned_V1 - equivocation_proof */;
4068-
return _toStringEquivocationProof_V1(
4068+
return _toStringBabeEquivocationProof_V1(
40694069
&m->basic.babe_report_equivocation_unsigned_V1.equivocation_proof,
40704070
outValue, outValueLen,
40714071
pageIdx, pageCount);
@@ -4940,7 +4940,7 @@ parser_error_t _getMethod_ItemValue_V1(
49404940
case 3072: /* module 12 call 0 */
49414941
switch (itemIdx) {
49424942
case 0: /* grandpa_report_equivocation_V1 - equivocation_proof */;
4943-
return _toStringEquivocationProof_V1(
4943+
return _toStringGrandpaEquivocationProof_V1(
49444944
&m->basic.grandpa_report_equivocation_V1.equivocation_proof,
49454945
outValue, outValueLen,
49464946
pageIdx, pageCount);
@@ -4955,7 +4955,7 @@ parser_error_t _getMethod_ItemValue_V1(
49554955
case 3073: /* module 12 call 1 */
49564956
switch (itemIdx) {
49574957
case 0: /* grandpa_report_equivocation_unsigned_V1 - equivocation_proof */;
4958-
return _toStringEquivocationProof_V1(
4958+
return _toStringGrandpaEquivocationProof_V1(
49594959
&m->basic.grandpa_report_equivocation_unsigned_V1.equivocation_proof,
49604960
outValue, outValueLen,
49614961
pageIdx, pageCount);
@@ -5310,7 +5310,7 @@ parser_error_t _getMethod_ItemValue_V1(
53105310
outValue, outValueLen,
53115311
pageIdx, pageCount);
53125312
case 2: /* identity_provide_judgement_V1 - judgement */;
5313-
return _toStringJudgement_V1(
5313+
return _toStringIdentityJudgement_V1(
53145314
&m->basic.identity_provide_judgement_V1.judgement,
53155315
outValue, outValueLen,
53165316
pageIdx, pageCount);

app/src/substrate_functions_V1.h

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ parser_error_t _readAccountVoteStandard_V1(parser_context_t* c, pd_AccountVoteSt
3333
parser_error_t _readAccountVote_V1(parser_context_t* c, pd_AccountVote_V1_t* v);
3434
parser_error_t _readAddress_V1(parser_context_t* c, pd_Address_V1_t* v);
3535
parser_error_t _readAssetInfo_V1(parser_context_t* c, pd_AssetInfo_V1_t* v);
36+
parser_error_t _readBabeEquivocationProof_V1(parser_context_t* c, pd_BabeEquivocationProof_V1_t* v);
3637
parser_error_t _readChainId_V1(parser_context_t* c, pd_ChainId_V1_t* v);
3738
parser_error_t _readChangesTrieConfiguration_V1(parser_context_t* c, pd_ChangesTrieConfiguration_V1_t* v);
3839
parser_error_t _readCompactAssignments_V1(parser_context_t* c, pd_CompactAssignments_V1_t* v);
@@ -50,13 +51,13 @@ parser_error_t _readDefunctVoter_V1(parser_context_t* c, pd_DefunctVoter_V1_t* v
5051
parser_error_t _readDepositNonce_V1(parser_context_t* c, pd_DepositNonce_V1_t* v);
5152
parser_error_t _readElectionScore_V1(parser_context_t* c, pd_ElectionScore_V1_t* v);
5253
parser_error_t _readElectionSize_V1(parser_context_t* c, pd_ElectionSize_V1_t* v);
53-
parser_error_t _readEquivocationProof_V1(parser_context_t* c, pd_EquivocationProof_V1_t* v);
5454
parser_error_t _readEraIndex_V1(parser_context_t* c, pd_EraIndex_V1_t* v);
5555
parser_error_t _readExtendedBalance_V1(parser_context_t* c, pd_ExtendedBalance_V1_t* v);
56+
parser_error_t _readGrandpaEquivocationProof_V1(parser_context_t* c, pd_GrandpaEquivocationProof_V1_t* v);
5657
parser_error_t _readH256_array_3_V1(parser_context_t* c, pd_H256_array_3_V1_t* v);
5758
parser_error_t _readIdentityFields_V1(parser_context_t* c, pd_IdentityFields_V1_t* v);
5859
parser_error_t _readIdentityInfo_V1(parser_context_t* c, pd_IdentityInfo_V1_t* v);
59-
parser_error_t _readJudgement_V1(parser_context_t* c, pd_Judgement_V1_t* v);
60+
parser_error_t _readIdentityJudgement_V1(parser_context_t* c, pd_IdentityJudgement_V1_t* v);
6061
parser_error_t _readKeyOwnerProof_V1(parser_context_t* c, pd_KeyOwnerProof_V1_t* v);
6162
parser_error_t _readKeyValue_V1(parser_context_t* c, pd_KeyValue_V1_t* v);
6263
parser_error_t _readKey_V1(parser_context_t* c, pd_Key_V1_t* v);
@@ -154,6 +155,13 @@ parser_error_t _toStringAssetInfo_V1(
154155
uint8_t pageIdx,
155156
uint8_t* pageCount);
156157

158+
parser_error_t _toStringBabeEquivocationProof_V1(
159+
const pd_BabeEquivocationProof_V1_t* v,
160+
char* outValue,
161+
uint16_t outValueLen,
162+
uint8_t pageIdx,
163+
uint8_t* pageCount);
164+
157165
parser_error_t _toStringChainId_V1(
158166
const pd_ChainId_V1_t* v,
159167
char* outValue,
@@ -273,22 +281,22 @@ parser_error_t _toStringElectionSize_V1(
273281
uint8_t pageIdx,
274282
uint8_t* pageCount);
275283

276-
parser_error_t _toStringEquivocationProof_V1(
277-
const pd_EquivocationProof_V1_t* v,
284+
parser_error_t _toStringEraIndex_V1(
285+
const pd_EraIndex_V1_t* v,
278286
char* outValue,
279287
uint16_t outValueLen,
280288
uint8_t pageIdx,
281289
uint8_t* pageCount);
282290

283-
parser_error_t _toStringEraIndex_V1(
284-
const pd_EraIndex_V1_t* v,
291+
parser_error_t _toStringExtendedBalance_V1(
292+
const pd_ExtendedBalance_V1_t* v,
285293
char* outValue,
286294
uint16_t outValueLen,
287295
uint8_t pageIdx,
288296
uint8_t* pageCount);
289297

290-
parser_error_t _toStringExtendedBalance_V1(
291-
const pd_ExtendedBalance_V1_t* v,
298+
parser_error_t _toStringGrandpaEquivocationProof_V1(
299+
const pd_GrandpaEquivocationProof_V1_t* v,
292300
char* outValue,
293301
uint16_t outValueLen,
294302
uint8_t pageIdx,
@@ -315,8 +323,8 @@ parser_error_t _toStringIdentityInfo_V1(
315323
uint8_t pageIdx,
316324
uint8_t* pageCount);
317325

318-
parser_error_t _toStringJudgement_V1(
319-
const pd_Judgement_V1_t* v,
326+
parser_error_t _toStringIdentityJudgement_V1(
327+
const pd_IdentityJudgement_V1_t* v,
320328
char* outValue,
321329
uint16_t outValueLen,
322330
uint8_t pageIdx,

app/src/substrate_methods_V1.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ typedef struct {
123123

124124
#define PD_CALL_BABE_REPORT_EQUIVOCATION_V1 0
125125
typedef struct {
126-
pd_EquivocationProof_V1_t equivocation_proof;
126+
pd_BabeEquivocationProof_V1_t equivocation_proof;
127127
pd_KeyOwnerProof_V1_t key_owner_proof;
128128
} pd_babe_report_equivocation_V1_t;
129129

130130
#define PD_CALL_BABE_REPORT_EQUIVOCATION_UNSIGNED_V1 1
131131
typedef struct {
132-
pd_EquivocationProof_V1_t equivocation_proof;
132+
pd_BabeEquivocationProof_V1_t equivocation_proof;
133133
pd_KeyOwnerProof_V1_t key_owner_proof;
134134
} pd_babe_report_equivocation_unsigned_V1_t;
135135

@@ -511,13 +511,13 @@ typedef struct {
511511

512512
#define PD_CALL_GRANDPA_REPORT_EQUIVOCATION_V1 0
513513
typedef struct {
514-
pd_EquivocationProof_V1_t equivocation_proof;
514+
pd_GrandpaEquivocationProof_V1_t equivocation_proof;
515515
pd_KeyOwnerProof_V1_t key_owner_proof;
516516
} pd_grandpa_report_equivocation_V1_t;
517517

518518
#define PD_CALL_GRANDPA_REPORT_EQUIVOCATION_UNSIGNED_V1 1
519519
typedef struct {
520-
pd_EquivocationProof_V1_t equivocation_proof;
520+
pd_GrandpaEquivocationProof_V1_t equivocation_proof;
521521
pd_KeyOwnerProof_V1_t key_owner_proof;
522522
} pd_grandpa_report_equivocation_unsigned_V1_t;
523523

@@ -660,7 +660,7 @@ typedef struct {
660660
typedef struct {
661661
pd_CompactRegistrarIndex_V1_t reg_index;
662662
pd_LookupSource_V1_t target;
663-
pd_Judgement_V1_t judgement;
663+
pd_IdentityJudgement_V1_t judgement;
664664
} pd_identity_provide_judgement_V1_t;
665665

666666
#define PD_CALL_IDENTITY_KILL_IDENTITY_V1 10

0 commit comments

Comments
 (0)