Compare commits
1 Commits
master
...
bash-codeb
Author | SHA1 | Date |
---|---|---|
poka | c6055ccc93 |
|
@ -1,16 +1,3 @@
|
||||||
# Chemin de la clé privé Ḡ1 de l'émetteur, au format PubSec
|
dunikey="" # Chemin du fichier de trousseau Ḡ1 de l'émetteur, au format PubSec
|
||||||
# ex. DUNIKEY="/path/myprivateG1key.dunikey"
|
pod="https://g1.data.duniter.fr" # Noeud Cecium+ utilisé pour l'envoi du message
|
||||||
DUNIKEY=""
|
#pod="https://data.gchange.fr" # Noeud Gchange utilisé pour l'envoi du message
|
||||||
|
|
||||||
# Noeud Duniter
|
|
||||||
DUNITER="https://g1.asycn.io"
|
|
||||||
#DUNITER="https://duniter.pini.fr"
|
|
||||||
#DUNITER="https://g1v1.p2p.legal"
|
|
||||||
|
|
||||||
# Adresse du pod Cesium ou Gchange à utiliser
|
|
||||||
ESNODE="https://g1.data.e-is.pro"
|
|
||||||
#ESNODE="https://g1.data.presles.fr"
|
|
||||||
#ESNODE="https://g1.data.adn.life"
|
|
||||||
#ESNODE=https://g1.data.le-sou.org
|
|
||||||
#ESNODE=https://g1.data.duniter.fr
|
|
||||||
#ESNODE=https://data.gchange.fr
|
|
||||||
|
|
|
@ -1,5 +1 @@
|
||||||
.env
|
.env
|
||||||
*.dunikey
|
|
||||||
not4U
|
|
||||||
.vscode/settings.json
|
|
||||||
__pycache__
|
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"python.pythonPath": "/usr/bin/python3.9",
|
|
||||||
"[python]": {
|
|
||||||
"editor.defaultFormatter": "ms-python.black-formatter"
|
|
||||||
},
|
|
||||||
"python.formatting.provider": "none"
|
|
||||||
}
|
|
|
@ -1,82 +1,53 @@
|
||||||
# Client CLI for Cesium+/Ḡchange pod
|
# Utilisation de la messagerie Cesium+/Gchange
|
||||||
## Installation
|
## Réception/Envoi/Suppression de messages
|
||||||
|
|
||||||
Linux:
|
|
||||||
```
|
|
||||||
bash setup.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
Autre:
|
|
||||||
```
|
|
||||||
Débrouillez-vous.
|
|
||||||
```
|
|
||||||
|
|
||||||
## Utilisation
|
## Utilisation
|
||||||
|
|
||||||
*Python 3.6 minimum*
|
|
||||||
|
|
||||||
Renseignez optionnellement le fichier **.env** (Généré lors de la première tentative d'execution, ou à copier depuis .env.template).
|
|
||||||
|
|
||||||
```
|
```
|
||||||
./jaklis.py -h
|
chmod u+x readmsg.sh sendmsg.sh deletemsg.sh
|
||||||
|
```
|
||||||
|
Par défaut utilise l'émetteur, le fichier de trousseau ainsi que le noeud Cesium+ indiqué dans le fichier `.env`.
|
||||||
|
Si non renseigné ni dans le fichier `.env` ni en argument de la commande, alors ils seront demandés interactivement.
|
||||||
|
|
||||||
|
### Lecture des messages
|
||||||
|
```
|
||||||
|
./readmsg.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
_Options_:
|
||||||
```
|
```
|
||||||
usage: jaklis.py [-h] [-v] [-k KEY] [-n NODE] {read,send,delete,get,set,erase,stars,unstars,getoffer,setoffer,deleteoffer,pay,history,balance,id,idBalance} ...
|
-r,--recipient <pubkey> Uses <pubkey> as recipient of the messages.
|
||||||
|
-k,--key <key> Path <key> to the pubsec keychain file of the issuer.
|
||||||
Client CLI pour Cesium+ et Ḡchange
|
-n,--number <number> Display the <number> lasts messages from Cesium (tail-like format)
|
||||||
|
-o,--outbox Read outbox messages instead of inbox
|
||||||
optional arguments:
|
-h,--help Display this help
|
||||||
-h, --help show this help message and exit
|
|
||||||
-v, --version Affiche la version actuelle du programme
|
|
||||||
-k KEY, --key KEY Chemin vers mon trousseau de clé (PubSec)
|
|
||||||
-n NODE, --node NODE Adresse du noeud Cesium+, Gchange ou Duniter à utiliser
|
|
||||||
|
|
||||||
Commandes de jaklis:
|
|
||||||
{read,send,delete,get,set,erase,stars,unstars,getoffer,setoffer,deleteoffer,pay,history,balance,id,idBalance}
|
|
||||||
read Lecture des messages
|
|
||||||
send Envoi d'un message
|
|
||||||
delete Supression d'un message
|
|
||||||
get Voir un profile Cesium+
|
|
||||||
set Configurer son profile Cesium+
|
|
||||||
erase Effacer son profile Cesium+
|
|
||||||
stars Voir les étoiles d'un profile / Noter un profile (option -s NOTE)
|
|
||||||
unstars Supprimer un star
|
|
||||||
getoffer Obtenir les informations d'une annonce gchange
|
|
||||||
setoffer Créer une annonce gchange
|
|
||||||
deleteoffer Supprimer une annonce gchange
|
|
||||||
pay Payer en Ḡ1
|
|
||||||
history Voir l'historique des transactions d'un compte Ḡ1
|
|
||||||
balance Voir le solde d'un compte Ḡ1
|
|
||||||
id Voir l'identité d'une clé publique/username
|
|
||||||
idBalance Voir l'identité d'une clé publique/username et son solde
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Utilisez `./jaklis CMD -h` où `CMD` est la commande souhaité pour obtenir l'aide détaillé de cette commande.
|
### Envoi de messages
|
||||||
|
|
||||||
### Exemples:
|
|
||||||
|
|
||||||
Lire les 10 derniers messages de mon compte indiqué dans le fichier `.env` (par defaut 3 messages):
|
|
||||||
```
|
```
|
||||||
./jaklis read -n10
|
./sendmsg.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
Envoyer un message à la clé publique `Do99s6wQR2JLfhirPdpAERSjNbmjjECzGxHNJMiNKT3P` avec un fichier de trousseau particulier:
|
_Options_:
|
||||||
```
|
```
|
||||||
./jaklis.py -k /home/saucisse/mon_fichier_de_trousseau.dunikey send -d Do99s6wQR2JLfhirPdpAERSjNbmjjECzGxHNJMiNKT3P -t "Objet du message" -m "Corps de mon message"
|
-t Test mode: Uses the "test.txt" file as well as the same recipient as the sender.
|
||||||
|
-f,--file <file> Read the file <file> with title in first line and content in rest of the file for the message.
|
||||||
|
-r,--recipient <pubkey> Uses <pubkey> as recipient of the message.
|
||||||
|
-i,--issuer <pubkey> Uses <pubkey> as issuer of the message (Could be remove in future version by calculating pubkey from privatekey).
|
||||||
|
-k,--key <key> Path <key> to the pubsec keychain file of the issuer.
|
||||||
|
-h,--help Display this help
|
||||||
```
|
```
|
||||||
|
|
||||||
Noter 4 étoiles le profile `S9EJbjbaGPnp26VuV6fKjR7raE1YkNhUGDgoydHvAJ1` sur gchange:
|
### Suppression de messages
|
||||||
```
|
```
|
||||||
./jaklis.py -n https://data.gchange.fr like -p S9EJbjbaGPnp26VuV6fKjR7raE1YkNhUGDgoydHvAJ1 -s 4
|
./deletemsg.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
Paramétrer mon profile Cesium+:
|
_Options_:
|
||||||
```
|
```
|
||||||
./jaklis.py set -n "Sylvain Durif" -v "Bugarach" -a "42 route de Vénus" -d "Christ cosmique" -pos 48.539927 2.6608169 -s https://www.creationmonetaire.info -A mon_avatar.png
|
-id,--id <ID du message> Delete the message with ID <id>.
|
||||||
```
|
-i,--issuer <pubkey> Uses <pubkey> as issuer of the message.
|
||||||
|
-k,--key <key> Path <key> to the pubsec keychain file of the issuer.
|
||||||
Effacer mon profile Gchange:
|
-o,--outbox Delete outbox messages instead of inbox
|
||||||
```
|
-h,--help Display this help
|
||||||
./jaklis.py -n https://data.gchange.fr erase
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -0,0 +1,70 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# ###
|
||||||
|
# Supprimer un message Cesium+
|
||||||
|
# ###
|
||||||
|
|
||||||
|
[[ ! -f .env ]] && cp .env.template .env
|
||||||
|
source .env
|
||||||
|
|
||||||
|
REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}"
|
||||||
|
|
||||||
|
# Help display
|
||||||
|
helpOpt() {
|
||||||
|
echo -e "Cesium+ messages deleting
|
||||||
|
Default: ID in interactive mode.
|
||||||
|
Advice: Fill your .env file for more fun.
|
||||||
|
Example: $0 <ID du message>
|
||||||
|
|
||||||
|
\rOptions:
|
||||||
|
-id,--id <ID du message>\tDelete the message with ID <id>.
|
||||||
|
-k,--key <key>\t\tPath <key> to the pubsec keychain file of the issuer.
|
||||||
|
-o,--outbox\t\t\tDelete outbox messages instead of inbox
|
||||||
|
-h,--help\t\t\tDisplay this help"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Parse options
|
||||||
|
declare -a args=($@)
|
||||||
|
for ((i=0; i<${#args[*]}; ++i))
|
||||||
|
do
|
||||||
|
case ${args[$i]} in
|
||||||
|
-o|--outbox) type=outbox;;
|
||||||
|
-id|--id) id="${args[$i+1]}"
|
||||||
|
[[ -z $id ]] && echo "Veuillez préciser un ID de message." && exit 1;;
|
||||||
|
-k|--key) DUNIKEY="${args[$i+1]}"
|
||||||
|
[[ -z $DUNIKEY ]] && echo "Veuillez préciser un fichier de trousseau." && exit 1;;
|
||||||
|
-h|--help) helpOpt && exit 0;;
|
||||||
|
*) [[ "${args[$i]}" == "-"* ]] && echo "Option inconnue." && exit 1;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -z $DUNIKEY ]]; then
|
||||||
|
read -p "Fichier de trousseau: " DUNIKEY
|
||||||
|
fi
|
||||||
|
issuer=$(./natools.py pk -f pubsec -k $DUNIKEY)
|
||||||
|
|
||||||
|
if [[ -z $type ]]; then
|
||||||
|
type="inbox"
|
||||||
|
fi
|
||||||
|
[[ -z $id ]] && id=$1
|
||||||
|
if [[ -z $id ]]; then
|
||||||
|
read -p "ID de message: " ID
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -z $(grep -Eo $REGEX_PUBKEYS <<<$issuer) ]] && echo "Le format de la clé publique de l'émetteur est invalide." && exit 1
|
||||||
|
|
||||||
|
times=$(date -u +'%s')
|
||||||
|
|
||||||
|
# Fabrication du hash
|
||||||
|
hashBrut="{\"version\":2,\"index\":\"message\",\"type\":\"$type\",\"id\":\"$id\",\"issuer\":\"$issuer\",\"time\":$times}"
|
||||||
|
hash=$(echo -n "$hashBrut" | sha256sum | cut -d ' ' -f1 | awk '{ print toupper($0) }')
|
||||||
|
|
||||||
|
# Fabrication de la signature
|
||||||
|
signature=$(echo -n "$hash" | ./natools.py sign -f pubsec -k $DUNIKEY --noinc -O 64)
|
||||||
|
|
||||||
|
document="{\"hash\":\"$hash\",\"signature\":\"$signature\",${hashBrut:1}"
|
||||||
|
jq . <<<$document
|
||||||
|
|
||||||
|
# Envoi du document
|
||||||
|
curl -s -X POST "$POD/history/delete" -d "$document"
|
||||||
|
echo
|
|
@ -1,2 +0,0 @@
|
||||||
pub: HTkEecgbtBd3aZiJJYuUjGwLB7r3Ud232TG4BwLDdB3J
|
|
||||||
sec: 36fT3if1YGLwmhSS89F8vQ6QpmhWmhcLdQyHHmSgxJpbYSxq7C37sDmPKZykmGrE8zmeUxdyAiY256H852p3Lfor
|
|
490
jaklis.py
490
jaklis.py
|
@ -1,490 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
import string
|
|
||||||
import random
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
from duniterpy.key import SigningKey
|
|
||||||
from pathlib import Path
|
|
||||||
from lib.gva import GvaApi
|
|
||||||
from lib.cesium import CesiumPlus
|
|
||||||
|
|
||||||
__version__ = "0.1.1"
|
|
||||||
|
|
||||||
MY_PATH = Path(__file__).resolve().parent
|
|
||||||
|
|
||||||
# Set file paths
|
|
||||||
dotenv_file = MY_PATH / ".env"
|
|
||||||
dotenv_template = MY_PATH / ".env.template"
|
|
||||||
|
|
||||||
# Check and create dotenv file
|
|
||||||
if not dotenv_file.is_file():
|
|
||||||
dotenv_file.write_text(dotenv_template.read_text())
|
|
||||||
|
|
||||||
# Load environment variables
|
|
||||||
load_dotenv(dotenv_file)
|
|
||||||
|
|
||||||
# Set global values (default parameters) regarding environment variables
|
|
||||||
node = os.getenv("DUNITER") + "/gva" or "https://g1v1.p2p.legal/gva"
|
|
||||||
pod = os.getenv("ESNODE") or "https://g1.data.e-is.pro"
|
|
||||||
destPubkey = False
|
|
||||||
|
|
||||||
# define parser
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
description="CLI Client for Cesium+ and Ḡchange",
|
|
||||||
epilog="current node: '" + node + "', current pod: '" + pod + "'.",
|
|
||||||
)
|
|
||||||
|
|
||||||
# load global arguments
|
|
||||||
parser.add_argument(
|
|
||||||
"-v",
|
|
||||||
"--version",
|
|
||||||
action="store_true",
|
|
||||||
help="Display the current program version",
|
|
||||||
)
|
|
||||||
parser.add_argument("-k", "--key", help="Path to the keyfile (PubSec)")
|
|
||||||
parser.add_argument(
|
|
||||||
"-n", "--node", help="Address of the Cesium+, Gchange, or Duniter node to use"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Define commands with arguments
|
|
||||||
commands = {
|
|
||||||
"read": {
|
|
||||||
"help": "Read messages",
|
|
||||||
"arguments": {
|
|
||||||
("n", "number"): {
|
|
||||||
"type": int,
|
|
||||||
"default": 3,
|
|
||||||
"help": "Display the last NUMBER messages",
|
|
||||||
},
|
|
||||||
("j", "json"): {"action": "store_true", "help": "Output in JSON format"},
|
|
||||||
("o", "outbox"): {"action": "store_true", "help": "Read sent messages"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"send": {
|
|
||||||
"help": "Send a message",
|
|
||||||
"arguments": {
|
|
||||||
("d", "destinataire"): {
|
|
||||||
"required": True,
|
|
||||||
"help": "Recipient of the message",
|
|
||||||
},
|
|
||||||
("t", "titre"): {"help": "Title of the message to send"},
|
|
||||||
("m", "message"): {"help": "Message to send"},
|
|
||||||
("f", "fichier"): {"help": "Send the message from the 'FILE'"},
|
|
||||||
("o", "outbox"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Send the message to the outbox",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"delete": {
|
|
||||||
"help": "Delete a message",
|
|
||||||
"arguments": {
|
|
||||||
("i", "id"): {
|
|
||||||
"action": "append",
|
|
||||||
"nargs": "+",
|
|
||||||
"required": True,
|
|
||||||
"help": "ID(s) of the message(s) to delete",
|
|
||||||
},
|
|
||||||
("o", "outbox"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Delete a sent message",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"get": {
|
|
||||||
"help": "View a Cesium+ profile",
|
|
||||||
"arguments": {
|
|
||||||
("p", "profile"): {"help": "Profile name"},
|
|
||||||
("a", "avatar"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Also retrieve the avatar in raw base64 format",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"page": {
|
|
||||||
"help": "View a Cesium+ page",
|
|
||||||
"arguments": {
|
|
||||||
("p", "page"): {"help": "Page name"},
|
|
||||||
("a", "avatar"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Also retrieve the page's avatar in raw base64 format",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"set": {
|
|
||||||
"help": "Configure your Cesium+ profile",
|
|
||||||
"arguments": {
|
|
||||||
("n", "name"): {"help": "Profile name"},
|
|
||||||
("d", "description"): {"help": "Profile description"},
|
|
||||||
("v", "ville"): {"help": "Profile city"},
|
|
||||||
("a", "adresse"): {"help": "Profile address"},
|
|
||||||
("pos", "position"): {
|
|
||||||
"nargs": 2,
|
|
||||||
"help": "Geographical coordinates (lat + lon)",
|
|
||||||
},
|
|
||||||
("s", "site"): {"help": "Profile website"},
|
|
||||||
("A", "avatar"): {"help": "Path to profile avatar in PNG"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"erase": {
|
|
||||||
"help": "Erase your Cesium+ profile",
|
|
||||||
"arguments": {},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"stars": {
|
|
||||||
"help": "View a profile's stars / Rate a profile (option -s RATING)",
|
|
||||||
"arguments": {
|
|
||||||
("p", "profile"): {"help": "Target profile"},
|
|
||||||
("n", "number"): {"type": int, "help": "Number of stars"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"unstars": {
|
|
||||||
"help": "Remove a star",
|
|
||||||
"arguments": {
|
|
||||||
("p", "profile"): {"help": "Profile to unstar"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"getoffer": {
|
|
||||||
"help": "Get information about a Ḡchange listing",
|
|
||||||
"arguments": {
|
|
||||||
("i", "id"): {"help": "Target listing to retrieve"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"setoffer": {
|
|
||||||
"help": "Create a Ḡchange listing",
|
|
||||||
"arguments": {
|
|
||||||
("t", "title"): {"help": "Title of the listing to create"},
|
|
||||||
("d", "description"): {"help": "Description of the listing to create"},
|
|
||||||
("c", "category"): {"help": "Category of the listing to create"},
|
|
||||||
("l", "location"): {
|
|
||||||
"nargs": 2,
|
|
||||||
"help": "Location of the listing to create (lat + lon)",
|
|
||||||
},
|
|
||||||
("p", "picture"): {"help": "Image of the listing to create"},
|
|
||||||
("ci", "city"): {"help": "City of the listing to create"},
|
|
||||||
("pr", "price"): {"help": "Price of the listing to create"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"deleteoffer": {
|
|
||||||
"help": "Delete a Ḡchange listing",
|
|
||||||
"arguments": {
|
|
||||||
("i", "id"): {"help": "Target listing to delete"},
|
|
||||||
},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"geolocProfiles": {
|
|
||||||
"help": "Get JSON of all geolocated accounts",
|
|
||||||
"arguments": {},
|
|
||||||
"type": "cesium",
|
|
||||||
},
|
|
||||||
"pay": {
|
|
||||||
"help": "Pay in Ḡ1",
|
|
||||||
"arguments": {
|
|
||||||
("p", "pubkey"): {"help": "Payment recipient"},
|
|
||||||
("a", "amount"): {"type": float, "help": "Transaction amount"},
|
|
||||||
("c", "comment"): {
|
|
||||||
"default": "",
|
|
||||||
"help": "Transaction comment",
|
|
||||||
"nargs": "*",
|
|
||||||
},
|
|
||||||
("m", "mempool"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Use mempool sources",
|
|
||||||
},
|
|
||||||
("v", "verbose"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display the JSON result of the transaction",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
"history": {
|
|
||||||
"help": "View Ḡ1 account transaction history",
|
|
||||||
"arguments": {
|
|
||||||
("p", "pubkey"): {"help": "Public key of the target account"},
|
|
||||||
("n", "number"): {
|
|
||||||
"type": int,
|
|
||||||
"default": 10,
|
|
||||||
"help": "Display the last NUMBER transactions",
|
|
||||||
},
|
|
||||||
("j", "json"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display the result in JSON format",
|
|
||||||
},
|
|
||||||
("nocolors"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display the result in black and white",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
"balance": {
|
|
||||||
"help": "View Ḡ1 account balance",
|
|
||||||
"arguments": {
|
|
||||||
("p", "pubkey"): {"help": "Public key of the target account"},
|
|
||||||
("m", "mempool"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Use mempool sources",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
"id": {
|
|
||||||
"help": "View public key/username identity",
|
|
||||||
"arguments": {
|
|
||||||
("p", "pubkey"): {"help": "Public key of the target account"},
|
|
||||||
("u", "username"): {"help": "Username of the target account"},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
"idBalance": {
|
|
||||||
"help": "View public key/username identity and balance",
|
|
||||||
"arguments": {
|
|
||||||
("p", "pubkey"): {"help": "Public key of the target account"},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
"currentUd": {
|
|
||||||
"help": "Display the current Universal Dividend amount",
|
|
||||||
"arguments": {
|
|
||||||
("p", "pubkey"): {"help": "Public key of the target account"},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
"listWallets": {
|
|
||||||
"help": "List all G1 wallets",
|
|
||||||
"arguments": {
|
|
||||||
("m", "mbr"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display raw list of member pubkeys",
|
|
||||||
},
|
|
||||||
("nm", "non_mbr"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display raw list of nonmember identity pubkeys",
|
|
||||||
},
|
|
||||||
("l", "larf"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display raw list of nonmember pubkeys",
|
|
||||||
},
|
|
||||||
("b", "brut"): {
|
|
||||||
"action": "store_true",
|
|
||||||
"help": "Display raw list of all pubkeys",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"type": "gva",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
# Process commands and arguments
|
|
||||||
subparsers = parser.add_subparsers(title="jaklis Commands", dest="cmd")
|
|
||||||
for cmd, cmd_info in commands.items():
|
|
||||||
cmd_parser = subparsers.add_parser(cmd, help=cmd_info["help"])
|
|
||||||
for args, kwargs in cmd_info["arguments"].items():
|
|
||||||
if isinstance(args, str):
|
|
||||||
cmd_parser.add_argument("--" + args, **kwargs)
|
|
||||||
else:
|
|
||||||
short_arg, long_arg = args
|
|
||||||
cmd_parser.add_argument("-" + short_arg, "--" + long_arg, **kwargs)
|
|
||||||
|
|
||||||
args = parser.parse_args()
|
|
||||||
args_dict = vars(args)
|
|
||||||
cmd = args.cmd
|
|
||||||
if args.version:
|
|
||||||
print(__version__)
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
if not cmd:
|
|
||||||
parser.print_help()
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
|
|
||||||
def createTmpDunikey():
|
|
||||||
# Generate a pseudo-random nonce
|
|
||||||
nonce = "".join(
|
|
||||||
random.choice(string.ascii_letters + string.digits) for _ in range(32)
|
|
||||||
)
|
|
||||||
keyPath = "/tmp/secret.dunikey-" + nonce
|
|
||||||
|
|
||||||
# Create a dummy key (replace with actual key creation logic)
|
|
||||||
key = SigningKey.from_credentials(
|
|
||||||
"sgse547yhd54xv6541srdh", "sfdgwdrhpkxdawsbszqpof1sdg65xc", None
|
|
||||||
)
|
|
||||||
key.save_pubsec_file(keyPath)
|
|
||||||
|
|
||||||
return keyPath
|
|
||||||
|
|
||||||
|
|
||||||
def get_arg_value(args, arg):
|
|
||||||
try:
|
|
||||||
return getattr(args, arg)
|
|
||||||
except AttributeError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def get_dunikey(args):
|
|
||||||
if args.key:
|
|
||||||
return args.key
|
|
||||||
dunikey = os.getenv("DUNIKEY")
|
|
||||||
if not dunikey:
|
|
||||||
keyPath = createTmpDunikey()
|
|
||||||
dunikey = keyPath
|
|
||||||
if not os.path.isfile(dunikey):
|
|
||||||
HOME = os.getenv("HOME")
|
|
||||||
dunikey = HOME + dunikey
|
|
||||||
if not os.path.isfile(dunikey):
|
|
||||||
sys.stderr.write("The keyfile {0} is not found.\n".format(dunikey))
|
|
||||||
sys.exit(1)
|
|
||||||
return dunikey
|
|
||||||
|
|
||||||
|
|
||||||
pubkey = get_arg_value(args, "pubkey")
|
|
||||||
profile = get_arg_value(args, "profile")
|
|
||||||
|
|
||||||
noNeedDunikey = cmd in (
|
|
||||||
"history",
|
|
||||||
"balance",
|
|
||||||
"page",
|
|
||||||
"id",
|
|
||||||
"idBalance",
|
|
||||||
"listWallets",
|
|
||||||
"geolocProfiles",
|
|
||||||
) and (pubkey or profile)
|
|
||||||
|
|
||||||
if noNeedDunikey:
|
|
||||||
dunikey = pubkey if pubkey else profile
|
|
||||||
else:
|
|
||||||
dunikey = get_dunikey(args)
|
|
||||||
|
|
||||||
keyPath = False if dunikey else createTmpDunikey()
|
|
||||||
|
|
||||||
|
|
||||||
def handle_cesium_commands(args, cmd, cesium):
|
|
||||||
# Get args of the command
|
|
||||||
cmd_args = (
|
|
||||||
list(zip(*list(commands[cmd]["arguments"].keys())))[1]
|
|
||||||
if len(commands[cmd]["arguments"].keys()) > 0
|
|
||||||
else []
|
|
||||||
)
|
|
||||||
cmd_args_dict = {arg: args_dict[arg] for arg in cmd_args if arg in args_dict}
|
|
||||||
cmd_args_values = list(cmd_args_dict.values())
|
|
||||||
|
|
||||||
# Messaging
|
|
||||||
if cmd == "read":
|
|
||||||
cesium.read(*cmd_args_values)
|
|
||||||
elif cmd == "send":
|
|
||||||
if args.fichier:
|
|
||||||
with open(args.fichier, "r") as f:
|
|
||||||
msgT = f.read()
|
|
||||||
titre = msgT.splitlines(True)[0].replace("\n", "")
|
|
||||||
msg = "".join(msgT.splitlines(True)[1:])
|
|
||||||
if args.titre:
|
|
||||||
titre = args.titre
|
|
||||||
msg = msgT
|
|
||||||
elif args.titre and args.message:
|
|
||||||
titre = args.titre
|
|
||||||
msg = args.message
|
|
||||||
else:
|
|
||||||
titre = input("Enter the message title: ")
|
|
||||||
msg = input("Enter the message content: ")
|
|
||||||
|
|
||||||
cesium.send(titre, msg, args.destinataire, args.outbox)
|
|
||||||
|
|
||||||
elif cmd == "delete":
|
|
||||||
cesium.delete(args.id[0], args.outbox)
|
|
||||||
|
|
||||||
# Profiles
|
|
||||||
elif cmd == "set":
|
|
||||||
cesium.set(**cmd_args_dict)
|
|
||||||
elif cmd == "get":
|
|
||||||
cesium.get(**cmd_args_dict)
|
|
||||||
elif cmd == "page":
|
|
||||||
cesium.getPage(**cmd_args_dict)
|
|
||||||
elif cmd == "erase":
|
|
||||||
cesium.erase()
|
|
||||||
elif cmd == "geolocProfiles":
|
|
||||||
cesium.geolocProfiles(node)
|
|
||||||
|
|
||||||
# Stars
|
|
||||||
elif cmd == "stars":
|
|
||||||
if args.number or args.number == 0:
|
|
||||||
cesium.like(args.number, args.profile)
|
|
||||||
else:
|
|
||||||
cesium.readLikes(args.profile)
|
|
||||||
elif cmd == "unstars":
|
|
||||||
cesium.unLike(args.profile)
|
|
||||||
|
|
||||||
# Offers
|
|
||||||
elif cmd == "getoffer":
|
|
||||||
cesium.getOffer(args.id)
|
|
||||||
elif cmd == "setoffer":
|
|
||||||
cesium.setOffer(**cmd_args_dict)
|
|
||||||
elif cmd == "deleteoffer":
|
|
||||||
cesium.deleteOffer(**cmd_args_dict)
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unknown command: {cmd}")
|
|
||||||
|
|
||||||
|
|
||||||
def handle_gva_commands(args, cmd, gva):
|
|
||||||
# Get args of the command
|
|
||||||
cmd_args = (
|
|
||||||
list(zip(*list(commands[cmd]["arguments"].keys())))[1]
|
|
||||||
if len(commands[cmd]["arguments"].keys()) > 0
|
|
||||||
else []
|
|
||||||
)
|
|
||||||
cmd_args_dict = {arg: args_dict[arg] for arg in cmd_args if arg in args_dict}
|
|
||||||
# cmd_args_values = list(cmd_args_dict.values())
|
|
||||||
|
|
||||||
if cmd == "pay":
|
|
||||||
gva.pay(args.amount, args.comment, args.mempool, args.verbose)
|
|
||||||
elif cmd == "history":
|
|
||||||
gva.history(args.json, args.nocolors, args.number)
|
|
||||||
elif cmd == "balance":
|
|
||||||
gva.balance(args.mempool)
|
|
||||||
elif cmd == "id":
|
|
||||||
gva.id(**cmd_args_dict)
|
|
||||||
elif cmd == "idBalance":
|
|
||||||
gva.idBalance(**cmd_args_dict)
|
|
||||||
elif cmd == "currentUd":
|
|
||||||
gva.currentUd()
|
|
||||||
elif cmd == "listWallets":
|
|
||||||
gva.listWallets(args.brut, args.mbr, args.non_mbr, args.larf)
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unknown command: {cmd}")
|
|
||||||
|
|
||||||
|
|
||||||
# Construct the CesiumPlus object
|
|
||||||
if commands[cmd]["type"] == "cesium":
|
|
||||||
if args.node:
|
|
||||||
pod = args.node
|
|
||||||
|
|
||||||
cesium = CesiumPlus(dunikey, pod, noNeedDunikey)
|
|
||||||
handle_cesium_commands(args, cmd, cesium)
|
|
||||||
|
|
||||||
# Construct the GvaApi object
|
|
||||||
elif commands[cmd]["type"] == "gva":
|
|
||||||
if args.node:
|
|
||||||
node = args.node
|
|
||||||
|
|
||||||
if hasattr(args, "pubkey"):
|
|
||||||
destPubkey = args.pubkey
|
|
||||||
|
|
||||||
gva = GvaApi(dunikey, node, destPubkey, noNeedDunikey)
|
|
||||||
handle_gva_commands(args, cmd, gva)
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unknown command: {cmd}")
|
|
||||||
|
|
||||||
if keyPath:
|
|
||||||
os.remove(keyPath)
|
|
170
lib/cesium.py
170
lib/cesium.py
|
@ -1,170 +0,0 @@
|
||||||
import json
|
|
||||||
import re, string, random, base64
|
|
||||||
from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX
|
|
||||||
from lib.geolocProfiles import GeolocProfiles
|
|
||||||
from lib.getPages import Pages
|
|
||||||
from lib.messaging import ReadFromCesium, SendToCesium, DeleteFromCesium
|
|
||||||
from lib.profiles import Profiles
|
|
||||||
from lib.stars import ReadLikes, SendLikes, UnLikes
|
|
||||||
from lib.offers import Offers
|
|
||||||
|
|
||||||
|
|
||||||
class CesiumPlus(CesiumCommon):
|
|
||||||
#################### Messaging ####################
|
|
||||||
|
|
||||||
def read(self, nbrMsg, isJSON, outbox):
|
|
||||||
readCesium = ReadFromCesium(self.dunikey, self.pod)
|
|
||||||
jsonMsg = readCesium.sendDocument(nbrMsg, outbox)
|
|
||||||
if isJSON:
|
|
||||||
jsonFormat = readCesium.jsonMessages(jsonMsg, nbrMsg, outbox)
|
|
||||||
print(jsonFormat)
|
|
||||||
else:
|
|
||||||
readCesium.readMessages(jsonMsg, nbrMsg, outbox)
|
|
||||||
|
|
||||||
def send(self, title, msg, recipient, outbox):
|
|
||||||
sendCesium = SendToCesium(self.dunikey, self.pod)
|
|
||||||
sendCesium.recipient = recipient
|
|
||||||
|
|
||||||
# Generate pseudo-random nonce
|
|
||||||
nonce = []
|
|
||||||
for _ in range(32):
|
|
||||||
nonce.append(random.choice(string.ascii_letters + string.digits))
|
|
||||||
sendCesium.nonce = base64.b64decode("".join(nonce))
|
|
||||||
|
|
||||||
finalDoc = sendCesium.configDoc(
|
|
||||||
sendCesium.encryptMsg(title), sendCesium.encryptMsg(msg)
|
|
||||||
) # Configure JSON document to send
|
|
||||||
sendCesium.sendDocument(finalDoc, outbox) # Send final signed document
|
|
||||||
|
|
||||||
def delete(self, idsMsgList, outbox):
|
|
||||||
deleteCesium = DeleteFromCesium(self.dunikey, self.pod)
|
|
||||||
# deleteCesium.issuer = recipient
|
|
||||||
for idMsg in idsMsgList:
|
|
||||||
finalDoc = deleteCesium.configDoc(idMsg, outbox)
|
|
||||||
deleteCesium.sendDocument(finalDoc, idMsg)
|
|
||||||
|
|
||||||
#################### Profiles ####################
|
|
||||||
|
|
||||||
def set(
|
|
||||||
self,
|
|
||||||
name=None,
|
|
||||||
description=None,
|
|
||||||
ville=None,
|
|
||||||
adresse=None,
|
|
||||||
position=None,
|
|
||||||
site=None,
|
|
||||||
avatar=None,
|
|
||||||
):
|
|
||||||
setProfile = Profiles(self.dunikey, self.pod)
|
|
||||||
document = setProfile.configDocSet(
|
|
||||||
name, description, ville, adresse, position, site, avatar
|
|
||||||
)
|
|
||||||
result = setProfile.sendDocument(document, "set")
|
|
||||||
|
|
||||||
print(result)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def get(self, profile=None, avatar=None):
|
|
||||||
getProfile = Profiles(self.dunikey, self.pod, self.noNeedDunikey)
|
|
||||||
if not profile:
|
|
||||||
profile = self.pubkey
|
|
||||||
if not re.match(PUBKEY_REGEX, profile) or len(profile) > 45:
|
|
||||||
scope = "title"
|
|
||||||
else:
|
|
||||||
scope = "_id"
|
|
||||||
|
|
||||||
document = getProfile.configDocGet(profile, scope, avatar)
|
|
||||||
resultJSON = getProfile.sendDocument(document, "get")
|
|
||||||
result = getProfile.parseJSON(resultJSON)
|
|
||||||
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def getPage(self, page=None, avatar=None):
|
|
||||||
getPage = Pages(self.dunikey, self.pod, self.noNeedDunikey)
|
|
||||||
if not page:
|
|
||||||
page = self.pubkey
|
|
||||||
if not re.match(PUBKEY_REGEX, page) or len(page) > 45:
|
|
||||||
scope = "title"
|
|
||||||
else:
|
|
||||||
scope = "_id"
|
|
||||||
|
|
||||||
document = getPage.configDocGet(page, scope, avatar)
|
|
||||||
resultJSON = getPage.sendDocument(document, "get")
|
|
||||||
result = getPage.parseJSON(resultJSON)
|
|
||||||
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def erase(self):
|
|
||||||
eraseProfile = Profiles(self.dunikey, self.pod)
|
|
||||||
document = eraseProfile.configDocErase()
|
|
||||||
result = eraseProfile.sendDocument(document, "erase")
|
|
||||||
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def geolocProfiles(self, node):
|
|
||||||
geolocProfiles = GeolocProfiles(self.dunikey, self.pod)
|
|
||||||
cesiumProfiles = geolocProfiles.getCesiumProfiles()
|
|
||||||
gvaProfiles = geolocProfiles.getGVAProfiles(node)
|
|
||||||
result = geolocProfiles.formatProfiles(cesiumProfiles, json.loads(gvaProfiles))
|
|
||||||
|
|
||||||
print(json.dumps(result))
|
|
||||||
|
|
||||||
#################### Likes ####################
|
|
||||||
|
|
||||||
def readLikes(self, profile=False):
|
|
||||||
likes = ReadLikes(self.dunikey, self.pod, self.noNeedDunikey)
|
|
||||||
document = likes.configDoc(profile)
|
|
||||||
result = likes.sendDocument(document)
|
|
||||||
result = likes.parseResult(result)
|
|
||||||
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def like(self, stars, profile=False):
|
|
||||||
likes = SendLikes(self.dunikey, self.pod)
|
|
||||||
document = likes.configDoc(profile, stars)
|
|
||||||
if document:
|
|
||||||
likes.sendDocument(document, profile)
|
|
||||||
|
|
||||||
def unLike(self, pubkey, silent=False):
|
|
||||||
likes = UnLikes(self.dunikey, self.pod)
|
|
||||||
idLike = likes.checkLike(pubkey)
|
|
||||||
if idLike:
|
|
||||||
document = likes.configDoc(idLike)
|
|
||||||
likes.sendDocument(document, silent)
|
|
||||||
|
|
||||||
#################### Offer ####################
|
|
||||||
|
|
||||||
def setOffer(
|
|
||||||
self,
|
|
||||||
title=None,
|
|
||||||
description=None,
|
|
||||||
city=None,
|
|
||||||
location=None,
|
|
||||||
category=None,
|
|
||||||
price=None,
|
|
||||||
picture=None,
|
|
||||||
):
|
|
||||||
setOffer = Offers(self.dunikey, self.pod)
|
|
||||||
document = setOffer.configDocSet(
|
|
||||||
title, description, city, location, category, price, picture
|
|
||||||
)
|
|
||||||
result = setOffer.sendDocumentSet(document, "set")
|
|
||||||
|
|
||||||
# print(result)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def getOffer(self, id, avatar=None):
|
|
||||||
getOffer = Offers(self.dunikey, self.pod, self.noNeedDunikey)
|
|
||||||
|
|
||||||
resultJSON = getOffer.sendDocumentGet(id, "get")
|
|
||||||
# print(resultJSON)
|
|
||||||
result = getOffer.parseJSON(resultJSON)
|
|
||||||
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def deleteOffer(self, id):
|
|
||||||
eraseOffer = Offers(self.dunikey, self.pod)
|
|
||||||
document = eraseOffer.configDocErase(id)
|
|
||||||
result = eraseOffer.sendDocumentSet(document, "delete", id)
|
|
||||||
|
|
||||||
print(result)
|
|
|
@ -1,51 +0,0 @@
|
||||||
import sys, re, json
|
|
||||||
from hashlib import sha256
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
|
|
||||||
PUBKEY_REGEX = "(?![OIl])[1-9A-Za-z]{42,45}"
|
|
||||||
|
|
||||||
def pp_json(json_thing, sort=True, indents=4):
|
|
||||||
# Print beautifull JSON
|
|
||||||
if type(json_thing) is str:
|
|
||||||
print(json.dumps(json.loads(json_thing), sort_keys=sort, indent=indents))
|
|
||||||
else:
|
|
||||||
print(json.dumps(json_thing, sort_keys=sort, indent=indents))
|
|
||||||
return None
|
|
||||||
|
|
||||||
class CesiumCommon:
|
|
||||||
def __init__(self, dunikey, pod, noNeedDunikey=False):
|
|
||||||
self.pod = pod
|
|
||||||
self.noNeedDunikey = noNeedDunikey
|
|
||||||
# Get my pubkey from my private key
|
|
||||||
try:
|
|
||||||
self.dunikey = dunikey
|
|
||||||
if not dunikey:
|
|
||||||
raise ValueError("Dunikey is empty")
|
|
||||||
except:
|
|
||||||
sys.stderr.write("Please fill the path to your private key (PubSec)\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if noNeedDunikey:
|
|
||||||
self.pubkey = self.dunikey
|
|
||||||
else:
|
|
||||||
self.pubkey = get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
|
|
||||||
if not re.match(PUBKEY_REGEX, self.pubkey) or len(self.pubkey) > 45:
|
|
||||||
sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
def signDoc(self, document):
|
|
||||||
# Generate hash of document
|
|
||||||
hashDoc = sha256(document.encode()).hexdigest().upper()
|
|
||||||
|
|
||||||
# Generate signature of document
|
|
||||||
signature = fmt["64"](sign(hashDoc.encode(), get_privkey(self.dunikey, "pubsec"))[:-len(hashDoc.encode())]).decode()
|
|
||||||
|
|
||||||
# Build final document
|
|
||||||
data = {}
|
|
||||||
data['hash'] = hashDoc
|
|
||||||
data['signature'] = signature
|
|
||||||
signJSON = json.dumps(data)
|
|
||||||
finalJSON = {**json.loads(signJSON), **json.loads(document)}
|
|
||||||
|
|
||||||
return json.dumps(finalJSON)
|
|
31
lib/crypt.py
31
lib/crypt.py
|
@ -1,31 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import base64, base58, sys, string, random
|
|
||||||
from natools import get_privkey, box_decrypt, box_encrypt, fmt
|
|
||||||
|
|
||||||
def getargv(arg:str, default:str="", n:int=1, args:list=sys.argv) -> str:
|
|
||||||
if arg in args and len(args) > args.index(arg)+n:
|
|
||||||
return args[args.index(arg)+n]
|
|
||||||
else:
|
|
||||||
return default
|
|
||||||
|
|
||||||
cmd = sys.argv[1]
|
|
||||||
|
|
||||||
dunikey = getargv("-k", "private.dunikey")
|
|
||||||
msg = getargv("-m", "test")
|
|
||||||
pubkey = getargv("-p")
|
|
||||||
|
|
||||||
def decrypt(msg):
|
|
||||||
msg64 = base64.b64decode(msg)
|
|
||||||
return box_decrypt(msg64, get_privkey(dunikey, "pubsec"), pubkey).decode()
|
|
||||||
|
|
||||||
def encrypt(msg):
|
|
||||||
return fmt["64"](box_encrypt(msg.encode(), get_privkey(dunikey, "pubsec"), pubkey)).decode()
|
|
||||||
|
|
||||||
if cmd == 'decrypt':
|
|
||||||
clear = decrypt(msg)
|
|
||||||
print(clear)
|
|
||||||
elif cmd == 'encrypt':
|
|
||||||
clear = encrypt(msg)
|
|
||||||
print(clear)
|
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys, re, os.path, json, ast
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
from gql import gql, Client
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
|
|
||||||
class currentUd:
|
|
||||||
|
|
||||||
def __init__(self, node):
|
|
||||||
# Define Duniter GVA node
|
|
||||||
transport = AIOHTTPTransport(url=node)
|
|
||||||
self.client = Client(transport=transport, fetch_schema_from_transport=True)
|
|
||||||
|
|
||||||
def sendDoc(self):
|
|
||||||
# Build UD generation document
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
query {
|
|
||||||
currentUd {
|
|
||||||
amount
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
paramsBuild = {
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send UD document
|
|
||||||
try:
|
|
||||||
udValue = self.client.execute(queryBuild, variable_values=paramsBuild)
|
|
||||||
except Exception as e:
|
|
||||||
message = ast.literal_eval(str(e))["message"]
|
|
||||||
sys.stderr.write("Echec de récupération du DU:\n" + message + "\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
udValueFinal = udValue['currentUd']['amount']
|
|
||||||
|
|
||||||
return udValueFinal
|
|
|
@ -1,112 +0,0 @@
|
||||||
import requests
|
|
||||||
from time import time
|
|
||||||
from lib.cesiumCommon import CesiumCommon
|
|
||||||
from lib.gvaWallets import ListWallets
|
|
||||||
|
|
||||||
|
|
||||||
class GeolocProfiles(CesiumCommon):
|
|
||||||
def getCesiumProfiles(self):
|
|
||||||
# Send a POST request to the Cesium profiles API
|
|
||||||
response = requests.post(
|
|
||||||
"https://g1.data.e-is.pro/user/profile/_search?scroll=2m",
|
|
||||||
json={
|
|
||||||
"query": {
|
|
||||||
"constant_score": {
|
|
||||||
"filter": [
|
|
||||||
{"exists": {"field": "geoPoint"}},
|
|
||||||
{
|
|
||||||
"geo_bounding_box": {
|
|
||||||
"geoPoint": {
|
|
||||||
"top_left": {"lat": 90, "lon": -180},
|
|
||||||
"bottom_right": {"lat": -90, "lon": 180},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"_source": [
|
|
||||||
"title",
|
|
||||||
"avatar._content_type",
|
|
||||||
"description",
|
|
||||||
"city",
|
|
||||||
"address",
|
|
||||||
"socials.url",
|
|
||||||
"creationTime",
|
|
||||||
"membersCount",
|
|
||||||
"type",
|
|
||||||
"geoPoint",
|
|
||||||
],
|
|
||||||
"size": 20000,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
scroll_id = response.json()["_scroll_id"]
|
|
||||||
finalResult: dict | None = response.json()["hits"]["hits"]
|
|
||||||
|
|
||||||
while True:
|
|
||||||
# Send a scroll request to get the next page
|
|
||||||
response_scroll = requests.post(
|
|
||||||
"https://g1.data.e-is.pro/_search/scroll",
|
|
||||||
json={"scroll_id": scroll_id, "scroll": "2m"},
|
|
||||||
)
|
|
||||||
|
|
||||||
# Check if the response is empty (no results) or if there's an error
|
|
||||||
if (
|
|
||||||
not response_scroll.json()["hits"]["hits"]
|
|
||||||
or "error" in response_scroll.json()
|
|
||||||
):
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
finalResult.extend(response_scroll.json()["hits"]["hits"])
|
|
||||||
|
|
||||||
# Process the results here
|
|
||||||
|
|
||||||
# Delete the scroll context when done
|
|
||||||
requests.delete(
|
|
||||||
"https://g1.data.e-is.pro/_search/scroll", json={"scroll_id": [scroll_id]}
|
|
||||||
)
|
|
||||||
|
|
||||||
return finalResult
|
|
||||||
|
|
||||||
def getGVAProfiles(self, node):
|
|
||||||
# Retrieve GVA profiles using the ListWallets class
|
|
||||||
gva = ListWallets(node, map=True)
|
|
||||||
return gva.sendDoc()
|
|
||||||
|
|
||||||
def formatProfiles(self, cesiumProfiles, gvaProfiles):
|
|
||||||
walletsResult = []
|
|
||||||
for profile in cesiumProfiles:
|
|
||||||
source: dict = profile["_source"]
|
|
||||||
pubkey: dict = profile["_id"]
|
|
||||||
|
|
||||||
if pubkey not in gvaProfiles:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Extract necessary information from the profiles
|
|
||||||
id_info: dict = gvaProfiles[pubkey].get("id") or {}
|
|
||||||
isMember = id_info.get("isMember", False)
|
|
||||||
userId = id_info.get("username")
|
|
||||||
title = source.get("title")
|
|
||||||
city = source.get("city")
|
|
||||||
avatar = source.get("avatar")
|
|
||||||
socials = source.get("socials")
|
|
||||||
description = source.get("description")
|
|
||||||
address = source.get("address")
|
|
||||||
|
|
||||||
walletsResult.append(
|
|
||||||
{
|
|
||||||
"pubkey": pubkey,
|
|
||||||
**({"address": address} if address else {}),
|
|
||||||
**({"city": city} if city else {}),
|
|
||||||
**({"description": description} if description else {}),
|
|
||||||
**({"avatar": avatar} if avatar else {}),
|
|
||||||
**({"userId": userId} if userId else {}),
|
|
||||||
"isMember": isMember,
|
|
||||||
"geoPoint": source["geoPoint"],
|
|
||||||
**({"socials": socials} if socials else {}),
|
|
||||||
**({"title": title} if title else {}),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
return {"wallets": walletsResult, "time": int(time())}
|
|
125
lib/getPages.py
125
lib/getPages.py
|
@ -1,125 +0,0 @@
|
||||||
import sys, re, json, requests, base64
|
|
||||||
from time import time
|
|
||||||
from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX
|
|
||||||
|
|
||||||
|
|
||||||
class Pages(CesiumCommon):
|
|
||||||
# Configure JSON document SET to send
|
|
||||||
def configDocSet(self, name, description, city, address, pos, socials, avatar):
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
if name: data['title'] = name
|
|
||||||
if description: data['description'] = description
|
|
||||||
if address: data['address'] = address
|
|
||||||
if city: data['city'] = city
|
|
||||||
if pos:
|
|
||||||
geoPoint = {}
|
|
||||||
geoPoint['lat'] = pos[0]
|
|
||||||
geoPoint['lon'] = pos[1]
|
|
||||||
data['geoPoint'] = geoPoint
|
|
||||||
if socials:
|
|
||||||
data['socials'] = []
|
|
||||||
data['socials'].append({})
|
|
||||||
data['socials'][0]['type'] = "web"
|
|
||||||
data['socials'][0]['url'] = socials
|
|
||||||
if avatar:
|
|
||||||
avatar = open(avatar, 'rb').read()
|
|
||||||
avatar = base64.b64encode(avatar).decode()
|
|
||||||
data['avatar'] = {}
|
|
||||||
data['avatar']['_content'] = avatar
|
|
||||||
data['avatar']['_content_type'] = "image/png"
|
|
||||||
data['time'] = timeSent
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
data['version'] = 2
|
|
||||||
data['tags'] = []
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
# Configure JSON document GET to send
|
|
||||||
def configDocGet(self, profile, scope='title', getAvatar=None):
|
|
||||||
|
|
||||||
if getAvatar:
|
|
||||||
avatar = "avatar"
|
|
||||||
else:
|
|
||||||
avatar = "avatar._content_type"
|
|
||||||
|
|
||||||
data = {
|
|
||||||
"query": {
|
|
||||||
"bool": {
|
|
||||||
"should":[
|
|
||||||
{
|
|
||||||
"match":{
|
|
||||||
scope:{
|
|
||||||
"query": profile,"boost":2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},{
|
|
||||||
"prefix": {scope: profile}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},"highlight": {
|
|
||||||
"fields": {
|
|
||||||
"title":{},
|
|
||||||
"tags":{}
|
|
||||||
}
|
|
||||||
},"from":0,
|
|
||||||
"size":100,
|
|
||||||
"_source":["title", avatar,"description","city","address","socials.url","creationTime","membersCount","type","geoPoint"],
|
|
||||||
"indices_boost":{"user":100,"page":1,"group":0.01
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return document
|
|
||||||
|
|
||||||
# Configure JSON document SET to send
|
|
||||||
def configDocErase(self):
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['time'] = timeSent
|
|
||||||
data['id'] = self.pubkey
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
data['version'] = 2
|
|
||||||
data['index'] = "user"
|
|
||||||
data['type'] = "profile"
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
def sendDocument(self, document, type):
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
if type == 'set':
|
|
||||||
reqQuery = '{0}/user/profile?pubkey={1}/_update?pubkey={1}'.format(self.pod, self.pubkey)
|
|
||||||
elif type == 'get':
|
|
||||||
reqQuery = '{0}/user,page,group/profile,record/_search'.format(self.pod)
|
|
||||||
elif type == 'erase':
|
|
||||||
reqQuery = '{0}/history/delete'.format(self.pod)
|
|
||||||
|
|
||||||
result = requests.post(reqQuery, headers=headers, data=document)
|
|
||||||
if result.status_code == 200:
|
|
||||||
# print(result.text)
|
|
||||||
return result.text
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document...\n" + result.text + '\n')
|
|
||||||
|
|
||||||
def parseJSON(self, doc):
|
|
||||||
doc = json.loads(doc)['hits']['hits']
|
|
||||||
if doc:
|
|
||||||
pubkey = { "pubkey": doc[0]['_id'] }
|
|
||||||
rest = doc[0]['_source']
|
|
||||||
final = {**pubkey, **rest}
|
|
||||||
return json.dumps(final, indent=2)
|
|
||||||
else:
|
|
||||||
return 'Profile vide'
|
|
84
lib/gva.py
84
lib/gva.py
|
@ -1,84 +0,0 @@
|
||||||
from lib.currentUd import currentUd
|
|
||||||
from lib.gvaWallets import ListWallets
|
|
||||||
import sys, re
|
|
||||||
from lib.natools import get_privkey
|
|
||||||
from lib.gvaPay import Transaction, PUBKEY_REGEX
|
|
||||||
from lib.gvaHistory import History
|
|
||||||
from lib.gvaBalance import Balance
|
|
||||||
from lib.gvaID import Id
|
|
||||||
|
|
||||||
class GvaApi():
|
|
||||||
def __init__(self, dunikey, node, pubkey, noNeedDunikey=False):
|
|
||||||
self.noNeedDunikey = noNeedDunikey
|
|
||||||
self.dunikey = dunikey
|
|
||||||
self.node = node
|
|
||||||
if noNeedDunikey:
|
|
||||||
self.pubkey = self.dunikey
|
|
||||||
else:
|
|
||||||
self.pubkey = get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
|
|
||||||
if pubkey:
|
|
||||||
self.destPubkey = pubkey
|
|
||||||
else:
|
|
||||||
self.destPubkey = self.pubkey
|
|
||||||
|
|
||||||
try:
|
|
||||||
if not re.match(PUBKEY_REGEX, self.pubkey) or len(self.pubkey) > 45:
|
|
||||||
raise ValueError("La clé publique n'est pas au bon format.")
|
|
||||||
except:
|
|
||||||
sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
raise
|
|
||||||
|
|
||||||
try:
|
|
||||||
if not re.match(PUBKEY_REGEX, self.destPubkey) or len(self.destPubkey) > 45:
|
|
||||||
raise ValueError("La clé publique n'est pas au bon format.")
|
|
||||||
except:
|
|
||||||
sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
raise
|
|
||||||
|
|
||||||
#################### Payments ####################
|
|
||||||
|
|
||||||
def pay(self, amount, comment, mempool, verbose):
|
|
||||||
comment = " ".join(comment)
|
|
||||||
gva = Transaction(self.dunikey, self.node, self.destPubkey, amount, comment, mempool, verbose)
|
|
||||||
gva.genDoc()
|
|
||||||
gva.checkTXDoc()
|
|
||||||
gva.signDoc()
|
|
||||||
return gva.sendTXDoc()
|
|
||||||
|
|
||||||
def history(self, isJSON=False, noColors=False, number=10):
|
|
||||||
gva = History(self.dunikey, self.node, self.destPubkey)
|
|
||||||
gva.sendDoc(number)
|
|
||||||
transList = gva.parseHistory()
|
|
||||||
|
|
||||||
if isJSON:
|
|
||||||
transJson = gva.jsonHistory(transList)
|
|
||||||
print(transJson)
|
|
||||||
else:
|
|
||||||
gva.printHistory(transList, noColors)
|
|
||||||
|
|
||||||
def balance(self, useMempool):
|
|
||||||
gva = Balance(self.dunikey, self.node, self.destPubkey, useMempool)
|
|
||||||
balanceValue = gva.sendDoc()
|
|
||||||
print(balanceValue)
|
|
||||||
|
|
||||||
def id(self, pubkey, username):
|
|
||||||
gva = Id(self.dunikey, self.node, pubkey, username)
|
|
||||||
result = gva.sendDoc()
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def idBalance(self, pubkey):
|
|
||||||
gva = Id(self.dunikey, self.node, pubkey)
|
|
||||||
result = gva.sendDoc(True)
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def currentUd(self):
|
|
||||||
gva = currentUd(self.node)
|
|
||||||
result = gva.sendDoc()
|
|
||||||
print(result)
|
|
||||||
|
|
||||||
def listWallets(self, brut, brutMbr, brutNonMbr, brutLarf):
|
|
||||||
gva = ListWallets(self.node, brut, brutMbr, brutNonMbr, brutLarf)
|
|
||||||
result = gva.sendDoc()
|
|
||||||
|
|
||||||
print(result)
|
|
|
@ -1,53 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys, re, os.path, json, ast
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
from gql import gql, Client
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
|
|
||||||
PUBKEY_REGEX = "(?![OIl])[1-9A-Za-z]{42,45}"
|
|
||||||
|
|
||||||
class Balance:
|
|
||||||
|
|
||||||
def __init__(self, dunikey, node, pubkey, useMempool=False):
|
|
||||||
self.dunikey = dunikey
|
|
||||||
self.pubkey = pubkey if pubkey else get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
self.useMempool = useMempool
|
|
||||||
if not re.match(PUBKEY_REGEX, self.pubkey) or len(self.pubkey) > 45:
|
|
||||||
sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Define Duniter GVA node
|
|
||||||
transport = AIOHTTPTransport(url=node)
|
|
||||||
self.client = Client(transport=transport, fetch_schema_from_transport=True)
|
|
||||||
|
|
||||||
def sendDoc(self):
|
|
||||||
# Build balance generation document
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
query ($pubkey: PkOrScriptGva!){
|
|
||||||
balance(script: $pubkey) {
|
|
||||||
amount
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
paramsBuild = {
|
|
||||||
"pubkey": self.pubkey
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send balance document
|
|
||||||
try:
|
|
||||||
balanceResult = self.client.execute(queryBuild, variable_values=paramsBuild)
|
|
||||||
except Exception as e:
|
|
||||||
message = ast.literal_eval(str(e))["message"]
|
|
||||||
sys.stderr.write("Echec de récupération du solde:\n" + message + "\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if (balanceResult['balance'] == None): balanceValue = 'null'
|
|
||||||
else:
|
|
||||||
balanceValue = balanceResult['balance']['amount']/100
|
|
||||||
|
|
||||||
# print(balanceValue)
|
|
||||||
return balanceValue
|
|
|
@ -1,286 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys, re, os.path, json, ast, time, hashlib
|
|
||||||
from datetime import datetime
|
|
||||||
from duniterpy.key import base58
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
from gql import gql, Client
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
|
|
||||||
PUBKEY_REGEX = "(?![OIl])[1-9A-Za-z]{42,45}"
|
|
||||||
|
|
||||||
class History:
|
|
||||||
|
|
||||||
def __init__(self, dunikey, node, pubkey):
|
|
||||||
self.dunikey = dunikey
|
|
||||||
self.pubkey = pubkey if pubkey else get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
self.node = node
|
|
||||||
if not re.match(PUBKEY_REGEX, self.pubkey) or len(self.pubkey) > 45:
|
|
||||||
sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Define Duniter GVA node
|
|
||||||
transport = AIOHTTPTransport(url=node)
|
|
||||||
self.client = Client(transport=transport, fetch_schema_from_transport=True)
|
|
||||||
|
|
||||||
def sendDoc(self, number):
|
|
||||||
# Build history generation document
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
query ($pubkey: PubKeyGva!, $script: PkOrScriptGva!, $number: Int!){
|
|
||||||
txsHistoryBc(
|
|
||||||
script: $script
|
|
||||||
pagination: { pageSize: $number, ord: DESC }
|
|
||||||
) {
|
|
||||||
both {
|
|
||||||
pageInfo {
|
|
||||||
hasPreviousPage
|
|
||||||
hasNextPage
|
|
||||||
}
|
|
||||||
edges {
|
|
||||||
direction
|
|
||||||
node {
|
|
||||||
currency
|
|
||||||
issuers
|
|
||||||
blockstamp
|
|
||||||
outputs
|
|
||||||
comment
|
|
||||||
writtenTime
|
|
||||||
hash
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
txsHistoryMp(pubkey: $pubkey) {
|
|
||||||
receiving {
|
|
||||||
currency
|
|
||||||
issuers
|
|
||||||
comment
|
|
||||||
outputs
|
|
||||||
receivedTime
|
|
||||||
blockstamp
|
|
||||||
hash
|
|
||||||
}
|
|
||||||
sending {
|
|
||||||
currency
|
|
||||||
issuers
|
|
||||||
comment
|
|
||||||
outputs
|
|
||||||
receivedTime
|
|
||||||
blockstamp
|
|
||||||
hash
|
|
||||||
}
|
|
||||||
}
|
|
||||||
balance(script: $script) {
|
|
||||||
amount
|
|
||||||
base
|
|
||||||
}
|
|
||||||
node {
|
|
||||||
peer {
|
|
||||||
currency
|
|
||||||
}
|
|
||||||
}
|
|
||||||
currentUd {
|
|
||||||
amount
|
|
||||||
base
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
paramsBuild = {
|
|
||||||
"pubkey": self.pubkey,
|
|
||||||
"number": number,
|
|
||||||
"script": f"SIG({self.pubkey})",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send history document
|
|
||||||
try:
|
|
||||||
self.historyDoc = self.client.execute(queryBuild, variable_values=paramsBuild)
|
|
||||||
except Exception as e:
|
|
||||||
message = ast.literal_eval(str(e))["message"]
|
|
||||||
sys.stderr.write("Echec de récupération de l'historique:\n" + message + "\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
def parseHistory(self):
|
|
||||||
trans = []
|
|
||||||
i = 0
|
|
||||||
|
|
||||||
currentBase = int(self.historyDoc['currentUd']['base'])
|
|
||||||
self.UD = self.historyDoc['currentUd']['amount']/100
|
|
||||||
|
|
||||||
|
|
||||||
# Parse transactions in blockchain
|
|
||||||
resBc = []
|
|
||||||
resBc = self.historyDoc['txsHistoryBc']['both']['edges']
|
|
||||||
for j, transaction in enumerate(resBc):
|
|
||||||
# print(transaction)
|
|
||||||
direction = resBc[j]['direction']
|
|
||||||
transaction = resBc[j]['node']
|
|
||||||
output = transaction['outputs'][0]
|
|
||||||
outPubkey = output.split("SIG(")[1].replace(')','')
|
|
||||||
# if direction == 'RECEIVED' or self.pubkey != outPubkey:
|
|
||||||
trans.append(i)
|
|
||||||
trans[i] = []
|
|
||||||
trans[i].append(direction)
|
|
||||||
trans[i].append(transaction['writtenTime'])
|
|
||||||
|
|
||||||
if direction == 'SENT':
|
|
||||||
trans[i].append(outPubkey)
|
|
||||||
amount = int('-' + output.split(':')[0])
|
|
||||||
else:
|
|
||||||
trans[i].append(transaction['issuers'][0])
|
|
||||||
amount = int(output.split(':')[0])
|
|
||||||
base = int(output.split(':')[1])
|
|
||||||
applyBase = base-currentBase
|
|
||||||
amount = round(amount*pow(10,applyBase)/100, 2)
|
|
||||||
# if referential == 'DU': amount = round(amount/UD, 2)
|
|
||||||
trans[i].append(amount)
|
|
||||||
trans[i].append(round(amount/self.UD, 2))
|
|
||||||
trans[i].append(transaction['comment'])
|
|
||||||
trans[i].append(base)
|
|
||||||
trans[i].append(transaction['blockstamp'])
|
|
||||||
trans[i].append(transaction['hash'])
|
|
||||||
i += 1
|
|
||||||
|
|
||||||
# Parse transactions in mempool
|
|
||||||
for direction, resBc in self.historyDoc['txsHistoryMp'].items():
|
|
||||||
for j, transaction in enumerate(resBc):
|
|
||||||
# print(transaction)
|
|
||||||
transaction = resBc[j]
|
|
||||||
output = transaction['outputs'][0]
|
|
||||||
outPubkey = output.split("SIG(")[1].replace(')','')
|
|
||||||
# if direction == 'RECEIVING' or self.pubkey != outPubkey:
|
|
||||||
trans.append(i)
|
|
||||||
trans[i] = []
|
|
||||||
trans[i].append(direction.upper())
|
|
||||||
trans[i].append(transaction['receivedTime'])
|
|
||||||
|
|
||||||
# trans[i].append(int(time.time()))
|
|
||||||
if direction.upper() == 'SENDING':
|
|
||||||
trans[i].append(outPubkey)
|
|
||||||
amount = int('-' + output.split(':')[0])
|
|
||||||
else:
|
|
||||||
trans[i].append(transaction['issuers'][0])
|
|
||||||
amount = int(output.split(':')[0])
|
|
||||||
base = int(output.split(':')[1])
|
|
||||||
applyBase = base-currentBase
|
|
||||||
amount = round(amount*pow(10,applyBase)/100, 2)
|
|
||||||
# if referential == 'DU': amount = round(amount/UD, 2)
|
|
||||||
trans[i].append(amount)
|
|
||||||
trans[i].append(round(amount/self.UD, 2))
|
|
||||||
trans[i].append(transaction['comment'])
|
|
||||||
trans[i].append(base)
|
|
||||||
trans[i].append(transaction['blockstamp'])
|
|
||||||
trans[i].append(transaction['hash'])
|
|
||||||
i += 1
|
|
||||||
|
|
||||||
# Order transactions by date
|
|
||||||
trans.sort(key=lambda x: x[1])
|
|
||||||
|
|
||||||
# Keep only base if there is base change
|
|
||||||
lastBase = 0
|
|
||||||
for i in trans:
|
|
||||||
if i[6] == lastBase: i[6] = None
|
|
||||||
else: lastBase = i[6]
|
|
||||||
|
|
||||||
return trans
|
|
||||||
|
|
||||||
def printHistory(self, trans, noColors):
|
|
||||||
# Get balance
|
|
||||||
if (self.historyDoc['balance'] == None):
|
|
||||||
balance = balanceUD = 'null'
|
|
||||||
else:
|
|
||||||
|
|
||||||
balance = self.historyDoc['balance']['amount']/100
|
|
||||||
balanceUD = round(balance/self.UD, 2)
|
|
||||||
|
|
||||||
# Get currency
|
|
||||||
currency = self.historyDoc['node']['peer']['currency']
|
|
||||||
if currency == 'g1': currency = 'Ḡ1'
|
|
||||||
elif currency == 'g1-test': currency = 'GT'
|
|
||||||
# if referential == 'DU': currency = 'DU/' + currency.lower()
|
|
||||||
|
|
||||||
# Get terminal size
|
|
||||||
rows = int(os.popen('stty size', 'r').read().split()[1])
|
|
||||||
|
|
||||||
# Display history
|
|
||||||
print('+', end='')
|
|
||||||
print('-'.center(rows-1, '-'))
|
|
||||||
if noColors: isBold = isBoldEnd = ''
|
|
||||||
else:
|
|
||||||
isBold = '\033[1m'
|
|
||||||
isBoldEnd = '\033[0m'
|
|
||||||
print(isBold + "|{: <19} | {: <12} | {: <7} | {: <7} | {: <30}".format(" Date"," De / À"," {0}".format(currency)," DU/{0}".format(currency.lower()),"Commentaire") + isBoldEnd)
|
|
||||||
print('|', end='')
|
|
||||||
for t in trans:
|
|
||||||
if t[0] == "RECEIVED": color = "green"
|
|
||||||
elif t[0] == "SENT": color = "blue"
|
|
||||||
elif t[0] == "receiving": color = "yellow"
|
|
||||||
elif t[0] == "sending": color = "red"
|
|
||||||
else: color = None
|
|
||||||
if noColors:
|
|
||||||
color = None
|
|
||||||
if t[0] in ('RECEIVING','SENDING'):
|
|
||||||
comment = '(EN ATTENTE) ' + t[5]
|
|
||||||
else:
|
|
||||||
comment = t[5]
|
|
||||||
else:
|
|
||||||
comment = t[5]
|
|
||||||
|
|
||||||
date = datetime.fromtimestamp(t[1]).strftime("%d/%m/%Y à %H:%M")
|
|
||||||
print('-'.center(rows-1, '-'))
|
|
||||||
if t[6]:
|
|
||||||
print('|', end='')
|
|
||||||
print(' Changement de base : {0} '.format(t[6]).center(rows-1, '#'))
|
|
||||||
print('|', end='')
|
|
||||||
print('-'.center(rows-1, '-'))
|
|
||||||
print('|', end='')
|
|
||||||
checksum = self.gen_checksum(t[2])
|
|
||||||
shortPubkey = t[2][0:4] + '\u2026' + t[2][-4:] + ':' + checksum
|
|
||||||
if noColors:
|
|
||||||
print(" {: <18} | {: <12} | {: <7} | {: <7} | {: <30}".format(date, shortPubkey, t[3], t[4], comment))
|
|
||||||
else:
|
|
||||||
print(colored(" {: <18} | {: <12} | {: <7} | {: <7} | {: <30}".format(date, shortPubkey, t[3], t[4], comment), color))
|
|
||||||
print('|', end='')
|
|
||||||
print('-'.center(rows-1, '-'))
|
|
||||||
print('|', end='')
|
|
||||||
print(isBold + 'Solde du compte: {0} {1} ({2} DU/{3})'.format(balance, currency, balanceUD, currency.lower()).center(rows-1, ' ') + isBoldEnd)
|
|
||||||
print('+', end='')
|
|
||||||
print(''.center(rows-1, '-'))
|
|
||||||
if not noColors:
|
|
||||||
print(colored('Reçus', 'green'), '-', colored('En cours de réception', 'yellow'), '-', colored('Envoyé', 'blue'), '-', colored("En cours d'envoi", 'red'))
|
|
||||||
|
|
||||||
return trans
|
|
||||||
|
|
||||||
def gen_checksum(self, pubkey):
|
|
||||||
"""
|
|
||||||
Returns the checksum of the input pubkey (encoded in b58)
|
|
||||||
thx Matograine
|
|
||||||
"""
|
|
||||||
pubkey_byte = base58.Base58Encoder.decode(str.encode(pubkey))
|
|
||||||
hash = hashlib.sha256(hashlib.sha256(pubkey_byte).digest()).digest()
|
|
||||||
return base58.Base58Encoder.encode(hash)[:3]
|
|
||||||
|
|
||||||
def jsonHistory(self, transList):
|
|
||||||
dailyJSON = []
|
|
||||||
for i, trans in enumerate(transList):
|
|
||||||
dailyJSON.append(i)
|
|
||||||
dailyJSON[i] = {}
|
|
||||||
dailyJSON[i]['status'] = trans[0].upper()
|
|
||||||
dailyJSON[i]['date'] = trans[1]
|
|
||||||
dailyJSON[i]['pubkey'] = trans[2]
|
|
||||||
dailyJSON[i]['amount'] = trans[3]
|
|
||||||
dailyJSON[i]['amountUD'] = trans[4]
|
|
||||||
dailyJSON[i]['comment'] = trans[5]
|
|
||||||
dailyJSON[i]['blockstamp'] = trans[7]
|
|
||||||
dailyJSON[i]['hash'] = trans[8]
|
|
||||||
|
|
||||||
dailyJSON = json.dumps(dailyJSON, indent=2)
|
|
||||||
# If we want to write JSON to a file
|
|
||||||
#jsonFile = open("history-{0}.json".format(self.pubkey[0:8]), "w")
|
|
||||||
#jsonFile.writelines(dailyJSON + '\n')
|
|
||||||
#jsonFile.close()
|
|
||||||
return dailyJSON
|
|
||||||
|
|
81
lib/gvaID.py
81
lib/gvaID.py
|
@ -1,81 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys, re, os.path, json, ast
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
from gql import gql, Client
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
|
|
||||||
PUBKEY_REGEX = "(?![OIl])[1-9A-Za-z]{42,45}"
|
|
||||||
|
|
||||||
class Id:
|
|
||||||
|
|
||||||
def __init__(self, dunikey, node, pubkey='', username=''):
|
|
||||||
|
|
||||||
self.dunikey = dunikey
|
|
||||||
self.pubkey = pubkey if pubkey else get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
self.username = username
|
|
||||||
# if not re.match(PUBKEY_REGEX, self.pubkey) or len(self.pubkey) > 45:
|
|
||||||
# sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
# sys.exit(1)
|
|
||||||
|
|
||||||
# Define Duniter GVA node
|
|
||||||
transport = AIOHTTPTransport(url=node)
|
|
||||||
self.client = Client(transport=transport, fetch_schema_from_transport=True)
|
|
||||||
|
|
||||||
def sendDoc(self, getBalance=False):
|
|
||||||
# Build balance generation document
|
|
||||||
if (getBalance):
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
query ($pubkey: PubKeyGva!, $script: PkOrScriptGva!){
|
|
||||||
idty (pubkey: $pubkey) {
|
|
||||||
isMember
|
|
||||||
username
|
|
||||||
}
|
|
||||||
balance(script: $script) {
|
|
||||||
amount
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
query ($pubkey: PubKeyGva!){
|
|
||||||
idty (pubkey: $pubkey) {
|
|
||||||
isMember
|
|
||||||
username
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
paramsBuild = {
|
|
||||||
"pubkey": self.pubkey,
|
|
||||||
"script": f"SIG({self.pubkey})"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send balance document
|
|
||||||
try:
|
|
||||||
queryResult = self.client.execute(queryBuild, variable_values=paramsBuild)
|
|
||||||
except Exception as e:
|
|
||||||
sys.stderr.write("Echec de récupération du solde:\n" + str(e) + "\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
jsonBrut = queryResult
|
|
||||||
|
|
||||||
if (getBalance):
|
|
||||||
if (queryResult['balance'] == None):
|
|
||||||
jsonBrut['balance'] = {"amount": 0.0}
|
|
||||||
else:
|
|
||||||
jsonBrut['balance'] = queryResult['balance']['amount']/100
|
|
||||||
|
|
||||||
if (queryResult['idty'] == None):
|
|
||||||
username = 'Matiou'
|
|
||||||
isMember = False
|
|
||||||
else:
|
|
||||||
username = queryResult['idty']['username']
|
|
||||||
isMember = queryResult['idty']['isMember']
|
|
||||||
|
|
||||||
return json.dumps(jsonBrut, indent=2)
|
|
172
lib/gvaPay.py
172
lib/gvaPay.py
|
@ -1,172 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys, re, os.path, json, ast
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
from gql import gql, Client
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
|
|
||||||
PUBKEY_REGEX = "(?![OIl])[0-9A-Za-z]{42,45}"
|
|
||||||
|
|
||||||
class Transaction:
|
|
||||||
|
|
||||||
def __init__(self, dunikey, node, recipient, amount, comment='', useMempool=False, verbose=False):
|
|
||||||
self.dunikey = dunikey
|
|
||||||
self.recipient = recipient
|
|
||||||
self.amount = int(amount*100)
|
|
||||||
self.comment = comment
|
|
||||||
self.issuer = get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
self.useMempool = useMempool
|
|
||||||
self.verbose = verbose
|
|
||||||
self.node = node
|
|
||||||
self._isChange = False
|
|
||||||
|
|
||||||
try:
|
|
||||||
if not re.match(PUBKEY_REGEX, recipient) or len(recipient) > 45:
|
|
||||||
raise ValueError("La clé publique n'est pas au bon format.")
|
|
||||||
except:
|
|
||||||
sys.stderr.write("La clé publique n'est pas au bon format.\n")
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
if recipient == self.issuer:
|
|
||||||
raise ValueError('Le destinataire ne peut pas être vous même.')
|
|
||||||
except:
|
|
||||||
sys.stderr.write("Le destinataire ne peut pas être vous même.\n")
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
# Define Duniter GVA node
|
|
||||||
transport = AIOHTTPTransport(url=node)
|
|
||||||
self.client = Client(transport=transport, fetch_schema_from_transport=True)
|
|
||||||
|
|
||||||
def genDoc(self):
|
|
||||||
# Build TX generation document
|
|
||||||
if self.verbose: print("useMempool:", str(self.useMempool))
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
query ($recipient: PkOrScriptGva!, $issuer: PubKeyGva!, $amount: Int!, $comment: String!, $useMempool: Boolean!){ genTx(
|
|
||||||
amount: $amount
|
|
||||||
comment: $comment
|
|
||||||
issuer: $issuer
|
|
||||||
recipient: $recipient
|
|
||||||
useMempoolSources: $useMempool
|
|
||||||
)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
paramsBuild = {
|
|
||||||
"recipient": self.recipient,
|
|
||||||
"issuer": self.issuer,
|
|
||||||
"amount": int(self.amount),
|
|
||||||
"comment": self.comment,
|
|
||||||
"useMempool": self.useMempool
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send TX document
|
|
||||||
try:
|
|
||||||
# self.txDoc = []
|
|
||||||
self.txDoc = self.client.execute(queryBuild, variable_values=paramsBuild)['genTx']
|
|
||||||
if self.verbose: print(self.txDoc[0])
|
|
||||||
return self.txDoc
|
|
||||||
except Exception as e:
|
|
||||||
message = ast.literal_eval(str(e))["message"]
|
|
||||||
sys.stderr.write("Echec de la génération du document:\n" + message + "\n")
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
# Check document
|
|
||||||
def checkTXDoc(self):
|
|
||||||
issuerRaw=[];outAmount=[];outPubkey=[];commentRaw=[]
|
|
||||||
for docs in self.txDoc:
|
|
||||||
docList = docs.splitlines()
|
|
||||||
for i, line in enumerate(docList):
|
|
||||||
if re.search("Issuers:", line):
|
|
||||||
issuerRaw.append(docList[(i + 1) % len(docList)])
|
|
||||||
if re.search("Outputs:", line):
|
|
||||||
outputRaw = docList[(i + 1) % len(docList)].split(":")
|
|
||||||
outAmount.append(int(outputRaw[0]))
|
|
||||||
outPubkey.append(outputRaw[2].split("SIG(")[1].replace(')',''))
|
|
||||||
if re.search("Comment:", line):
|
|
||||||
commentRaw.append(line.split(': ', 1)[1])
|
|
||||||
|
|
||||||
# Check if it's only a change transaction
|
|
||||||
if all(i == self.issuer for i in outPubkey):
|
|
||||||
print("Le document contient une transaction de change")
|
|
||||||
self.isChange = True
|
|
||||||
# Check validity of the document
|
|
||||||
elif all(i != self.issuer for i in issuerRaw) or sum(outAmount) != self.amount or all(i != self.recipient for i in outPubkey) or all(i != self.comment for i in commentRaw):
|
|
||||||
sys.stderr.write(colored("Le document généré est corrompu !\nLe noeud " + self.node + "a peut être un dysfonctionnement.\n", 'red'))
|
|
||||||
sys.stderr.write(colored(issuerRaw[0] + " envoi " + str(outAmount[0]) + " vers " + outPubkey[0] + " with comment: " + commentRaw[0] + "\n", "yellow"))
|
|
||||||
raise ValueError('Le document généré est corrompu !')
|
|
||||||
else:
|
|
||||||
print("Le document généré est conforme.")
|
|
||||||
self.isChange = False
|
|
||||||
return self.txDoc
|
|
||||||
|
|
||||||
def signDoc(self):
|
|
||||||
# Sign TX documents
|
|
||||||
signature=[]
|
|
||||||
self.signedDoc=[]
|
|
||||||
for i, docs in enumerate(self.txDoc):
|
|
||||||
signature.append(fmt["64"](sign(docs.encode(), get_privkey(self.dunikey, "pubsec"))[:-len(docs.encode())]))
|
|
||||||
self.signedDoc.append(docs + signature[i].decode())
|
|
||||||
return self.signedDoc
|
|
||||||
|
|
||||||
|
|
||||||
def sendTXDoc(self):
|
|
||||||
# Build TX documents
|
|
||||||
txResult=[]
|
|
||||||
for docs in self.signedDoc:
|
|
||||||
querySign = gql(
|
|
||||||
"""
|
|
||||||
mutation ($signedDoc: String!){ tx(
|
|
||||||
rawTx: $signedDoc
|
|
||||||
) {
|
|
||||||
version
|
|
||||||
issuers
|
|
||||||
outputs
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
paramsSign = {
|
|
||||||
"signedDoc": docs
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send TX Signed document
|
|
||||||
try:
|
|
||||||
txResult.append(str(self.client.execute(querySign, variable_values=paramsSign)))
|
|
||||||
except Exception as e:
|
|
||||||
message = ast.literal_eval(str(e))["message"]
|
|
||||||
sys.stderr.write("Echec de la transaction:\n" + message + "\n")
|
|
||||||
if self.verbose:
|
|
||||||
sys.stderr.write("Document final:\n" + docs)
|
|
||||||
raise ValueError(message)
|
|
||||||
else:
|
|
||||||
if self.isChange:
|
|
||||||
self.send()
|
|
||||||
else:
|
|
||||||
print(colored("Transaction effectué avec succès !", "green"))
|
|
||||||
if self.verbose:
|
|
||||||
print(docs)
|
|
||||||
break
|
|
||||||
|
|
||||||
return txResult
|
|
||||||
|
|
||||||
def _getIsChange(self):
|
|
||||||
return self._isChange
|
|
||||||
def _setIsChange(self, newChange):
|
|
||||||
if self.verbose: print("_setIsChange: ", str(newChange))
|
|
||||||
self._isChange = newChange
|
|
||||||
if newChange: self.useMempool == True
|
|
||||||
isChange = property(_getIsChange, _setIsChange)
|
|
||||||
|
|
||||||
def send(self):
|
|
||||||
result = self.genDoc()
|
|
||||||
result = self.checkTXDoc()
|
|
||||||
result = self.signDoc()
|
|
||||||
result = self.sendTXDoc()
|
|
||||||
return result
|
|
||||||
|
|
|
@ -1,100 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
from gql import gql, Client
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
from lib.natools import fmt, sign, get_privkey
|
|
||||||
|
|
||||||
|
|
||||||
class ListWallets:
|
|
||||||
def __init__(
|
|
||||||
self, node=False, brut=False, mbr=False, nonMbr=False, larf=False, map=False
|
|
||||||
):
|
|
||||||
# Initialize the ListWallets class with optional filters
|
|
||||||
self.mbr = mbr # Filter for members
|
|
||||||
self.larf = larf # Filter for non-empty identities
|
|
||||||
self.nonMbr = nonMbr # Filter for non-members
|
|
||||||
self.brut = brut # Output format flag (brut or JSON)
|
|
||||||
self.map = map # Output format flag (map or list)
|
|
||||||
|
|
||||||
# Define Duniter GVA node
|
|
||||||
transport = AIOHTTPTransport(url=node)
|
|
||||||
self.client = Client(transport=transport, fetch_schema_from_transport=True)
|
|
||||||
|
|
||||||
def sendDoc(self):
|
|
||||||
# Define the GraphQL query to retrieve wallet information
|
|
||||||
queryBuild = gql(
|
|
||||||
"""
|
|
||||||
{
|
|
||||||
wallets(pagination: { cursor: null, ord: ASC, pageSize: 0 }) {
|
|
||||||
pageInfo {
|
|
||||||
hasNextPage
|
|
||||||
endCursor
|
|
||||||
}
|
|
||||||
edges {
|
|
||||||
node {
|
|
||||||
script
|
|
||||||
balance {
|
|
||||||
amount
|
|
||||||
base
|
|
||||||
}
|
|
||||||
idty {
|
|
||||||
isMember
|
|
||||||
username
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Execute the GraphQL query
|
|
||||||
queryResult = self.client.execute(queryBuild)
|
|
||||||
except Exception as e:
|
|
||||||
# Handle any exceptions that occur during the query
|
|
||||||
sys.stderr.write("Failed to retrieve the list:\n" + str(e) + "\n")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
jsonBrut = queryResult["wallets"]["edges"]
|
|
||||||
|
|
||||||
walletList = []
|
|
||||||
walletMap = {}
|
|
||||||
|
|
||||||
for i, trans in enumerate(jsonBrut):
|
|
||||||
dataWork = trans["node"]
|
|
||||||
identity = dataWork["idty"]
|
|
||||||
is_member = identity and identity["isMember"]
|
|
||||||
|
|
||||||
# Apply filters based on member status and larf flag
|
|
||||||
member_filter = self.mbr and not is_member
|
|
||||||
non_member_filter = self.nonMbr and is_member
|
|
||||||
larf_filter = self.larf and identity
|
|
||||||
if member_filter or non_member_filter or larf_filter:
|
|
||||||
continue
|
|
||||||
|
|
||||||
wallet_data = {
|
|
||||||
"pubkey": dataWork["script"],
|
|
||||||
"balance": dataWork["balance"]["amount"] / 100,
|
|
||||||
"id": identity,
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.map:
|
|
||||||
walletMap[dataWork["script"]] = wallet_data
|
|
||||||
else:
|
|
||||||
walletList.append(wallet_data)
|
|
||||||
|
|
||||||
if self.brut:
|
|
||||||
# Generate a list of formatted wallet names using list comprehension
|
|
||||||
names = [
|
|
||||||
wallet["pubkey"]
|
|
||||||
if not (self.mbr or self.nonMbr) or wallet["id"] is None
|
|
||||||
else f'{wallet["pubkey"]} {wallet["id"]["username"]}'
|
|
||||||
for wallet in walletList
|
|
||||||
]
|
|
||||||
return "\n".join(names)
|
|
||||||
else:
|
|
||||||
# Return JSON data in either map or list format
|
|
||||||
return json.dumps(walletMap if self.map else walletList, indent=2)
|
|
252
lib/messaging.py
252
lib/messaging.py
|
@ -1,252 +0,0 @@
|
||||||
import os, sys, ast, requests, json, base58, base64
|
|
||||||
from time import time
|
|
||||||
from datetime import datetime
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.natools import fmt, get_privkey, box_decrypt, box_encrypt
|
|
||||||
from lib.cesiumCommon import CesiumCommon, pp_json, PUBKEY_REGEX
|
|
||||||
|
|
||||||
|
|
||||||
#################### Reading class ####################
|
|
||||||
|
|
||||||
|
|
||||||
class ReadFromCesium(CesiumCommon):
|
|
||||||
# Configure JSON document to send
|
|
||||||
def configDoc(self, nbrMsg, outbox):
|
|
||||||
boxType = "issuer" if outbox else "recipient"
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['sort'] = { "time": "desc" }
|
|
||||||
data['from'] = 0
|
|
||||||
data['size'] = nbrMsg
|
|
||||||
data['_source'] = ['issuer','recipient','title','content','time','nonce','read_signature']
|
|
||||||
data['query'] = {}
|
|
||||||
data['query']['bool'] = {}
|
|
||||||
data['query']['bool']['filter'] = {}
|
|
||||||
data['query']['bool']['filter']['term'] = {}
|
|
||||||
data['query']['bool']['filter']['term'][boxType] = self.pubkey
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
return document
|
|
||||||
|
|
||||||
def sendDocument(self, nbrMsg, outbox):
|
|
||||||
boxType = "outbox" if outbox else "inbox"
|
|
||||||
|
|
||||||
document = self.configDoc(nbrMsg, outbox)
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
result = requests.post('{0}/message/{1}/_search'.format(self.pod, boxType), headers=headers, data=document)
|
|
||||||
if result.status_code == 200:
|
|
||||||
return result.json()["hits"]
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + result.text)
|
|
||||||
|
|
||||||
# Parse JSON result and display messages
|
|
||||||
def readMessages(self, msgJSON, nbrMsg, outbox):
|
|
||||||
def decrypt(msg):
|
|
||||||
if msg is None: return ''
|
|
||||||
msg64 = base64.b64decode(msg)
|
|
||||||
return box_decrypt(msg64, get_privkey(self.dunikey, "pubsec"), self.issuer, nonce).decode()
|
|
||||||
|
|
||||||
# Get terminal size
|
|
||||||
rows = int(os.popen('stty size', 'r').read().split()[1])
|
|
||||||
|
|
||||||
totalMsg = msgJSON["total"]
|
|
||||||
if nbrMsg > totalMsg:
|
|
||||||
nbrMsg = totalMsg
|
|
||||||
|
|
||||||
if totalMsg == 0:
|
|
||||||
print(colored("Aucun message à afficher.", 'yellow'))
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
infoTotal = " Nombre de messages: " + str(nbrMsg) + "/" + str(totalMsg) + " "
|
|
||||||
print(colored(infoTotal.center(rows, '#'), "yellow"))
|
|
||||||
for hits in msgJSON["hits"]:
|
|
||||||
self.idMsg = hits["_id"]
|
|
||||||
msgSrc = hits["_source"]
|
|
||||||
self.issuer = msgSrc["issuer"]
|
|
||||||
nonce = msgSrc["nonce"]
|
|
||||||
try:
|
|
||||||
nonce = base58.b58decode(nonce)
|
|
||||||
except:
|
|
||||||
nonce = base58.b58decode('5aZdSqKGHBqm2uMPwN6XnfiiJKRieb1Hh')
|
|
||||||
self.dateS = msgSrc["time"]
|
|
||||||
date = datetime.fromtimestamp(self.dateS).strftime(", le %d/%m/%Y à %H:%M ")
|
|
||||||
if outbox:
|
|
||||||
startHeader = " À " + msgSrc["recipient"]
|
|
||||||
else:
|
|
||||||
startHeader = " De " + self.issuer
|
|
||||||
headerMsg = startHeader + date + "(ID: {})".format(self.idMsg) + " "
|
|
||||||
|
|
||||||
print('-'.center(rows, '-'))
|
|
||||||
print(colored(headerMsg, "blue").center(rows+9, '-'))
|
|
||||||
print('-'.center(rows, '-'))
|
|
||||||
try:
|
|
||||||
self.title = decrypt(msgSrc["title"])
|
|
||||||
self.content = decrypt(msgSrc["content"])
|
|
||||||
except Exception as e:
|
|
||||||
sys.stderr.write(colored(str(e), 'red') + '\n')
|
|
||||||
pp_json(hits)
|
|
||||||
continue
|
|
||||||
print('\033[1m' + self.title + '\033[0m')
|
|
||||||
print(self.content)
|
|
||||||
|
|
||||||
print(colored(infoTotal.center(rows, '#'), "yellow"))
|
|
||||||
|
|
||||||
# Parse JSON result and display messages
|
|
||||||
def jsonMessages(self, msgJSON, nbrMsg, outbox):
|
|
||||||
def decrypt(msg):
|
|
||||||
if msg is None: return ''
|
|
||||||
msg64 = base64.b64decode(msg)
|
|
||||||
return box_decrypt(msg64, get_privkey(self.dunikey, "pubsec"), self.issuer, nonce).decode()
|
|
||||||
|
|
||||||
totalMsg = msgJSON["total"]
|
|
||||||
if nbrMsg > totalMsg:
|
|
||||||
nbrMsg = totalMsg
|
|
||||||
|
|
||||||
if totalMsg == 0:
|
|
||||||
print("Aucun message à afficher")
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
data = []
|
|
||||||
# data.append({})
|
|
||||||
# data[0]['total'] = totalMsg
|
|
||||||
for i, hits in enumerate(msgJSON["hits"]):
|
|
||||||
self.idMsg = hits["_id"]
|
|
||||||
msgSrc = hits["_source"]
|
|
||||||
self.issuer = msgSrc["issuer"]
|
|
||||||
nonce = msgSrc["nonce"]
|
|
||||||
try:
|
|
||||||
nonce = base58.b58decode(nonce)
|
|
||||||
except:
|
|
||||||
nonce = base58.b58decode('5aZdSqKGHBqm2uMPwN6XnfiiJKRieb1Hh')
|
|
||||||
self.date = msgSrc["time"]
|
|
||||||
|
|
||||||
if outbox:
|
|
||||||
pubkey = msgSrc["recipient"]
|
|
||||||
else:
|
|
||||||
pubkey = self.issuer
|
|
||||||
|
|
||||||
try:
|
|
||||||
self.title = decrypt(msgSrc["title"])
|
|
||||||
except Exception as e:
|
|
||||||
self.title = "jaklis can't read that mother fucker"
|
|
||||||
# sys.stderr.write(colored(str('Error decrypt message title: ' + str(e)), 'red') + '\n')
|
|
||||||
# pp_json(hits)
|
|
||||||
|
|
||||||
try:
|
|
||||||
self.content = decrypt(msgSrc["content"])
|
|
||||||
except Exception as e:
|
|
||||||
self.content = "jaklis can't read that mother fucker"
|
|
||||||
# sys.stderr.write(colored(str('Error decrypt message content: ' + str(e)), 'red') + '\n')
|
|
||||||
# pp_json(hits)
|
|
||||||
|
|
||||||
|
|
||||||
data.append(i)
|
|
||||||
data[i] = {}
|
|
||||||
data[i]['id'] = self.idMsg
|
|
||||||
data[i]['date'] = self.date
|
|
||||||
data[i]['pubkey'] = pubkey
|
|
||||||
data[i]['title'] = self.title
|
|
||||||
data[i]['content'] = self.content
|
|
||||||
# print('toto')
|
|
||||||
|
|
||||||
data = json.dumps(data, indent=2)
|
|
||||||
return data
|
|
||||||
|
|
||||||
|
|
||||||
#################### Sending class ####################
|
|
||||||
|
|
||||||
|
|
||||||
class SendToCesium(CesiumCommon):
|
|
||||||
def encryptMsg(self, msg):
|
|
||||||
return fmt["64"](box_encrypt(msg.encode(), get_privkey(self.dunikey, "pubsec"), self.recipient, self.nonce)).decode()
|
|
||||||
|
|
||||||
def configDoc(self, title, msg):
|
|
||||||
b58nonce = base58.b58encode(self.nonce).decode()
|
|
||||||
|
|
||||||
# Get current timestamp
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
# Generate custom JSON
|
|
||||||
data = {}
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
data['recipient'] = self.recipient
|
|
||||||
data['title'] = title
|
|
||||||
data['content'] = msg
|
|
||||||
data['time'] = timeSent
|
|
||||||
data['nonce'] = b58nonce
|
|
||||||
data['version'] = 2
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
|
|
||||||
def sendDocument(self, document, outbox):
|
|
||||||
boxType = "outbox" if outbox else "inbox"
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get result
|
|
||||||
try:
|
|
||||||
result = requests.post('{0}/message/{1}?pubkey={2}'.format(self.pod, boxType, self.recipient), headers=headers, data=document)
|
|
||||||
except Exception as e:
|
|
||||||
sys.stderr.write("Impossible d'envoyer le message:\n" + str(e))
|
|
||||||
sys.exit(1)
|
|
||||||
else:
|
|
||||||
if result.status_code == 200:
|
|
||||||
print(colored("Message envoyé avec succès !", "green"))
|
|
||||||
print("ID: " + result.text)
|
|
||||||
return result
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Erreur inconnue:" + '\n')
|
|
||||||
print(str(pp_json(result.text)) + '\n')
|
|
||||||
|
|
||||||
|
|
||||||
#################### Deleting class ####################
|
|
||||||
|
|
||||||
|
|
||||||
class DeleteFromCesium(CesiumCommon):
|
|
||||||
def configDoc(self, idMsg, outbox):
|
|
||||||
# Get current timestamp
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
boxType = "outbox" if outbox else "inbox"
|
|
||||||
|
|
||||||
# Generate document to customize
|
|
||||||
data = {}
|
|
||||||
data['version'] = 2
|
|
||||||
data['index'] = "message"
|
|
||||||
data['type'] = boxType
|
|
||||||
data['id'] = idMsg
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
data['time'] = timeSent
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
def sendDocument(self, document, idMsg):
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get result
|
|
||||||
try:
|
|
||||||
result = requests.post('{0}/history/delete'.format(self.pod), headers=headers, data=document)
|
|
||||||
if result.status_code == 404:
|
|
||||||
raise ValueError("Message introuvable")
|
|
||||||
elif result.status_code == 403:
|
|
||||||
raise ValueError("Vous n'êtes pas l'auteur de ce message.")
|
|
||||||
except Exception as e:
|
|
||||||
sys.stderr.write(colored("Impossible de supprimer le message {0}:\n".format(idMsg), 'red') + str(e) + "\n")
|
|
||||||
return False
|
|
||||||
else:
|
|
||||||
if result.status_code == 200:
|
|
||||||
print(colored("Message {0} supprimé avec succès !".format(idMsg), "green"))
|
|
||||||
return result
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Erreur inconnue.")
|
|
138
lib/offers.py
138
lib/offers.py
|
@ -1,138 +0,0 @@
|
||||||
import sys, re, json, requests, base64
|
|
||||||
from time import time
|
|
||||||
from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX
|
|
||||||
|
|
||||||
class Offers(CesiumCommon):
|
|
||||||
# Configure JSON document SET to send
|
|
||||||
def configDocSet(self, title, description, city, location, category, price: float, picture):
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
# {"parent":"cat90","localizedNames":{"en":"Fruits & Vegetables","es-ES":"Frutas y Vegetales","fr-FR":"Fruits & Légumes"},"name":"Fruits & Légumes","id":"cat92"}
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
if title: data['title'] = title
|
|
||||||
if description: data['description'] = description
|
|
||||||
if city: data['city'] = city
|
|
||||||
if location:
|
|
||||||
geoPoint = {}
|
|
||||||
geoPoint['lat'] = location[0]
|
|
||||||
geoPoint['lon'] = location[1]
|
|
||||||
data['geoPoint'] = geoPoint
|
|
||||||
if picture:
|
|
||||||
picture = open(picture, 'rb').read()
|
|
||||||
picture = base64.b64encode(picture).decode()
|
|
||||||
data['thumbnail'] = {}
|
|
||||||
data['thumbnail']['_content'] = picture
|
|
||||||
data['thumbnail']['_content_type'] = "image/png"
|
|
||||||
# if category: data['category'] = category
|
|
||||||
# else:
|
|
||||||
data['category'] = {"parent":"cat24","localizedNames":{"en":"DVD / Films","es-ES":"DVDs / Cine","fr-FR":"DVD / Films"},"name":"DVD / Films","id":"cat25"}
|
|
||||||
if price: data['price'] = float(price) * 100
|
|
||||||
data['type'] = 'offer'
|
|
||||||
data['time'] = timeSent
|
|
||||||
data['creationTime'] = timeSent
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
data['pubkey'] = self.pubkey
|
|
||||||
data['version'] = 2
|
|
||||||
data['currency'] = 'g1'
|
|
||||||
data['unit'] = None
|
|
||||||
data['fees'] = None
|
|
||||||
data['feesCurrency'] = None
|
|
||||||
if picture: data['picturesCount'] = 1
|
|
||||||
else: data['picturesCount'] = 0
|
|
||||||
data['stock'] = 1
|
|
||||||
data['tags'] = []
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
# Configure JSON document SET to send
|
|
||||||
def configDocErase(self, id):
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
# "currency":"g1","unit":null,"fees":null,"feesCurrency":null,"picturesCount":0,"stock":0,"tags":[],"id":"AXehXeyZaml2THvBAeS5","creationTime":1613320117}
|
|
||||||
#AXehXeyZaml2THvBAeS5
|
|
||||||
|
|
||||||
|
|
||||||
offerToDeleteBrut = self.sendDocumentGet(id, 'get')
|
|
||||||
offerToDelete = json.loads(self.parseJSON(offerToDeleteBrut))
|
|
||||||
|
|
||||||
title = offerToDelete['title']
|
|
||||||
creationTime = offerToDelete['time']
|
|
||||||
issuer = offerToDelete['issuer']
|
|
||||||
pubkey = offerToDelete['pubkey']
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['title'] = title
|
|
||||||
data['time'] = timeSent
|
|
||||||
data['creationTime'] = creationTime
|
|
||||||
data['id'] = id
|
|
||||||
data['issuer'] = issuer
|
|
||||||
data['pubkey'] = pubkey
|
|
||||||
data['version'] = 2
|
|
||||||
data['type'] = "offer"
|
|
||||||
data['currency'] = "g1"
|
|
||||||
data['unit'] = None
|
|
||||||
data['fees'] = None
|
|
||||||
data['feesCurrency'] = None
|
|
||||||
data['picturesCount'] = 0
|
|
||||||
data['stock'] = 0
|
|
||||||
data['tags'] = []
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
def sendDocumentGet(self, id, type):
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
if type == 'set':
|
|
||||||
reqQuery = '{0}/market/record'.format(self.pod)
|
|
||||||
elif type == 'get':
|
|
||||||
reqQuery = '{0}/market/record/{1}?_source=category,title,description,issuer,time,creationTime,location,address,city,price,unit,currency,thumbnail._content_type,thumbnail._content,picturesCount,type,stock,fees,feesCurrency,geoPoint,pubkey,freePrice'.format(self.pod, id)
|
|
||||||
elif type == 'erase':
|
|
||||||
reqQuery = '{0}/market/delete'.format(self.pod)
|
|
||||||
|
|
||||||
|
|
||||||
result = requests.get(reqQuery, headers=headers)
|
|
||||||
# print(result)
|
|
||||||
if result.status_code == 200:
|
|
||||||
# print(result.text)
|
|
||||||
return result.text
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document...\n" + result.text + '\n')
|
|
||||||
|
|
||||||
|
|
||||||
def sendDocumentSet(self, document, type, id=None):
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
if type == 'set':
|
|
||||||
reqQuery = '{0}/market/record'.format(self.pod)
|
|
||||||
if type == 'delete':
|
|
||||||
reqQuery = '{0}/market/record/{1}/_update'.format(self.pod, id)
|
|
||||||
|
|
||||||
result = requests.post(reqQuery, headers=headers, data=document)
|
|
||||||
if result.status_code == 200:
|
|
||||||
# print(result.text)
|
|
||||||
return result.text
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document...\n" + result.text + '\n')
|
|
||||||
|
|
||||||
def parseJSON(self, doc):
|
|
||||||
doc = json.loads(doc)['_source']
|
|
||||||
if doc:
|
|
||||||
# pubkey = { "pubkey": doc['issuer'] }
|
|
||||||
# rest = { "description": doc['description'] }
|
|
||||||
# final = {**pubkey, **rest}
|
|
||||||
return json.dumps(doc, indent=2)
|
|
||||||
else:
|
|
||||||
return 'Profile vide'
|
|
129
lib/profiles.py
129
lib/profiles.py
|
@ -1,129 +0,0 @@
|
||||||
import sys, json, requests, base64
|
|
||||||
from time import time
|
|
||||||
from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX
|
|
||||||
|
|
||||||
|
|
||||||
class Profiles(CesiumCommon):
|
|
||||||
# Configure JSON document SET to send
|
|
||||||
def configDocSet(self, name, description, city, address, pos, socials, avatar):
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
if name:
|
|
||||||
data["title"] = name
|
|
||||||
if description:
|
|
||||||
data["description"] = description
|
|
||||||
if address:
|
|
||||||
data["address"] = address
|
|
||||||
if city:
|
|
||||||
data["city"] = city
|
|
||||||
if pos:
|
|
||||||
geoPoint = {}
|
|
||||||
geoPoint["lat"] = pos[0]
|
|
||||||
geoPoint["lon"] = pos[1]
|
|
||||||
data["geoPoint"] = geoPoint
|
|
||||||
if socials:
|
|
||||||
data["socials"] = []
|
|
||||||
data["socials"].append({})
|
|
||||||
data["socials"][0]["type"] = "web"
|
|
||||||
data["socials"][0]["url"] = socials
|
|
||||||
if avatar:
|
|
||||||
avatar = open(avatar, "rb").read()
|
|
||||||
avatar = base64.b64encode(avatar).decode()
|
|
||||||
data["avatar"] = {}
|
|
||||||
data["avatar"]["_content"] = avatar
|
|
||||||
data["avatar"]["_content_type"] = "image/png"
|
|
||||||
data["time"] = timeSent
|
|
||||||
data["issuer"] = self.pubkey
|
|
||||||
data["version"] = 2
|
|
||||||
data["tags"] = []
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
# Configure JSON document GET to send
|
|
||||||
def configDocGet(self, profile, scope="title", getAvatar=None):
|
|
||||||
if getAvatar:
|
|
||||||
avatar = "avatar"
|
|
||||||
else:
|
|
||||||
avatar = "avatar._content_type"
|
|
||||||
|
|
||||||
data = {
|
|
||||||
"query": {
|
|
||||||
"bool": {
|
|
||||||
"should": [
|
|
||||||
{"match": {scope: {"query": profile, "boost": 2}}},
|
|
||||||
{"prefix": {scope: profile}},
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"highlight": {"fields": {"title": {}, "tags": {}}},
|
|
||||||
"from": 0,
|
|
||||||
"size": 100,
|
|
||||||
"_source": [
|
|
||||||
"title",
|
|
||||||
avatar,
|
|
||||||
"description",
|
|
||||||
"city",
|
|
||||||
"address",
|
|
||||||
"socials.url",
|
|
||||||
"creationTime",
|
|
||||||
"membersCount",
|
|
||||||
"type",
|
|
||||||
"geoPoint",
|
|
||||||
],
|
|
||||||
"indices_boost": {"user": 100, "page": 1, "group": 0.01},
|
|
||||||
}
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return document
|
|
||||||
|
|
||||||
# Configure JSON document SET to send
|
|
||||||
def configDocErase(self):
|
|
||||||
timeSent = int(time())
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data["time"] = timeSent
|
|
||||||
data["id"] = self.pubkey
|
|
||||||
data["issuer"] = self.pubkey
|
|
||||||
data["version"] = 2
|
|
||||||
data["index"] = "user"
|
|
||||||
data["type"] = "profile"
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
return self.signDoc(document)
|
|
||||||
|
|
||||||
def sendDocument(self, document, type):
|
|
||||||
headers = {
|
|
||||||
"Content-type": "application/json",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
if type == "set":
|
|
||||||
reqQuery = "{0}/user/profile?pubkey={1}/_update?pubkey={1}".format(
|
|
||||||
self.pod, self.pubkey
|
|
||||||
)
|
|
||||||
elif type == "get":
|
|
||||||
reqQuery = "{0}/user,page,group/profile,record/_search".format(self.pod)
|
|
||||||
elif type == "erase":
|
|
||||||
reqQuery = "{0}/history/delete".format(self.pod)
|
|
||||||
|
|
||||||
result = requests.post(reqQuery, headers=headers, data=document)
|
|
||||||
if result.status_code == 200:
|
|
||||||
# print(result.text)
|
|
||||||
return result.text
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document...\n" + result.text + "\n")
|
|
||||||
|
|
||||||
def parseJSON(self, doc):
|
|
||||||
doc = json.loads(doc)["hits"]["hits"]
|
|
||||||
if doc:
|
|
||||||
pubkey = {"pubkey": doc[0]["_id"]}
|
|
||||||
rest = doc[0]["_source"]
|
|
||||||
final = {**pubkey, **rest}
|
|
||||||
return json.dumps(final, indent=2)
|
|
||||||
else:
|
|
||||||
return "Profile vide"
|
|
|
@ -1,86 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
from io import BytesIO
|
|
||||||
import base64, base58, varint, os, json
|
|
||||||
# from lib.cesium import CesiumPlus as cs
|
|
||||||
|
|
||||||
## BytesIO adds a stream interface to bytes
|
|
||||||
## Exemple:
|
|
||||||
qr = BytesIO(bytes.fromhex("8316140212c28e52e034ecaf684fa3e5d755db519074f27ad086bddffd26b386e55f3b623ca01f0177c0f8ce5f6a69764c7bc10263ec"))
|
|
||||||
|
|
||||||
## Read from a file:
|
|
||||||
# qr = open("qrcode-AXfA-M5faml2THvBAmPs.bin","rb")
|
|
||||||
# qr = BytesIO(qr.read())
|
|
||||||
|
|
||||||
## Check magic number
|
|
||||||
assert qr.read(3) == b"\x83\x16\x14"
|
|
||||||
|
|
||||||
## Read data type
|
|
||||||
data_type = varint.decode_stream(qr)
|
|
||||||
|
|
||||||
## Read price type
|
|
||||||
raw_price_type = varint.decode_stream(qr)
|
|
||||||
price_type = raw_price_type >> 4
|
|
||||||
amount_len = raw_price_type & 0b1111
|
|
||||||
|
|
||||||
## Read pubkey
|
|
||||||
pubkey = qr.read(32)
|
|
||||||
pubkey_b58 = base58.b58encode(pubkey)
|
|
||||||
# print("Pubkey: {}".format(pubkey_b58.decode("utf-8")))
|
|
||||||
|
|
||||||
## Read amount
|
|
||||||
|
|
||||||
if price_type == 0: # Free price, ignore amount
|
|
||||||
qr.read(amount_len)
|
|
||||||
print("Free price")
|
|
||||||
|
|
||||||
elif price_type == 1: # Units
|
|
||||||
amount = varint.decode_stream(qr)
|
|
||||||
# print("Price: {} Ğ1".format(amount/100))
|
|
||||||
|
|
||||||
elif price_type == 2: # UD
|
|
||||||
amount_n = varint.decode_stream(qr)
|
|
||||||
amount_e = varint.decode_stream(qr)
|
|
||||||
amount = amount_n * 10 ** -amount_e
|
|
||||||
# print("Price: {} UD_Ğ1".format(amount.decode("utf-8")))
|
|
||||||
|
|
||||||
else:
|
|
||||||
qr.read(amount_len)
|
|
||||||
print("Error: unknown price type, ignoring price")
|
|
||||||
|
|
||||||
## Read data
|
|
||||||
|
|
||||||
if data_type == 0: # No data
|
|
||||||
data = None
|
|
||||||
print("There is no data")
|
|
||||||
|
|
||||||
elif data_type == 1: # Plain text
|
|
||||||
data = qr.read()
|
|
||||||
print("Data:")
|
|
||||||
print(data)
|
|
||||||
|
|
||||||
elif data_type == 2: # Ğchange ad
|
|
||||||
data = base64.urlsafe_b64encode(qr.read(16))
|
|
||||||
# print("Ğchange ad ID: {}".format(data.decode("utf-8")))
|
|
||||||
|
|
||||||
|
|
||||||
## Get gchange-pod datas
|
|
||||||
|
|
||||||
item = os.popen("./../jaklis/jaklis.py getoffer -i {0}".format(data.decode("utf-8")))
|
|
||||||
# item = cs.getOffer(id)
|
|
||||||
|
|
||||||
|
|
||||||
jsonR = json.load(item)
|
|
||||||
item_time = jsonR['creationTime']
|
|
||||||
item_name = jsonR['title']
|
|
||||||
item_description = jsonR['description']
|
|
||||||
item_image = jsonR['thumbnail']
|
|
||||||
isImage = '_content' in item_image
|
|
||||||
if (isImage):
|
|
||||||
print(item_image['_content'])
|
|
||||||
|
|
||||||
# print(jsonR)
|
|
||||||
print(item_time)
|
|
||||||
print(item_name)
|
|
||||||
print(item_description)
|
|
||||||
|
|
242
lib/stars.py
242
lib/stars.py
|
@ -1,242 +0,0 @@
|
||||||
import os, sys, ast, requests, json, base58, base64, time, string, random, re
|
|
||||||
from lib.natools import fmt, sign, get_privkey, box_decrypt, box_encrypt
|
|
||||||
from time import sleep
|
|
||||||
from hashlib import sha256
|
|
||||||
from datetime import datetime
|
|
||||||
from termcolor import colored
|
|
||||||
from lib.cesiumCommon import CesiumCommon, PUBKEY_REGEX
|
|
||||||
|
|
||||||
class ReadLikes(CesiumCommon):
|
|
||||||
# Configure JSON document to send
|
|
||||||
def configDoc(self, profile):
|
|
||||||
if not profile: profile = self.pubkey
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['query'] = {}
|
|
||||||
data['query']['bool'] = {}
|
|
||||||
data['query']['bool']['filter'] = [
|
|
||||||
{'term': {'index': 'user'}},
|
|
||||||
{'term': {'type': 'profile'}},
|
|
||||||
{'term': {'id': profile}},
|
|
||||||
{'term': {'kind': 'STAR'}}
|
|
||||||
]
|
|
||||||
# data['query']['bool']['should'] = {'term':{'issuer': self.issuer}}
|
|
||||||
data['size'] = 5000
|
|
||||||
data['_source'] = ['issuer','level']
|
|
||||||
data['aggs'] = {
|
|
||||||
'level_sum': {
|
|
||||||
'sum': {
|
|
||||||
'field': 'level'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return json.dumps(data)
|
|
||||||
|
|
||||||
def sendDocument(self, document):
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
result = requests.post('{0}/like/record/_search'.format(self.pod), headers=headers, data=document)
|
|
||||||
|
|
||||||
if result.status_code == 200:
|
|
||||||
# print(result.text)
|
|
||||||
return result.text
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + result.text + '\n')
|
|
||||||
|
|
||||||
def parseResult(self, result):
|
|
||||||
result = json.loads(result)
|
|
||||||
totalLikes = result['hits']['total']
|
|
||||||
totalValue = result['aggregations']['level_sum']['value']
|
|
||||||
if totalLikes:
|
|
||||||
score = totalValue/totalLikes
|
|
||||||
else:
|
|
||||||
score = 0
|
|
||||||
raw = result['hits']['hits']
|
|
||||||
finalPrint = {}
|
|
||||||
finalPrint['likes'] = []
|
|
||||||
for i in raw:
|
|
||||||
issuer = i['_source']['issuer']
|
|
||||||
# print(issuer)
|
|
||||||
gProfile = self.getProfile(issuer)
|
|
||||||
try:
|
|
||||||
pseudo = gProfile['title']
|
|
||||||
except:
|
|
||||||
pseudo = ''
|
|
||||||
try:
|
|
||||||
payTo = gProfile['pubkey']
|
|
||||||
except:
|
|
||||||
payTo = ''
|
|
||||||
id = i['_id']
|
|
||||||
level = i['_source']['level']
|
|
||||||
if issuer == self.pubkey:
|
|
||||||
finalPrint['yours'] = { 'id' : id, 'pseudo' : pseudo, 'payTo' : payTo, 'level' : level }
|
|
||||||
else:
|
|
||||||
finalPrint['likes'].append({ 'issuer' : issuer, 'pseudo' : pseudo, 'payTo' : payTo, 'level' : level })
|
|
||||||
finalPrint['score'] = score
|
|
||||||
|
|
||||||
return json.dumps(finalPrint)
|
|
||||||
|
|
||||||
def getProfile(self, profile):
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['query'] = {}
|
|
||||||
data['query']['bool'] = {}
|
|
||||||
data['query']['bool']['filter'] = [
|
|
||||||
{'term': {'_index': 'user'}},
|
|
||||||
{'term': {'_type': 'profile'}},
|
|
||||||
{'term': {'_id': profile}}
|
|
||||||
]
|
|
||||||
data['_source'] = ['title','pubkey']
|
|
||||||
|
|
||||||
data = json.dumps(data)
|
|
||||||
|
|
||||||
result = requests.post('{0}/user/profile/_search'.format(self.pod), headers=headers, data=data)
|
|
||||||
result = json.loads(result.text)['hits']['hits']
|
|
||||||
for i in result:
|
|
||||||
return i['_source']
|
|
||||||
|
|
||||||
|
|
||||||
#################### Like class ####################
|
|
||||||
|
|
||||||
|
|
||||||
class SendLikes(CesiumCommon):
|
|
||||||
# Configure JSON document to send
|
|
||||||
def configDoc(self, profile, likes):
|
|
||||||
if not profile: profile = self.pubkey
|
|
||||||
if likes not in range(0, 6):
|
|
||||||
sys.stderr.write(colored('Votre like doit être compris entre 0 et 5.\n', 'red'))
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
timeSent = int(time.time())
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['version'] = 2
|
|
||||||
data['index'] = "user"
|
|
||||||
data['type'] = "profile"
|
|
||||||
data['id'] = profile
|
|
||||||
data['kind'] = "STAR"
|
|
||||||
data['level'] = likes
|
|
||||||
data['time'] = timeSent
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
# Generate hash of document
|
|
||||||
hashDoc = sha256(document.encode()).hexdigest().upper()
|
|
||||||
|
|
||||||
# Generate signature of document
|
|
||||||
signature = fmt["64"](sign(hashDoc.encode(), get_privkey(self.dunikey, "pubsec"))[:-len(hashDoc.encode())]).decode()
|
|
||||||
|
|
||||||
# Build final document
|
|
||||||
data = {}
|
|
||||||
data['hash'] = hashDoc
|
|
||||||
data['signature'] = signature
|
|
||||||
signJSON = json.dumps(data)
|
|
||||||
finalJSON = {**json.loads(signJSON), **json.loads(document)}
|
|
||||||
finalDoc = json.dumps(finalJSON)
|
|
||||||
|
|
||||||
return finalDoc
|
|
||||||
|
|
||||||
def sendDocument(self, document, pubkey):
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
result = requests.post('{0}/user/profile/:id/_like'.format(self.pod), headers=headers, data=document)
|
|
||||||
|
|
||||||
if result.status_code == 200:
|
|
||||||
print(colored("Profile liké avec succès !", 'green'))
|
|
||||||
return result.text
|
|
||||||
elif result.status_code == 400:
|
|
||||||
resultJson = json.loads(result.text)
|
|
||||||
if 'DuplicatedDocumentException' in resultJson['error']:
|
|
||||||
rmLike = UnLikes(self.dunikey, self.pod)
|
|
||||||
idLike = rmLike.checkLike(pubkey)
|
|
||||||
if idLike:
|
|
||||||
document = rmLike.configDoc(idLike)
|
|
||||||
rmLike.sendDocument(document, True)
|
|
||||||
sleep(0.5)
|
|
||||||
self.sendDocument(document, pubkey)
|
|
||||||
return resultJson['error']
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + resultJson['error'] + '\n')
|
|
||||||
else:
|
|
||||||
resultJson = json.loads(result.text)
|
|
||||||
sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + resultJson['error'] + '\n')
|
|
||||||
|
|
||||||
|
|
||||||
#################### Unlike class ####################
|
|
||||||
|
|
||||||
|
|
||||||
class UnLikes(CesiumCommon):
|
|
||||||
# Check if you liked this profile
|
|
||||||
def checkLike(self, pubkey):
|
|
||||||
readProfileLikes = ReadLikes(self.dunikey, self.pod)
|
|
||||||
document = readProfileLikes.configDoc(pubkey)
|
|
||||||
result = readProfileLikes.sendDocument(document)
|
|
||||||
result = readProfileLikes.parseResult(result)
|
|
||||||
result = json.loads(result)
|
|
||||||
|
|
||||||
if 'yours' in result:
|
|
||||||
myLike = result['yours']['id']
|
|
||||||
return myLike
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Vous n'avez pas liké ce profile\n")
|
|
||||||
return False
|
|
||||||
|
|
||||||
# Configure JSON document to send
|
|
||||||
def configDoc(self, idLike):
|
|
||||||
timeSent = int(time.time())
|
|
||||||
|
|
||||||
data = {}
|
|
||||||
data['version'] = 2
|
|
||||||
data['index'] = "like"
|
|
||||||
data['type'] = "record"
|
|
||||||
data['id'] = idLike
|
|
||||||
data['issuer'] = self.pubkey
|
|
||||||
data['time'] = timeSent
|
|
||||||
|
|
||||||
document = json.dumps(data)
|
|
||||||
|
|
||||||
# Generate hash of document
|
|
||||||
hashDoc = sha256(document.encode()).hexdigest().upper()
|
|
||||||
|
|
||||||
# Generate signature of document
|
|
||||||
signature = fmt["64"](sign(hashDoc.encode(), get_privkey(self.dunikey, "pubsec"))[:-len(hashDoc.encode())]).decode()
|
|
||||||
|
|
||||||
# Build final document
|
|
||||||
data = {}
|
|
||||||
data['hash'] = hashDoc
|
|
||||||
data['signature'] = signature
|
|
||||||
signJSON = json.dumps(data)
|
|
||||||
finalJSON = {**json.loads(signJSON), **json.loads(document)}
|
|
||||||
finalDoc = json.dumps(finalJSON)
|
|
||||||
|
|
||||||
return finalDoc
|
|
||||||
|
|
||||||
def sendDocument(self, document, silent):
|
|
||||||
|
|
||||||
headers = {
|
|
||||||
'Content-type': 'application/json',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Send JSON document and get JSON result
|
|
||||||
result = requests.post('{0}/history/delete'.format(self.pod), headers=headers, data=document)
|
|
||||||
|
|
||||||
if result.status_code == 200:
|
|
||||||
if not silent:
|
|
||||||
print(colored("Like supprimé avec succès !", 'green'))
|
|
||||||
return result.text
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Echec de l'envoi du document de lecture des messages...\n" + result.text + '\n')
|
|
94
paiements.py
94
paiements.py
|
@ -1,94 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
"""
|
|
||||||
ZetCode Tkinter tutorial
|
|
||||||
|
|
||||||
In this example, we use the pack
|
|
||||||
manager to create a review example.
|
|
||||||
|
|
||||||
Author: Jan Bodnar
|
|
||||||
Website: www.zetcode.com
|
|
||||||
"""
|
|
||||||
|
|
||||||
import PySimpleGUI as sg
|
|
||||||
from lib.gva import GvaApi
|
|
||||||
import sys, os, threading
|
|
||||||
from shutil import copyfile
|
|
||||||
from os.path import join, dirname
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
from lib.natools import get_privkey
|
|
||||||
import requests
|
|
||||||
|
|
||||||
class StdoutRedirector(object):
|
|
||||||
def __init__(self, text_widget):
|
|
||||||
self.text_widget = text_widget
|
|
||||||
|
|
||||||
def write(self, s):
|
|
||||||
self.text_widget.insert('end', s)
|
|
||||||
self.text_widget.see('end')
|
|
||||||
|
|
||||||
def flush(self):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
MY_PATH = os.path.realpath(os.path.dirname(sys.argv[0])) + '/'
|
|
||||||
|
|
||||||
# Get variables environment
|
|
||||||
if not os.path.isfile(MY_PATH + '.env'):
|
|
||||||
copyfile(MY_PATH + ".env.template",MY_PATH + ".env")
|
|
||||||
dotenv_path = join(dirname(__file__),MY_PATH + '.env')
|
|
||||||
load_dotenv(dotenv_path)
|
|
||||||
|
|
||||||
dunikey = os.getenv('DUNIKEY')
|
|
||||||
if not os.path.isfile(dunikey):
|
|
||||||
HOME = os.getenv("HOME")
|
|
||||||
dunikey = HOME + dunikey
|
|
||||||
if not os.path.isfile(dunikey):
|
|
||||||
sys.stderr.write('Le fichier de trousseau {0} est introuvable.\n'.format(dunikey))
|
|
||||||
sys.exit(1)
|
|
||||||
node = os.getenv('NODE')
|
|
||||||
issuer = get_privkey(dunikey, "pubsec").pubkey
|
|
||||||
|
|
||||||
|
|
||||||
def ProceedPaiement(recipient, amount, comment):
|
|
||||||
if not recipient:
|
|
||||||
raise ValueError("Veuillez indiquer un destinataire de paiement")
|
|
||||||
elif not amount:
|
|
||||||
raise ValueError("Veuillez indiquer le montant de la transaction")
|
|
||||||
|
|
||||||
amount = int(float(amount.replace(',','.'))*100)
|
|
||||||
print("Paiement en cours vers", recipient)
|
|
||||||
gva = GvaApi(dunikey, node, recipient)
|
|
||||||
gva.pay(amount, comment, False, False)
|
|
||||||
|
|
||||||
recipient = amount = comment = None
|
|
||||||
|
|
||||||
|
|
||||||
sg.theme('DarkGrey2')
|
|
||||||
layout = [ [sg.Text('Noeud utilisé: ' + node)],
|
|
||||||
[sg.Text('Votre clé publique: ' + issuer)],
|
|
||||||
[sg.Text('')],
|
|
||||||
[sg.Text('Destinataire: '), sg.InputText(size=(55, None),default_text=issuer)],
|
|
||||||
[sg.Text('Montant: '), sg.InputText(size=(7, None)), sg.Text('Ḡ1')],
|
|
||||||
[sg.Text('Commentaire:'), sg.InputText(size=(55, None))],
|
|
||||||
[sg.Button('Envoyer')] ]
|
|
||||||
|
|
||||||
# Create the Window
|
|
||||||
window = sg.Window('Paiement Ḡ1 - GVA', layout)
|
|
||||||
# availablePubkeys = requests.get('https://g1-stats.axiom-team.fr/data/wallets-g1.txt')
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
event, values = window.read()
|
|
||||||
if event == sg.WIN_CLOSED:
|
|
||||||
break
|
|
||||||
if event == 'Envoyer':
|
|
||||||
ProceedPaiement(values[0], values[1], values[2])
|
|
||||||
except Exception as e:
|
|
||||||
loc = window.CurrentLocation()
|
|
||||||
sg.popup(e, title="ERREUR", button_color=('black','red'), location=(loc))
|
|
||||||
else:
|
|
||||||
loc = window.CurrentLocation()
|
|
||||||
sg.popup(f'Transaction effectué avec succès !', title="Envoyé", location=(loc))
|
|
||||||
|
|
||||||
|
|
||||||
window.close()
|
|
|
@ -0,0 +1,82 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# ###
|
||||||
|
# Lecture des messages Cesium+
|
||||||
|
# ###
|
||||||
|
|
||||||
|
[[ -z $(which jq) || -z $(which curl) ]] && echo "Installation de jq et curl ..." && sudo apt update && sudo apt install jq curl -y
|
||||||
|
|
||||||
|
[[ ! -f .env ]] && cp .env.template .env
|
||||||
|
source .env
|
||||||
|
|
||||||
|
# Help display
|
||||||
|
helpOpt() {
|
||||||
|
echo -e "Cesium+ messages sender
|
||||||
|
\r$0
|
||||||
|
Default: ask recipient in interactive mode.
|
||||||
|
Advice: Fill your .env file for more fun.
|
||||||
|
|
||||||
|
\rOptions:
|
||||||
|
-k,--key <key>\t\tPath <key> to the pubsec keychain file of the issuer.
|
||||||
|
-n,--number <number>\tDisplay the <number> lasts messages from Cesium (tail-like format)
|
||||||
|
-o,--outbox\t\t\tRead outbox messages instead of inbox
|
||||||
|
-h,--help\t\t\tDisplay this help"
|
||||||
|
}
|
||||||
|
|
||||||
|
REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}"
|
||||||
|
|
||||||
|
recipient=$issuer
|
||||||
|
|
||||||
|
# Parse options
|
||||||
|
declare -a args=($@)
|
||||||
|
for ((i=0; i<${#args[*]}; ++i))
|
||||||
|
do
|
||||||
|
case ${args[$i]} in
|
||||||
|
-k|--key) DUNIKEY="${args[$i+1]}"
|
||||||
|
[[ -z $DUNIKEY ]] && echo "Veuillez préciser un fichier de trousseau." && exit 1;;
|
||||||
|
-o|--outbox) type=outbox;;
|
||||||
|
-n|--number) nbrRaw="${args[$i+1]}";;
|
||||||
|
-n*) nbrRaw="${args[$i]:2}";;
|
||||||
|
-h|--help) helpOpt && exit 0;;
|
||||||
|
*) [[ "${args[$i]}" == "-"* ]] && echo "Option inconnue." && exit 1;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
recipient=$(./natools.py pk -f pubsec -k $DUNIKEY)
|
||||||
|
if [[ -z $DUNIKEY ]]; then
|
||||||
|
read -p "Fichier de trousseau: " DUNIKEY
|
||||||
|
fi
|
||||||
|
[[ -z $type ]] && type="inbox"
|
||||||
|
[[ -z $nbrRaw ]] && nbrRaw=5000
|
||||||
|
|
||||||
|
[[ -z $(grep -Eo $REGEX_PUBKEYS <<<$recipient) ]] && echo "Le format de la clé publique du destinataire est invalide." && exit 1
|
||||||
|
|
||||||
|
document="{\"sort\":{\"time\":\"desc\"},\"from\":0,\"size\":$nbrRaw,\"_source\":[\"issuer\",\"recipient\",\"title\",\"content\",\"time\",\"nonce\",\"read_signature\"],\"query\":{\"bool\":{\"filter\":{\"term\":{\"recipient\":\"$recipient\"}}}}}"
|
||||||
|
|
||||||
|
# Envoi du document
|
||||||
|
msgContent=$(curl -s -X POST "$POD/message/$type/_search" -d "$document" | jq .hits.hits[]._source -c)
|
||||||
|
|
||||||
|
#Traitement des données
|
||||||
|
n=0
|
||||||
|
for i in $msgContent; do
|
||||||
|
echo -e "=== $n ===\n"
|
||||||
|
dataObj=($(jq -r '.issuer,.recipient,.nonce,.title,.content,.time' <<<"$i"))
|
||||||
|
issuer="${dataObj[0]}"
|
||||||
|
recipient="${dataObj[1]}"
|
||||||
|
nonce=$(echo "${dataObj[2]}" | base58 -d | base64 -w 0)
|
||||||
|
title="${dataObj[3]}"
|
||||||
|
content="${dataObj[4]}"
|
||||||
|
time="${dataObj[5]}"
|
||||||
|
|
||||||
|
titleClear=$(./natools.py box-decrypt -p $issuer -f pubsec -k $DUNIKEY -n $nonce -I 64 <<< "${title}")
|
||||||
|
contentClear=$(./natools.py box-decrypt -p $issuer -f pubsec -k $DUNIKEY -n $nonce -I 64 <<< "${content}")
|
||||||
|
echo "$titleClear"
|
||||||
|
echo "$contentClear"
|
||||||
|
echo "========="
|
||||||
|
((n++))
|
||||||
|
# echo "./natools.py box-decrypt -p $issuer -f pubsec -k $DUNIKEY -n $nonce -I 64 <<< \"${title}\""
|
||||||
|
done
|
||||||
|
|
||||||
|
#echo "$msgContent" | jq
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
wheel
|
|
||||||
base58
|
|
||||||
pybase64
|
|
||||||
duniterpy
|
|
||||||
termcolor
|
|
||||||
python-dotenv
|
|
||||||
gql
|
|
||||||
requests
|
|
|
@ -0,0 +1,101 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# ###
|
||||||
|
# Simple testeur d'envoi de message via la messagerie de Cesium ou de Gchange.
|
||||||
|
# ###
|
||||||
|
|
||||||
|
[[ -z $(which jq) || -z $(which curl) ]] && echo "Installation de jq et curl ..." && sudo apt update && sudo apt install jq curl -y
|
||||||
|
|
||||||
|
[[ ! -f .env ]] && cp .env.template .env
|
||||||
|
source .env
|
||||||
|
|
||||||
|
# Help display
|
||||||
|
helpOpt() {
|
||||||
|
echo -e "Cesium+ messages sender
|
||||||
|
Default: ask title, content and recipient in interactive mode.
|
||||||
|
Advice: Fill your .env file for more fun.
|
||||||
|
Example: $0 -f <Path of file content message> -r <recipient pubkey> -k <path of pubsec keychain of issuer>
|
||||||
|
|
||||||
|
\rOptions:
|
||||||
|
-t\t\t\t\tTest mode: Uses the \"test.txt\" file as well as the same recipient as the sender.
|
||||||
|
-f,--file <file>\t\tRead the file <file> with title in first line and content in rest of the file for the message.
|
||||||
|
-r,--recipient <pubkey>\tUses <pubkey> as recipient of the message.
|
||||||
|
-k,--key <key>\t\tPath <key> to the pubsec keychain file of the issuer.
|
||||||
|
-h,--help\t\t\tDisplay this help"
|
||||||
|
}
|
||||||
|
|
||||||
|
REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}"
|
||||||
|
|
||||||
|
# Parse options
|
||||||
|
declare -a args=($@)
|
||||||
|
for ((i=0; i<${#args[*]}; ++i))
|
||||||
|
do
|
||||||
|
case ${args[$i]} in
|
||||||
|
-f|--file) file="${args[$i+1]}"
|
||||||
|
[[ ! -f $file ]] && echo "Le fichier $file n'existe pas." && exit 1;;
|
||||||
|
-t|--test) file="test.txt"
|
||||||
|
issuer=$(./natools.py pk -f pubsec -k $DUNIKEY)
|
||||||
|
recipient=$issuer;;
|
||||||
|
-r|--recipient) recipient="${args[$i+1]}"
|
||||||
|
[[ -z $recipient ]] && echo "Veuillez préciser un destinataire." && exit 1;;
|
||||||
|
-k|--key) DUNIKEY="${args[$i+1]}"
|
||||||
|
[[ -z $DUNIKEY ]] && echo "Veuillez préciser un fichier de trousseau." && exit 1;;
|
||||||
|
-h|--help) helpOpt && exit 0;;
|
||||||
|
*) [[ "${args[$i]}" == "-"* ]] && echo "Option inconnue." && exit 1;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -z $DUNIKEY ]]; then
|
||||||
|
read -p "Fichier de trousseau: " DUNIKEY
|
||||||
|
fi
|
||||||
|
issuer=$(./natools.py pk -f pubsec -k $DUNIKEY)
|
||||||
|
|
||||||
|
if [[ -z $file ]]; then
|
||||||
|
read -p "Objet du message: " title
|
||||||
|
read -p "Corps du message: " content
|
||||||
|
message="$title"$'\n'"$content"
|
||||||
|
else
|
||||||
|
message=$(cat $file)
|
||||||
|
fi
|
||||||
|
if [[ -z $recipient ]]; then
|
||||||
|
read -p "Destinataire: " recipient
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -z $(grep -Eo $REGEX_PUBKEYS <<<$recipient) ]] && echo "Le format de la clé publique du destinataire est invalide." && exit 1
|
||||||
|
[[ -z $(grep -Eo $REGEX_PUBKEYS <<<$issuer) ]] && echo "Le format de la clé publique de l'émetteur est invalide." && exit 1
|
||||||
|
|
||||||
|
# Récupération et chiffrement du titre et du message
|
||||||
|
nonce=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
||||||
|
b58nonce=$(echo $nonce | base64 -d | base58)
|
||||||
|
title=$(head -n1 <<<$message | ./natools.py box-encrypt -n $nonce -f pubsec -k $DUNIKEY -p $recipient -O 64)
|
||||||
|
content=$(tail -n+2 <<<$message | ./natools.py box-encrypt -n $nonce -f pubsec -k $DUNIKEY -p $recipient -O 64)
|
||||||
|
|
||||||
|
times=$(date -u +'%s')
|
||||||
|
|
||||||
|
# Fabrication du hash
|
||||||
|
hashBrut="{\"issuer\":\"$issuer\",\"recipient\":\"$recipient\",\"title\":\"$title\",\"content\":\"$content\",\"time\":$times,\"nonce\":\"$b58nonce\",\"version\":2}"
|
||||||
|
hash=$(echo -n "$hashBrut" | sha256sum | cut -d ' ' -f1 | awk '{ print toupper($0) }')
|
||||||
|
|
||||||
|
# Fabrication de la signature
|
||||||
|
signature=$(echo -n "$hash" | ./natools.py sign -f pubsec -k $DUNIKEY --noinc -O 64)
|
||||||
|
|
||||||
|
# Affichage du JSON final
|
||||||
|
document="{\"hash\":\"$hash\",\"signature\":\"$signature\",${hashBrut:1}"
|
||||||
|
jq . <<<$document
|
||||||
|
|
||||||
|
# Envoi du document
|
||||||
|
#curl -s -i -X OPTIONS "$POD/message/inbox?pubkey=$issuer" -d "pubkey=$issuer"
|
||||||
|
msgID=$(curl -s -X POST "$POD/message/inbox?pubkey=$recipient" -d "$document")
|
||||||
|
echo -e "\nMessage ID: $msgID"
|
||||||
|
|
||||||
|
|
||||||
|
### Tests mode ###
|
||||||
|
|
||||||
|
# Delete the message 1 second later, just for test
|
||||||
|
#sleep 1 && ./deletemsg.sh -id $msgID
|
||||||
|
|
||||||
|
# To put the message in outbox too
|
||||||
|
#curl -s -X POST "$POD/message/outbox?pubkey=$issuer" -d "$document"
|
||||||
|
|
||||||
|
# To put the message as read, add this at the end of document
|
||||||
|
#,\"read_signature\":\"$signature\"
|
21
setup.sh
21
setup.sh
|
@ -1,21 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
hasError=0
|
|
||||||
|
|
||||||
for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel; do
|
|
||||||
if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
|
|
||||||
[[ ! $j ]] && sudo apt update
|
|
||||||
sudo apt install -y $i
|
|
||||||
j=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
pip3 install -r requirements.txt || hasError=1
|
|
||||||
chmod u+x jaklis.py
|
|
||||||
sudo ln -sf $(realpath jaklis.py) /usr/local/bin/jaklis || hasError=1
|
|
||||||
|
|
||||||
if [[ hasError -eq 0 ]]; then
|
|
||||||
echo "Setup done. You can use 'jaklis' command, try it."
|
|
||||||
else
|
|
||||||
echo "An error has occurred"
|
|
||||||
fi
|
|
Loading…
Reference in New Issue