From b43624beb7bb05cec4008c7923a86ac76adff10c Mon Sep 17 00:00:00 2001 From: lukepark327 Date: Fri, 13 Nov 2020 12:33:25 +0900 Subject: [PATCH] minor fix --- ds.py | 7 ++++--- main.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ds.py b/ds.py index f44706c..95b04e1 100644 --- a/ds.py +++ b/ds.py @@ -204,7 +204,8 @@ def valid_block(self, block, prev_block): if block.header.index == 0: pass # TODO: re-calculate genesis' tx sign. else: - self.valid_transaction(tx) + if not self.valid_transaction(tx): + return True # TODO: Valid timestamp @@ -218,14 +219,14 @@ def valid_block(self, block, prev_block): def valid_transaction(self, tx): if tx.sender == '': # mint - pass # TODO: minting addr. + return True # TODO: minting addr. else: raw_tx = Transaction(tx.sender, tx.receiver, tx.amount, tx.data) raw_tx_string = json.dumps(raw_tx.toDict(), sort_keys=True).encode() raw_tx_digest = sha256(raw_tx_string).digest() vk = VerifyingKey.from_string(bytearray.fromhex(tx.sender), curve=SECP256k1) - return vk.verify(bytes(bytearray.fromhex(tx.sign)), raw_tx_digest) + return vk.verify(bytearray.fromhex(tx.sign), raw_tx_digest) if __name__ == "__main__": diff --git a/main.py b/main.py index 6fc1200..ae7c72e 100644 --- a/main.py +++ b/main.py @@ -23,7 +23,7 @@ global sk -global vk +# global vk global Addr @@ -111,7 +111,7 @@ def transaction_new(): return jsonify({'res': index}), 201 -# Curl http://127.0.0.1:8327/pool +# Curl http://127.0.0.1:8327/transaction/pool @app.route('/transaction/pool') def transaction_pool(): return jsonify({'res': [tx.toDict() for tx in bc.transaction_pool]}), 200 @@ -169,9 +169,9 @@ def parser(): Addr = wallet.public_key.decode() print(Addr) - # Generate sk & vk + # Generate sk # & vk private_key = bytearray.fromhex(wallet.private_key) sk = SigningKey.from_string(private_key, curve=SECP256k1) - vk = sk.verifying_key # wallet.public_key == vk.to_string("compressed").hex() + # vk = sk.verifying_key # wallet.public_key == vk.to_string("compressed").hex() app.run(host='0.0.0.0', port=port)