From 78bedc2c29cc44f39d15a3606ece0ec498d2c1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1lli=20Zolt=C3=A1n?= Date: Wed, 25 Jul 2018 15:34:27 +0200 Subject: [PATCH 1/3] makefile use bash instead of sh make build failed with: /bin/sh: 1: source: not found --- test/gen/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/test/gen/Makefile b/test/gen/Makefile index 5a6035e..011ea30 100644 --- a/test/gen/Makefile +++ b/test/gen/Makefile @@ -1,4 +1,5 @@ +SHELL := /bin/bash SCRYPT_DIR=../../node_modules/triplesec/contrib/scrypt-1.1.6 SCRYPT=${SCRYPT_DIR}/scrypt PBKDF2=./pbkdf2.py From dd5f4c420e1a420b2884b3f45b78eb518ce5339a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1lli=20Zolt=C3=A1n?= Date: Wed, 25 Jul 2018 23:25:42 +0200 Subject: [PATCH 2/3] bu becomes ku bu renamed to ku (key utility) in pycoin version 0.40 --- test/gen/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/gen/Makefile b/test/gen/Makefile index 011ea30..fab65f6 100644 --- a/test/gen/Makefile +++ b/test/gen/Makefile @@ -3,7 +3,7 @@ SHELL := /bin/bash SCRYPT_DIR=../../node_modules/triplesec/contrib/scrypt-1.1.6 SCRYPT=${SCRYPT_DIR}/scrypt PBKDF2=./pbkdf2.py -BU=py-venv/bin/bu +KU=py-venv/bin/ku build: build-scrypt build-python @@ -18,6 +18,6 @@ input: iced gen_input.iced > input.json spec: - (source py-venv/bin/activate && iced gen_spec.iced ${SCRYPT} ${PBKDF2} ${BU} > ../spec.json) + (source py-venv/bin/activate && iced gen_spec.iced ${SCRYPT} ${PBKDF2} ${KU} > ../spec.json) .PHONY: build-scrypt build-python build From 0d9c82b181364fd6d38187f60a51919ed86e8930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1lli=20Zolt=C3=A1n?= Date: Wed, 25 Jul 2018 23:52:04 +0200 Subject: [PATCH 3/3] pycoin's ku syntax changed --- test/gen/gen_spec.iced | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/gen/gen_spec.iced b/test/gen/gen_spec.iced index a0ba985..240cbf2 100644 --- a/test/gen/gen_spec.iced +++ b/test/gen/gen_spec.iced @@ -105,14 +105,14 @@ class Runner for line in out.join("\n").split(/\n+/) when line.length [key,val] = line.split(/:\s+/) if key[0] is ' ' - bu_out[last_key][key.replace(/\s+/, '')] = val + bu_out[last_key][key.replace(/^\s+|\s+$/g, '')] = val else - last_key = key - bu_out[key] = { _ : val} + last_key = key.replace(/\s+$/, '') + bu_out[last_key] = { "value" : val} cb { - "private" : bu_out.WIF.uncompressed - "public" : bu_out['Bitcoin address'].uncompressed + "private" : bu_out.wif.uncompressed + "public" : bu_out['Bitcoin address uncompressed'].value } #-------------------