Merge branch 'master' of https://git.p2p.legal/axiom-team/astroport
This commit is contained in:
commit
d69b9f4e8e
|
@ -116,7 +116,7 @@ fi
|
||||||
|
|
||||||
# COHERENCE TEST
|
# COHERENCE TEST
|
||||||
[[ -f /home/$YOU/.zen/secret.astroport.key ]] && source /home/$YOU/.zen/secret.astroport.key || echo "Missing /home/$YOU/.zen/secret.astroport.key" || exit 1
|
[[ -f /home/$YOU/.zen/secret.astroport.key ]] && source /home/$YOU/.zen/secret.astroport.key || echo "Missing /home/$YOU/.zen/secret.astroport.key" || exit 1
|
||||||
[[ -f /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna ]] && NODE_UIDNA=$(cat /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna)|| echo "Missing _uidna" || exit 1
|
[[ -f /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna ]] && export NODE_UIDNA=$(cat /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_uidna)|| echo "Missing _uidna" || exit 1
|
||||||
|
|
||||||
## INIT NODE G1 PUB & PRIV KEY
|
## INIT NODE G1 PUB & PRIV KEY
|
||||||
NODE_G1PUBKEY=$G1PUB
|
NODE_G1PUBKEY=$G1PUB
|
||||||
|
|
|
@ -91,6 +91,12 @@ for hashfile in /tmp/loveland_entrance/*; do
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
## CHECK FOR DOUBLE AUTH REQUEST
|
||||||
|
[[ ! -f /tmp/sms.commands ]] && exit 1
|
||||||
|
for phone_auth in $(cat /tmp/sms.auth.commands) do
|
||||||
|
$MY_PATH/sms_AUTH.sh $phone_auth
|
||||||
|
done
|
||||||
|
|
||||||
[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
|
[[ -d /home/$YOU/.zen/g1sms/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms/$PHONE
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -17,12 +17,12 @@ source $MY_PATH/init.sh
|
||||||
source $MY_PATH/functions.sh
|
source $MY_PATH/functions.sh
|
||||||
|
|
||||||
PHONE=$1
|
PHONE=$1
|
||||||
PARRAIN=$2
|
NBLOVE=$2
|
||||||
TODAY=$(date '+%Y%m%d')
|
TODAY=$(date '+%Y%m%d')
|
||||||
log "__SUB:sms_AUTH.sh ($PHONE, $PARRAIN) $TODAY"
|
log "__SUB:sms_AUTH.sh ($PHONE, $PARRAIN) $TODAY"
|
||||||
|
|
||||||
[[ $PHONE != "" ]] && sms_INIT_ACCOUNT "$PHONE" "NOSMS" || exit 1 # VERIFICATION ALREADY DONE BY CALLING bash ?
|
[[ $PHONE != "" ]] && $MY_PATH/sms_INIT_ACCOUNT "$PHONE" "NOSMS" || exit 1 # VERIFICATION ALREADY DONE BY CALLING bash ?
|
||||||
[[ $UNKNOWN == "unknown" ]] && echo "G1sms Wallet $PHONE inconnu! Envoyer N au $MASTERPHONE" && exit 1
|
[[ $UNKNOWN == "unknown" ]] && sms_SEND "$PHONE" "Portefeuille $PHONE inconnu! Envoyer N au $MASTERPHONE" && exit 1
|
||||||
|
|
||||||
# Get AMOUNTG1, AMOUNTLOVE, AMOUNTDU
|
# Get AMOUNTG1, AMOUNTLOVE, AMOUNTDU
|
||||||
AMOUNTG1=$(silkaj_balance $PUBKEY)
|
AMOUNTG1=$(silkaj_balance $PUBKEY)
|
||||||
|
@ -30,19 +30,20 @@ AMOUNTDU=$(bc -l <<< "scale=2; $AMOUNTG1 / $DUFACTOR")
|
||||||
AMOUNTLOVE=$(bc -l <<< "scale=0; $AMOUNTG1 * 100 / $DUFACTOR")
|
AMOUNTLOVE=$(bc -l <<< "scale=0; $AMOUNTG1 * 100 / $DUFACTOR")
|
||||||
|
|
||||||
# Convert amount to G1 unit
|
# Convert amount to G1 unit
|
||||||
VIR=$(bc -l <<< "scale=2; $PARRAIN * $DUFACTOR / 100")
|
VIR=$(bc -l <<< "scale=2; $NBLOVE * $DUFACTOR / 100")
|
||||||
|
|
||||||
# Need at least $MIN G1 available!
|
# Need at least $MIN G1 available!
|
||||||
MIN=$(bc -l <<< "$AMOUNTG1 - $LIMIT")
|
MIN=$(bc -l <<< "$AMOUNTG1 - $LIMIT")
|
||||||
testmin=$( echo "${VIR} < ${MIN}" | bc -l )
|
testmin=$( echo "${VIR} < ${MIN}" | bc -l )
|
||||||
|
|
||||||
|
SMSPIN=$((1000 + RANDOM % 9999))
|
||||||
|
|
||||||
log "__SUB:sms_AUTH.sh: CODE $SMSPIN : $VIR < $MIN ? $testmin"
|
log "__SUB:sms_AUTH.sh: CODE $SMSPIN : $VIR < $MIN ? $testmin"
|
||||||
if [[ "$testmin" -eq "1" ]]
|
if [[ "$testmin" -eq "1" ]]
|
||||||
then
|
then
|
||||||
mess="CODE: $SMSPIN
|
mess="CODE: $SMSPIN
|
||||||
A saisir pour vous authentifier...
|
A saisir pour vous authentifier...
|
||||||
[G1] Zen Astroport Station #$(cat /etc/hostname)"
|
[G1sms] Astroport Station $NODE_UIDNA"
|
||||||
# Send response SMS
|
# Send response SMS
|
||||||
sms_SEND "$PHONE" "$mess"
|
sms_SEND "$PHONE" "$mess"
|
||||||
echo $SMSPIN > /tmp/$PHONE.PIN.auth
|
echo $SMSPIN > /tmp/$PHONE.PIN.auth
|
||||||
|
|
|
@ -3,10 +3,10 @@ header("Access-Control-Allow-Origin: *");
|
||||||
if (strlen($_REQUEST['num']) == 10 ) {
|
if (strlen($_REQUEST['num']) == 10 ) {
|
||||||
$newNumber = preg_replace('/^0?/', '+33', $_REQUEST['num']);
|
$newNumber = preg_replace('/^0?/', '+33', $_REQUEST['num']);
|
||||||
$data = '"'.$newNumber.'" "'.$_REQUEST['val'].'"'.PHP_EOL;
|
$data = '"'.$newNumber.'" "'.$_REQUEST['val'].'"'.PHP_EOL;
|
||||||
$fp = fopen('/tmp/sms.commands', 'w');
|
$fp = fopen('/tmp/sms.auth.commands', 'w');
|
||||||
fwrite($fp, $data);
|
fwrite($fp, $data);
|
||||||
sleep(1);
|
//sleep(1);
|
||||||
echo exec('cat /tmp/sms.commmand.result');
|
echo "OK commnand sent! $data";
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -5,6 +5,10 @@ MY_PATH="`dirname \"$0\"`" # relative
|
||||||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||||
ME="${0##*/}"
|
ME="${0##*/}"
|
||||||
|
|
||||||
|
#### ARM / X64 NOT USED THERE
|
||||||
|
MACHINE_TYPE=`uname -m`
|
||||||
|
[ ${MACHINE_TYPE:0:3} == 'arm' ] && isARM="YES"
|
||||||
|
|
||||||
if [[ "$1" == "RAZ" ]]; then
|
if [[ "$1" == "RAZ" ]]; then
|
||||||
echo "~/.SSB_ORIGIN is made for $(whoami)"
|
echo "~/.SSB_ORIGIN is made for $(whoami)"
|
||||||
[[ -d ~/.ssb_$(whoami) ]] && mv ~/.ssb_$(whoami) ~/.SSB_ORIGIN
|
[[ -d ~/.ssb_$(whoami) ]] && mv ~/.ssb_$(whoami) ~/.SSB_ORIGIN
|
||||||
|
@ -334,16 +338,12 @@ ssb-server start &
|
||||||
|
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
##echo "Starting OASIS..."
|
if [[ $isARM ]]; then
|
||||||
## Don't ...
|
echo "Starting OASIS..."
|
||||||
## oasis --allow-host $nodename --host $nodename &
|
oasis --allow-host $nodename --host $nodename &
|
||||||
#sleep 7
|
sleep 7
|
||||||
|
else
|
||||||
# Intall Patchwork
|
# Intall Patchwork
|
||||||
#### ARM / X64 NOT USED THERE
|
|
||||||
MACHINE_TYPE=`uname -m`
|
|
||||||
[ ${MACHINE_TYPE:0:3} == 'arm' ] && isARM="YES"
|
|
||||||
if [[ ! $isARM="YES" ]]; then
|
|
||||||
if [[ ! $(which ssb-patchwork) ]]; then
|
if [[ ! $(which ssb-patchwork) ]]; then
|
||||||
wget https://github.com/ssbc/patchwork/releases/download/v3.18.0/ssb-patchwork_3.18.0_amd64.deb -O /tmp/patchwork.deb
|
wget https://github.com/ssbc/patchwork/releases/download/v3.18.0/ssb-patchwork_3.18.0_amd64.deb -O /tmp/patchwork.deb
|
||||||
sudo dpkg -i /tmp/patchwork.deb
|
sudo dpkg -i /tmp/patchwork.deb
|
||||||
|
|
Loading…
Reference in New Issue