added Tezos support #302

Adman · 2018-08-31T12:49:35Z

also added device tests for tezos

Signed-off-by: Adrian Matejov [email protected]

We also pushed signed operations to betanet network and they got accepted.
Here's the list of them

transaction tz1 http://tzscan.io/ong8MQBX595Ld4dteHCbPqd6uzmEorEft6ZvfiX5vQMX4WHRh7K
transaction tz2 http://tzscan.io/ooHZ2vbFX1M1fmr9KpLPWQ8r6oZB2RikpGBXsoQSZfbV1hWVjCP
transaction tz3 http://tzscan.io/op79uLwaFqNB6SgcaAaJtoHFBQk3mL5bC1BQTvYzwX2DVSr8RJG
origination tz1 http://tzscan.io/ooJg7qXtUjh16AtdSvv5kgaQnxjtAiBysFkG3EaG5qPAuDT1Cym contract http://tzscan.io/KT1VakcExcig27ZAuoLTExgGXtvUsykQSf5R
origination tz2 http://tzscan.io/opDrUvCGUwKeu86b7GbRLeVzAkyKkdfnV9aSGAzGDLYYS11m6Qr contract http://tzscan.io/KT1LdQeHBSpvvzdRH495qHmtagavZcZ9Z5GW
origination tz3 http://tzscan.io/opVWtfwvSvHzC6hsSGG31G23Q6nBov8SSvmA2nYXBNc5fWGk3Bg contract http://tzscan.io/KT1VfKfsgKFEfZ5vZUaZNaZyGrQf1gr1MEqr
delegation tz1 http://tzscan.io/onws37YkYRnUvwYiPqYATZFtBVhBwbS2rdPkQjFGbAfLzt82MGa
delegation tz2 http://tzscan.io/oocKfbotJwN5Zvmoybhb9LUJ6VhmeS42G2oZHaXQ2mXm98Rzx8r
delegation tz3 http://tzscan.io/ooFQBcoMzwseJHnFgQ9fEPxAXhtgifuvvEH1CtmyAtnK5R7Drik
transaction+reveal tz2 http://tzscan.io/ooEyN4FxP8RYh98RJgQxposDUuWHLWT8fUzWawNRCsMGxaNAN9c
transaction+reveal tz3 http://tzscan.io/ooLaWQzZj1cbkMjZAifV71QCu5bdbMtET5CabrzLWQmnGMMhwmE

* also added device tests for tezos Signed-off-by: Adrian Matejov <[email protected]>

matejcik · 2018-09-04T14:42:31Z

trezorctl

+#
+@cli.command(help='Get Tezos address for specified path.')
+@click.option('-n', '--address', required=True, help="BIP-32 path, e.g. m/44'/1729'/0'/0'/0'")
+@click.option('-c', '--curve', default=0, type=click.IntRange(0, 2), help='Curve to use (0 = ed25519, 1 = secp256k1, 2 = p256)')


please use a ChoiceType for curve, see Bitcoin's get_address and CHOICE_INPUT_SCRIPT_TYPE

matejcik · 2018-09-04T14:45:34Z

trezorlib/tests/device_tests/test_msg_tezos_sign_tx.py

+@pytest.mark.skip_t1
+class TestMsgTezosSignTx(TrezorTest):
+
+    def setup_method(self, method):


instead of this method, make a constant TEZOS_PATH = parse_path(...) at top level and use it in tests

matejcik · 2018-09-04T14:46:33Z

trezorlib/tests/device_tests/test_msg_tezos_getaddress.py

+
+        path = parse_path("m/44'/1729'/0'/0'/0'")
+
+        address = get_address(self.client, path, 0, show_display=True)


please use your CurveType enums

matejcik · 2018-09-04T14:54:11Z

trezorlib/tezos.py

+
+
+@field('address')
+@expect(messages.TezosAddress)


you will need to update this to @expect(messages.TezosAddress, field="address")

matejcik · 2018-09-04T14:54:55Z

trezorlib/tezos.py

+
+
+@expect(messages.TezosSignedTx)
+def sign_tx(client, msg: messages.TezosSignTx):


this function should take address_n as argument

(and probably curve too, if that's a property of the derived address)

matejcik · 2018-09-04T14:55:23Z

trezorlib/tezos.py

+    return client.call(msg)
+
+
+def create_sign_tx_msg(address_n, curve, transaction) -> messages.TezosSignTx:


you might be able to replace most of this function with protobuf.dict_to_proto

matejcik · 2018-09-04T14:57:10Z

trezorlib/tests/device_tests/test_msg_tezos_getpublickey.py

+
+        path = parse_path("m/44'/1729'/0'/0'/0'")
+
+        pk = get_public_key(self.client, path, 0)


please use your CurveType enums instead of constants like 0, 1, 2

matejcik · 2018-09-04T15:02:43Z

I reviewed your code, please see and make changes where appropriate.

General notes:

you should use CurveType constants in most places - maybe not in the dicts that are inputs to create_sign_tx_msg, because these might come from outside? But definitely in arguments to calls.
please mark all your tests as @pytest.mark.xfail, so that we can merge this before trezor-core code is ready

I also did a big change to master, so now you get merge conflicts. Resolution instructions are as follows:

fix trezorctl. that should be as simple as copy-pasting your code pre-merge to the appropriate place post-merge
change @field-@expect decorators to @expect(..., field=...)
run make style. this requires Python 3.6

You should also be able to leverage protobuf.dict_to_proto instead of the explicit create_sign_tx_msg function.

Signed-off-by: Adrian Matejov <[email protected]>

Adman · 2018-09-05T11:05:08Z

@matejcik Everything should be fixed

matejcik · 2018-09-05T12:16:56Z

trezorlib/tezos.py

+def sign_tx(client, address_n, curve, operations):
+    operations["address_n"] = address_n
+    operations["curve"] = curve
+    msg = dict_to_proto(messages.TezosSignTx, operations)


instead:

def sign_tx(client, address_n, curve, transaction: messages.TezosSignTx): transaction.address_n = address_n transaction.curve = curve return client.call(transaction)

matejcik · 2018-09-05T12:17:09Z

trezorctl

+def tezos_sign_tx(connect, address, curve, file):
+    client = connect()
+    address_n = tools.parse_path(address)
+    return tezos.sign_tx(client, address_n, curve, json.load(file))


do not pass raw dicts to sign_tx, instead move the dict_to_proto call here.

matejcik · 2018-09-05T12:17:44Z

trezorlib/tests/device_tests/test_msg_tezos_getaddress.py

+
+import pytest
+
+from trezorlib import messages as proto


please use messages directly instead of messages as proto

matejcik · 2018-09-05T12:18:42Z

thank you. Looks mostly good now, a couple minor points. I'll also wait for changes in the used paths (or not), as discussed on Gitter.

Signed-off-by: Adrian Matejov <[email protected]>

Adman · 2018-09-05T15:08:48Z

@matejcik I will rework this to support only one curve ed25519.

Signed-off-by: Adrian Matejov <[email protected]>

Adman · 2018-09-07T12:12:07Z

@matejcik done.
Tests:

transaction: http://tzscan.io/opNeGBdgbM5jN2ykz4o8NdsCuJfqNZ6WBEFVbBUmYH8gp45CJvH
transaction + reveal: http://tzscan.io/opQHu93L8juNm2VjmsMKioFowWNyMvGzopcuoVcuzFV1bJMhJef
origination: http://tzscan.io/onuKkBtP4K2JMGg7YMv7qs869B8aHCEUQecvuiL71aKkY8iPCb6
delegation: http://tzscan.io/oocgc3hyKsGHPsw6WFWJpWT8jBwQLtebQAXF27KNisThkzoj635

Signed-off-by: Adrian Matejov <[email protected]>

matejcik · 2018-09-10T14:18:38Z

Looks good.
Please add @pytest.mark.skip_t1 to all tests, we won't be doing Tezos on T1 codebase.
I'm ready to merge after that change.

Signed-off-by: Adrian Matejov <[email protected]>

Adman · 2018-09-10T14:27:11Z

Added

matejcik · 2018-09-10T14:40:40Z

Thanks!

Adman mentioned this pull request Aug 31, 2018

Tezos integration trezor/trezor-core#292

Merged

added Tezos support

ca10734

* also added device tests for tezos Signed-off-by: Adrian Matejov <[email protected]>

matejcik reviewed Sep 4, 2018

View reviewed changes

Adrian Matejov added 2 commits September 5, 2018 09:12

Merge branch 'master' into tezos

b67727f

Signed-off-by: Adrian Matejov <[email protected]>

tezos: using dict_to_proto, curve enums

20a8b59

Signed-off-by: Adrian Matejov <[email protected]>

matejcik reviewed Sep 5, 2018

View reviewed changes

tezos: shorter path and small fixes

265a478

Signed-off-by: Adrian Matejov <[email protected]>

Adrian Matejov added 4 commits September 6, 2018 14:01

Merge branch 'master' into tezos

c203aad

tezos: added values to tests

3eed7ff

Signed-off-by: Adrian Matejov <[email protected]>

Merge branch 'master' into tezos

712795a

Signed-off-by: Adrian Matejov <[email protected]>

tezos: fixed tests

b642a32

Signed-off-by: Adrian Matejov <[email protected]>

Adrian Matejov added 3 commits September 7, 2018 14:21

run black

10f8d95

Signed-off-by: Adrian Matejov <[email protected]>

vendor: updated trezor-common

bd94afb

Signed-off-by: Adrian Matejov <[email protected]>

Merge branch 'master' into tezos

62835e7

tezos: skip_t1 in tests

5113b50

Signed-off-by: Adrian Matejov <[email protected]>

matejcik merged commit 15df848 into trezor:master Sep 10, 2018

matejcik added this to the v0.11 milestone Nov 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added Tezos support #302

added Tezos support #302

Adman commented Aug 31, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik Sep 4, 2018

matejcik commented Sep 4, 2018

Adman commented Sep 5, 2018

matejcik Sep 5, 2018

matejcik Sep 5, 2018

matejcik Sep 5, 2018

matejcik commented Sep 5, 2018

Adman commented Sep 5, 2018

Adman commented Sep 7, 2018

matejcik commented Sep 10, 2018

Adman commented Sep 10, 2018

matejcik commented Sep 10, 2018


		path = parse_path("m/44'/1729'/0'/0'/0'")

		address = get_address(self.client, path, 0, show_display=True)



		@expect(messages.TezosSignedTx)
		def sign_tx(client, msg: messages.TezosSignTx):

		return client.call(msg)


		def create_sign_tx_msg(address_n, curve, transaction) -> messages.TezosSignTx:


		path = parse_path("m/44'/1729'/0'/0'/0'")

		pk = get_public_key(self.client, path, 0)



		@field('address')
		@expect(messages.TezosAddress)

added Tezos support #302

added Tezos support #302

Conversation

Adman commented Aug 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matejcik commented Sep 4, 2018

Adman commented Sep 5, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matejcik commented Sep 5, 2018

Adman commented Sep 5, 2018

Adman commented Sep 7, 2018

matejcik commented Sep 10, 2018

Adman commented Sep 10, 2018

matejcik commented Sep 10, 2018