Skip to content

Commit 67134ac

Browse files
authored
Merge pull request #3 from Zondax/update/2060
2 parents bbba117 + 29ec2b1 commit 67134ac

17 files changed

Lines changed: 15644 additions & 14777 deletions

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Please:
2828
- **Do not use in production**
2929
- **Do not use a Ledger device with funds for development purposes.**
3030
- **Have a separate and marked device that is used ONLY for development and testing**
31-
# Acala 1.2050.x
31+
# Acala 1.2060.x
3232

3333
## System
3434

@@ -380,7 +380,7 @@ Please:
380380

381381
| Name | Light | XL | Nesting | Arguments |
382382
| :---------- |:------------:|:--------:|:--------:|:--------|
383-
|Propose | | :heavy_check_mark: | | `Hash` proposal_hash <br/>`Compactu128` amount <br/> |
383+
|Propose | | :heavy_check_mark: | | `Hash` proposal_hash <br/>`CompactBalance` amount <br/> |
384384
|Second | | :heavy_check_mark: | | `Compactu32` proposal <br/>`Compactu32` seconds_upper_bound <br/> |
385385
|Vote | | | | `Compactu32` ref_index <br/>`AccountVote` vote <br/> |
386386
|Emergency cancel | | :heavy_check_mark: | | `ReferendumIndex` ref_index <br/> |

app/Makefile.version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is the `transaction_version` field of `Runtime`
22
APPVERSION_M=1
33
# This is the `spec_version` field of `Runtime`
4-
APPVERSION_N=2050
4+
APPVERSION_N=2060
55
# This is the patch version of this release
6-
APPVERSION_P=1
6+
APPVERSION_P=0

app/src/substrate/substrate_dispatch_V1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ __Z_INLINE parser_error_t _readMethod_democracy_propose_V1(
510510
parser_context_t* c, pd_democracy_propose_V1_t* m)
511511
{
512512
CHECK_ERROR(_readHash(c, &m->proposal_hash))
513-
CHECK_ERROR(_readCompactu128(c, &m->amount))
513+
CHECK_ERROR(_readCompactBalance(c, &m->amount))
514514
return parser_ok;
515515
}
516516

@@ -4014,7 +4014,7 @@ parser_error_t _getMethod_ItemValue_V1(
40144014
outValue, outValueLen,
40154015
pageIdx, pageCount);
40164016
case 1: /* democracy_propose_V1 - amount */;
4017-
return _toStringCompactu128(
4017+
return _toStringCompactBalance(
40184018
&m->basic.democracy_propose_V1.amount,
40194019
outValue, outValueLen,
40204020
pageIdx, pageCount);

app/src/substrate/substrate_methods_V1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ typedef struct {
303303
#define PD_CALL_DEMOCRACY_PROPOSE_V1 0
304304
typedef struct {
305305
pd_Hash_t proposal_hash;
306-
pd_Compactu128_t amount;
306+
pd_CompactBalance_t amount;
307307
} pd_democracy_propose_V1_t;
308308

309309
#define PD_CALL_DEMOCRACY_SECOND_V1 1

app/src/substrate/substrate_types_V1.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ parser_error_t _toStringAccessListItem_V1(
688688
CLEAN_AND_CHECK()
689689

690690
// First measure number of pages
691-
uint8_t pages[2];
691+
uint8_t pages[2] = { 0 };
692692
CHECK_ERROR(_toStringEvmAddress_V1(&v->address, outValue, outValueLen, 0, &pages[0]))
693693
CHECK_ERROR(_toStringVecH256(&v->storageKeys, outValue, outValueLen, 0, &pages[1]))
694694

@@ -828,10 +828,10 @@ parser_error_t _toStringAccountVote_V1(
828828
CLEAN_AND_CHECK()
829829
switch (v->value) {
830830
case 0:
831-
_toStringAccountVoteStandard_V1(&v->voteStandard, outValue, outValueLen, pageIdx, pageCount);
831+
CHECK_ERROR(_toStringAccountVoteStandard_V1(&v->voteStandard, outValue, outValueLen, pageIdx, pageCount));
832832
break;
833833
case 1:
834-
_toStringAccountVoteSplit_V1(&v->voteSplit, outValue, outValueLen, pageIdx, pageCount);
834+
CHECK_ERROR(_toStringAccountVoteSplit_V1(&v->voteSplit, outValue, outValueLen, pageIdx, pageCount));
835835
break;
836836
default:
837837
return parser_unexpected_value;
@@ -1044,7 +1044,7 @@ parser_error_t _toStringClassIdOfTTokenIdOfT_V1(
10441044
CLEAN_AND_CHECK()
10451045

10461046
// First measure number of pages
1047-
uint8_t pages[2];
1047+
uint8_t pages[2] = { 0 };
10481048
CHECK_ERROR(_toStringClassIdOfT_V1(&v->value1, outValue, outValueLen, 0, &pages[0]))
10491049
CHECK_ERROR(_toStringTokenIdOfT_V1(&v->value2, outValue, outValueLen, 0, &pages[1]))
10501050

@@ -1172,7 +1172,7 @@ parser_error_t _toStringDexShareFixed_V1(
11721172
CLEAN_AND_CHECK()
11731173

11741174
// First measure number of pages
1175-
uint8_t pages[2];
1175+
uint8_t pages[2] = { 0 };
11761176
CHECK_ERROR(_toStringDexShare_V1(&v->dexShare1, outValue, outValueLen, 0, &pages[0]))
11771177
CHECK_ERROR(_toStringDexShare_V1(&v->dexShare2, outValue, outValueLen, 0, &pages[1]))
11781178

@@ -1444,7 +1444,7 @@ parser_error_t _toStringPriority_V1(
14441444
CLEAN_AND_CHECK()
14451445

14461446
// First measure number of pages
1447-
uint8_t pages[2];
1447+
uint8_t pages[2] = { 0 };
14481448
CHECK_ERROR(_toStringu32(&v->stream_id, outValue, outValueLen, 0, &pages[0]))
14491449
CHECK_ERROR(_toStringStreamDependency_V1(&v->dependency, outValue, outValueLen, 0, &pages[1]))
14501450

@@ -1572,7 +1572,7 @@ parser_error_t _toStringStreamDependency_V1(
15721572
CLEAN_AND_CHECK()
15731573

15741574
// First measure number of pages
1575-
uint8_t pages[3];
1575+
uint8_t pages[3] = { 0 };
15761576
CHECK_ERROR(_toStringu32(&v->dependency_id, outValue, outValueLen, 0, &pages[0]))
15771577
CHECK_ERROR(_toStringu16((const pd_u16_t*)&v->weight, outValue, outValueLen, 0, &pages[1]))
15781578
CHECK_ERROR(_toStringbool(&v->is_exclusive, outValue, outValueLen, 0, &pages[2]))
@@ -1616,7 +1616,7 @@ parser_error_t _toStringSwapLimitBalance_V1(
16161616
CLEAN_AND_CHECK()
16171617

16181618
// First measure number of pages
1619-
uint8_t pages[2];
1619+
uint8_t pages[2] = { 0 };
16201620
CHECK_ERROR(_toStringBalance(&v->balance1, outValue, outValueLen, 0, &pages[0]))
16211621
CHECK_ERROR(_toStringBalance(&v->balance2, outValue, outValueLen, 0, &pages[1]))
16221622

@@ -1664,7 +1664,7 @@ parser_error_t _toStringTimepoint_V1(
16641664
CLEAN_AND_CHECK()
16651665

16661666
// First measure number of pages
1667-
uint8_t pages[2];
1667+
uint8_t pages[2] = { 0 };
16681668
CHECK_ERROR(_toStringBlockNumber(&v->height, outValue, outValueLen, 0, &pages[0]))
16691669
CHECK_ERROR(_toStringu32(&v->index, outValue, outValueLen, 0, &pages[1]))
16701670

@@ -1876,7 +1876,7 @@ parser_error_t _toStringVestingScheduleOf_V1(
18761876
CLEAN_AND_CHECK()
18771877

18781878
// First measure number of pages
1879-
uint8_t pages[4];
1879+
uint8_t pages[4] = { 0 };
18801880
CHECK_ERROR(_toStringBlockNumber(&v->start, outValue, outValueLen, 0, &pages[0]))
18811881
CHECK_ERROR(_toStringBlockNumber(&v->period, outValue, outValueLen, 0, &pages[1]))
18821882
CHECK_ERROR(_toStringBalance(&v->balance, outValue, outValueLen, 0, &pages[2]))

0 commit comments

Comments
 (0)