From 042e66a0918a4543f4167108123f9b2a28c056a4 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 8 Dec 2020 17:05:04 +0100
Subject: [PATCH 1/3] Use python only, no bash anymore ...

---
 zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py b/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py
index 86ded7c..167b691 100755
--- a/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py
+++ b/zen/tools/create_ipfsnodeid_from_tmp_secret.dunikey.py
@@ -8,19 +8,19 @@
 # protoc --python_out=. crypto.proto
 #########################################################################
 
-import os
-import base58
-import base64
+import re, base58, base64, crypto_pb2
 import cryptography.hazmat.primitives.asymmetric.ed25519 as ed25519
 from cryptography.hazmat.primitives import serialization
-import crypto_pb2
-from sys import argv
 
 # TODO controls
 # Capturing keys (from /tmp/secret.dunikey)
-shared_key = os.popen('cat /tmp/secret.dunikey | grep pub | cut -d " " -f 2').read()
-secure_key = os.popen('cat /tmp/secret.dunikey | grep sec | cut -d " " -f 2').read()
 
+dunikey = "/tmp/secret.dunikey"
+for line in open(dunikey, "r"):
+    if re.search("pub", line):
+        shared_key = line.replace('\n','').split(': ')[1]
+    elif re.search("sec", line):
+        secure_key = line.replace('\n','').split(': ')[1]
 
 # Decoding keys
 decoded_shared = base58.b58decode(shared_key)
@@ -46,7 +46,7 @@ pkey = crypto_pb2.PrivateKey()
 pkey.Type = 1
 pkey.Data = ipfs_secure_bytes + ipfs_shared_bytes
 PrivKey = base64.b64encode(pkey.SerializeToString()).decode('ascii')
-print('PrivKEY={}'.format(base64.b64encode(pkey.SerializeToString()).decode('ascii')))
+print('PrivKEY=' + base64.b64encode(pkey.SerializeToString()).decode('ascii'))
 
 # jq '.Identity.PeerID="$PeerID"' ~/.ipfs/config
 # jq '.Identity.PrivKey="$PrivKey"' ~/.ipfs/config

From 5c65c8fb55a92928db09d9887acb296bc65d2b49 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 8 Dec 2020 18:01:42 +0100
Subject: [PATCH 2/3] Add tool to convert ipfs ID to pubkey

---
 zen/tools/ipfs_to_g1.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 zen/tools/ipfs_to_g1.py

diff --git a/zen/tools/ipfs_to_g1.py b/zen/tools/ipfs_to_g1.py
new file mode 100755
index 0000000..f34b750
--- /dev/null
+++ b/zen/tools/ipfs_to_g1.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+import sys, base58
+
+ID = sys.argv[1]
+hexFmt = base58.b58decode(ID)
+noTag = hexFmt[6:]
+b58Key = base58.b58encode(noTag).decode()
+
+print(b58Key)

From 913ae5a16d5c3d01f3e4caadd81090f1da695b16 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 8 Dec 2020 18:36:48 +0100
Subject: [PATCH 3/3] remove zen/tools/__pycache__/ -> .gitignore

---
 .gitignore                                      |   1 +
 zen/tools/__pycache__/crypto_pb2.cpython-36.pyc | Bin 3040 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 zen/tools/__pycache__/crypto_pb2.cpython-36.pyc

diff --git a/.gitignore b/.gitignore
index 7cb3b64..c31e826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ www/LOVELand/jukebox/prefs
 www/LOVELand/jukebox/albumart
 www/LOVELand/g1barre/img/qrcodes
 zen/tools/scraping/transiscope/transiscope.json
+zen/tools/__pycache__
diff --git a/zen/tools/__pycache__/crypto_pb2.cpython-36.pyc b/zen/tools/__pycache__/crypto_pb2.cpython-36.pyc
deleted file mode 100644
index ba72c329458995fb1ecdc5beef84a296f951dffa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3040
zcmbtWNpIUm6eg*iS}og(oOqF!EOKlqcIp&CgP@7+6hYcVu-&wo3qff{3T28UhIC>J
zxv8fDz7_osz4dPtD9}5vy;QfJ3l!*kLv2o7piMR4<2P^KI`7R;chhP0=Wl<~ew&u0
zU!{p(5%8z*xIZeAL?tSl5|NnHmZ>x+QRP_Ti!?;T-$>3Hjo_OoAQd%3oiGW@s1Y+G
zohXS390wdH34s%URgx4~1)L&jfs=qUBqK{K-OlzTl4G&<6iv}I%`k;#dos<Phe@90
z+S4rGlR+-lo}p7TPi2+|JWHp+D?|!o<~$-ev$OzXl5>R?VN7!7r~+faX@v#4O0UuR
z^8_h?w=1k5yoK9EL}ZRi<SH$YYqUt_sX`XO(;{7<ix>wyvGx*Oq9ur=K$qzXcv~Gr
zB?Ce~Yv)-Zb)DV-nIgSOZ=n=qS%xfwF_LU4EeQwkS7}C|b$Xj_oaabMc;2Ly3!bb0
z%JZEM^1Ma2h392fV5Rm7U7C}$Rlv(5Tw?k58eMoGv1Nfa0TlpUr&EBE?HhD~CE7Qe
zGP}h}^e+AAT<L{K8TNUdLH1Bpl-V4~ERSSv3z^#}Lw8tS+koshS*Bg-Nw9PGdU8(z
zZk5W1Qu*UPw(|3S2xvn_3_pD1vkQ+K2J%h<QTh1~Kz#X>qp%=<+^fE}JFME|j8@;;
z{MdE$2CM3>$8E>vUbV}ts%P7#TW#<&$Fnu3zFl$7{P+V?@6@UOFoG`Nk$4oyg$Up{
z1rewK-brmJY!5?Lp8HW#_Y7+bqKPuAVN+I?ImS7TjH6*;bL0V}r<irp(Y!N<X>Ymi
zIE({RrOa(`1ERxOtixPaZ-GT$<*aG4hG*Co%(CuTr*4}X)jhqgyC{$uYhq&ERFGuF
z;kIXY6T?}ZL<MKN`=@$ABtI5e`9w|BPU@!7c*f51B{h5mK^Enbax1f)uZ%2JU=>&L
zDK)$YffN;xNUc0j)fzY6=pOq3?e+U=Y-l#7h7JxN<)nO4jqTIzot>@wIXRzJ6Njwf
zZ13DV-pVQYgc{l3-2<`E;|;RjGQ8I(^-9C;R86DqY&+GKy&0g*hRxZa@>Qo^4*OwC
z?=U|GU2+V2>_^=*%hOLu+GX6(O{2>wY@|O7r#tnx#C?pf9N}3guOBfi%1-?#6t&K{
zAF~~-mFtJG!u~LUKDM$y&Y+Kt<p(MBzX#m^1xPs&*i1A}Oj8qK#+!!81PUYaqi=Nc
zgt>mUVMEl0WmqlIOT2&va}znZp3Xf#Gr?gN^~VM7PLC5CRoxdg?-nmvs$k9g8H_a!
z<ViUzg5^sv;WJ2Pkz4^n;tj_UVfhhLuQQWOz1CfgvZj7wdYVYVPhXgl)S%}BwZ!O<
z@KrRJGF*+FddzZRb4hjtHMe2I2@=VRX1qLfY}0-U4D}O0e5rp8@k=1(+(Z^7VDM!m
z=+uuk4Q5i;S4Zw#lCqfVL5E;<U80V{bVUp#J&cp;b(8TaFhg=9b&cy*3)G^v#q6fb
z*U;5<bTx5wx-%1-KRQs|xy!hsCjYP`a{d~O_rDV!0)4zA%8IY<?H}$QJgptQIPg_X
z>)7<fWSVx={cnfqjvsQ*TtD@OaV(5xSWTNKTAdVIw%syWa0}H>nia$H7`JqjV*yC^
zy=9KqD@j6!3~xc6L{3~AbOp!afx!4S<Z0yOwD)dAjtxp;dqJy_7_MuyPBKs6^z4nz
z-$${+0c#mhPJVHbWcJ}SkA=xJ&R^oen_$MZXZx>?Ue)%;X5LfF;v7%SSHV5c^Wc=j
ze>aKaA2xm!$vhCEPT0*p!LFNNs9NpI$Dcpl1$VFmwS%WGA06%EBop+fRzDMW1>ZnZ
zvy<n@9j?JYF^DDT+7WO5GiEUk7dEZo$D(1IUj*MBjG4p+6F*FihR1K9@$7KJ25Wo=
zxk)_SgL{vpwVKXd_9D0jNfNhqIEfFXCccs4JC5H+_#Ovs_z=IM?(ab2@}is?k5D`k
zmK8BlimD8;0w@aHsC@Z5t^_)9&{07~jPOWX4)o(f8!g}yhk*!mQF~w^K=J>h8^U~4
P97+aaRzstAC@TL2ENnMC