axiom-team
/
astroport
9
3
Fork 1
Code Issues 13 Pull Requests 1 Releases Wiki Activity

2020.6.6 ASTROPORT METAVERSE #SWARM0 IDENTITY

This commit is contained in:
qo-op 2020-05-11 02:56:04 +02:00
parent e0f8f81c63
commit f564bdf9b0
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g1sms/functions.sh
View File

@ -252,9 +252,9 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
# 4 derniers chiffres du numéro de téléphone
TAIL=${PHONE:8:4}
# No UIDNA yet. Create new
UIDNA=$(./diceware.sh 1 | xargs)
UIDNA=$(~/.zen/astroport/zen/tools/diceware.sh 1 | xargs)
# Check if already existing among all swarm wallets
while [[ $(grep -Rwl "$UIDNA$TAIL" ~/.zen/ipfs_swarm/.*/G1*/_uidna) ]]; do UIDNA=$(./diceware.sh 1 | xargs); done
while [[ $(grep -Rwl "$UIDNA$TAIL" ~/.zen/ipfs_swarm/.*/G1*/_uidna) ]]; do UIDNA=$(~/.zen/astroport/zen/tools/diceware.sh 1 | xargs); done
UIDNA="$UIDNA$TAIL"
echo "$UIDNA" > "$UIDNAFILE"
@ -262,7 +262,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
# Create Account Files
#######################
mkdir -p "~/.zen/g1sms_wallets/$PHONE/"
PIN=$(./diceware.sh | xargs)
PIN=$(~/.zen/astroport/zen/tools/diceware.sh | xargs)
python3 ./tools/key_create_dunikey.py "$UIDNA" "$PIN" ## Copy PubSec file to /tmp/secret.dunikey
mv /tmp/secret.dunikey ~/.zen/g1sms_wallets/$PHONE/

14
g1sms/init_keys.sh
View File

@ -63,9 +63,9 @@ if [[ ! -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna ]]; then
# And write ~/.zen/g1sms_wallets/.Qm***/G1SSB/(_files)
####################################################################
PRE=${ADMINPHONE:8:4}
ZUID=$($MY_PATH/diceware.sh 1 | xargs)
ZUID=$(~/.zen/astroport/zen/tools/diceware.sh 1 | xargs)
# Check if already existing among all swarm wallets G1SSB or G1SMS
while [[ $(grep -Rwl "$PRE$ZUID" ~/.zen/ipfs_swarm/.*/*/_uidna) ]]; do ZUID=$($MY_PATH/diceware.sh 1 | xargs); done
while [[ $(grep -Rwl "$PRE$ZUID" ~/.zen/ipfs_swarm/.*/*/_uidna 2>/dev/null) ]]; do ZUID=$(~/.zen/astroport/zen/tools/diceware.sh 1 | xargs); done
NODE_UIDNA="$PRE$ZUID"
echo "
@ -79,6 +79,7 @@ $NODE_UIDNA
"
if [[ -f ~/.zen/secret.astroport.key ]]; then
#[[ ! $(cat ~/.zen/secret.astroport.key | grep -F 'NODE_UIDNA' )]]
echo "IPFSNODEID=$IPFSNODEID" >> ~/.zen/secret.astroport.key
echo "NODE_UIDNA=$NODE_UIDNA" >> ~/.zen/secret.astroport.key
else
echo "ERROR NO ~/.zen/secret.astroport.key !!" && exit 1
@ -108,9 +109,12 @@ $NODE_UIDNA
#TX_IN=$(silkaj -p "$duniter_server" -af --file ~/.ssb/secret.dunikey tx --output $SWARM_G1PUBKEY --amount 3.24 --comment "[A.Station] G1SSBIPF ($ADMINPSEUDO) $NODE_UIDNA $IPFSNODEID" -y)
log "__SUB:initkeys.sh: [ADMIN] NODE G1sms+ $NODE_UIDNA : ls ~/.zen/ipfs/.$IPFSNODEID"
gammu-smsd-inject -l TEXT "$ADMINPHONE" -text "[ADMIN] G1sms+ NODE $NODE_UIDNA ($IPFSNODEID)" 1>&2
gammu-smsd-inject -l TEXT "$ADMINPHONE" -text "$NODE_G1PUBKEY" 1>&2
if [[ $G1SMS == "YES" ]]; then
echo "SENDING SMS to $ADMINPHONE"
gammu-smsd-inject -l TEXT "$ADMINPHONE" -text "[ADMIN] G1sms+ NODE $NODE_UIDNA ($IPFSNODEID)" 1>&2
gammu-smsd-inject -l TEXT "$ADMINPHONE" -text "$ZENID / $ZENPWD" 1>&2
gammu-smsd-inject -l TEXT "$ADMINPHONE" -text "$ZENG1" 1>&2
fi
fi
# COHERENCE TEST

2
zen/tools/make_G1SSB_secret.sh
View File

@ -239,7 +239,7 @@ fi
echo "........."
rm -f ~/.zen/secret.astroport.key
echo "# ASTROPORT #SWARM0 KEY SECRET CREDENTIALS !!!
echo "#2020.6.6 ASTROPORT METAVERSE #SWARM0 IDENTITY
ZENID=\"$salt\"
ZENPWD=\"$pepper\"" > ~/.zen/secret.astroport.key
sleep 1