Add Transaction feature #21

Tortue95 · 2017-03-21T11:12:35Z

No description provided.

jytou · 2017-03-21T13:35:18Z

src/tools.py

+        blockstamp = pending["blockstamp"]
+        block_number = int(blockstamp.split("-")[0])
+        #if it's not an old transaction (bug in mirror node)
+        if(block_number >= last_block_number-3):


Pas de parenthèses en python

jytou

J'ai été chiant, et j'ai commenté absolument tout ce que j'aurais fait différemment:
-pas de parenthèses autour des conditions (à moins de spécifier des priorités, ce qui est autre chose),
-pas de parenthèses dans les retours de fonction (à moins de vouloir créer des tuples),
-conditions plus concises.
Bref, tu corriges… ou pas, à toi de voir. :) En tout cas tu le sauras pour la prochaine fois (je te rassure quand j'ai démarré le python je me suis fait engueulé un nombre de fois à cause de la syntaxe, il m'arrivait même de mettre des ; à la fin des instructions, ça ne génère pas d'erreur mais c'est complètement inutile :p ).
Super boulot en tout cas, j'ai hâte de tester tout ça quand j'aurai le temps un de ces 4…

jytou · 2017-03-21T13:35:36Z

src/tools.py

+            i = 0
+            for output in pending["outputs"]:
+                outputsplited = output.split(":")
+                if(outputsplited[2] == "SIG("+pubkey+")"):


Pas de parenthèses en python

jytou · 2017-03-21T13:35:53Z

src/tools.py

+                outputsplited = output.split(":")
+                if(outputsplited[2] == "SIG("+pubkey+")"):
+                    inputgenerated=str(outputsplited[0])+":"+str(outputsplited[1])+":T:"+identifier+":"+str(i)
+                    if(inputgenerated not in listinput):


jytou · 2017-03-21T13:35:59Z

src/tools.py

+        blockstamp = pending["blockstamp"]
+        block_number = int(blockstamp.split("-")[0])
+        #if it's not an old transaction (bug in mirror node)
+        if(block_number >= last_block_number-3):       


jytou · 2017-03-21T13:36:05Z

src/tools.py

+        #if it's not an old transaction (bug in mirror node)
+        if(block_number >= last_block_number-3):       
+            for input in pending["inputs"]:
+                if(input in listinput):


jytou · 2017-03-21T13:38:02Z

src/tools.py

+
+
+def b58_encode(b):
+    b58_digits = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'


tu aurais pu le sortir pour le partager avec le decode, mais pas forcément bien grave :)

jytou · 2017-03-21T14:08:48Z

src/commands.py

+    else:
+        allSources = False
+
+    if(c.contains_definitions('outputBackChange')):


jytou · 2017-03-21T14:09:39Z

src/commands.py

+    currency_name = str(current_blk["currency"])
+
+
+    if(totalAmountInput-amount != 0):


parenthèses

jytou · 2017-03-21T14:10:47Z

src/tools.py

+def check_public_key(pubkey):
+    regex = re.compile('^[1-9A-HJ-NP-Za-km-z]{43,44}$')
+    regex_checksum = re.compile('^[1-9A-HJ-NP-Za-km-z]{43,44}:[1-9A-HJ-NP-Za-km-z]{3}$')
+    if (re.search(regex, pubkey) is not None):


if re.search(regex, pubkey):

jytou · 2017-03-21T14:11:06Z

src/tools.py

+    regex_checksum = re.compile('^[1-9A-HJ-NP-Za-km-z]{43,44}:[1-9A-HJ-NP-Za-km-z]{3}$')
+    if (re.search(regex, pubkey) is not None):
+        return(pubkey)
+    if(re.search(regex_checksum, pubkey) is not None):


if re.search(regex_checksum, pubkey):

jytou · 2017-03-21T14:11:34Z

src/tools.py

+        pubkey, checksum = pubkey.split(":")
+        pubkey_byte=b58_decode(pubkey)
+        checksum_calculed = b58_encode(nacl.hash.sha256(nacl.hash.sha256(pubkey_byte,nacl.encoding.RawEncoder),nacl.encoding.RawEncoder))[:3]
+        if(checksum_calculed == checksum):


parenthèses

M5oul · 2017-03-21T13:12:30Z

src/silkaj.py

    if c.is_help_request() or c.is_usage_request() or c.subcmd not in subcmd: usage(); exit()
    if c.is_version_request(): print("silkaj 0.1.0"); exit()
    ep["domain"], ep["port"] = "duniter.org", "10901"
    try: ep["domain"], ep["port"] = c.get_definition('p').rsplit(':', 1)
    except:
-        print("Fallback to default node {}:{}\nCause: no specifed node, node not reachable or parsing issue."
-        .format(ep["domain"], ep["port"]), file=sys.stderr)


@mmuman PR have been removed.
It seems you manually merged changes from other PR.

M5oul · 2017-03-21T13:13:21Z

src/tools.py

+        if c == b58_digits[0]: pad += 1
+        else: break
+    return b'\x00' * pad + res
+


Five empty lines

M5oul · 2017-03-21T13:14:56Z

src/tx.py

+    return(transaction_document)
+
+
+


M5oul · 2017-03-21T13:15:07Z

src/tx.py

+            print("Successful Transaction")
+            break 
+
+


M5oul · 2017-03-21T13:15:30Z

src/tx.py

+import math
+import time
+
+


One surplus space.

M5oul · 2017-03-21T13:15:55Z

src/tools.py

+    lastDUblock = request(ep, "blockchain/block/" + str(NBlastDUblock))
+    return(lastDUblock["dividend"]*10**lastDUblock["unitbase"])
+
+


Two surplus lines.

M5oul · 2017-03-21T13:16:07Z

src/tools.py

+                if(input in listinput):
+                    listinput.remove(input)
+
+


One surplus empty line.

jytou

J'avais laissé passer des points virgule, ah lala! :D

jytou · 2017-03-21T15:22:40Z

src/tools.py

@@ -72,7 +72,7 @@ def check_public_key(pubkey):

 def get_amount_from_pubkey(ep, pubkey):
    sources = request(ep, "tx/sources/" + pubkey)["sources"]
-    if sources == None: return(None)
+    if sources == None: return None

    listinput = [];


ah le point-virgule! :D

jytou · 2017-03-21T15:24:48Z

src/tools.py



 def get_uid_from_pubkey(ep, pubkey):
    i, results = 0, request(ep, "wot/lookup/" + pubkey)["results"]
-    if results == None: return(None)
+    if results == None: return None
    while (i < len(results)):


raté celui-là

jytou · 2017-03-21T15:25:56Z

src/tools.py



 def get_uid_from_pubkey(ep, pubkey):
    i, results = 0, request(ep, "wot/lookup/" + pubkey)["results"]
-    if results == None: return(None)
+    if results == None: return None


if not results: return None
:)

jytou · 2017-03-21T15:27:22Z

src/tools.py

        i+=1


 def get_current_block(ep):
    current_blk = request(ep, "blockchain/current")
-    if current_blk is None: return (None)
-    else: return (current_blk)
+    if current_blk is None: return None


En fait, le test ne sert à rien, tu pourrais te contenter de simplement renvoyer current_blk

jytou · 2017-03-21T15:28:11Z

src/tools.py

@@ -72,7 +72,7 @@ def check_public_key(pubkey):

 def get_amount_from_pubkey(ep, pubkey):
    sources = request(ep, "tx/sources/" + pubkey)["sources"]
-    if sources == None: return(None)
+    if sources == None: return None


if not sources: return None

jytou · 2017-03-21T15:28:42Z

src/tools.py



 def get_last_du_value(ep):
    blockswithud = request(ep, "blockchain/with/ud")["result"]
-    if blockswithud == None: return(None)
+    if blockswithud == None: return None


if not blockswithud: return None

jytou · 2017-03-21T15:29:55Z

src/tx.py

            transaction = generate_transaction_document(ep,issuers,totalAmountInput,listinput_and_amount,issuers,"Change operation")
            transaction += sign_document_from_seed(transaction,seed)+"\n" 
            retour =  post_request(ep, "tx/process", "transaction="+urllib.parse.quote_plus(transaction) )   
            print("Successful Change Transaction")
-            time.sleep(1)
+            time.sleep(1) #wait 1 seconde before send a new transaction


wait 1 second before sending a new transaction

jytou · 2017-03-21T15:30:55Z

src/tx.py

@@ -139,7 +139,7 @@ def generate_transaction_document(ep,issuers,AmountTransfered,listinput_and_amou
 def get_list_input_for_transaction(ep,pubkey,TXamount,allinput = False):
    #real source in blockchain
    sources = request(ep, "tx/sources/" + pubkey)["sources"]
-    if sources == None: return(None)
+    if sources == None: return None


if not sources: return None

jytou · 2017-03-21T15:31:17Z

src/tx.py

@@ -139,7 +139,7 @@ def generate_transaction_document(ep,issuers,AmountTransfered,listinput_and_amou
 def get_list_input_for_transaction(ep,pubkey,TXamount,allinput = False):
    #real source in blockchain
    sources = request(ep, "tx/sources/" + pubkey)["sources"]
-    if sources == None: return(None)
+    if sources == None: return None
    listinput = [];


le ; qui tue :p

M5oul · 2017-03-22T12:47:39Z

src/tx.py

+            transaction += sign_document_from_seed(transaction,seed)+"\n" 
+
+            retour =  post_request(ep, "tx/process", "transaction="+urllib.parse.quote_plus(transaction))    
+            print("Successful Transaction")


Transaction successfully sent.

M5oul · 2017-03-22T12:48:18Z

src/tx.py

+                if input in listinput:
+                    listinput.remove(input)
+
+    #generate final liste source


M5oul · 2017-03-22T12:48:57Z

src/tx.py

+    if not OutputbackChange: 
+        OutputbackChange = issuers
+
+    #si c'est pas une transaction de change, on retire les unité à + de 2 chiffres apres la virgule.


french comment.

M5oul · 2017-03-22T13:04:24Z

src/tools.py

+    res = ''.join(res[::-1])
+
+    # Encode leading zeros as base58 zeros
+    import sys


import at file beginning

M5oul · 2017-03-22T13:05:12Z

src/silkaj.py

+
+    elif c.subcmd == "generate_auth_file":
+        generate_auth_file(c)
+


One space surplus.

mmuman · 2017-03-23T15:37:09Z

root committed 2 days ago

You really don't want to commit things as root. Because first, it will use the git config of the root account which obviously is not configured at all, second because it will create files in your tree that are root-owned that you later on won't be able to edit as user, and finally because it obviously confuses github which doesn't know who root is because the commit log doesn't have your email.

You should really fix this commit. First, make sure all files are owned by your user:

~/silkaj $ id # as user, will tell you your own user ID and groups, like:
uid=1000(tortue) gid=1000(tortue) groupes=1000(tortue),20(dialout)
~/silkaj $ sudo chown -R 1000:1000 * .git

Then, still as user, redo the bad commit (on the transaction branch):

~/silkaj $ git stash # this stashes away all non-committed changes
~/silkaj $ git rebase -i master # this rebases all commits onto the master branch
# Now change in the first line "pick" to "edit", should look like:
edit 3865029 add transaction feature
pick 423f38b re add argos
pick bab1d27 remove comment
pick 2c6c0db Typo correction (thanks Jytou)
pick 3bcea48 Remove useless spaces and back lines
pick a216bb1 remove useless test
pick 3708358 correct my bad english (thanks jytou)
pick 2dfbfa4 remove useless back line
# save the file...
# Now it says you can amend the first commit, so let's force it to have the correct author:
git commit --amend --author='Tortue95 <github@tednet.fr>'
# save the commit log
# continue the rebase
git rebase --continue

Then you'll have to force push on github (git push -f), but it will overwrite the commits, and also the review others made on them... So make sure you address them first. Next time you really want to do only one thing by branch instead of putting unrelated stuff ;-)

M5oul · 2017-03-24T10:54:29Z

I have an issue installing scrypt. I will test transaction feature once it will be correct.

Tortue95 · 2017-03-24T10:57:26Z

pip-3.2 install scrypt fonctionne bien chez moi

M5oul · 2017-03-24T11:09:03Z

src/commands.py

+        print("Quantitative =",  round((totalAmountInput-amount)/100,2), currency_name +"\n")
+
+
+    print("Total Ammount of : " + pubkey)


Total amount of:

M5oul

Big typography review.
You could use pep8 python formating on the futur.

M5oul · 2017-03-24T11:23:17Z

src/tools.py

+
+
+def get_seed_from_scrypt(salt,password, N=4096, r=16, p=1):
+    seed = scrypt.hash(password,salt,N,r,p,32)


spaces (password, salt, N, r, p, 32)

M5oul · 2017-03-24T11:24:39Z

src/tools.py

+    listinput = []
+    amount = 0
+    for source in sources:
+        amount += source["amount"]*10**source["base"]


spaces between operators: source["amount"] * 10 ** source["base"]

M5oul · 2017-03-24T11:25:36Z

src/tools.py

+    amount = 0
+    for source in sources:
+        amount += source["amount"]*10**source["base"]
+        listinput.append(str(source["amount"])+":"+str(source["base"])+":"+str(source["type"])+":"+str(source["identifier"])+":"+str(source["noffset"]))


spaces around +.

M5oul · 2017-03-24T11:25:58Z

src/tools.py

+
+
+    #pending source
+    history = request(ep, "tx/history/"+ pubkey+"/pending")["history"]


spaces around +.

M5oul · 2017-03-24T11:26:20Z

src/tools.py

+        blockstamp = pending["blockstamp"]
+        block_number = int(blockstamp.split("-")[0])
+        #if it's not an old transaction (bug in mirror node)
+        if block_number >= last_block_number-3:


spaces around - operator.

M5oul · 2017-03-24T11:45:10Z

src/commands.py

+        exit()
+
+    if c.contains_definitions('amount'):
+        amount = int(float(c.get_definition('amount'))*100)


spaces around *.
Same two lines below.

M5oul · 2017-03-24T11:46:01Z

src/auth.py

+def auth_by_scrypt():
+    salt = input("Please enter your Scrypt Salt (Secret identifier):")
+    password = getpass.getpass("Please enter your Scrypt password (masked):")
+    scrypt_param = input("Please enter your Scrypt parameters (N,r,p): [4096,16,1]")


spaces after ,.

Nah, it's ok.
It will be harder to split for below lines.

M5oul · 2017-03-24T11:46:20Z

src/auth.py

+    else:
+        file = "authfile"
+    if not os.path.isfile(file):
+        print("Error: the file \""+file+"\" does not exist")


spaces around +.

M5oul · 2017-03-24T11:46:43Z

src/auth.py

+        return auth_by_scrypt()
+    if c.contains_switches('auth-seed'):
+        return auth_by_seed()
+    #if c.contains_switches('auth-wif'): ### for the future


Could be kept on your side for futur contribution.

can be remove i you want

M5oul · 2017-03-24T11:47:24Z

README.md

@@ -28,7 +30,7 @@ sudo (apt-get or dnf) install python-tabulate python-ipaddress
 ```

 ### Integrate it on a dropdown menu to the panel
-Under GNOME Shell, with [Argos](https://github.com/p-e-w/argos)  extension:
+Under GNOME Shell, with [Argos](https://github.com/p-e-w/argos)  extension:


My unbreakable space 😄

M5oul · 2017-03-24T12:42:09Z

src/auth.py

+    if not scrypt_param:
+        scrypt_param = "4096,16,1"
+    scrypt_param_splited= scrypt_param.split(",")
+    n=int(scrypt_param_splited[0])


spaces around =.
For two following lines.

M5oul · 2017-03-24T12:42:27Z

src/auth.py

+    n=int(scrypt_param_splited[0])
+    r=int(scrypt_param_splited[1])
+    p=int(scrypt_param_splited[2])
+    if(n <= 0 or n > 65536 or r <= 0 or r > 512 or p <= 0 or p > 32):


M5oul · 2017-03-24T12:43:18Z

src/auth.py

+    if(n <= 0 or n > 65536 or r <= 0 or r > 512 or p <= 0 or p > 32):
+        print("Error: the values of Scrypt parameters are not good")
+
+    seed = get_seed_from_scrypt(salt,password, n, r, p)


space after salt,.

M5oul · 2017-03-24T12:58:55Z

src/tools.py

+        inputsplit = input.split(":")
+        totalAmountInput += int(inputsplit[0])*10**int(inputsplit[1])
+
+    return int(totalAmountInput),int(amount)


space after ,.

M5oul · 2017-03-24T14:17:27Z

src/tools.py

+    # Convert big-endian bytes to integer
+    n = int('0x0' + nacl.encoding.HexEncoder.encode(b).decode('utf8'), 16)
+
+    # Divide that integer into bas58


M5oul · 2017-03-24T14:26:20Z

src/tx.py

+        listinput_and_amount = get_list_input_for_transaction(ep,issuers,AmountTransfered,all_input)
+        transactionintermediaire = listinput_and_amount[2]
+
+        if transactionintermediaire:


intermediary

M5oul · 2017-03-24T14:36:13Z

src/tx.py

+        TXamount -= int(inputsplit[0])*10**int(inputsplit[1])
+        #if more 40 sources, it's an intermediate transaction
+        if len(listinputfinal) >= 40:
+            transactionintermediaire = True


M5oul · 2017-03-27T09:25:06Z

I modified the history.
I squashed your commits into one with explanations. I did the same for mine.
Now, there is two commits which erased previous commits on Tortue95/silkaj:transaction.

Transactions works fine.

@Tortue95, there is still two important remarks I let you answer. Then we could merge it.

Thanks for this awesome work.

- authentication feature: - scrypt - seed - authfile - pubkey money amount

- add space after imput prompt.

M5oul · 2017-03-27T09:26:08Z

src/network_tools.py

+    url = "http://" + ep[address] + ":" + ep["port"] + "/" + path
+    if ep["port"] == "443":
+        url = "https://" + ep[address] + "/" + path
+    request = urllib.request.Request(url,bytes(postdata, 'utf-8'))


space after ,.

M5oul · 2017-03-27T09:36:09Z

src/commands.py

+    currency_name = str(current_blk["currency"])
+
+
+    if totalAmountInput-amount != 0:


spaces around -.

M5oul · 2017-03-27T09:41:18Z

src/commands.py

+        print("Blockchain:")
+        print("-----------")
+        print("Relative     =", round(amount / DUvalue, 2), "DU", currency_name)
+        print("Quantitative =",  round(amount / 100, 2), currency_name+"\n")


spaces around +.

M5oul

Nice!

jytou reviewed Mar 21, 2017

View reviewed changes

jytou approved these changes Mar 21, 2017

View reviewed changes

M5oul reviewed Mar 21, 2017

View reviewed changes

jytou approved these changes Mar 21, 2017

View reviewed changes

M5oul reviewed Mar 22, 2017

View reviewed changes

src/tools.py Outdated

res = ''.join(res[::-1])

# Encode leading zeros as base58 zeros

import sys

Copy link

Member

M5oul Mar 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import at file beginning

M5oul reviewed Mar 22, 2017

View reviewed changes

src/silkaj.py Outdated

elif c.subcmd == "generate_auth_file":

generate_auth_file(c)

Copy link

Member

M5oul Mar 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One space surplus.

M5oul reviewed Mar 24, 2017

View reviewed changes

M5oul modified the milestones: 0.2.0, 0.3.0 Mar 26, 2017

Tortue95 and others added 3 commits March 27, 2017 14:08

[enh] add transaction feature:

8c3ae67

- authentication feature: - scrypt - seed - authfile - pubkey money amount

[mod] code typo review.

2ea744c

- add space after imput prompt.

[mod] use english name for variable.

229ccdc

M5oul reviewed Mar 27, 2017

View reviewed changes

M5oul approved these changes Mar 27, 2017

View reviewed changes

M5oul merged commit 4f9cd41 into duniter:master Mar 27, 2017



		def b58_encode(b):
		b58_digits = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'

		currency_name = str(current_blk["currency"])


		if(totalAmountInput-amount != 0):

		lastDUblock = request(ep, "blockchain/block/" + str(NBlastDUblock))
		return(lastDUblock["dividend"]10*lastDUblock["unitbase"])

		print("Quantitative =", round((totalAmountInput-amount)/100,2), currency_name +"\n")


		print("Total Ammount of : " + pubkey)



		def get_seed_from_scrypt(salt,password, N=4096, r=16, p=1):
		seed = scrypt.hash(password,salt,N,r,p,32)



		#pending source
		history = request(ep, "tx/history/"+ pubkey+"/pending")["history"]

		currency_name = str(current_blk["currency"])


		if totalAmountInput-amount != 0:

Add Transaction feature #21

Add Transaction feature #21

Conversation

Tortue95 commented Mar 21, 2017

Choose a reason for hiding this comment

jytou left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jytou left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mmuman commented Mar 23, 2017

M5oul commented Mar 24, 2017 • edited Loading

Tortue95 commented Mar 24, 2017 • edited Loading

Choose a reason for hiding this comment

M5oul left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

M5oul Mar 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

M5oul commented Mar 27, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

M5oul left a comment

Choose a reason for hiding this comment

M5oul commented Mar 24, 2017 •

edited

Loading

Tortue95 commented Mar 24, 2017 •

edited

Loading

M5oul Mar 24, 2017 •

edited

Loading