Merge pull request #9 from ton-blockchain/develop

Hardcoded jettons

Author: fbeutin-ledger

Makefile

@@ -21,125 +21,53 @@ endif
 
 include $(BOLOS_SDK)/Makefile.defines
 
-APP_LOAD_PARAMS  = --curve ed25519
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX))
-APP_LOAD_PARAMS += --appFlags 0x200  # APPLICATION_FLAG_BOLOS_SETTINGS
-else
-APP_LOAD_PARAMS += --appFlags 0x000
+ifneq ($(TARGET_NAME),TARGET_NANOS)
+    DEFINES += HAVE_HARDCODED_JETTONS
 endif
-APP_LOAD_PARAMS += --path "44'/607'"
-APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)
 
 APPNAME      = "TON"
 APPVERSION_M = 2
-APPVERSION_N = 1
+APPVERSION_N = 3
 APPVERSION_P = 0
 APPVERSION   = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-    ICONNAME=icons/nanos_app_ton.gif
-else ifeq ($(TARGET_NAME),TARGET_STAX)
-    ICONNAME=icons/ledger_stax_ton_32.gif
-else
-    ICONNAME=icons/nanox_app_ton.gif
-endif
-
-all: default
-
-DEFINES += $(DEFINES_LIB)
-DEFINES += APPNAME=\"$(APPNAME)\"
-DEFINES += APPVERSION=\"$(APPVERSION)\"
-DEFINES += MAJOR_VERSION=$(APPVERSION_M) MINOR_VERSION=$(APPVERSION_N) PATCH_VERSION=$(APPVERSION_P)
-DEFINES += OS_IO_SEPROXYHAL
-DEFINES += HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
-DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
-DEFINES += USB_SEGMENT_SIZE=64
-DEFINES += BLE_SEGMENT_SIZE=32
-DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
-
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX))
-    DEFINES += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000 HAVE_BLE_APDU
-endif
-
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-    DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128
-else
-    DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300
-endif
-
-ifeq ($(TARGET_NAME),TARGET_STAX)
-    DEFINES += NBGL_QRCODE
-    SDK_SOURCE_PATH += qrcode
-else
-    DEFINES += HAVE_BAGL HAVE_UX_FLOW
-    ifneq ($(TARGET_NAME),TARGET_NANOS)
-        DEFINES += HAVE_GLO096
-        DEFINES += BAGL_WIDTH=128 BAGL_HEIGHT=64
-        DEFINES += HAVE_BAGL_ELLIPSIS # long label truncation feature
-        DEFINES += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
-        DEFINES += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
-        DEFINES += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
-    endif
-endif
-
-DEBUG = 0
-ifneq ($(DEBUG),0)
-    DEFINES += HAVE_PRINTF
-    ifeq ($(TARGET_NAME),TARGET_NANOS)
-        DEFINES += PRINTF=screen_printf
-    else
-        DEFINES += PRINTF=mcu_usb_printf
-    endif
-else
-        DEFINES += PRINTF\(...\)=
-endif
-
-ifneq ($(BOLOS_ENV),)
-$(info BOLOS_ENV=$(BOLOS_ENV))
-CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin/
-GCCPATH   := $(BOLOS_ENV)/gcc-arm-none-eabi-5_3-2016q1/bin/
-else
-$(info BOLOS_ENV is not set: falling back to CLANGPATH and GCCPATH)
-endif
-ifeq ($(CLANGPATH),)
-$(info CLANGPATH is not set: clang will be used from PATH)
-endif
-ifeq ($(GCCPATH),)
-$(info GCCPATH is not set: arm-none-eabi-* will be used from PATH)
-endif
+APP_SOURCE_PATH += src
 
-CC      := $(CLANGPATH)clang
-CFLAGS  += -O3 -Os
-AS      := $(GCCPATH)arm-none-eabi-gcc
-LD      := $(GCCPATH)arm-none-eabi-gcc
-LDFLAGS += -O3 -Os
-LDLIBS  += -lm -lgcc -lc
+ICON_NANOX = icons/nanox_app_ton.gif
+ICON_NANOSP = icons/nanox_app_ton.gif
+ICON_NANOS = icons/nanos_app_ton.gif
+ICON_STAX = icons/ledger_stax_ton_32.gif
+ICON_FLEX = icons/ledger_flex_ton_40.gif
 
-include $(BOLOS_SDK)/Makefile.glyphs
+CURVE_APP_LOAD_PARAMS = ed25519
 
-APP_SOURCE_PATH += src
-SDK_SOURCE_PATH += lib_stusb lib_stusb_impl
+PATH_APP_LOAD_PARAMS = "44'/607'"
 
-ifneq ($(TARGET_NAME),TARGET_STAX)
-    SDK_SOURCE_PATH += lib_ux
-endif
-
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX))
-    SDK_SOURCE_PATH += lib_blewbxx lib_blewbxx_impl
-endif
+VARIANT_PARAM = COIN
+VARIANT_VALUES = TON
 
-load: all
-	python3 -m ledgerblue.loadApp $(APP_LOAD_PARAMS)
+# DEBUG = 1
 
-load-offline: all
-	python3 -m ledgerblue.loadApp $(APP_LOAD_PARAMS) --offline
+# HAVE_APPLICATION_FLAG_DERIVE_MASTER = 1
+# HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1
+# HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
+# HAVE_APPLICATION_FLAG_LIBRARY = 1
 
-delete:
-	python3 -m ledgerblue.deleteApp $(COMMON_DELETE_PARAMS)
+ENABLE_BLUETOOTH = 1
+# ENABLE_NFC = 1
 
-include $(BOLOS_SDK)/Makefile.rules
+ENABLE_NBGL_QRCODE = 1
+# ENABLE_NBGL_KEYBOARD = 1
+# ENABLE_NBGL_KEYPAD = 1
 
-dep/%.d: %.c Makefile
+# DISABLE_STANDARD_APP_FILES = 1 
+# DISABLE_DEFAULT_IO_SEPROXY_BUFFER_SIZE = 1 # To allow custom size declaration
+# DISABLE_STANDARD_APP_DEFINES = 1 # Will set all the following disablers
+# DISABLE_STANDARD_SNPRINTF = 1
+# DISABLE_STANDARD_USB = 1
+# DISABLE_STANDARD_WEBUSB = 1
+# DISABLE_STANDARD_BAGL_UX_FLOW = 1
+# DISABLE_DEBUG_LEDGER_ASSERT = 1
+# DISABLE_DEBUG_THROW = 1
 
-listvariants:
-	@echo VARIANTS COIN TON
+include $(BOLOS_SDK)/Makefile.standard_app

doc/COMMANDS.md

@@ -47,12 +47,13 @@
 Use P2 to control what kind of address to present to user:
 * set bit 0x01 to make address testnet only
 * set bit 0x02 to use masterchain instead of basechain for the address
+* set bit 0x04 to include is_v3r2 flag and subwallet_id
 
 The bip32 path must be at least 3 elements long and must start with the prefix `m/44'/607'/`.
 
 | CLA | INS | P1 | P2 | Lc | CData |
 | --- | --- | --- | --- | --- | --- |
-| 0xE0 | 0x05 | 0x00 (no display) <br> 0x01 (display) | 0x00-0x03 | 1 + 4n | `len(bip32_path) (1)` \|\|<br> `bip32_path{1} (4)` \|\|<br>`...` \|\|<br>`bip32_path{n} (4)` |
+| 0xE0 | 0x05 | 0x00 (no display) <br> 0x01 (display) | 0x00-0x07 | 1 + 4n + (0 or 5) | `len(bip32_path) (1)` \|\|<br> `bip32_path{1} (4)` \|\|<br>`...` \|\|<br>`bip32_path{n} (4)` \|\|<br> (if `P2 & 0x04`) `is_v3r2 (1)` (`0x00` or `0x01`) \|\|<br> (if `P2 & 0x04`) `subwallet_id (4)` |
 
 ### Response
 
@@ -89,6 +90,7 @@ Then an arbitrary number of chunks with transaction data (see [TRANSACTION.md](.
 Use P2 to control what kind of address to present to user:
 * set bit 0x01 to make address testnet only
 * set bit 0x02 to use masterchain instead of basechain for the address
+* set bit 0x04 to include is_v3r2 flag and subwallet_id
 
 The bip32 path must be at least 3 elements long and must start with the prefix `m/44'/607'/`.
 
@@ -98,7 +100,7 @@ Proofs are generated according to this [spec](https://github.com/ton-blockchain/
 
 | CLA | INS | P1 | P2 | Lc | CData |
 | --- | --- | --- | --- | --- | --- |
-| 0xE0 | 0x08 | 0x01 | 0x00-0x03 | 1 + 4n + 1 + d + 8 + p | `len(bip32_path) (1)` \|\|<br> `bip32_path{1} (4)` \|\|<br>`...` \|\|<br>`bip32_path{n} (4)` \|\|<br> `len(app_domain) == d (1)` \|\|<br> `app_domain (d)` \|\|<br> `timestamp (8)` \|\|<br> `payload (p)` |
+| 0xE0 | 0x08 | 0x01 | 0x00-0x03 | 1 + 4n + 1 + d + 8 + p | `len(bip32_path) (1)` \|\|<br> `bip32_path{1} (4)` \|\|<br>`...` \|\|<br>`bip32_path{n} (4)` \|\|<br> (if `P2 & 0x04`) `is_v3r2 (1)` (`0x00` or `0x01`) \|\|<br> (if `P2 & 0x04`) `subwallet_id (4)` \|\|<br> `len(app_domain) == d (1)` \|\|<br> `app_domain (d)` \|\|<br> `timestamp (8)` \|\|<br> `payload (p)` |
 
 ### Response
 

doc/MESSAGES.md

@@ -45,8 +45,10 @@ transfer#0f8a7ea5 query_id:uint64 amount:(VarUInteger 16) destination:MsgAddress
 ### Hints
 | Value | Length or type | Description |
 | --- | --- | --- |
-| `has_query_id` | 1 | Whether `query_id` is present |
-| `query_id` | 0 or 8 | `query_id` for the message, 0 will be used if `!has_query_id` |
+| `flags` | 1 | Bit +1 - whether `query_id` is present, bit +2 - whether this is a known jetton (bit +2 is not available on nano S) |
+| `query_id` | 0 or 8 | `query_id` for the message, 0 will be used if not present. Present only when `flags & 1` |
+| `jetton_id` | 0 or 2 | ID of the known jetton. Present only when `flags & 2` |
+| `owner_workchain` | 0 or 1 | Workchain of owner. Present only when `flags & 2` |
 | `amount` | `varuint` | Jetton amount |
 | `destination` | `address` | Whom to transfer jettons to |
 | `response_destination` | `address` | Whom to transfer the excess of TON to |

fuzzing/fuzz_tx_parser.cc

@@ -4,7 +4,7 @@
 #include <sys/types.h>
 
 extern "C" {
-#include "common/buffer.h"
+#include "common/mybuffer.h"
 #include "transaction/deserialize.h"
 #include "transaction/types.h"
 }

icons/ledger_flex_ton_40.gif

@@ -1,7 +1,7 @@
 [app]
 build_directory = "./"
 sdk = "C"
-devices = ["nanos", "nanox", "nanos+", "stax"]
+devices = ["nanos", "nanox", "nanos+", "stax", "flex"]
 
 [use_cases]
 debug = "DEBUG=1"

ledger_app.toml

@@ -77,45 +77,93 @@ const uint8_t root_header[] = {
     0xd5,
     0xc0};
 
+const uint8_t v3r2_root_header[] = {0x2,  0x1,  0x34, 0x0,  0x0,  0x0,  0x0,  0x84, 0xda, 0xfa,
+                                    0x44, 0x9f, 0x98, 0xa6, 0x98, 0x77, 0x89, 0xba, 0x23, 0x23,
+                                    0x58, 0x7,  0x2b, 0xc0, 0xf7, 0x6d, 0xc4, 0x52, 0x40, 0x2,
+                                    0xa5, 0xd0, 0x91, 0x8b, 0x9a, 0x75, 0xd2, 0xd5, 0x99};
+
 const uint8_t data_header[] = {
     0x00,
     0x51,  // Cell header
     0x00,
     0x00,
     0x00,
     0x00,  // Seqno
-    0x29,
-    0xa9,
-    0xa3,
-    0x17,  // Wallet ID
+};
+
+const uint8_t v3r2_data_header[] = {
+    0x00,
+    0x50,  // Cell header
+    0x00,
+    0x00,
+    0x00,
+    0x00,  // Seqno
 };
 
 const uint8_t data_tail[] = {
     0x40  // zero bit + padding
 };
 
-bool pubkey_to_hash(const uint8_t public_key[static PUBKEY_LEN], uint8_t *out, size_t out_len) {
+bool pubkey_to_hash(const uint8_t public_key[static PUBKEY_LEN],
+                    const uint32_t subwallet_id,
+                    const bool is_v3r2,
+                    uint8_t *out,
+                    size_t out_len) {
     if (out_len != HASH_LEN) {
         return false;
     }
 
     uint8_t inner[HASH_LEN] = {0};
     cx_sha256_t state;
 
+    uint8_t subwallet_buf[4];
+    subwallet_buf[0] = (subwallet_id >> 24) & 0xff;
+    subwallet_buf[1] = (subwallet_id >> 16) & 0xff;
+    subwallet_buf[2] = (subwallet_id >> 8) & 0xff;
+    subwallet_buf[3] = subwallet_id & 0xff;
+
     // Hash init data cell bits
     SAFE(cx_sha256_init_no_throw(&state));
-    SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, data_header, sizeof(data_header), NULL, 0));
-    SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, public_key, PUBKEY_LEN, NULL, 0));
-    SAFE(cx_hash_no_throw((cx_hash_t *) &state,
-                          CX_LAST,
-                          data_tail,
-                          sizeof(data_tail),
-                          inner,
-                          sizeof(inner)));
+    if (is_v3r2) {
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state,
+                              0,
+                              v3r2_data_header,
+                              sizeof(v3r2_data_header),
+                              NULL,
+                              0));
+    } else {
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, data_header, sizeof(data_header), NULL, 0));
+    }
+    SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, subwallet_buf, sizeof(subwallet_buf), NULL, 0));
+    if (is_v3r2) {
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state,
+                              CX_LAST,
+                              public_key,
+                              PUBKEY_LEN,
+                              inner,
+                              sizeof(inner)));
+    } else {
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, public_key, PUBKEY_LEN, NULL, 0));
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state,
+                              CX_LAST,
+                              data_tail,
+                              sizeof(data_tail),
+                              inner,
+                              sizeof(inner)));
+    }
 
     // Hash root
     SAFE(cx_sha256_init_no_throw(&state));
-    SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, root_header, sizeof(root_header), NULL, 0));
+    if (is_v3r2) {
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state,
+                              0,
+                              v3r2_root_header,
+                              sizeof(v3r2_root_header),
+                              NULL,
+                              0));
+    } else {
+        SAFE(cx_hash_no_throw((cx_hash_t *) &state, 0, root_header, sizeof(root_header), NULL, 0));
+    }
     SAFE(cx_hash_no_throw((cx_hash_t *) &state, CX_LAST, inner, sizeof(inner), out, out_len));
 
     return true;
@@ -125,6 +173,8 @@ bool address_from_pubkey(const uint8_t public_key[static PUBKEY_LEN],
                          const uint8_t chain,
                          const bool bounceable,
                          const bool testOnly,
+                         const uint32_t subwallet_id,
+                         const bool is_v3r2,
                          uint8_t *out,
                          size_t out_len) {
     if (out_len < ADDRESS_LEN) {
@@ -133,7 +183,7 @@ bool address_from_pubkey(const uint8_t public_key[static PUBKEY_LEN],
 
     uint8_t hash[HASH_LEN] = {0};
 
-    if (!pubkey_to_hash(public_key, hash, sizeof(hash))) {
+    if (!pubkey_to_hash(public_key, subwallet_id, is_v3r2, hash, sizeof(hash))) {
         return false;
     }
 

src/address.c

@@ -12,6 +12,10 @@
  * @param[in]  public_key
  *   Pointer to byte buffer with public key.
  *   The public key is represented as 32 bytes.
+ * @param[in]  subwallet_id
+ *   Subwallet ID to be used when deriving wallet hash.
+ * @param[in]  is_v3r2
+ *   Whether to use wallet version V3R2 or V4.
  * @param[out] out
  *   Pointer to output byte buffer for address.
  * @param[in]  out_len
@@ -20,7 +24,11 @@
  * @return true if success, false otherwise.
  *
  */
-bool pubkey_to_hash(const uint8_t public_key[static PUBKEY_LEN], uint8_t *out, size_t out_len);
+bool pubkey_to_hash(const uint8_t public_key[static PUBKEY_LEN],
+                    const uint32_t subwallet_id,
+                    const bool is_v3r2,
+                    uint8_t *out,
+                    size_t out_len);
 
 /**
  * Convert public key to address. Uses Wallet V4 contract.
@@ -34,6 +42,10 @@ bool pubkey_to_hash(const uint8_t public_key[static PUBKEY_LEN], uint8_t *out, s
  *   Address have to have bounceable flag set
  * @param[in]  testOnly
  *   Address have to have testnet flag set
+ * @param[in]  subwallet_id
+ *   Subwallet ID to be used when deriving wallet address.
+ * @param[in]  is_v3r2
+ *   Whether to use wallet version V3R2 or V4.
  * @param[out] out
  *   Pointer to output byte buffer for address.
  * @param[in]  out_len
@@ -46,5 +58,7 @@ bool address_from_pubkey(const uint8_t public_key[static PUBKEY_LEN],
                          const uint8_t chain,
                          const bool bounceable,
                          const bool testOnly,
+                         const uint32_t subwallet_id,
+                         const bool is_v3r2,
                          uint8_t *out,
                          size_t out_len);