From 33ac5de8486642e25c6b4ccf69577568f08dbc0d Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Mon, 12 Mar 2018 13:21:41 +0100 Subject: [PATCH] wallet/nem: basic modtrezorcrypto for nem --- .../modtrezorcrypto/modtrezorcrypto-nem.h | 47 +++++++++++++++++++ .../extmod/modtrezorcrypto/modtrezorcrypto.c | 2 + mocks/generated/trezorcrypto.py | 6 +++ src/trezor/crypto/__init__.py | 2 +- 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 embed/extmod/modtrezorcrypto/modtrezorcrypto-nem.h diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto-nem.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-nem.h new file mode 100644 index 000000000..67e35a3b7 --- /dev/null +++ b/embed/extmod/modtrezorcrypto/modtrezorcrypto-nem.h @@ -0,0 +1,47 @@ +/* + * This file is part of the TREZOR project, https://trezor.io/ + * + * Copyright (c) SatoshiLabs + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "py/objstr.h" +#include "nem.h" + +/// def validate_address(address: str, network: int) -> bool: +/// ''' +/// Validate a NEM address +/// ''' +STATIC mp_obj_t mod_trezorcrypto_nem_validate_address(mp_obj_t address, mp_obj_t network) { + + mp_buffer_info_t addr; + mp_get_buffer_raise(address, &addr, MP_BUFFER_READ); + + uint32_t n = mp_obj_get_int_truncated(network); + return mp_obj_new_bool(nem_validate_address(addr.buf, n)); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nem_validate_address_obj, mod_trezorcrypto_nem_validate_address); + +// objects definition +STATIC const mp_rom_map_elem_t mod_trezorcrypto_nem_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR_validate_address), MP_ROM_PTR(&mod_trezorcrypto_nem_validate_address_obj) }, +}; +STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_nem_globals, mod_trezorcrypto_nem_globals_table); + +// module definition +STATIC const mp_obj_module_t mod_trezorcrypto_nem_module = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t*)&mod_trezorcrypto_nem_globals, +}; diff --git a/embed/extmod/modtrezorcrypto/modtrezorcrypto.c b/embed/extmod/modtrezorcrypto/modtrezorcrypto.c index 466a409b4..de107b881 100644 --- a/embed/extmod/modtrezorcrypto/modtrezorcrypto.c +++ b/embed/extmod/modtrezorcrypto/modtrezorcrypto.c @@ -36,6 +36,7 @@ #include "modtrezorcrypto-curve25519.h" #include "modtrezorcrypto-ed25519.h" #include "modtrezorcrypto-nist256p1.h" +#include "modtrezorcrypto-nem.h" #include "modtrezorcrypto-pbkdf2.h" #include "modtrezorcrypto-random.h" #include "modtrezorcrypto-rfc6979.h" @@ -60,6 +61,7 @@ STATIC const mp_rom_map_elem_t mp_module_trezorcrypto_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_curve25519), MP_ROM_PTR(&mod_trezorcrypto_curve25519_module) }, { MP_ROM_QSTR(MP_QSTR_ed25519), MP_ROM_PTR(&mod_trezorcrypto_ed25519_module) }, { MP_ROM_QSTR(MP_QSTR_nist256p1), MP_ROM_PTR(&mod_trezorcrypto_nist256p1_module) }, + { MP_ROM_QSTR(MP_QSTR_nem), MP_ROM_PTR(&mod_trezorcrypto_nem_module) }, { MP_ROM_QSTR(MP_QSTR_pbkdf2), MP_ROM_PTR(&mod_trezorcrypto_Pbkdf2_type) }, { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mod_trezorcrypto_random_module) }, { MP_ROM_QSTR(MP_QSTR_rfc6979), MP_ROM_PTR(&mod_trezorcrypto_Rfc6979_type) }, diff --git a/mocks/generated/trezorcrypto.py b/mocks/generated/trezorcrypto.py index a110d65af..ddba1f1c6 100644 --- a/mocks/generated/trezorcrypto.py +++ b/mocks/generated/trezorcrypto.py @@ -309,6 +309,12 @@ def cosi_sign(secret_key: bytes, message: bytes, nonce: bytes, sigR: bytes, comb Produce signature of message using COSI cosigning scheme. ''' +# extmod/modtrezorcrypto/modtrezorcrypto-nem.h +def validate_address(address: str, network: int) -> bool: + ''' + Validate a NEM address + ''' + # extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h def generate_secret() -> bytes: ''' diff --git a/src/trezor/crypto/__init__.py b/src/trezor/crypto/__init__.py index 0cb5c1497..1041d98cf 100644 --- a/src/trezor/crypto/__init__.py +++ b/src/trezor/crypto/__init__.py @@ -1 +1 @@ -from trezorcrypto import bip32, bip39, chacha20poly1305, crc, pbkdf2, random, rfc6979 # noqa: F401 +from trezorcrypto import bip32, bip39, chacha20poly1305, crc, pbkdf2, random, rfc6979, nem # noqa: F401