Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-04-29 14:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop sending presence transactions once a trade has started, otherwise trade bots that are in a bad state can keep an offer visible in the list.

Browse Source
This commit is contained in:
CalDescent 2022-01-24 18:39:14 +00:00
parent 29bed8e4a0
commit f5d3681a95
7 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/qortal/controller/tradebot/BitcoinACCTv1TradeBot.java
View File

@ -397,13 +397,16 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
break; break;
case ALICE_WAITING_FOR_P2SH_A: case ALICE_WAITING_FOR_P2SH_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForP2shA(repository, tradeBotData, atData, tradeData); handleAliceWaitingForP2shA(repository, tradeBotData, atData, tradeData);
break; break;
@ -413,22 +416,22 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_P2SH_B: case BOB_WAITING_FOR_P2SH_B:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForP2shB(repository, tradeBotData, atData, tradeData); handleBobWaitingForP2shB(repository, tradeBotData, atData, tradeData);
break; break;
case ALICE_WATCH_P2SH_B: case ALICE_WATCH_P2SH_B:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWatchingP2shB(repository, tradeBotData, atData, tradeData); handleAliceWatchingP2shB(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -437,12 +440,12 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_B: case ALICE_REFUNDING_B:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shB(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shB(repository, tradeBotData, atData, tradeData);
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;

9
src/main/java/org/qortal/controller/tradebot/DogecoinACCTv1TradeBot.java
View File

@ -391,6 +391,9 @@ public class DogecoinACCTv1TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class DogecoinACCTv1TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -416,7 +419,7 @@ public class DogecoinACCTv1TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;

9
src/main/java/org/qortal/controller/tradebot/DogecoinACCTv2TradeBot.java
View File

@ -390,6 +390,9 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -401,12 +404,12 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -415,7 +418,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;

9
src/main/java/org/qortal/controller/tradebot/DogecoinACCTv3TradeBot.java
View File

@ -391,6 +391,9 @@ public class DogecoinACCTv3TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class DogecoinACCTv3TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -416,7 +419,7 @@ public class DogecoinACCTv3TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;

9
src/main/java/org/qortal/controller/tradebot/LitecoinACCTv1TradeBot.java
View File

@ -402,6 +402,9 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -413,12 +416,12 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -427,7 +430,7 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;

9
src/main/java/org/qortal/controller/tradebot/LitecoinACCTv2TradeBot.java
View File

@ -391,6 +391,9 @@ public class LitecoinACCTv2TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class LitecoinACCTv2TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -416,7 +419,7 @@ public class LitecoinACCTv2TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;

9
src/main/java/org/qortal/controller/tradebot/LitecoinACCTv3TradeBot.java
View File

@ -391,6 +391,9 @@ public class LitecoinACCTv3TradeBot implements AcctTradeBot {
} }
} }
// Note: for now, we aren't sending presence transactions once a trade has started,
// otherwise trade bots that are in a bad state can keep an offer visible in the list
switch (tradeBotState) { switch (tradeBotState) {
case BOB_WAITING_FOR_AT_CONFIRM: case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData); handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class LitecoinACCTv3TradeBot implements AcctTradeBot {
break; break;
case ALICE_WAITING_FOR_AT_LOCK: case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData); handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break; break;
case BOB_WAITING_FOR_AT_REDEEM: case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData); handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break; break;
@ -416,7 +419,7 @@ public class LitecoinACCTv3TradeBot implements AcctTradeBot {
break; break;
case ALICE_REFUNDING_A: case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData); //TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData); handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break; break;