Skip to content

Commit 03086fe

Browse files
authored
Merge pull request #5 from Zondax/update-2061
2 parents 9ae58de + b7ba885 commit 03086fe

68 files changed

Lines changed: 18913 additions & 15547 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ file(GLOB_RECURSE LIB_SRC
115115
####
116116
${CMAKE_CURRENT_SOURCE_DIR}/app/src/crypto_helper.c
117117
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser.c
118+
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl_common.c
118119
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
119120
${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_txdef.c
120121
${CMAKE_CURRENT_SOURCE_DIR}/app/src/substrate/substrate*.c

README.md

Lines changed: 13 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.2060.x
31+
# Acala 1.2061.x
3232

3333
## System
3434

@@ -507,7 +507,6 @@ Please:
507507
| :---------- |:------------:|:--------:|:--------:|:--------|
508508
|Liquidate | | | | `CurrencyId` currency_id <br/>`LookupasStaticLookupSource` who <br/> |
509509
|Settle | | | | `CurrencyId` currency_id <br/>`LookupasStaticLookupSource` who <br/> |
510-
|Set global params | | | | `Rate` global_interest_rate_per_sec <br/> |
511510
|Set collateral params | | | | `CurrencyId` currency_id <br/>`ChangeOptionRate` interest_rate_per_sec <br/>`ChangeOptionRatio` liquidation_ratio <br/>`ChangeOptionRate` liquidation_penalty <br/>`ChangeOptionRatio` required_collateral_ratio <br/>`ChangeBalance` maximum_total_debit_value <br/> |
512511

513512
## EmergencyShutdown
@@ -601,6 +600,18 @@ Please:
601600
|Claim account | | :heavy_check_mark: | | `EvmAddress` eth_address <br/>`Eip712Signature` eth_signature <br/> |
602601
|Claim default account | | :heavy_check_mark: | | |
603602

603+
## StableAsset
604+
605+
| Name | Light | XL | Nesting | Arguments |
606+
| :---------- |:------------:|:--------:|:--------:|:--------|
607+
|Create pool | | | | `AssetId` pool_asset <br/>`VecAssetId` assets <br/>`VecAtLeast64BitUnsigned` precisions <br/>`AtLeast64BitUnsigned` mint_fee <br/>`AtLeast64BitUnsigned` swap_fee <br/>`AtLeast64BitUnsigned` redeem_fee <br/>`AtLeast64BitUnsigned` initial_a <br/>`AccountId` fee_recipient <br/>`AccountId` yield_recipient <br/>`AtLeast64BitUnsigned` precision <br/> |
608+
|Mint | | :heavy_check_mark: | | `StableAssetPoolId` pool_id <br/>`VecBalance` amounts <br/>`Balance` min_mint_amount <br/> |
609+
|Swap | | :heavy_check_mark: | | `StableAssetPoolId` pool_id <br/>`PoolTokenIndex` i <br/>`PoolTokenIndex` j <br/>`Balance` dx <br/>`Balance` min_dy <br/>`u32` asset_length <br/> |
610+
|Redeem proportion | | :heavy_check_mark: | | `StableAssetPoolId` pool_id <br/>`Balance` amount <br/>`VecBalance` min_redeem_amounts <br/> |
611+
|Redeem single | | :heavy_check_mark: | | `StableAssetPoolId` pool_id <br/>`Balance` amount <br/>`PoolTokenIndex` i <br/>`Balance` min_redeem_amount <br/>`u32` asset_length <br/> |
612+
|Redeem multi | | :heavy_check_mark: | | `StableAssetPoolId` pool_id <br/>`VecBalance` amounts <br/>`Balance` max_redeem_amount <br/> |
613+
|Modify a | | | | `StableAssetPoolId` pool_id <br/>`AtLeast64BitUnsigned` a <br/>`BlockNumber` future_a_block <br/> |
614+
604615
## ParachainSystem
605616

606617
| Name | Light | XL | Nesting | Arguments |

app/Makefile

Lines changed: 3 additions & 2 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=\"${COMMON_LOAD_PARAMS}\"" >> $(OUTPUT_INSTALLER)
31-
@echo "DELETE_PARAMS=\"${COMMON_DELETE_PARAMS}\"" >> $(OUTPUT_INSTALLER)
30+
@echo "LOAD_PARAMS=\"${APP_LOAD_PARAMS}\"" >> $(OUTPUT_INSTALLER)
31+
@echo "DELETE_PARAMS=\"${APP_DELETE_PARAMS}\"" >> $(OUTPUT_INSTALLER)
3232
@echo "APPHEX=\"" >> $(OUTPUT_INSTALLER)
3333
@cat $(CURDIR)/bin/app.hex >> $(OUTPUT_INSTALLER)
3434
@echo "\"" >> $(OUTPUT_INSTALLER)
@@ -96,6 +96,7 @@ $(error "$(error_message)")
9696
endif
9797

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

100101
ifeq ($(TARGET_NAME),TARGET_NANOS)
101102
APP_LOAD_PARAMS += --appFlags 0x000

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=2060
4+
APPVERSION_N=2061
55
# This is the patch version of this release
6-
APPVERSION_P=1
6+
APPVERSION_P=0

app/src/common/parser_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* (c) 2019 Zondax GmbH
2+
* (c) 2019 - 2022 Zondax GmbH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)