Mine transactions and clear blockchain transactions from pool

Author: 15Dkatz

backend/app/__init__.py

@@ -26,12 +26,10 @@ def route_blockchain():
 
 @app.route('/blockchain/mine')
 def route_blockchain_mine():
-    transaction_data = 'stubbed_transaction_data'
-
-    blockchain.add_block(transaction_data)
-
+    blockchain.add_block(transaction_pool.transaction_data())
     block = blockchain.chain[-1]
     pubsub.broadcast_block(block)
+    transaction_pool.clear_blockchain_transactions(blockchain)
 
     return jsonify(block.to_json())
 

backend/pubsub.py

@@ -32,6 +32,9 @@ def message(self, pubnub, message_object):
 
             try:
                 self.blockchain.replace_chain(potential_chain)
+                self.transaction_pool.clear_blockchain_transactions(
+                    self.blockchain
+                )
                 print('\n -- Successfully replaced the local chain')
             except Exception as e:
                 print(f'\n -- Did not replace chain: {e}')

backend/scripts/test_app.py

@@ -0,0 +1,33 @@
+import requests
+import time
+
+from backend.wallet.wallet import Wallet
+
+BASE_URL = 'http://localhost:5000'
+
+def get_blockchain():
+    return requests.get(f'{BASE_URL}/blockchain').json()
+
+def get_blockchain_mine():
+    return requests.get(f'{BASE_URL}/blockchain/mine').json()   
+
+def post_wallet_transact(recipient, amount): 
+    return requests.post(
+        f'{BASE_URL}/wallet/transact',
+        json={ 'recipient': recipient, 'amount': amount }
+    ).json()
+
+start_blockchain = get_blockchain()
+print(f'start_blockchain: {start_blockchain}')
+
+recipient = Wallet().address
+post_wallet_transact_1 = post_wallet_transact(recipient, 21)
+print(f'\npost_wallet_transact_1: {post_wallet_transact_1}')
+
+time.sleep(1)
+post_wallet_transact_2 = post_wallet_transact(recipient, 13)
+print(f'\npost_wallet_transact_2: {post_wallet_transact_2}')
+
+time.sleep(1)
+mined_block = get_blockchain_mine()
+print(f'\nmined_block: {mined_block}')

backend/tests/wallet/test_transaction_pool.py

@@ -1,10 +1,30 @@
 from backend.wallet.transaction_pool import TransactionPool
 from backend.wallet.transaction import Transaction
 from backend.wallet.wallet import Wallet
+from backend.blockchain.blockchain import Blockchain
 
 def test_set_transaction():
     transaction_pool = TransactionPool()
     transaction = Transaction(Wallet(), 'recipient', 1)
     transaction_pool.set_transaction(transaction)
 
-    assert transaction_pool.transaction_map[transaction.id] == transaction
+    assert transaction_pool.transaction_map[transaction.id] == transaction
+
+def test_clear_blockchain_transactions():
+    transaction_pool = TransactionPool()
+    transaction_1 = Transaction(Wallet(), 'recipient', 1)
+    transaction_2 = Transaction(Wallet(), 'recipient', 2)
+
+    transaction_pool.set_transaction(transaction_1)
+    transaction_pool.set_transaction(transaction_2)
+
+    blockchain = Blockchain()
+    blockchain.add_block([transaction_1.to_json(), transaction_2.to_json()])
+
+    assert transaction_1.id in transaction_pool.transaction_map
+    assert transaction_2.id in transaction_pool.transaction_map    
+
+    transaction_pool.clear_blockchain_transactions(blockchain)
+
+    assert not transaction_1.id in transaction_pool.transaction_map
+    assert not transaction_2.id in transaction_pool.transaction_map 

backend/wallet/transaction_pool.py

@@ -15,4 +15,25 @@ def existing_transaction(self, address):
         """
         for transaction in self.transaction_map.values():
             if transaction.input['address'] == address:
-                return transaction
+                return transaction
+
+    def transaction_data(self):
+        """
+        Return the transactions of thje transaction pool represented in their
+        json serialized form.
+        """
+        return list(map(
+            lambda transaction: transaction.to_json(),
+            self.transaction_map.values()
+        ))
+
+    def clear_blockchain_transactions(self, blockchain):
+        """
+        Delete blockchain recorded transactions from the transaction pool.
+        """
+        for block in blockchain.chain:
+            for transaction in block.data:
+                try:
+                    del self.transaction_map[transaction['id']]
+                except KeyError:
+                    pass