[Software Project 2019/2020] Extending the support for cryptocurrencies in our blockchain-based decentralized exchange

.gitignore

@@ -10,3 +10,4 @@ anydex/test/temp/**
 cover/**
 build/**
 dist/**
+/bcl_config.ini

anydex/config.py

@@ -1,86 +1,92 @@
-import copy
-
-default = {
-    'address': '0.0.0.0',
-    'port': 8090,
-    'keys': [
-        {
-            'alias': "main key",
-            'generation': u"curve25519",
-            'file': u"ec.pem"
-        }
-    ],
-    'logger': {
-        'level': "INFO"
-    },
-    'walker_interval': 0.5,
-    'overlays': [
-        {
-            'class': 'DiscoveryCommunity',
-            'key': "main key",
-            'walkers': [
-                {
-                    'strategy': "RandomWalk",
-                    'peers': 20,
-                    'init': {
-                        'timeout': 3.0
-                    }
-                },
-                {
-                    'strategy': "RandomChurn",
-                    'peers': -1,
-                    'init': {
-                        'sample_size': 8,
-                        'ping_interval': 10.0,
-                        'inactive_time': 27.5,
-                        'drop_time': 57.5
-                    }
-                },
-                {
-                    'strategy': "PeriodicSimilarity",
-                    'peers': -1,
-                    'init': {}
-                }
-            ],
-            'initialize': {},
-            'on_start': [
-                ('resolve_dns_bootstrap_addresses', )
-            ]
-        },
-        {
-            'class': 'TrustChainCommunity',
-            'key': "main key",
-            'walkers': [{
-                'strategy': "EdgeWalk",
-                'peers': 20,
-                'init': {
-                    'edge_length': 4,
-                    'neighborhood_size': 6,
-                    'edge_timeout': 3.0
-                }
-            }],
-            'initialize': {},
-            'on_start': []
-        },
-        {
-            'class': 'DHTDiscoveryCommunity',
-            'key': "main key",
-            'walkers': [{
-                'strategy': "RandomWalk",
-                'peers': 20,
-                'init': {
-                    'timeout': 3.0
-                }
-            }],
-            'initialize': {},
-            'on_start': []
-        }
-    ]
-}
-
-
-def get_anydex_configuration():
-    return copy.deepcopy(default)
-
-
-__all__ = ['get_anydex_configuration']
+import copy
+
+default = {
+    'address': '0.0.0.0',
+    'port': 8090,
+    'keys': [
+        {
+            'alias': "main key",
+            'generation': u"curve25519",
+            'file': u"ec.pem"
+        }
+    ],
+    'logger': {
+        'level': "INFO"
+    },
+    'walker_interval': 0.5,
+    'overlays': [
+        {
+            'class': 'DiscoveryCommunity',
+            'key': "main key",
+            'walkers': [
+                {
+                    'strategy': "RandomWalk",
+                    'peers': 20,
+                    'init': {
+                        'timeout': 3.0
+                    }
+                },
+                {
+                    'strategy': "RandomChurn",
+                    'peers': -1,
+                    'init': {
+                        'sample_size': 8,
+                        'ping_interval': 10.0,
+                        'inactive_time': 27.5,
+                        'drop_time': 57.5
+                    }
+                },
+                {
+                    'strategy': "PeriodicSimilarity",
+                    'peers': -1,
+                    'init': {}
+                }
+            ],
+            'initialize': {},
+            'on_start': [
+                ('resolve_dns_bootstrap_addresses',)
+            ]
+        },
+        {
+            'class': 'TrustChainCommunity',
+            'key': "main key",
+            'walkers': [{
+                'strategy': "EdgeWalk",
+                'peers': 20,
+                'init': {
+                    'edge_length': 4,
+                    'neighborhood_size': 6,
+                    'edge_timeout': 3.0
+                }
+            }],
+            'initialize': {},
+            'on_start': []
+        },
+        {
+            'class': 'DHTDiscoveryCommunity',
+            'key': "main key",
+            'walkers': [{
+                'strategy': "RandomWalk",
+                'peers': 20,
+                'init': {
+                    'timeout': 3.0
+                }
+            }],
+            'initialize': {},
+            'on_start': []
+        }
+    ],
+    'node_config': {
+        # host: protocol://username:password@domain:port
+        'host': '',
+        'timeout': 10.0,
+        'retry': 3
+    }
+}
+
+
+def get_anydex_configuration():
+    return copy.deepcopy(default)
+
+
+__all__ = ['get_anydex_configuration']

anydex/core/community.py

@@ -13,7 +13,7 @@
 from ipv8.messaging.payload_headers import GlobalTimeDistributionPayload
 from ipv8.peer import Peer
 from ipv8.requestcache import NumberCache, RandomNumberCache, RequestCache
-from ipv8.util import fail, succeed
+from ipv8.util import succeed
 
 from anydex.core import DeclineMatchReason, DeclinedTradeReason, MAX_ORDER_TIMEOUT
 from anydex.core.block import MarketBlock
@@ -43,7 +43,7 @@
     MemoryTransactionRepository
 from anydex.core.wallet_address import WalletAddress
 from anydex.util.asyncio import call_later
-from anydex.wallet.tc_wallet import TrustchainWallet
+from anydex.wallet.trustchain.tc_wallet import TrustchainWallet
 
 
 # Message definitions
@@ -583,16 +583,16 @@ def get_ipv8_address(self):
         """
         return self.my_estimated_lan if self.use_local_address else self.my_estimated_wan
 
-    def get_order_addresses(self, order):
+    async def get_order_addresses(self, order):
         """
         Return a tuple of incoming and outgoing payment address of an order.
         """
         if order.is_ask():
-            return (WalletAddress(self.wallets[order.assets.second.asset_id].get_address()),
-                    WalletAddress(self.wallets[order.assets.first.asset_id].get_address()))
+            return (WalletAddress(await self.wallets[order.assets.second.asset_id].get_address()),
+                    WalletAddress(await self.wallets[order.assets.first.asset_id].get_address()))
         else:
-            return (WalletAddress(self.wallets[order.assets.first.asset_id].get_address()),
-                    WalletAddress(self.wallets[order.assets.second.asset_id].get_address()))
+            return (WalletAddress(await self.wallets[order.assets.first.asset_id].get_address()),
+                    WalletAddress(await self.wallets[order.assets.second.asset_id].get_address()))
 
     def match_order_ids(self, order_ids):
         """
@@ -1615,7 +1615,7 @@ async def received_accept_trade(self, peer, payload):
         if not order:
             return
 
-        incoming_address, outgoing_address = self.get_order_addresses(order)
+        incoming_address, outgoing_address = await self.get_order_addresses(order)
 
         # Create a tx_init block to capture that we are going to initiate a transaction
         transaction = await self.create_new_tx_init_block(peer, accepted_trade)
@@ -1696,7 +1696,7 @@ async def received_wallet_info(self, _, payload):
 
         if not transaction.sent_wallet_info:
             order = self.order_manager.order_repository.find_by_id(transaction.order_id)
-            incoming_address, outgoing_address = self.get_order_addresses(order)
+            incoming_address, outgoing_address = await self.get_order_addresses(order)
             self.send_wallet_info(transaction, incoming_address, outgoing_address)
         else:
             self.logger.info("Wallet info exchanged for transaction %s - starting payments",
@@ -1733,7 +1733,7 @@ async def send_payment(self, transaction):
             return
 
         payment = Payment(TraderId(self.mid), transaction.transaction_id, transfer_amount,
-                          wallet.get_address(), str(transaction.partner_incoming_address), PaymentId(txid),
+                          wallet.get_address().result(), str(transaction.partner_incoming_address), PaymentId(txid),
                           Timestamp.now())
 
         # Add it to the transaction

anydex/restapi/wallets_endpoint.py

@@ -11,6 +11,8 @@ class WalletsEndpoint(BaseMarketEndpoint):
     """
     This class represents the root endpoint of the wallets resource.
     """
+    TRANSFER_NETWORKS = ['BTC', 'TBTC', 'LTC', 'XLT', 'DASH', 'TDASH',
+                         'ETH', 'TETH', 'IOTA', 'TIOTA', 'XMR', 'TXMR', 'XLM', 'TXLM']
 
     def setup_routes(self):
         self.app.add_routes([web.get('', self.get_wallets),
@@ -56,10 +58,11 @@ async def get_wallets(self, request):
 
         async def add_wallet(wallet_id, wallet):
             balance = await wallet.get_balance()
+            address = await wallet.get_address()
             wallets[wallet_id] = {
                 'created': wallet.created,
                 'unlocked': wallet.unlocked,
-                'address': wallet.get_address(),
+                'address': address,
                 'name': wallet.get_name(),
                 'precision': wallet.precision(),
                 'min_unit': wallet.min_unit(),
@@ -172,8 +175,7 @@ async def transfer_funds(self, request):
             .. sourcecode:: none
 
                 curl -X POST http://localhost:8085/wallets/BTC/transfer
-                --data "amount=0.3&destination=mpC1DDgSP4PKc5HxJzQ5w9q6CGLBEQuLsN"
-
+                    --data "amount=0.3&destination=mpC1DDgSP4PKc5HxJzQ5w9q6CGLBEQuLsN"
             **Example response**:
 
             .. sourcecode:: javascript
@@ -185,9 +187,8 @@ async def transfer_funds(self, request):
         parameters = await request.post()
 
         identifier = request.match_info['wallet_id']
-        if identifier != "BTC" and identifier != "TBTC":
-            return Response({"error": "currently, currency transfers using the API "
-                                      "is only supported for Bitcoin"}, status=HTTP_BAD_REQUEST)
+        if identifier not in self.TRANSFER_NETWORKS:
+            return Response({"error": "unsupported currency"}, status=HTTP_BAD_REQUEST)
 
         wallet = self.get_market_community().wallets[identifier]
 

anydex/test/core/test_community.py

@@ -16,8 +16,8 @@
 from anydex.core.timestamp import Timestamp
 from anydex.core.transaction import Transaction, TransactionId
 from anydex.test.util import MockObject, timeout
-from anydex.wallet.dummy_wallet import DummyWallet1, DummyWallet2
-from anydex.wallet.tc_wallet import TrustchainWallet
+from anydex.wallet.dummy.dummy_wallet import DummyWallet1, DummyWallet2
+from anydex.wallet.trustchain.tc_wallet import TrustchainWallet
 
 
 class TestMarketCommunityBase(TestBase):

anydex/test/restapi/base.py

@@ -9,7 +9,7 @@
 from anydex.core.community import MarketCommunity
 from anydex.restapi.rest_manager import RESTManager
 from anydex.test.util import get_random_port
-from anydex.wallet.dummy_wallet import DummyWallet1, DummyWallet2
+from anydex.wallet.dummy.dummy_wallet import DummyWallet1, DummyWallet2
 
 
 def urlencode(data):

anydex/test/restapi/test_wallets_endpoint.py

@@ -4,14 +4,14 @@
 
 from anydex.test.restapi.base import TestRestApiBase
 from anydex.test.util import timeout
+from anydex.wallet.bitcoinlib.bitcoinlib_wallets import BitcoinWallet, BitcoinTestnetWallet
 
 
 class TestWalletsEndpoint(TestRestApiBase):
 
     def setUp(self):
         super(TestWalletsEndpoint, self).setUp()
 
-        from anydex.wallet.btc_wallet import BitcoinWallet, BitcoinTestnetWallet
         wallet_path = self.temporary_directory()
         btc_wallet = BitcoinWallet(wallet_path)
         btc_testnet_wallet = BitcoinTestnetWallet(wallet_path)
@@ -48,7 +48,7 @@ async def test_create_wallet_btc(self):
         """
         Test creating a BTC wallet
         """
-        self.nodes[0].overlay.wallets['BTC'].create_wallet = lambda: succeed(None)
+        self.nodes[0].overlay.wallets['BTC'].create_bitcoinlib_wallet = lambda: succeed(None)
         self.should_check_equality = False
         await self.do_request('wallets/BTC', expected_code=200, request_type='PUT')
 

anydex/test/wallet/bitcoinlib/__init__.py

@@ -0,0 +1,3 @@
+"""
+Contains tests for all child classes of the Bitcoinlib wallet.
+"""