diff --git a/.gitignore b/.gitignore index 9f8a057..1892174 100644 --- a/.gitignore +++ b/.gitignore @@ -34,11 +34,11 @@ proto-downloader/*.iml proto-downloader/*.proto python-examples/*.iml python-examples/myvenv -python-examples/python_examples/__pycache__ -python-examples/python_examples/bisqapi/__pycache__ -python-examples/python_examples/bisqapi/*.py -python-examples/python_examples/bots/__pycache__ -python-examples/python_examples/bots/bisq_events/__pycache__ +python-examples/bisq/__pycache__ +python-examples/bisq/api/__pycache__ +python-examples/bisq/api/*.py +python-examples/bisq/bots/__pycache__ +python-examples/bisq/bots/bisq_events/__pycache__ python-examples/proto/* reference-doc-builder/*.iml reference-doc-builder/build diff --git a/java-examples/src/main/java/rpccalls/BaseJavaExample.java b/java-examples/src/main/java/bisq/rpccalls/BaseJavaExample.java similarity index 98% rename from java-examples/src/main/java/rpccalls/BaseJavaExample.java rename to java-examples/src/main/java/bisq/rpccalls/BaseJavaExample.java index add6340..64a7f73 100644 --- a/java-examples/src/main/java/rpccalls/BaseJavaExample.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/CancelOffer.java b/java-examples/src/main/java/bisq/rpccalls/CancelOffer.java similarity index 97% rename from java-examples/src/main/java/rpccalls/CancelOffer.java rename to java-examples/src/main/java/bisq/rpccalls/CancelOffer.java index 4e0b480..d2dc571 100644 --- a/java-examples/src/main/java/rpccalls/CancelOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/CloseTrade.java b/java-examples/src/main/java/bisq/rpccalls/CloseTrade.java similarity index 97% rename from java-examples/src/main/java/rpccalls/CloseTrade.java rename to java-examples/src/main/java/bisq/rpccalls/CloseTrade.java index 0b3f219..5daf4a7 100644 --- a/java-examples/src/main/java/rpccalls/CloseTrade.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/ConfirmPaymentReceived.java b/java-examples/src/main/java/bisq/rpccalls/ConfirmPaymentReceived.java similarity index 97% rename from java-examples/src/main/java/rpccalls/ConfirmPaymentReceived.java rename to java-examples/src/main/java/bisq/rpccalls/ConfirmPaymentReceived.java index 9d8e1a3..013e5be 100644 --- a/java-examples/src/main/java/rpccalls/ConfirmPaymentReceived.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/ConfirmPaymentStarted.java b/java-examples/src/main/java/bisq/rpccalls/ConfirmPaymentStarted.java similarity index 97% rename from java-examples/src/main/java/rpccalls/ConfirmPaymentStarted.java rename to java-examples/src/main/java/bisq/rpccalls/ConfirmPaymentStarted.java index 84f2b3d..34186b9 100644 --- a/java-examples/src/main/java/rpccalls/ConfirmPaymentStarted.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/CreateBsqSwapOffer.java b/java-examples/src/main/java/bisq/rpccalls/CreateBsqSwapOffer.java similarity index 97% rename from java-examples/src/main/java/rpccalls/CreateBsqSwapOffer.java rename to java-examples/src/main/java/bisq/rpccalls/CreateBsqSwapOffer.java index c03e4f7..97ec137 100644 --- a/java-examples/src/main/java/rpccalls/CreateBsqSwapOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/CreateCryptoCurrencyPaymentAccount.java b/java-examples/src/main/java/bisq/rpccalls/CreateCryptoCurrencyPaymentAccount.java similarity index 98% rename from java-examples/src/main/java/rpccalls/CreateCryptoCurrencyPaymentAccount.java rename to java-examples/src/main/java/bisq/rpccalls/CreateCryptoCurrencyPaymentAccount.java index 5d52e89..fa32bd0 100644 --- a/java-examples/src/main/java/rpccalls/CreateCryptoCurrencyPaymentAccount.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/CreateOffer.java b/java-examples/src/main/java/bisq/rpccalls/CreateOffer.java similarity index 99% rename from java-examples/src/main/java/rpccalls/CreateOffer.java rename to java-examples/src/main/java/bisq/rpccalls/CreateOffer.java index 0006bbb..efcddd6 100644 --- a/java-examples/src/main/java/rpccalls/CreateOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/CreatePaymentAccount.java b/java-examples/src/main/java/bisq/rpccalls/CreatePaymentAccount.java similarity index 97% rename from java-examples/src/main/java/rpccalls/CreatePaymentAccount.java rename to java-examples/src/main/java/bisq/rpccalls/CreatePaymentAccount.java index fb3789f..6ea58d8 100644 --- a/java-examples/src/main/java/rpccalls/CreatePaymentAccount.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/EditOffer.java b/java-examples/src/main/java/bisq/rpccalls/EditOffer.java similarity index 99% rename from java-examples/src/main/java/rpccalls/EditOffer.java rename to java-examples/src/main/java/bisq/rpccalls/EditOffer.java index fab6ab0..bcb5c5e 100644 --- a/java-examples/src/main/java/rpccalls/EditOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/FailTrade.java b/java-examples/src/main/java/bisq/rpccalls/FailTrade.java similarity index 97% rename from java-examples/src/main/java/rpccalls/FailTrade.java rename to java-examples/src/main/java/bisq/rpccalls/FailTrade.java index 4d64025..6495762 100644 --- a/java-examples/src/main/java/rpccalls/FailTrade.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetAddressBalance.java b/java-examples/src/main/java/bisq/rpccalls/GetAddressBalance.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetAddressBalance.java rename to java-examples/src/main/java/bisq/rpccalls/GetAddressBalance.java index acbabb2..ce4d776 100644 --- a/java-examples/src/main/java/rpccalls/GetAddressBalance.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetBalances.java b/java-examples/src/main/java/bisq/rpccalls/GetBalances.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetBalances.java rename to java-examples/src/main/java/bisq/rpccalls/GetBalances.java index c04d6bb..d8b0aa3 100644 --- a/java-examples/src/main/java/rpccalls/GetBalances.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetBsqSwapOffer.java b/java-examples/src/main/java/bisq/rpccalls/GetBsqSwapOffer.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetBsqSwapOffer.java rename to java-examples/src/main/java/bisq/rpccalls/GetBsqSwapOffer.java index ff1598f..bd0463f 100644 --- a/java-examples/src/main/java/rpccalls/GetBsqSwapOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetBsqSwapOffers.java b/java-examples/src/main/java/bisq/rpccalls/GetBsqSwapOffers.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetBsqSwapOffers.java rename to java-examples/src/main/java/bisq/rpccalls/GetBsqSwapOffers.java index 06fa736..fc100db 100644 --- a/java-examples/src/main/java/rpccalls/GetBsqSwapOffers.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetCryptoCurrencyPaymentMethods.java b/java-examples/src/main/java/bisq/rpccalls/GetCryptoCurrencyPaymentMethods.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetCryptoCurrencyPaymentMethods.java rename to java-examples/src/main/java/bisq/rpccalls/GetCryptoCurrencyPaymentMethods.java index 26c4abe..108c699 100644 --- a/java-examples/src/main/java/rpccalls/GetCryptoCurrencyPaymentMethods.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetFundingAddresses.java b/java-examples/src/main/java/bisq/rpccalls/GetFundingAddresses.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetFundingAddresses.java rename to java-examples/src/main/java/bisq/rpccalls/GetFundingAddresses.java index d164ee3..4e4693c 100644 --- a/java-examples/src/main/java/rpccalls/GetFundingAddresses.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetMarketPrice.java b/java-examples/src/main/java/bisq/rpccalls/GetMarketPrice.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetMarketPrice.java rename to java-examples/src/main/java/bisq/rpccalls/GetMarketPrice.java index d537dfd..085aa8f 100644 --- a/java-examples/src/main/java/rpccalls/GetMarketPrice.java +++ b/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; diff --git a/java-examples/src/main/java/bisq/rpccalls/GetMethodHelp.java b/java-examples/src/main/java/bisq/rpccalls/GetMethodHelp.java new file mode 100644 index 0000000..833fd0f --- /dev/null +++ b/java-examples/src/main/java/bisq/rpccalls/GetMethodHelp.java @@ -0,0 +1 @@ +package bisq.rpccalls;// Help Service is for CLI users. \ No newline at end of file diff --git a/java-examples/src/main/java/rpccalls/GetMyBsqSwapOffer.java b/java-examples/src/main/java/bisq/rpccalls/GetMyBsqSwapOffer.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetMyBsqSwapOffer.java rename to java-examples/src/main/java/bisq/rpccalls/GetMyBsqSwapOffer.java index a4d3f2d..5e76828 100644 --- a/java-examples/src/main/java/rpccalls/GetMyBsqSwapOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetMyBsqSwapOffers.java b/java-examples/src/main/java/bisq/rpccalls/GetMyBsqSwapOffers.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetMyBsqSwapOffers.java rename to java-examples/src/main/java/bisq/rpccalls/GetMyBsqSwapOffers.java index 29132f2..6ae9403 100644 --- a/java-examples/src/main/java/rpccalls/GetMyBsqSwapOffers.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetMyOffer.java b/java-examples/src/main/java/bisq/rpccalls/GetMyOffer.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetMyOffer.java rename to java-examples/src/main/java/bisq/rpccalls/GetMyOffer.java index f8ed919..5e072bb 100644 --- a/java-examples/src/main/java/rpccalls/GetMyOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetMyOffers.java b/java-examples/src/main/java/bisq/rpccalls/GetMyOffers.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetMyOffers.java rename to java-examples/src/main/java/bisq/rpccalls/GetMyOffers.java index 019b2f4..820d4bc 100644 --- a/java-examples/src/main/java/rpccalls/GetMyOffers.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetOffer.java b/java-examples/src/main/java/bisq/rpccalls/GetOffer.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetOffer.java rename to java-examples/src/main/java/bisq/rpccalls/GetOffer.java index 49b0f66..a7a332e 100644 --- a/java-examples/src/main/java/rpccalls/GetOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetOfferCategory.java b/java-examples/src/main/java/bisq/rpccalls/GetOfferCategory.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetOfferCategory.java rename to java-examples/src/main/java/bisq/rpccalls/GetOfferCategory.java index 6450663..9c15f00 100644 --- a/java-examples/src/main/java/rpccalls/GetOfferCategory.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetOffers.java b/java-examples/src/main/java/bisq/rpccalls/GetOffers.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetOffers.java rename to java-examples/src/main/java/bisq/rpccalls/GetOffers.java index 080f29d..b5e9504 100644 --- a/java-examples/src/main/java/rpccalls/GetOffers.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetPaymentAccountForm.java b/java-examples/src/main/java/bisq/rpccalls/GetPaymentAccountForm.java similarity index 98% rename from java-examples/src/main/java/rpccalls/GetPaymentAccountForm.java rename to java-examples/src/main/java/bisq/rpccalls/GetPaymentAccountForm.java index c9870a1..0154d3b 100644 --- a/java-examples/src/main/java/rpccalls/GetPaymentAccountForm.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetPaymentAccounts.java b/java-examples/src/main/java/bisq/rpccalls/GetPaymentAccounts.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetPaymentAccounts.java rename to java-examples/src/main/java/bisq/rpccalls/GetPaymentAccounts.java index 3704474..cccf02f 100644 --- a/java-examples/src/main/java/rpccalls/GetPaymentAccounts.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetPaymentMethods.java b/java-examples/src/main/java/bisq/rpccalls/GetPaymentMethods.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetPaymentMethods.java rename to java-examples/src/main/java/bisq/rpccalls/GetPaymentMethods.java index f25fc3e..94fdf5c 100644 --- a/java-examples/src/main/java/rpccalls/GetPaymentMethods.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetTrade.java b/java-examples/src/main/java/bisq/rpccalls/GetTrade.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetTrade.java rename to java-examples/src/main/java/bisq/rpccalls/GetTrade.java index f095503..0b57cc0 100644 --- a/java-examples/src/main/java/rpccalls/GetTrade.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetTrades.java b/java-examples/src/main/java/bisq/rpccalls/GetTrades.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetTrades.java rename to java-examples/src/main/java/bisq/rpccalls/GetTrades.java index a8c3f57..8419b63 100644 --- a/java-examples/src/main/java/rpccalls/GetTrades.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetTransaction.java b/java-examples/src/main/java/bisq/rpccalls/GetTransaction.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetTransaction.java rename to java-examples/src/main/java/bisq/rpccalls/GetTransaction.java index a3b2291..7c2baf8 100644 --- a/java-examples/src/main/java/rpccalls/GetTransaction.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetTxFeeRate.java b/java-examples/src/main/java/bisq/rpccalls/GetTxFeeRate.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetTxFeeRate.java rename to java-examples/src/main/java/bisq/rpccalls/GetTxFeeRate.java index 859d476..10a7218 100644 --- a/java-examples/src/main/java/rpccalls/GetTxFeeRate.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetUnusedBsqAddress.java b/java-examples/src/main/java/bisq/rpccalls/GetUnusedBsqAddress.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetUnusedBsqAddress.java rename to java-examples/src/main/java/bisq/rpccalls/GetUnusedBsqAddress.java index 7b10fd7..756ee9e 100644 --- a/java-examples/src/main/java/rpccalls/GetUnusedBsqAddress.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetVersion.java b/java-examples/src/main/java/bisq/rpccalls/GetVersion.java similarity index 97% rename from java-examples/src/main/java/rpccalls/GetVersion.java rename to java-examples/src/main/java/bisq/rpccalls/GetVersion.java index 6151615..047780e 100644 --- a/java-examples/src/main/java/rpccalls/GetVersion.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/LockWallet.java b/java-examples/src/main/java/bisq/rpccalls/LockWallet.java similarity index 97% rename from java-examples/src/main/java/rpccalls/LockWallet.java rename to java-examples/src/main/java/bisq/rpccalls/LockWallet.java index 03ca6cd..5ff4856 100644 --- a/java-examples/src/main/java/rpccalls/LockWallet.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/RemoveWalletPassword.java b/java-examples/src/main/java/bisq/rpccalls/RemoveWalletPassword.java similarity index 97% rename from java-examples/src/main/java/rpccalls/RemoveWalletPassword.java rename to java-examples/src/main/java/bisq/rpccalls/RemoveWalletPassword.java index 52f709f..5086aec 100644 --- a/java-examples/src/main/java/rpccalls/RemoveWalletPassword.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/SendBsq.java b/java-examples/src/main/java/bisq/rpccalls/SendBsq.java similarity index 97% rename from java-examples/src/main/java/rpccalls/SendBsq.java rename to java-examples/src/main/java/bisq/rpccalls/SendBsq.java index 0310f6e..4c7ef06 100644 --- a/java-examples/src/main/java/rpccalls/SendBsq.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/SendBtc.java b/java-examples/src/main/java/bisq/rpccalls/SendBtc.java similarity index 97% rename from java-examples/src/main/java/rpccalls/SendBtc.java rename to java-examples/src/main/java/bisq/rpccalls/SendBtc.java index 97fa1f4..d8b232d 100644 --- a/java-examples/src/main/java/rpccalls/SendBtc.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/SetTxFeeRatePreference.java b/java-examples/src/main/java/bisq/rpccalls/SetTxFeeRatePreference.java similarity index 97% rename from java-examples/src/main/java/rpccalls/SetTxFeeRatePreference.java rename to java-examples/src/main/java/bisq/rpccalls/SetTxFeeRatePreference.java index ef4ff44..4500486 100644 --- a/java-examples/src/main/java/rpccalls/SetTxFeeRatePreference.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/SetWalletPassword.java b/java-examples/src/main/java/bisq/rpccalls/SetWalletPassword.java similarity index 97% rename from java-examples/src/main/java/rpccalls/SetWalletPassword.java rename to java-examples/src/main/java/bisq/rpccalls/SetWalletPassword.java index 0ff0b3b..7ba5c6f 100644 --- a/java-examples/src/main/java/rpccalls/SetWalletPassword.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/Stop.java b/java-examples/src/main/java/bisq/rpccalls/Stop.java similarity index 97% rename from java-examples/src/main/java/rpccalls/Stop.java rename to java-examples/src/main/java/bisq/rpccalls/Stop.java index 2bb92c1..5f124d2 100644 --- a/java-examples/src/main/java/rpccalls/Stop.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/TakeOffer.java b/java-examples/src/main/java/bisq/rpccalls/TakeOffer.java similarity index 99% rename from java-examples/src/main/java/rpccalls/TakeOffer.java rename to java-examples/src/main/java/bisq/rpccalls/TakeOffer.java index 9e3eaaf..bf1e17b 100644 --- a/java-examples/src/main/java/rpccalls/TakeOffer.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/UnFailTrade.java b/java-examples/src/main/java/bisq/rpccalls/UnFailTrade.java similarity index 97% rename from java-examples/src/main/java/rpccalls/UnFailTrade.java rename to java-examples/src/main/java/bisq/rpccalls/UnFailTrade.java index b200c79..92a5cfc 100644 --- a/java-examples/src/main/java/rpccalls/UnFailTrade.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/UnlockWallet.java b/java-examples/src/main/java/bisq/rpccalls/UnlockWallet.java similarity index 97% rename from java-examples/src/main/java/rpccalls/UnlockWallet.java rename to java-examples/src/main/java/bisq/rpccalls/UnlockWallet.java index 05b0d88..55f92fd 100644 --- a/java-examples/src/main/java/rpccalls/UnlockWallet.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/UnsetTxFeeRatePreference.java b/java-examples/src/main/java/bisq/rpccalls/UnsetTxFeeRatePreference.java similarity index 97% rename from java-examples/src/main/java/rpccalls/UnsetTxFeeRatePreference.java rename to java-examples/src/main/java/bisq/rpccalls/UnsetTxFeeRatePreference.java index f29c1bb..c69293f 100644 --- a/java-examples/src/main/java/rpccalls/UnsetTxFeeRatePreference.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/VerifyBsqSentToAddress.java b/java-examples/src/main/java/bisq/rpccalls/VerifyBsqSentToAddress.java similarity index 97% rename from java-examples/src/main/java/rpccalls/VerifyBsqSentToAddress.java rename to java-examples/src/main/java/bisq/rpccalls/VerifyBsqSentToAddress.java index 859dc53..dc9d892 100644 --- a/java-examples/src/main/java/rpccalls/VerifyBsqSentToAddress.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/WithdrawFunds.java b/java-examples/src/main/java/bisq/rpccalls/WithdrawFunds.java similarity index 97% rename from java-examples/src/main/java/rpccalls/WithdrawFunds.java rename to java-examples/src/main/java/bisq/rpccalls/WithdrawFunds.java index ac5b376..8374d14 100644 --- a/java-examples/src/main/java/rpccalls/WithdrawFunds.java +++ b/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; diff --git a/java-examples/src/main/java/rpccalls/GetMethodHelp.java b/java-examples/src/main/java/rpccalls/GetMethodHelp.java deleted file mode 100644 index b10067b..0000000 --- a/java-examples/src/main/java/rpccalls/GetMethodHelp.java +++ /dev/null @@ -1 +0,0 @@ -package rpccalls;// Help Service is for CLI users. \ No newline at end of file diff --git a/proto-downloader/download-bisq-protos.sh b/proto-downloader/download-bisq-protos.sh index 1558401..9ebd67f 100755 --- a/proto-downloader/download-bisq-protos.sh +++ b/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 \ No newline at end of file diff --git a/python-examples/python_examples/__init__.py b/python-examples/bisq/__init__.py similarity index 100% rename from python-examples/python_examples/__init__.py rename to python-examples/bisq/__init__.py diff --git a/python-examples/python_examples/bisqapi/README.md b/python-examples/bisq/api/README.md similarity index 100% rename from python-examples/python_examples/bisqapi/README.md rename to python-examples/bisq/api/README.md diff --git a/python-examples/python_examples/bots/__init__.py b/python-examples/bisq/bots/__init__.py similarity index 100% rename from python-examples/python_examples/bots/__init__.py rename to python-examples/bisq/bots/__init__.py diff --git a/python-examples/python_examples/bots/assets/bisq_logo.png b/python-examples/bisq/bots/assets/bisq_logo.png similarity index 100% rename from python-examples/python_examples/bots/assets/bisq_logo.png rename to python-examples/bisq/bots/assets/bisq_logo.png diff --git a/python-examples/python_examples/bots/assets/btc_amount_entry.png b/python-examples/bisq/bots/assets/btc_amount_entry.png similarity index 100% rename from python-examples/python_examples/bots/assets/btc_amount_entry.png rename to python-examples/bisq/bots/assets/btc_amount_entry.png diff --git a/python-examples/python_examples/bots/assets/payment_received_button.png b/python-examples/bisq/bots/assets/payment_received_button.png similarity index 100% rename from python-examples/python_examples/bots/assets/payment_received_button.png rename to python-examples/bisq/bots/assets/payment_received_button.png diff --git a/python-examples/python_examples/bots/assets/payment_sent_button.png b/python-examples/bisq/bots/assets/payment_sent_button.png similarity index 100% rename from python-examples/python_examples/bots/assets/payment_sent_button.png rename to python-examples/bisq/bots/assets/payment_sent_button.png diff --git a/python-examples/python_examples/bots/assets/reference_price_margin_entry.png b/python-examples/bisq/bots/assets/reference_price_margin_entry.png similarity index 100% rename from python-examples/python_examples/bots/assets/reference_price_margin_entry.png rename to python-examples/bisq/bots/assets/reference_price_margin_entry.png diff --git a/python-examples/python_examples/bots/assets/spread_entry.png b/python-examples/bisq/bots/assets/spread_entry.png similarity index 100% rename from python-examples/python_examples/bots/assets/spread_entry.png rename to python-examples/bisq/bots/assets/spread_entry.png diff --git a/python-examples/python_examples/bots/assets/start_button.png b/python-examples/bisq/bots/assets/start_button.png similarity index 100% rename from python-examples/python_examples/bots/assets/start_button.png rename to python-examples/bisq/bots/assets/start_button.png diff --git a/python-examples/python_examples/bots/assets/stop_button.png b/python-examples/bisq/bots/assets/stop_button.png similarity index 100% rename from python-examples/python_examples/bots/assets/stop_button.png rename to python-examples/bisq/bots/assets/stop_button.png diff --git a/python-examples/python_examples/bots/assets/window_icon.png b/python-examples/bisq/bots/assets/window_icon.png similarity index 100% rename from python-examples/python_examples/bots/assets/window_icon.png rename to python-examples/bisq/bots/assets/window_icon.png diff --git a/python-examples/python_examples/bots/best_priced_offer_bot.ini b/python-examples/bisq/bots/best_priced_offer_bot.ini similarity index 100% rename from python-examples/python_examples/bots/best_priced_offer_bot.ini rename to python-examples/bisq/bots/best_priced_offer_bot.ini diff --git a/python-examples/python_examples/bots/best_priced_offer_bot.py b/python-examples/bisq/bots/best_priced_offer_bot.py similarity index 100% rename from python-examples/python_examples/bots/best_priced_offer_bot.py rename to python-examples/bisq/bots/best_priced_offer_bot.py diff --git a/python-examples/python_examples/bots/bisq_client.py b/python-examples/bisq/bots/bisq_client.py similarity index 99% rename from python-examples/python_examples/bots/bisq_client.py rename to python-examples/bisq/bots/bisq_client.py index efb8145..91c1c64 100644 --- a/python-examples/python_examples/bots/bisq_client.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +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 diff --git a/python-examples/python_examples/bots/bisq_events/__init__.py b/python-examples/bisq/bots/bisq_events/__init__.py similarity index 100% rename from python-examples/python_examples/bots/bisq_events/__init__.py rename to python-examples/bisq/bots/bisq_events/__init__.py diff --git a/python-examples/python_examples/bots/bisq_events/event.py b/python-examples/bisq/bots/bisq_events/event.py similarity index 100% rename from python-examples/python_examples/bots/bisq_events/event.py rename to python-examples/bisq/bots/bisq_events/event.py diff --git a/python-examples/python_examples/bots/bisq_events/event_dispatcher.py b/python-examples/bisq/bots/bisq_events/event_dispatcher.py similarity index 100% rename from python-examples/python_examples/bots/bisq_events/event_dispatcher.py rename to python-examples/bisq/bots/bisq_events/event_dispatcher.py diff --git a/python-examples/python_examples/bots/bisq_events/test_trade_event.py b/python-examples/bisq/bots/bisq_events/test_trade_event.py similarity index 100% rename from python-examples/python_examples/bots/bisq_events/test_trade_event.py rename to python-examples/bisq/bots/bisq_events/test_trade_event.py diff --git a/python-examples/python_examples/bots/bisq_events/trade_event.py b/python-examples/bisq/bots/bisq_events/trade_event.py similarity index 88% rename from python-examples/python_examples/bots/bisq_events/trade_event.py rename to python-examples/bisq/bots/bisq_events/trade_event.py index 31d2834..6231322 100644 --- a/python-examples/python_examples/bots/bisq_events/trade_event.py +++ b/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): diff --git a/python-examples/python_examples/bots/bisq_events/trade_event_data.py b/python-examples/bisq/bots/bisq_events/trade_event_data.py similarity index 100% rename from python-examples/python_examples/bots/bisq_events/trade_event_data.py rename to python-examples/bisq/bots/bisq_events/trade_event_data.py diff --git a/python-examples/python_examples/bots/bisq_events/trade_event_listener.py b/python-examples/bisq/bots/bisq_events/trade_event_listener.py similarity index 95% rename from python-examples/python_examples/bots/bisq_events/trade_event_listener.py rename to python-examples/bisq/bots/bisq_events/trade_event_listener.py index 6f8422c..b5ccdd8 100644 --- a/python-examples/python_examples/bots/bisq_events/trade_event_listener.py +++ b/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 diff --git a/python-examples/python_examples/bots/bisq_events/trade_event_sender.py b/python-examples/bisq/bots/bisq_events/trade_event_sender.py similarity index 100% rename from python-examples/python_examples/bots/bisq_events/trade_event_sender.py rename to python-examples/bisq/bots/bisq_events/trade_event_sender.py diff --git a/python-examples/python_examples/bots/bisqswap_mm_bot.ini b/python-examples/bisq/bots/bisqswap_mm_bot.ini similarity index 100% rename from python-examples/python_examples/bots/bisqswap_mm_bot.ini rename to python-examples/bisq/bots/bisqswap_mm_bot.ini diff --git a/python-examples/python_examples/bots/bisqswap_mm_bot.py b/python-examples/bisq/bots/bisqswap_mm_bot.py similarity index 100% rename from python-examples/python_examples/bots/bisqswap_mm_bot.py rename to python-examples/bisq/bots/bisqswap_mm_bot.py diff --git a/python-examples/python_examples/bots/logger.py b/python-examples/bisq/bots/logger.py similarity index 100% rename from python-examples/python_examples/bots/logger.py rename to python-examples/bisq/bots/logger.py diff --git a/python-examples/python_examples/bots/path_config.py b/python-examples/bisq/bots/path_config.py similarity index 100% rename from python-examples/python_examples/bots/path_config.py rename to python-examples/bisq/bots/path_config.py diff --git a/python-examples/python_examples/bots/protocol_step.py b/python-examples/bisq/bots/protocol_step.py similarity index 99% rename from python-examples/python_examples/bots/protocol_step.py rename to python-examples/bisq/bots/protocol_step.py index b453075..1233079 100644 --- a/python-examples/python_examples/bots/protocol_step.py +++ b/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' diff --git a/python-examples/python_examples/bots/run-main.py b/python-examples/bisq/bots/run-main.py similarity index 100% rename from python-examples/python_examples/bots/run-main.py rename to python-examples/bisq/bots/run-main.py diff --git a/python-examples/bisq/bots/sepa_mm_bot.ini b/python-examples/bisq/bots/sepa_mm_bot.ini new file mode 100644 index 0000000..a8c8261 --- /dev/null +++ b/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 diff --git a/python-examples/python_examples/bots/sepa_mm_bot.py b/python-examples/bisq/bots/sepa_mm_bot.py similarity index 94% rename from python-examples/python_examples/bots/sepa_mm_bot.py rename to python-examples/bisq/bots/sepa_mm_bot.py index 4b34f56..56c3176 100644 --- a/python-examples/python_examples/bots/sepa_mm_bot.py +++ b/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 diff --git a/python-examples/python_examples/bots/sepa_mm_bot_ui.py b/python-examples/bisq/bots/sepa_mm_bot_ui.py similarity index 94% rename from python-examples/python_examples/bots/sepa_mm_bot_ui.py rename to python-examples/bisq/bots/sepa_mm_bot_ui.py index aa84554..cdf248a 100644 --- a/python-examples/python_examples/bots/sepa_mm_bot_ui.py +++ b/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) diff --git a/python-examples/python_examples/rpccalls/README.md b/python-examples/bisq/rpccalls/README.md similarity index 100% rename from python-examples/python_examples/rpccalls/README.md rename to python-examples/bisq/rpccalls/README.md diff --git a/python-examples/python_examples/rpccalls/__init__.py b/python-examples/bisq/rpccalls/__init__.py similarity index 100% rename from python-examples/python_examples/rpccalls/__init__.py rename to python-examples/bisq/rpccalls/__init__.py diff --git a/python-examples/python_examples/rpccalls/cancel_offer.py b/python-examples/bisq/rpccalls/cancel_offer.py similarity index 84% rename from python-examples/python_examples/rpccalls/cancel_offer.py rename to python-examples/bisq/rpccalls/cancel_offer.py index cab000b..437d2ea 100644 --- a/python-examples/python_examples/rpccalls/cancel_offer.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/close_trade.py b/python-examples/bisq/rpccalls/close_trade.py similarity index 84% rename from python-examples/python_examples/rpccalls/close_trade.py rename to python-examples/bisq/rpccalls/close_trade.py index f794061..c8c4d24 100644 --- a/python-examples/python_examples/rpccalls/close_trade.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/confirm_payment_received.py b/python-examples/bisq/rpccalls/confirm_payment_received.py similarity index 85% rename from python-examples/python_examples/rpccalls/confirm_payment_received.py rename to python-examples/bisq/rpccalls/confirm_payment_received.py index e47229e..c6d1d59 100644 --- a/python-examples/python_examples/rpccalls/confirm_payment_received.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/confirm_payment_started.py b/python-examples/bisq/rpccalls/confirm_payment_started.py similarity index 85% rename from python-examples/python_examples/rpccalls/confirm_payment_started.py rename to python-examples/bisq/rpccalls/confirm_payment_started.py index 650eb08..ea92dee 100644 --- a/python-examples/python_examples/rpccalls/confirm_payment_started.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/create_bsq_swap_offer.py b/python-examples/bisq/rpccalls/create_bsq_swap_offer.py similarity index 88% rename from python-examples/python_examples/rpccalls/create_bsq_swap_offer.py rename to python-examples/bisq/rpccalls/create_bsq_swap_offer.py index 87c8f90..d67057a 100644 --- a/python-examples/python_examples/rpccalls/create_bsq_swap_offer.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/create_crypto_currency_payment_account.py b/python-examples/bisq/rpccalls/create_crypto_currency_payment_account.py similarity index 88% rename from python-examples/python_examples/rpccalls/create_crypto_currency_payment_account.py rename to python-examples/bisq/rpccalls/create_crypto_currency_payment_account.py index c6366e1..848ebff 100644 --- a/python-examples/python_examples/rpccalls/create_crypto_currency_payment_account.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/create_offer.py b/python-examples/bisq/rpccalls/create_offer.py similarity index 96% rename from python-examples/python_examples/rpccalls/create_offer.py rename to python-examples/bisq/rpccalls/create_offer.py index b8b2e71..35061a1 100644 --- a/python-examples/python_examples/rpccalls/create_offer.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/create_payment_account.py b/python-examples/bisq/rpccalls/create_payment_account.py similarity index 87% rename from python-examples/python_examples/rpccalls/create_payment_account.py rename to python-examples/bisq/rpccalls/create_payment_account.py index b50f688..ca630b0 100644 --- a/python-examples/python_examples/rpccalls/create_payment_account.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/edit_offer.py b/python-examples/bisq/rpccalls/edit_offer.py similarity index 97% rename from python-examples/python_examples/rpccalls/edit_offer.py rename to python-examples/bisq/rpccalls/edit_offer.py index ff2a3c3..8957d29 100644 --- a/python-examples/python_examples/rpccalls/edit_offer.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service EDITED_USD_OFFER_ID = '44736-16df6819-d98b-4f13-87dd-50087c464fac-184' diff --git a/python-examples/python_examples/rpccalls/fail_trade.py b/python-examples/bisq/rpccalls/fail_trade.py similarity index 84% rename from python-examples/python_examples/rpccalls/fail_trade.py rename to python-examples/bisq/rpccalls/fail_trade.py index 204c41e..f7bea43 100644 --- a/python-examples/python_examples/rpccalls/fail_trade.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_address_balance.py b/python-examples/bisq/rpccalls/get_address_balance.py similarity index 89% rename from python-examples/python_examples/rpccalls/get_address_balance.py rename to python-examples/bisq/rpccalls/get_address_balance.py index c89d24a..a4e5673 100644 --- a/python-examples/python_examples/rpccalls/get_address_balance.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_balances.py b/python-examples/bisq/rpccalls/get_balances.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_balances.py rename to python-examples/bisq/rpccalls/get_balances.py index f228876..fce181d 100644 --- a/python-examples/python_examples/rpccalls/get_balances.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_bsq_swap_offer.py b/python-examples/bisq/rpccalls/get_bsq_swap_offer.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_bsq_swap_offer.py rename to python-examples/bisq/rpccalls/get_bsq_swap_offer.py index f395be2..131ca5f 100644 --- a/python-examples/python_examples/rpccalls/get_bsq_swap_offer.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_bsq_swap_offers.py b/python-examples/bisq/rpccalls/get_bsq_swap_offers.py similarity index 84% rename from python-examples/python_examples/rpccalls/get_bsq_swap_offers.py rename to python-examples/bisq/rpccalls/get_bsq_swap_offers.py index 0e959fd..f3067ca 100644 --- a/python-examples/python_examples/rpccalls/get_bsq_swap_offers.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_crypto_currency_payment_methods.py b/python-examples/bisq/rpccalls/get_crypto_currency_payment_methods.py similarity index 87% rename from python-examples/python_examples/rpccalls/get_crypto_currency_payment_methods.py rename to python-examples/bisq/rpccalls/get_crypto_currency_payment_methods.py index 19f714a..dcc7b95 100644 --- a/python-examples/python_examples/rpccalls/get_crypto_currency_payment_methods.py +++ b/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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_funding_addresses.py b/python-examples/bisq/rpccalls/get_funding_addresses.py similarity index 90% rename from python-examples/python_examples/rpccalls/get_funding_addresses.py rename to python-examples/bisq/rpccalls/get_funding_addresses.py index 350ecc5..ebdc8e1 100644 --- a/python-examples/python_examples/rpccalls/get_funding_addresses.py +++ b/python-examples/bisq/rpccalls/get_funding_addresses.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_market_price.py b/python-examples/bisq/rpccalls/get_market_price.py similarity index 84% rename from python-examples/python_examples/rpccalls/get_market_price.py rename to python-examples/bisq/rpccalls/get_market_price.py index 00165be..6cd87ba 100644 --- a/python-examples/python_examples/rpccalls/get_market_price.py +++ b/python-examples/bisq/rpccalls/get_market_price.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_method_help.py b/python-examples/bisq/rpccalls/get_method_help.py similarity index 100% rename from python-examples/python_examples/rpccalls/get_method_help.py rename to python-examples/bisq/rpccalls/get_method_help.py diff --git a/python-examples/python_examples/rpccalls/get_my_bsq_swap_offer.py b/python-examples/bisq/rpccalls/get_my_bsq_swap_offer.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_my_bsq_swap_offer.py rename to python-examples/bisq/rpccalls/get_my_bsq_swap_offer.py index a46952a..10a6160 100644 --- a/python-examples/python_examples/rpccalls/get_my_bsq_swap_offer.py +++ b/python-examples/bisq/rpccalls/get_my_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_my_bsq_swap_offers.py b/python-examples/bisq/rpccalls/get_my_bsq_swap_offers.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_my_bsq_swap_offers.py rename to python-examples/bisq/rpccalls/get_my_bsq_swap_offers.py index 858c056..876f3a2 100644 --- a/python-examples/python_examples/rpccalls/get_my_bsq_swap_offers.py +++ b/python-examples/bisq/rpccalls/get_my_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_my_offer.py b/python-examples/bisq/rpccalls/get_my_offer.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_my_offer.py rename to python-examples/bisq/rpccalls/get_my_offer.py index 64ceb52..884bc2c 100644 --- a/python-examples/python_examples/rpccalls/get_my_offer.py +++ b/python-examples/bisq/rpccalls/get_my_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_my_offers.py b/python-examples/bisq/rpccalls/get_my_offers.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_my_offers.py rename to python-examples/bisq/rpccalls/get_my_offers.py index 6f76096..f5f00f2 100644 --- a/python-examples/python_examples/rpccalls/get_my_offers.py +++ b/python-examples/bisq/rpccalls/get_my_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_offer.py b/python-examples/bisq/rpccalls/get_offer.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_offer.py rename to python-examples/bisq/rpccalls/get_offer.py index 65b7de5..df0a243 100644 --- a/python-examples/python_examples/rpccalls/get_offer.py +++ b/python-examples/bisq/rpccalls/get_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_offer_category.py b/python-examples/bisq/rpccalls/get_offer_category.py similarity index 86% rename from python-examples/python_examples/rpccalls/get_offer_category.py rename to python-examples/bisq/rpccalls/get_offer_category.py index 5044e22..cf4fd5e 100644 --- a/python-examples/python_examples/rpccalls/get_offer_category.py +++ b/python-examples/bisq/rpccalls/get_offer_category.py @@ -3,8 +3,8 @@ from builtins import print import grpc -import python_examples.bisqapi.grpc_pb2 as bisq_messages -import python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_offers.py b/python-examples/bisq/rpccalls/get_offers.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_offers.py rename to python-examples/bisq/rpccalls/get_offers.py index 40bc3bd..5853f35 100644 --- a/python-examples/python_examples/rpccalls/get_offers.py +++ b/python-examples/bisq/rpccalls/get_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_payment_account_form.py b/python-examples/bisq/rpccalls/get_payment_account_form.py similarity index 65% rename from python-examples/python_examples/rpccalls/get_payment_account_form.py rename to python-examples/bisq/rpccalls/get_payment_account_form.py index 791a126..5284c2f 100644 --- a/python-examples/python_examples/rpccalls/get_payment_account_form.py +++ b/python-examples/bisq/rpccalls/get_payment_account_form.py @@ -1,10 +1,12 @@ +import os +import tempfile from builtins import print import grpc # from getpass import getpass -import python_examples.bisqapi.grpc_pb2 as bisq_messages -import python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): @@ -19,6 +21,11 @@ def main(): print('Response: ' + json_string) # The client should save this json string to file, manually fill in the form # fields, then use it as shown in the create_payment_account.py example. + json_filename = os.sep.join([tempfile.gettempdir(), 'swift-account-form.json']) + print('Write response to json file: {0}'.format(json_filename)) + json_file = open(json_filename, "w") + num_written_chars = json_file.write(json_string) + print('Wrote {0} characters to {1}'.format(num_written_chars, json_file.name)) except grpc.RpcError as rpc_error: print('gRPC API Exception: %s', rpc_error) diff --git a/python-examples/python_examples/rpccalls/get_payment_accounts.py b/python-examples/bisq/rpccalls/get_payment_accounts.py similarity index 90% rename from python-examples/python_examples/rpccalls/get_payment_accounts.py rename to python-examples/bisq/rpccalls/get_payment_accounts.py index 881f4be..21fd75b 100644 --- a/python-examples/python_examples/rpccalls/get_payment_accounts.py +++ b/python-examples/bisq/rpccalls/get_payment_accounts.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_payment_methods.py b/python-examples/bisq/rpccalls/get_payment_methods.py similarity index 87% rename from python-examples/python_examples/rpccalls/get_payment_methods.py rename to python-examples/bisq/rpccalls/get_payment_methods.py index 90b92de..8a6dc36 100644 --- a/python-examples/python_examples/rpccalls/get_payment_methods.py +++ b/python-examples/bisq/rpccalls/get_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_trade.py b/python-examples/bisq/rpccalls/get_trade.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_trade.py rename to python-examples/bisq/rpccalls/get_trade.py index af70ddf..e594013 100644 --- a/python-examples/python_examples/rpccalls/get_trade.py +++ b/python-examples/bisq/rpccalls/get_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_trades.py b/python-examples/bisq/rpccalls/get_trades.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_trades.py rename to python-examples/bisq/rpccalls/get_trades.py index 07d9965..b63ca87 100644 --- a/python-examples/python_examples/rpccalls/get_trades.py +++ b/python-examples/bisq/rpccalls/get_trades.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_transaction.py b/python-examples/bisq/rpccalls/get_transaction.py similarity index 85% rename from python-examples/python_examples/rpccalls/get_transaction.py rename to python-examples/bisq/rpccalls/get_transaction.py index 8e57ee0..2f790ce 100644 --- a/python-examples/python_examples/rpccalls/get_transaction.py +++ b/python-examples/bisq/rpccalls/get_transaction.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_tx_fee_rate.py b/python-examples/bisq/rpccalls/get_tx_fee_rate.py similarity index 84% rename from python-examples/python_examples/rpccalls/get_tx_fee_rate.py rename to python-examples/bisq/rpccalls/get_tx_fee_rate.py index c1c8ec9..101e5b3 100644 --- a/python-examples/python_examples/rpccalls/get_tx_fee_rate.py +++ b/python-examples/bisq/rpccalls/get_tx_fee_rate.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_unused_bsq_address.py b/python-examples/bisq/rpccalls/get_unused_bsq_address.py similarity index 84% rename from python-examples/python_examples/rpccalls/get_unused_bsq_address.py rename to python-examples/bisq/rpccalls/get_unused_bsq_address.py index ffa41f8..c36a49e 100644 --- a/python-examples/python_examples/rpccalls/get_unused_bsq_address.py +++ b/python-examples/bisq/rpccalls/get_unused_bsq_address.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/get_version.py b/python-examples/bisq/rpccalls/get_version.py similarity index 84% rename from python-examples/python_examples/rpccalls/get_version.py rename to python-examples/bisq/rpccalls/get_version.py index 5e11df5..314d985 100644 --- a/python-examples/python_examples/rpccalls/get_version.py +++ b/python-examples/bisq/rpccalls/get_version.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/lock_wallet.py b/python-examples/bisq/rpccalls/lock_wallet.py similarity index 83% rename from python-examples/python_examples/rpccalls/lock_wallet.py rename to python-examples/bisq/rpccalls/lock_wallet.py index 1bcfa35..8580b7c 100644 --- a/python-examples/python_examples/rpccalls/lock_wallet.py +++ b/python-examples/bisq/rpccalls/lock_wallet.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/remove_wallet_password.py b/python-examples/bisq/rpccalls/remove_wallet_password.py similarity index 84% rename from python-examples/python_examples/rpccalls/remove_wallet_password.py rename to python-examples/bisq/rpccalls/remove_wallet_password.py index 914e7d7..db7428e 100644 --- a/python-examples/python_examples/rpccalls/remove_wallet_password.py +++ b/python-examples/bisq/rpccalls/remove_wallet_password.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/send_bsq.py b/python-examples/bisq/rpccalls/send_bsq.py similarity index 86% rename from python-examples/python_examples/rpccalls/send_bsq.py rename to python-examples/bisq/rpccalls/send_bsq.py index aa474f2..cd07cd3 100644 --- a/python-examples/python_examples/rpccalls/send_bsq.py +++ b/python-examples/bisq/rpccalls/send_bsq.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/send_btc.py b/python-examples/bisq/rpccalls/send_btc.py similarity index 87% rename from python-examples/python_examples/rpccalls/send_btc.py rename to python-examples/bisq/rpccalls/send_btc.py index 413b14a..419eb92 100644 --- a/python-examples/python_examples/rpccalls/send_btc.py +++ b/python-examples/bisq/rpccalls/send_btc.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/set_tx_fee_rate_preference.py b/python-examples/bisq/rpccalls/set_tx_fee_rate_preference.py similarity index 85% rename from python-examples/python_examples/rpccalls/set_tx_fee_rate_preference.py rename to python-examples/bisq/rpccalls/set_tx_fee_rate_preference.py index 7dede78..1055f2a 100644 --- a/python-examples/python_examples/rpccalls/set_tx_fee_rate_preference.py +++ b/python-examples/bisq/rpccalls/set_tx_fee_rate_preference.py @@ -3,8 +3,8 @@ from builtins import print import grpc -import python_examples.bisqapi.grpc_pb2 as bisq_messages -import python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/set_wallet_password.py b/python-examples/bisq/rpccalls/set_wallet_password.py similarity index 84% rename from python-examples/python_examples/rpccalls/set_wallet_password.py rename to python-examples/bisq/rpccalls/set_wallet_password.py index 0ec8d29..3abfeae 100644 --- a/python-examples/python_examples/rpccalls/set_wallet_password.py +++ b/python-examples/bisq/rpccalls/set_wallet_password.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/stop.py b/python-examples/bisq/rpccalls/stop.py similarity index 84% rename from python-examples/python_examples/rpccalls/stop.py rename to python-examples/bisq/rpccalls/stop.py index ea04301..f9b9c0a 100644 --- a/python-examples/python_examples/rpccalls/stop.py +++ b/python-examples/bisq/rpccalls/stop.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/take_offer.py b/python-examples/bisq/rpccalls/take_offer.py similarity index 93% rename from python-examples/python_examples/rpccalls/take_offer.py rename to python-examples/bisq/rpccalls/take_offer.py index d907c3d..f262b39 100644 --- a/python-examples/python_examples/rpccalls/take_offer.py +++ b/python-examples/bisq/rpccalls/take_offer.py @@ -3,8 +3,8 @@ from builtins import print import grpc -import python_examples.bisqapi.grpc_pb2 as bisq_messages -import python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/unfail_trade.py b/python-examples/bisq/rpccalls/unfail_trade.py similarity index 85% rename from python-examples/python_examples/rpccalls/unfail_trade.py rename to python-examples/bisq/rpccalls/unfail_trade.py index 30ee5be..d38fa0d 100644 --- a/python-examples/python_examples/rpccalls/unfail_trade.py +++ b/python-examples/bisq/rpccalls/unfail_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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/unlock_wallet.py b/python-examples/bisq/rpccalls/unlock_wallet.py similarity index 85% rename from python-examples/python_examples/rpccalls/unlock_wallet.py rename to python-examples/bisq/rpccalls/unlock_wallet.py index 78d1e16..55d8da3 100644 --- a/python-examples/python_examples/rpccalls/unlock_wallet.py +++ b/python-examples/bisq/rpccalls/unlock_wallet.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/unset_tx_fee_rate_preference.py b/python-examples/bisq/rpccalls/unset_tx_fee_rate_preference.py similarity index 84% rename from python-examples/python_examples/rpccalls/unset_tx_fee_rate_preference.py rename to python-examples/bisq/rpccalls/unset_tx_fee_rate_preference.py index 01c1a93..10c8693 100644 --- a/python-examples/python_examples/rpccalls/unset_tx_fee_rate_preference.py +++ b/python-examples/bisq/rpccalls/unset_tx_fee_rate_preference.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/verify_bsq_sent_to_address.py b/python-examples/bisq/rpccalls/verify_bsq_sent_to_address.py similarity index 86% rename from python-examples/python_examples/rpccalls/verify_bsq_sent_to_address.py rename to python-examples/bisq/rpccalls/verify_bsq_sent_to_address.py index e8014dd..4afe6a2 100644 --- a/python-examples/python_examples/rpccalls/verify_bsq_sent_to_address.py +++ b/python-examples/bisq/rpccalls/verify_bsq_sent_to_address.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/python_examples/rpccalls/withdraw_funds.py b/python-examples/bisq/rpccalls/withdraw_funds.py similarity index 84% rename from python-examples/python_examples/rpccalls/withdraw_funds.py rename to python-examples/bisq/rpccalls/withdraw_funds.py index b782b34..e98c7ac 100644 --- a/python-examples/python_examples/rpccalls/withdraw_funds.py +++ b/python-examples/bisq/rpccalls/withdraw_funds.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 python_examples.bisqapi.grpc_pb2_grpc as bisq_service +import bisq.api.grpc_pb2 as bisq_messages +import bisq.api.grpc_pb2_grpc as bisq_service def main(): diff --git a/python-examples/generate-python-protos.sh b/python-examples/generate-python-protos.sh index b0c1705..b9e43ea 100755 --- a/python-examples/generate-python-protos.sh +++ b/python-examples/generate-python-protos.sh @@ -1,20 +1,13 @@ #!/bin/bash -# + # Generates Bisq API protobufs from pb.proto and grpc.proto. -# # Must be run from root project directory `bisq-grpc-api-doc`. (Set the IDE launcher's working directory). -# -# TODO Use requirement.txt for this step: -# Requirements: -# Install python plugins for protoc. -# python -m pip install grpcio grpcio-tools -# pip3 install mypy-protobuf # Relative path to directory containing the Bisq .proto files (the protoc compiler input). export PROTO_PATH="proto" # The destination directory for the generated Python code (he protoc compiler output). -export PYTHON_PROTO_OUT_PATH="python_examples/bisqapi" +export PYTHON_PROTO_OUT_PATH="bisq/api" python3 -m grpc_tools.protoc \ --proto_path=$PROTO_PATH \ @@ -24,5 +17,5 @@ protoc --proto_path=$PROTO_PATH --python_out=$PYTHON_PROTO_OUT_PATH $PROTO_PATH/ # Hack the internal import statements in the generated python to prepend the `bisq.api` package name. # See why Google will not fix this: https://github.com/protocolbuffers/protobuf/issues/1491 -sed -i 's/import pb_pb2 as pb__pb2/import python_examples.bisqapi.pb_pb2 as pb__pb2/g' $PYTHON_PROTO_OUT_PATH/grpc_pb2.py -sed -i 's/import grpc_pb2 as grpc__pb2/import python_examples.bisqapi.grpc_pb2 as grpc__pb2/g' $PYTHON_PROTO_OUT_PATH/grpc_pb2_grpc.py +sed -i 's/import pb_pb2 as pb__pb2/import bisq.api.pb_pb2 as pb__pb2/g' $PYTHON_PROTO_OUT_PATH/grpc_pb2.py +sed -i 's/import grpc_pb2 as grpc__pb2/import bisq.api.grpc_pb2 as grpc__pb2/g' $PYTHON_PROTO_OUT_PATH/grpc_pb2_grpc.py diff --git a/python-examples/python_examples/bots/sepa_mm_bot.ini b/python-examples/python_examples/bots/sepa_mm_bot.ini deleted file mode 100644 index 5b53359..0000000 --- a/python-examples/python_examples/bots/sepa_mm_bot.ini +++ /dev/null @@ -1,14 +0,0 @@ -[general] -offers_poll_interval_in_sec = 30 - -# TODO Create sepa_mm_bot.py method: get_oldest_sepa_account -sepa_payment_account_id=f82c408a-b7b9-4db6-9e14-146cc4c9ee64 - -# TODO Explain why a negative reference_price_margin value makes the offer price more competitive. -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 diff --git a/python-examples/run-setup.sh b/python-examples/run-setup.sh index 0c7be6d..0b8e9ba 100755 --- a/python-examples/run-setup.sh +++ b/python-examples/run-setup.sh @@ -8,13 +8,21 @@ # Install Python setuptools if necessary. # pip install setuptools +# Generate gRPC Python protobuf classes. You can download them from the +# Bisq repo with the proto-downloader/download-bisq-protos.sh script. +echo "Generating gRPC Python service stubs..." +./generate-python-protos.sh + # Set up Python environment in python-examples directory. +echo "Building Python virtual environment in the python-examples directory..." rm -rf myvenv python -m venv myvenv source ./myvenv/bin/activate # Install Python example dependencies. +echo "Installing example code dependencies in virtual environment..." pip install -r requirements.txt # Install API example packages in myvenv. +echo "Installing example code packages in virtual environment..." pip install . diff --git a/python-examples/setup.py b/python-examples/setup.py index a190158..a45056c 100644 --- a/python-examples/setup.py +++ b/python-examples/setup.py @@ -1,15 +1,16 @@ from setuptools import setup, find_packages setup( - name='python-examples', + name='bisq', version='0.0.1', description='Bisq Python Examples', url='https://bisq-network.github.io/slate/#python-examples', license='GNU AFFERO GENERAL PUBLIC LICENSE Version 3', setup_requires=['wheel'], packages=find_packages(), - # package_data={'bots': ['bots/assets/*.png']}, - install_requires=['grpcio', 'grpcio-tools', 'mypy-protobuf', 'python-examples'], + include_package_data=True, + package_data={'bisq.bots': ['assets/*.png']}, + install_requires=['grpcio', 'grpcio-tools', 'mypy-protobuf', 'bisq'], classifiers=[ 'Operating System :: POSIX :: Linux :: MacOS', 'Programming Language :: Python :: 3.8.10', diff --git a/reference-doc-builder/src/main/java/bisq/apidoc/markdown/CodeExamples.java b/reference-doc-builder/src/main/java/bisq/apidoc/markdown/CodeExamples.java index ac55d16..68c25ac 100644 --- a/reference-doc-builder/src/main/java/bisq/apidoc/markdown/CodeExamples.java +++ b/reference-doc-builder/src/main/java/bisq/apidoc/markdown/CodeExamples.java @@ -38,8 +38,8 @@ public class CodeExamples { // TODO Is hard-coding paths to example source files OK? private static final String CLI_EXAMPLES_DIR = "cli-examples"; - private static final String JAVA_EXAMPLES_DIR = "java-examples/src/main/java/rpccalls"; - private static final String PYTHON_EXAMPLES_DIR = "python-examples/python_examples/rpccalls"; + private static final String JAVA_EXAMPLES_DIR = "java-examples/src/main/java/bisq/rpccalls"; + private static final String PYTHON_EXAMPLES_DIR = "python-examples/python_examples/bisq/rpccalls"; private static final String START_SHELL_MD = "```shell"; private static final String START_JAVA_MD = "```java";