Skip to content

Commit 48dbda6

Browse files
authored
Merge pull request #47 from Zondax/update-1007
2 parents bd7fafa + 14783d8 commit 48dbda6

29 files changed

Lines changed: 31782 additions & 1231 deletions

README.md

Lines changed: 11 additions & 1 deletion
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-
# Centrifuge 1.1005.x
31+
# Centrifuge 1.1007.x
3232

3333
## System
3434

@@ -115,6 +115,7 @@ Please:
115115
|As derivative | | | | `u16` index <br/>`Call` call <br/> |
116116
|Batch all | | | | `VecCall` calls <br/> |
117117
|Dispatch as | | | | `BoxPalletsOrigin` as_origin <br/>`Call` call <br/> |
118+
|Force batch | | | | `VecCall` calls <br/> |
118119

119120
## Scheduler
120121

@@ -218,6 +219,15 @@ Please:
218219
|Request preimage | | | | `Hash` hash <br/> |
219220
|Unrequest preimage | | | | `Hash` hash <br/> |
220221

222+
## Treasury
223+
224+
| Name | Light | XL | Nesting | Arguments |
225+
| :---------- |:------------:|:--------:|:--------:|:--------|
226+
|Propose spend | | | | `CompactBalance` amount <br/>`LookupasStaticLookupSource` beneficiary <br/> |
227+
|Reject proposal | | | | `Compactu32` proposal_id <br/> |
228+
|Approve proposal | | | | `Compactu32` proposal_id <br/> |
229+
|Remove approval | | | | `Compactu32` proposal_id <br/> |
230+
221231
## Fees
222232

223233
| Name | Light | XL | Nesting | Arguments |

app/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ all: bin/app.elf
2727
@echo "APPNAME=\"${APPNAME}\"" >> $(OUTPUT_INSTALLER)
2828
@echo "APPVERSION=\"${APPVERSION}\"" >> $(OUTPUT_INSTALLER)
2929
@echo "APPPATH=\""${APPPATH}"\"" >> $(OUTPUT_INSTALLER)
30-
@echo "LOAD_PARAMS=\"${APP_LOAD_PARAMS}\"" >> $(OUTPUT_INSTALLER)
31-
@echo "DELETE_PARAMS=\"${APP_DELETE_PARAMS}\"" >> $(OUTPUT_INSTALLER)
30+
@echo "LOAD_PARAMS=($$(echo "${APP_LOAD_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER)
31+
@echo "DELETE_PARAMS=($$(echo "${COMMON_DELETE_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER)
3232
@echo "APPHEX=\"" >> $(OUTPUT_INSTALLER)
3333
@cat $(CURDIR)/bin/app.hex >> $(OUTPUT_INSTALLER)
3434
@echo "\"" >> $(OUTPUT_INSTALLER)
@@ -95,8 +95,7 @@ endef
9595
$(error "$(error_message)")
9696
endif
9797

98-
APP_LOAD_PARAMS = --curve ed25519 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH)
99-
APP_DELETE_PARAMS = $(COMMON_DELETE_PARAMS)
98+
APP_LOAD_PARAMS = --curve ed25519 $(COMMON_LOAD_PARAMS) --path $(APPPATH)
10099

101100
# Ledger: add the "Pending security review" disclaimer
102101
APP_LOAD_PARAMS += --tlvraw 9F:01

app/Makefile.version

Lines changed: 1 addition & 1 deletion
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=1005
4+
APPVERSION_N=10070
55
# This is the `patch_version`
66
APPVERSION_P=0

app/rust/Cargo.lock

Lines changed: 63 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/common/parser_common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ typedef enum {
5353
parser_tx_nesting_not_supported,
5454
parser_tx_nesting_limit_reached,
5555
parser_tx_call_vec_too_large,
56+
parser_junction_limit,
5657
} parser_error_t;
5758

5859
typedef struct {

app/src/parser_impl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ parser_error_t _readCompactIndex(parser_context_t *c, pd_CompactIndex_t *v);
183183
uint16_t _detectAddressType(const parser_context_t *c);
184184

185185
parser_error_t _toStringCompactInt(const compactInt_t *c, uint8_t decimalPlaces,
186+
bool trimTrailingZeros,
186187
char postfix[],
187188
char prefix[],
188189
char *outValue, uint16_t outValueLen,

0 commit comments

Comments
 (0)