Skip to content

Commit e89609b

Browse files
chcmedeiroschcmedeiros
authored
Merge pull request #13 from Zondax/update-2082
Update 2082
2 parents 98ae0b7 + 1217018 commit e89609b

39 files changed

Lines changed: 28895 additions & 23216 deletions

‎README.md‎

Lines changed: 15 additions & 12 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.2064.x
31+
# Acala 1.2082.x
3232

3333
## System
3434

@@ -69,6 +69,7 @@ Please:
6969
|As derivative | | | | `u16` index <br/>`Call` call <br/> |
7070
|Batch all | :heavy_check_mark: | :heavy_check_mark: | | `VecCall` calls <br/> |
7171
|Dispatch as | | | | `BoxPalletsOrigin` as_origin <br/>`Call` call <br/> |
72+
|Force batch | :heavy_check_mark: | :heavy_check_mark: | | `VecCall` calls <br/> |
7273

7374
## Multisig
7475

@@ -83,9 +84,9 @@ Please:
8384

8485
| Name | Light | XL | Nesting | Arguments |
8586
| :---------- |:------------:|:--------:|:--------:|:--------|
86-
|Proxy | | :heavy_check_mark: | :heavy_check_mark: | `AccountId` real <br/>`OptionProxyType` force_proxy_type <br/>`Call` call <br/> |
87-
|Add proxy | | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
88-
|Remove proxy | | :heavy_check_mark: | | `AccountId` delegate <br/>`ProxyType` proxy_type <br/>`BlockNumber` delay <br/> |
87+
|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/> |
8990
|Remove proxies | | :heavy_check_mark: | | |
9091
|Anonymous | | :heavy_check_mark: | | `ProxyType` proxy_type <br/>`BlockNumber` delay <br/>`u16` index <br/> |
9192
|Kill anonymous | | :heavy_check_mark: | | `AccountId` spawner <br/>`ProxyType` proxy_type <br/>`u16` index <br/>`Compactu32` height <br/>`Compactu32` ext_index <br/> |
@@ -163,6 +164,7 @@ Please:
163164
|Propose spend | | | | `CompactBalance` amount <br/>`LookupasStaticLookupSource` beneficiary <br/> |
164165
|Reject proposal | | | | `Compactu32` proposal_id <br/> |
165166
|Approve proposal | | | | `Compactu32` proposal_id <br/> |
167+
|Remove approval | | | | `Compactu32` proposal_id <br/> |
166168

167169
## Bounties
168170

@@ -224,7 +226,7 @@ Please:
224226

225227
| Name | Light | XL | Nesting | Arguments |
226228
| :---------- |:------------:|:--------:|:--------:|:--------|
227-
|Service overweight | | | | `OverweightIndex` index <br/>`Weight` weight_limit <br/> |
229+
|Service overweight | | :heavy_check_mark: | | `OverweightIndex` index <br/>`Weight` weight_limit <br/> |
228230
|Suspend xcm execution | | :heavy_check_mark: | | |
229231
|Resume xcm execution | | :heavy_check_mark: | | |
230232
|Update suspend threshold | | :heavy_check_mark: | | `u32` new_ <br/> |
@@ -259,7 +261,7 @@ Please:
259261

260262
| Name | Light | XL | Nesting | Arguments |
261263
| :---------- |:------------:|:--------:|:--------:|:--------|
262-
|Transfer | | | | `CurrencyId` currency_id <br/>`Balance` amount <br/>`BoxVersionedMultiLocation` dest <br/>`Weight` dest_weight <br/> |
264+
|Transfer | | :heavy_check_mark: | | `CurrencyId` currency_id <br/>`Balance` amount <br/>`BoxVersionedMultiLocation` dest <br/>`Weight` dest_weight <br/> |
263265
|Transfer multiasset | | | | `BoxVersionedMultiAsset` asset <br/>`BoxVersionedMultiLocation` dest <br/>`Weight` dest_weight <br/> |
264266
|Transfer with fee | | | | `CurrencyId` currency_id <br/>`Balance` amount <br/>`Balance` fee <br/>`BoxVersionedMultiLocation` dest <br/>`Weight` dest_weight <br/> |
265267
|Transfer multiasset with fee | | | | `BoxVersionedMultiAsset` asset <br/>`BoxVersionedMultiAsset` fee <br/>`BoxVersionedMultiLocation` dest <br/>`Weight` dest_weight <br/> |
@@ -447,9 +449,9 @@ Please:
447449

448450
| Name | Light | XL | Nesting | Arguments |
449451
| :---------- |:------------:|:--------:|:--------:|:--------|
450-
|Swap with exact supply | | :heavy_check_mark: | | `VecCurrencyId` path <br/>`Compactu128` supply_amount <br/>`Compactu128` min_target_amount <br/> |
452+
|Swap with exact supply | | :heavy_check_mark: | :heavy_check_mark: | `VecCurrencyId` path <br/>`Compactu128` supply_amount <br/>`Compactu128` min_target_amount <br/> |
451453
|Swap with exact target | | :heavy_check_mark: | | `VecCurrencyId` path <br/>`Compactu128` target_amount <br/>`Compactu128` max_supply_amount <br/> |
452-
|Add liquidity | | :heavy_check_mark: | | `CurrencyId` currency_id_a <br/>`CurrencyId` currency_id_b <br/>`Compactu128` max_amount_a <br/>`Compactu128` max_amount_b <br/>`Compactu128` min_share_increment <br/>`bool` stake_increment_share <br/> |
454+
|Add liquidity | | :heavy_check_mark: | :heavy_check_mark: | `CurrencyId` currency_id_a <br/>`CurrencyId` currency_id_b <br/>`Compactu128` max_amount_a <br/>`Compactu128` max_amount_b <br/>`Compactu128` min_share_increment <br/>`bool` stake_increment_share <br/> |
453455
|Add provision | | :heavy_check_mark: | | `CurrencyId` currency_id_a <br/>`CurrencyId` currency_id_b <br/>`Compactu128` amount_a <br/>`Compactu128` amount_b <br/> |
454456
|Claim dex share | | :heavy_check_mark: | | `AccountId` owner <br/>`CurrencyId` currency_id_a <br/>`CurrencyId` currency_id_b <br/> |
455457
|Remove liquidity | | :heavy_check_mark: | | `CurrencyId` currency_id_a <br/>`CurrencyId` currency_id_b <br/>`Compactu128` remove_share <br/>`Compactu128` min_withdrawn_a <br/>`Compactu128` min_withdrawn_b <br/>`bool` by_unstake <br/> |
@@ -473,8 +475,9 @@ Please:
473475

474476
| Name | Light | XL | Nesting | Arguments |
475477
| :---------- |:------------:|:--------:|:--------:|:--------|
476-
|Swap with exact supply | | | | `VecSwapPath` paths <br/>`Balance` supply_amount <br/>`Balance` min_target_amount <br/> |
477-
|Update aggregated swap paths | | | | `VecTupleCurrencyIdCurrencyIdOptionVecSwapPath` updates <br/> |
478+
|Swap with exact supply | | :heavy_check_mark: | :heavy_check_mark: | `VecSwapPath` paths <br/>`CompactBalance` supply_amount <br/>`CompactBalance` min_target_amount <br/> |
479+
|Swap with exact target | | :heavy_check_mark: | :heavy_check_mark: | `VecSwapPath` paths <br/>`CompactBalance` target_amount <br/>`CompactBalance` max_supply_amount <br/> |
480+
|Update aggregated swap paths | | :heavy_check_mark: | :heavy_check_mark: | `VecTupleCurrencyIdCurrencyIdOptionVecSwapPath` updates <br/> |
478481

479482
## AuctionManager
480483

@@ -491,7 +494,7 @@ Please:
491494

492495
| Name | Light | XL | Nesting | Arguments |
493496
| :---------- |:------------:|:--------:|:--------:|:--------|
494-
|Adjust loan | | :heavy_check_mark: | | `CurrencyId` currency_id <br/>`Amount` collateral_adjustment <br/>`Amount` debit_adjustment <br/> |
497+
|Adjust loan | | :heavy_check_mark: | :heavy_check_mark: | `CurrencyId` currency_id <br/>`Amount` collateral_adjustment <br/>`Amount` debit_adjustment <br/> |
495498
|Close loan has debit by dex | | :heavy_check_mark: | | `CurrencyId` currency_id <br/>`Compactu128` max_collateral_amount <br/> |
496499
|Transfer loan from | | :heavy_check_mark: | | `CurrencyId` currency_id <br/>`LookupasStaticLookupSource` from <br/> |
497500
|Authorize | | :heavy_check_mark: | | `CurrencyId` currency_id <br/>`LookupasStaticLookupSource` to <br/> |
@@ -553,7 +556,7 @@ Please:
553556
| Name | Light | XL | Nesting | Arguments |
554557
| :---------- |:------------:|:--------:|:--------:|:--------|
555558
|Deposit dex share | | :heavy_check_mark: | | `CurrencyId` lp_currency_id <br/>`Compactu128` amount <br/> |
556-
|Withdraw dex share | | :heavy_check_mark: | | `CurrencyId` lp_currency_id <br/>`Compactu128` amount <br/> |
559+
|Withdraw dex share | | :heavy_check_mark: | :heavy_check_mark: | `CurrencyId` lp_currency_id <br/>`Compactu128` amount <br/> |
557560
|Claim rewards | | :heavy_check_mark: | | `PoolId` pool_id <br/> |
558561
|Update incentive rewards | | | | `VecTuplePoolIdVecTupleCurrencyIdBalance` updates <br/> |
559562
|Update dex saving rewards | | | | `VecTuplePoolIdRate` updates <br/> |

‎app/Makefile‎

Lines changed: 4 additions & 5 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,12 +95,11 @@ 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
ifeq ($(TARGET_NAME),TARGET_NANOS)
102101
APP_LOAD_PARAMS += --appFlags 0x000
103-
APP_STACK_SIZE:=3216
102+
APP_STACK_SIZE:=3144
104103
ICONNAME:=$(CURDIR)/nanos_icon.gif
105104
OUTPUT_ELF ?= $(CURDIR)/output/app_s.elf
106105
OUTPUT_INSTALLER := $(CURDIR)/pkg/installer_s.sh

‎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=2064
4+
APPVERSION_N=2082
55
# This is the patch version of this release
66
APPVERSION_P=0

0 commit comments

Comments
 (0)