Rename java & python pkgs, make python setup easier

.gitignore

@@ -34,11 +34,11 @@ proto-downloader/*.iml
 proto-downloader/*.proto
 python-examples/*.iml
 python-examples/myvenv
-python-examples/python_examples/__pycache__
+python-examples/bisq/__pycache__
-python-examples/python_examples/bisqapi/__pycache__
+python-examples/bisq/api/__pycache__
-python-examples/python_examples/bisqapi/*.py
+python-examples/bisq/api/*.py
-python-examples/python_examples/bots/__pycache__
+python-examples/bisq/bots/__pycache__
-python-examples/python_examples/bots/bisq_events/__pycache__
+python-examples/bisq/bots/bisq_events/__pycache__
 python-examples/proto/*
 reference-doc-builder/*.iml
 reference-doc-builder/build

java-examples/src/main/java/bisq/rpccalls/BaseJavaExample.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import io.grpc.CallCredentials;
 import io.grpc.ManagedChannel;

java-examples/src/main/java/bisq/rpccalls/CancelOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.CancelOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/CloseTrade.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.CloseTradeRequest;
 import bisq.proto.grpc.TradesGrpc;

java-examples/src/main/java/bisq/rpccalls/ConfirmPaymentReceived.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.ConfirmPaymentReceivedRequest;
 import bisq.proto.grpc.TradesGrpc;

java-examples/src/main/java/bisq/rpccalls/ConfirmPaymentStarted.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.ConfirmPaymentStartedRequest;
 import bisq.proto.grpc.TradesGrpc;

java-examples/src/main/java/bisq/rpccalls/CreateBsqSwapOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.CreateBsqSwapOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/CreateCryptoCurrencyPaymentAccount.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.CreateCryptoCurrencyPaymentAccountRequest;
 import bisq.proto.grpc.PaymentAccountsGrpc;

java-examples/src/main/java/bisq/rpccalls/CreateOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.CreateOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/CreatePaymentAccount.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.CreatePaymentAccountRequest;
 import bisq.proto.grpc.PaymentAccountsGrpc;

java-examples/src/main/java/bisq/rpccalls/EditOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.EditOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/FailTrade.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.FailTradeRequest;
 import bisq.proto.grpc.TradesGrpc;

java-examples/src/main/java/bisq/rpccalls/GetAddressBalance.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetAddressBalanceRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetBalances.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetBalancesRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetBsqSwapOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetBsqSwapOffers.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetBsqSwapOffersRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetCryptoCurrencyPaymentMethods.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetCryptoCurrencyPaymentMethodsRequest;
 import bisq.proto.grpc.PaymentAccountsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetFundingAddresses.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetFundingAddressesRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetMarketPrice.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.MarketPriceRequest;
 import bisq.proto.grpc.PriceGrpc;

java-examples/src/main/java/bisq/rpccalls/GetMethodHelp.java

@@ -0,0 +1 @@
+package bisq.rpccalls;// Help Service is for CLI users.

java-examples/src/main/java/bisq/rpccalls/GetMyBsqSwapOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetMyOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetMyBsqSwapOffers.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetBsqSwapOffersRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetMyOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetMyOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetMyOffers.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetMyOffersRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetOfferRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetOfferCategory.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetOfferCategoryRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetOffers.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetOffersRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/GetPaymentAccountForm.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetPaymentAccountFormRequest;
 import bisq.proto.grpc.PaymentAccountsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetPaymentAccounts.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetPaymentAccountsRequest;
 import bisq.proto.grpc.PaymentAccountsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetPaymentMethods.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetPaymentMethodsRequest;
 import bisq.proto.grpc.PaymentAccountsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetTrade.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetTradeRequest;
 import bisq.proto.grpc.TradesGrpc;

java-examples/src/main/java/bisq/rpccalls/GetTrades.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetTradesRequest;
 import bisq.proto.grpc.TradesGrpc;

java-examples/src/main/java/bisq/rpccalls/GetTransaction.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetTransactionRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetTxFeeRate.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetTxFeeRateRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetUnusedBsqAddress.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetUnusedBsqAddressRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/GetVersion.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetVersionGrpc;
 import bisq.proto.grpc.GetVersionRequest;

java-examples/src/main/java/bisq/rpccalls/LockWallet.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.LockWalletRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/RemoveWalletPassword.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.RemoveWalletPasswordRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/SendBsq.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.SendBsqRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/SendBtc.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.SendBtcRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/SetTxFeeRatePreference.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.SetTxFeeRatePreferenceRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/SetWalletPassword.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.SetWalletPasswordRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/Stop.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.ShutdownServerGrpc;
 import bisq.proto.grpc.StopRequest;

java-examples/src/main/java/bisq/rpccalls/TakeOffer.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.GetOfferCategoryRequest;
 import bisq.proto.grpc.OffersGrpc;

java-examples/src/main/java/bisq/rpccalls/UnFailTrade.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.TradesGrpc;
 import bisq.proto.grpc.UnFailTradeRequest;

java-examples/src/main/java/bisq/rpccalls/UnlockWallet.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.UnlockWalletRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/UnsetTxFeeRatePreference.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.UnsetTxFeeRatePreferenceRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/VerifyBsqSentToAddress.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.VerifyBsqSentToAddressRequest;
 import bisq.proto.grpc.WalletsGrpc;

java-examples/src/main/java/bisq/rpccalls/WithdrawFunds.java

@@ -1,4 +1,4 @@
-package rpccalls;
+package bisq.rpccalls;
 
 import bisq.proto.grpc.TradesGrpc;
 import bisq.proto.grpc.WithdrawFundsRequest;

java-examples/src/main/java/rpccalls/GetMethodHelp.java

@@ -1 +0,0 @@
-package rpccalls;// Help Service is for CLI users.

proto-downloader/download-bisq-protos.sh

@@ -3,10 +3,10 @@
 echo "Downloading Bisq protobuf files from github to $PROTO_PATH directory."
 echo "You may want to skip this step and copy your own local .proto files instead."
 
-set -x
+# Download the Bisq master branch's protobuf definition files.
 curl -o ./pb.proto https://raw.githubusercontent.com/bisq-network/bisq/master/proto/src/main/proto/pb.proto
 curl -o ./grpc.proto https://raw.githubusercontent.com/bisq-network/bisq/master/proto/src/main/proto/grpc.proto
 
+# Copy the proto files to the Java and Python example projects.
 cp -v *.proto ../java-examples/src/main/proto
 cp -v *.proto ../python-examples/proto
-set +x

python-examples/bisq/bots/bisq_client.py

@@ -5,8 +5,8 @@ from decimal import *
 
 import grpc
 
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 from logger import log
 
 # For more channel options, please see https://grpc.io/grpc/core/group__grpc__arg__keys.html

python-examples/bisq/bots/bisq_events/trade_event.py

@@ -1,5 +1,5 @@
 # From https://expobrain.net/2010/07/31/simple-event-dispatcher-in-python
-from python_examples.bots.bisq_events.event import Event
+from bisq.bots.bisq_events.event import Event
 
 
 class TradeEvent(Event):

python-examples/bisq/bots/bisq_events/trade_event_listener.py

@@ -1,5 +1,5 @@
 # From https://expobrain.net/2010/07/31/simple-event-dispatcher-in-python
-from python_examples.bots.logger import log
+from bisq.bots.logger import log
 
 from trade_event import TradeEvent
 

python-examples/bisq/bots/protocol_step.py

@@ -1,6 +1,6 @@
 import grpc
 
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
 from logger import log
 
 WAIT_FOR_TRADE_DEPOSIT_CONFIRMATION = 'WAIT_FOR_TRADE_DEPOSIT_CONFIRMATION'

python-examples/bisq/bots/sepa_mm_bot.ini

@@ -0,0 +1,15 @@
+[general]
+offers_poll_interval_in_sec = 30
+max_polling_iterations = 1000
+
+# Take care to configure the correct payment account bot trading.
+sepa_payment_account_id=bb03eadd-c511-4c74-a714-871800d56534
+
+# The reference market price margin as a percent literal.  1.00 means 1.00%.
+reference_price_margin=0.00
+
+# The target spread as a percent literal.  Cannot be a negative value.
+spread = 5.00
+
+# The amount of BTC to be traded, in Satoshis.
+amount = 10000000

python-examples/bisq/bots/sepa_mm_bot.py

@@ -2,20 +2,24 @@ import sys
 import threading
 import time
 
+from bisq.bots.bisq_events.trade_event import TradeEvent
+from bisq.bots.bisq_events.trade_event_data import TradeEventData
 from bisq_client import BisqClient
 from protocol_step import *
-from python_examples.bots.bisq_events.trade_event import TradeEvent
+
-from python_examples.bots.bisq_events.trade_event_data import TradeEventData
+MAX_POLLING_ITERATIONS = 1000
 
 
 # noinspection PyInitNewSignature
 class SepaMMBot(BisqClient):
-    def __init__(self, host, port, api_password, event_dispatcher):
+    def __init__(self, host, port, api_password, max_polling_iterations, event_dispatcher):
         super().__init__(host, port, api_password)
         self.is_running = False
         self.timer = None
+        self.max_polling_iterations = max_polling_iterations
         self.event_dispatcher = event_dispatcher
-        log.info('Starting ' + str(self))
+        log.info('Initialized ' + str(self))
+        log.info('Click the Start button to make SEPA offers and trade.')
 
     def start(self, offers_poll_interval_in_sec,
               reference_price_margin,
@@ -31,7 +35,6 @@ class SepaMMBot(BisqClient):
 
         # Poll the bot's offers.  Replace taken offers with new offers so there is always 1 buy and 1 sell offer.
         self.timer = threading.Timer(0, ())
-        max_iterations = 100
         count = 0
         interval = 0
         try:
@@ -46,9 +49,11 @@ class SepaMMBot(BisqClient):
                 # Execute a single trade protocol step for each open SEPA trade.
                 self.process_open_trades(sepa_payment_account_id)
 
+                all_closed_trades = self.get_closed_trades()
+                log.info('My Closed Trades:\n%s', self.get_trades_tbl(all_closed_trades))
                 log.info('Bot is sleeping for %d seconds.', offers_poll_interval_in_sec)
                 count = count + 1
-                if count >= max_iterations:
+                if count >= self.max_polling_iterations:
                     self.timer.cancel()
                 else:
                     interval = offers_poll_interval_in_sec

python-examples/bisq/bots/sepa_mm_bot_ui.py

@@ -5,9 +5,9 @@ from pathlib import Path
 from tkinter import *
 
 import sepa_mm_bot
+from bisq.bots.bisq_events.event_dispatcher import EventDispatcher
+from bisq.bots.bisq_events.trade_event import TradeEvent
 from logger import log
-from python_examples.bots.bisq_events.event_dispatcher import EventDispatcher
-from python_examples.bots.bisq_events.trade_event import TradeEvent
 
 config = configparser.ConfigParser()
 config.read('sepa_mm_bot.ini')
@@ -42,6 +42,9 @@ btc_amount_input.set(round(int(config.get('general', 'amount')) * 0.00000001, 8)
 # Polling interval is not editable in UI.  Edit the .init file and restart UI.
 offers_poll_interval_in_sec = int(config.get('general', 'offers_poll_interval_in_sec'))
 
+# Maximum number of polling cycles is not editable in UI.  Edit the .init file and restart UI.
+max_polling_iterations = int(config.get('general', 'max_polling_iterations'))
+
 # Payment account id is not editable in UI.
 # If you want to change it, shut down the bot and edit the .ini file.
 sepa_payment_account_id = config.get('general', 'sepa_payment_account_id')
@@ -54,7 +57,11 @@ trade_id_for_start_payment_msg = None
 trade_id_for_payment_received_msg = None
 
 # Create the bot instance this UI controls.
-bot = sepa_mm_bot.SepaMMBot('localhost', 9998, 'xyz', event_dispatcher)
+bot = sepa_mm_bot.SepaMMBot('localhost',
+                            9998,
+                            'xyz',
+                            max_polling_iterations,
+                            event_dispatcher)
 
 
 def start():
@@ -280,7 +287,7 @@ def enable_button(button):
 
 # Event handling method must be declared before listeners are set up.
 def handle_trade_event(event):
-    log.info('\tHandling %s...', str(event.type))
+    log.info('Handling %s...', str(event.type))
     trade = event.data.trade
     instructions = event.data.instructions
     trade_summary = bot.get_trade_payment_summary(trade)

python-examples/bisq/rpccalls/cancel_offer.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/close_trade.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/confirm_payment_received.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/confirm_payment_started.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/create_bsq_swap_offer.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/create_crypto_currency_payment_account.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/create_offer.py

@@ -4,8 +4,8 @@ from builtins import print
 
 import grpc
 
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/create_payment_account.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/edit_offer.py

@@ -4,8 +4,8 @@ from builtins import print
 
 import grpc
 
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 EDITED_USD_OFFER_ID = '44736-16df6819-d98b-4f13-87dd-50087c464fac-184'
 

python-examples/bisq/rpccalls/fail_trade.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/get_address_balance.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/get_balances.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/get_bsq_swap_offer.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/get_bsq_swap_offers.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():

python-examples/bisq/rpccalls/get_crypto_currency_payment_methods.py

@@ -3,8 +3,8 @@ from builtins import print
 import grpc
 
 # from getpass import getpass
-import python_examples.bisqapi.grpc_pb2 as bisq_messages
+import bisq.api.grpc_pb2 as bisq_messages
-import python_examples.bisqapi.grpc_pb2_grpc as bisq_service
+import bisq.api.grpc_pb2_grpc as bisq_service
 
 
 def main():