Skip to content

Commit e571a2b

Browse files
chcmedeiroschcmedeiros
authored
Merge pull request #14 from Zondax/update-pallets
Update pallets
2 parents e89609b + 554bb73 commit e571a2b

17 files changed

Lines changed: 21341 additions & 20645 deletions

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ Please:
8585
| Name | Light | XL | Nesting | Arguments |
8686
| :---------- |:------------:|:--------:|:--------:|:--------|
8787
|Proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` real <br/>`OptionProxyType` force_proxy_type <br/>`Call` call <br/> |
88-
|Add proxy | :heavy_check_mark: | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
89-
|Remove proxy | :heavy_check_mark: | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
88+
|Add proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
89+
|Remove proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
9090
|Remove proxies | | :heavy_check_mark: | | |
9191
|Anonymous | | :heavy_check_mark: | | `ProxyType` proxy_type <br/>`BlockNumber` delay <br/>`u16` index <br/> |
9292
|Kill anonymous | | :heavy_check_mark: | | `AccountId` spawner <br/>`ProxyType` proxy_type <br/>`u16` index <br/>`Compactu32` height <br/>`Compactu32` ext_index <br/> |

‎app/Makefile.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ APPVERSION_M=1
33
# This is the `spec_version` field of `Runtime`
44
APPVERSION_N=2082
55
# This is the patch version of this release
6-
APPVERSION_P=0
6+
APPVERSION_P=1

‎app/src/substrate/substrate_dispatch_V1.c‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,10 +1172,10 @@ parser_error_t _readMethod_V1(
11721172
CHECK_ERROR(_readMethod_proxy_proxy_V1(c, &method->nested.proxy_proxy_V1))
11731173
break;
11741174
case 1281: /* module 5 call 1 */
1175-
CHECK_ERROR(_readMethod_proxy_add_proxy_V1(c, &method->basic.proxy_add_proxy_V1))
1175+
CHECK_ERROR(_readMethod_proxy_add_proxy_V1(c, &method->nested.proxy_add_proxy_V1))
11761176
break;
11771177
case 1282: /* module 5 call 2 */
1178-
CHECK_ERROR(_readMethod_proxy_remove_proxy_V1(c, &method->basic.proxy_remove_proxy_V1))
1178+
CHECK_ERROR(_readMethod_proxy_remove_proxy_V1(c, &method->nested.proxy_remove_proxy_V1))
11791179
break;
11801180
case 2560: /* module 10 call 0 */
11811181
CHECK_ERROR(_readMethod_balances_transfer_V1(c, &method->nested.balances_transfer_V1))
@@ -3601,17 +3601,17 @@ parser_error_t _getMethod_ItemValue_V1(
36013601
switch (itemIdx) {
36023602
case 0: /* proxy_add_proxy_V1 - delegate */;
36033603
return _toStringAccountId_V1(
3604-
&m->basic.proxy_add_proxy_V1.delegate,
3604+
&m->nested.proxy_add_proxy_V1.delegate,
36053605
outValue, outValueLen,
36063606
pageIdx, pageCount);
36073607
case 1: /* proxy_add_proxy_V1 - proxy_type */;
36083608
return _toStringProxyType_V1(
3609-
&m->basic.proxy_add_proxy_V1.proxy_type,
3609+
&m->nested.proxy_add_proxy_V1.proxy_type,
36103610
outValue, outValueLen,
36113611
pageIdx, pageCount);
36123612
case 2: /* proxy_add_proxy_V1 - delay */;
36133613
return _toStringBlockNumber(
3614-
&m->basic.proxy_add_proxy_V1.delay,
3614+
&m->nested.proxy_add_proxy_V1.delay,
36153615
outValue, outValueLen,
36163616
pageIdx, pageCount);
36173617
default:
@@ -3621,17 +3621,17 @@ parser_error_t _getMethod_ItemValue_V1(
36213621
switch (itemIdx) {
36223622
case 0: /* proxy_remove_proxy_V1 - delegate */;
36233623
return _toStringAccountId_V1(
3624-
&m->basic.proxy_remove_proxy_V1.delegate,
3624+
&m->nested.proxy_remove_proxy_V1.delegate,
36253625
outValue, outValueLen,
36263626
pageIdx, pageCount);
36273627
case 1: /* proxy_remove_proxy_V1 - proxy_type */;
36283628
return _toStringProxyType_V1(
3629-
&m->basic.proxy_remove_proxy_V1.proxy_type,
3629+
&m->nested.proxy_remove_proxy_V1.proxy_type,
36303630
outValue, outValueLen,
36313631
pageIdx, pageCount);
36323632
case 2: /* proxy_remove_proxy_V1 - delay */;
36333633
return _toStringBlockNumber(
3634-
&m->basic.proxy_remove_proxy_V1.delay,
3634+
&m->nested.proxy_remove_proxy_V1.delay,
36353635
outValue, outValueLen,
36363636
pageIdx, pageCount);
36373637
default:
@@ -5710,8 +5710,6 @@ bool _getMethod_IsNestingSupported_V1(uint8_t moduleIdx, uint8_t callIdx)
57105710
case 768: // Utility:Batch
57115711
case 770: // Utility:Batch all
57125712
case 772: // Utility:Force batch
5713-
case 1281: // Proxy:Add proxy
5714-
case 1282: // Proxy:Remove proxy
57155713
case 1283: // Proxy:Remove proxies
57165714
case 1284: // Proxy:Anonymous
57175715
case 1285: // Proxy:Kill anonymous

‎app/src/substrate/substrate_methods_V1.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,6 @@ typedef struct {
6565
pd_VecCall_t calls;
6666
} pd_utility_force_batch_V1_t;
6767

68-
#define PD_CALL_PROXY_ADD_PROXY_V1 1
69-
typedef struct {
70-
pd_AccountId_V1_t delegate;
71-
pd_ProxyType_V1_t proxy_type;
72-
pd_BlockNumber_t delay;
73-
} pd_proxy_add_proxy_V1_t;
74-
75-
#define PD_CALL_PROXY_REMOVE_PROXY_V1 2
76-
typedef struct {
77-
pd_AccountId_V1_t delegate;
78-
pd_ProxyType_V1_t proxy_type;
79-
pd_BlockNumber_t delay;
80-
} pd_proxy_remove_proxy_V1_t;
81-
8268
#define PD_CALL_BALANCES_TRANSFER_ALL_V1 4
8369
typedef struct {
8470
pd_LookupasStaticLookupSource_V1_t dest;
@@ -747,8 +733,6 @@ typedef union {
747733
pd_utility_batch_V1_t utility_batch_V1;
748734
pd_utility_batch_all_V1_t utility_batch_all_V1;
749735
pd_utility_force_batch_V1_t utility_force_batch_V1;
750-
pd_proxy_add_proxy_V1_t proxy_add_proxy_V1;
751-
pd_proxy_remove_proxy_V1_t proxy_remove_proxy_V1;
752736
pd_balances_transfer_all_V1_t balances_transfer_all_V1;
753737
pd_session_set_keys_V1_t session_set_keys_V1;
754738
pd_session_purge_keys_V1_t session_purge_keys_V1;
@@ -871,6 +855,20 @@ typedef struct {
871855
pd_Call_t call;
872856
} pd_proxy_proxy_V1_t;
873857

858+
#define PD_CALL_PROXY_ADD_PROXY_V1 1
859+
typedef struct {
860+
pd_AccountId_V1_t delegate;
861+
pd_ProxyType_V1_t proxy_type;
862+
pd_BlockNumber_t delay;
863+
} pd_proxy_add_proxy_V1_t;
864+
865+
#define PD_CALL_PROXY_REMOVE_PROXY_V1 2
866+
typedef struct {
867+
pd_AccountId_V1_t delegate;
868+
pd_ProxyType_V1_t proxy_type;
869+
pd_BlockNumber_t delay;
870+
} pd_proxy_remove_proxy_V1_t;
871+
874872
#define PD_CALL_BALANCES_TRANSFER_V1 0
875873
typedef struct {
876874
pd_LookupasStaticLookupSource_V1_t dest;
@@ -1027,6 +1025,8 @@ typedef struct {
10271025

10281026
typedef union {
10291027
pd_proxy_proxy_V1_t proxy_proxy_V1;
1028+
pd_proxy_add_proxy_V1_t proxy_add_proxy_V1;
1029+
pd_proxy_remove_proxy_V1_t proxy_remove_proxy_V1;
10301030
pd_balances_transfer_V1_t balances_transfer_V1;
10311031
pd_balances_force_transfer_V1_t balances_force_transfer_V1;
10321032
pd_balances_transfer_keep_alive_V1_t balances_transfer_keep_alive_V1;

‎app/src/substrate/substrate_types_V1.c‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2989,10 +2989,40 @@ parser_error_t _toStringTupleCurrencyIdCurrencyIdOptionVecSwapPath_V1(
29892989
uint8_t* pageCount)
29902990
{
29912991
CLEAN_AND_CHECK()
2992-
CHECK_ERROR(_toStringCurrencyId_V1(&v->currencyid1, outValue, outValueLen, pageIdx, pageCount))
2993-
CHECK_ERROR(_toStringCurrencyId_V1(&v->currencyid2, outValue, outValueLen, pageIdx, pageCount))
2994-
CHECK_ERROR(_toStringOptionVecSwapPath_V1(&v->paths, outValue, outValueLen, pageIdx, pageCount))
2995-
return parser_ok;
2992+
2993+
// First measure number of pages
2994+
uint8_t pages[3] = { 0 };
2995+
CHECK_ERROR(_toStringCurrencyId_V1(&v->currencyid1, outValue, outValueLen, 0, &pages[0]))
2996+
CHECK_ERROR(_toStringCurrencyId_V1(&v->currencyid2, outValue, outValueLen, 0, &pages[1]))
2997+
CHECK_ERROR(_toStringOptionVecSwapPath_V1(&v->paths, outValue, outValueLen, 0, &pages[2]))
2998+
2999+
*pageCount = 0;
3000+
for (uint8_t i = 0; i < (uint8_t)sizeof(pages); i++) {
3001+
*pageCount += pages[i];
3002+
}
3003+
3004+
if (pageIdx > *pageCount) {
3005+
return parser_display_idx_out_of_range;
3006+
}
3007+
3008+
if (pageIdx < pages[0]) {
3009+
CHECK_ERROR(_toStringCurrencyId_V1(&v->currencyid1, outValue, outValueLen, pageIdx, &pages[0]))
3010+
return parser_ok;
3011+
}
3012+
pageIdx -= pages[0];
3013+
3014+
if (pageIdx < pages[1]) {
3015+
CHECK_ERROR(_toStringCurrencyId_V1(&v->currencyid2, outValue, outValueLen, pageIdx, &pages[1]))
3016+
return parser_ok;
3017+
}
3018+
pageIdx -= pages[1];
3019+
3020+
if (pageIdx < pages[2]) {
3021+
CHECK_ERROR(_toStringOptionVecSwapPath_V1(&v->paths, outValue, outValueLen, pageIdx, &pages[2]))
3022+
return parser_ok;
3023+
}
3024+
3025+
return parser_display_idx_out_of_range;
29963026
}
29973027

29983028
parser_error_t _toStringWeight_V1(

‎deps/ledger-zxlib‎

‎docs/supported_1.2082.x.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
| Name | Light | XL | Nesting | Arguments |
5656
| :---------- |:------------:|:--------:|:--------:|:--------|
5757
|Proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` real <br/>`OptionProxyType` force_proxy_type <br/>`Call` call <br/> |
58-
|Add proxy | :heavy_check_mark: | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
59-
|Remove proxy | :heavy_check_mark: | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
58+
|Add proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
59+
|Remove proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
6060
|Remove proxies | | :heavy_check_mark: | | |
6161
|Anonymous | | :heavy_check_mark: | | `ProxyType` proxy_type <br/>`BlockNumber` delay <br/>`u16` index <br/> |
6262
|Kill anonymous | | :heavy_check_mark: | | `AccountId` spawner <br/>`ProxyType` proxy_type <br/>`u16` index <br/>`Compactu32` height <br/>`Compactu32` ext_index <br/> |

‎docs/supported_latest.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
| Name | Light | XL | Nesting | Arguments |
5656
| :---------- |:------------:|:--------:|:--------:|:--------|
5757
|Proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` real <br/>`OptionProxyType` force_proxy_type <br/>`Call` call <br/> |
58-
|Add proxy | :heavy_check_mark: | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
59-
|Remove proxy | :heavy_check_mark: | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
58+
|Add proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
59+
|Remove proxy | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
6060
|Remove proxies | | :heavy_check_mark: | | |
6161
|Anonymous | | :heavy_check_mark: | | `ProxyType` proxy_type <br/>`BlockNumber` delay <br/>`u16` index <br/> |
6262
|Kill anonymous | | :heavy_check_mark: | | `AccountId` spawner <br/>`ProxyType` proxy_type <br/>`u16` index <br/>`Compactu32` height <br/>`Compactu32` ext_index <br/> |

0 commit comments

Comments
 (0)