Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ ledger/
# Proto sources
proto/canton/
proto/daml/
proto/canton-protos-scala/
!proto/com/daml/*
proto/*.options
36 changes: 25 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,42 @@
{
"files.associations": {
"*.h": "c"
"*.h": "c",
"optional": "c",
"istream": "c",
"ostream": "c",
"ratio": "c",
"array": "c",
"functional": "c",
"tuple": "c",
"type_traits": "c",
"utility": "c",
"system_error": "c",
"hash_map": "c",
"hash_set": "c",
"string_view": "c",
"initializer_list": "c",
"sstream": "c"
},
"ledgerDevTools.appSettings": {
"selectedUseCase": "release",
"selectedUseCase": "debug",
"selectedDevice": "Nano X",
"selectedVariant": "BOL",
"testsList": [
"test_app_mainmenu",
"test_app_name",
"test_bad_cla",
"test_bad_ins",
"test_wrong_p1p2",
"test_wrong_data_length",
"test_invalid_state",
"test_get_app_and_version",
"test_get_public_key_no_confirm",
"test_get_public_key_confirm_accepted",
"test_get_public_key_confirm_refused",
"test_sign_tx_short_tx",
"test_sign_tx_short_tx_blind_sign",
"test_sign_tx_long_tx",
"test_sign_tx_refused",
"test_sign_tx_hash_32",
"test_sign_tx_hash_34",
"test_sign_tx_ping",
"test_sign_tx_token_transfer",
"test_sign_topology_tx",
"test_version"
],
"selectedTests": [
"test_sign_tx_token_transfer"
]
}
}
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ APPNAME = "Canton"

# Application version
APPVERSION_M = 2
APPVERSION_N = 4
APPVERSION_P = 2
APPVERSION_N = 5
APPVERSION_P = 0
APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"

# Application source files
Expand Down Expand Up @@ -115,7 +115,8 @@ include vendor/nanopb/extra/nanopb.mk

INCLUDES_PATH += $(NANOPB_DIR) . proto

DEFINES += PB_NO_ERRMSG=1
# DEFINES += PB_NO_ERRMSG=1
DEFINES += PB_ENABLE_ERRORS=1
SOURCE_FILES += $(NANOPB_CORE)
APP_SOURCE_PATH += proto

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<br />
<div align="center">
<a href="https://github.com/LedgerHQ/app-canton">
<img src="https://www.canton.network/hubfs/Canton%20Network%20Files/Images/Canton-Network-logos-icons/Canton%20Icon.png" width="70"/>
<img src="doc/canton-vertical-black.png" width=200"/>
</a>
<h1 align="center">app-canton</h1>
<p align="center">
Canton Network wallet application for Ledger devices.
</p>
<p></p>
<p align="center">
Canton Network wallet application for Ledger devices.
</p>
</div>
<br/>

Expand Down
Binary file added doc/canton-vertical-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions proto/com/daml/ledger/api/v2/commands.pb.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,9 @@ typedef struct _com_daml_ledger_api_v2_ExerciseByKeyCommand {

/* Exercise a choice on an existing contract. */
typedef struct _com_daml_ledger_api_v2_ExerciseCommand {
/* The template or interface of the contract the client wants to exercise.
/* The template of contract the client wants to exercise.
Both package-name and package-id reference identifier formats for the template-id are supported.
Note: The package-id reference identifier format is deprecated. We plan to end support for this format in version 3.4.
To exercise a choice on an interface, specify the interface identifier in the template_id field.

Required */
bool has_template_id;
Expand Down
45 changes: 23 additions & 22 deletions proto/com/daml/ledger/api/v2/commands_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading