AlphaX
/
qortal
forked from Qortal/qortal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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.

trade-portal-updates
CalDescent 3 years ago
parent
29bed8e4a0
commit
f5d3681a95
7 changed files with 46 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/main/java/org/qortal/controller/tradebot/BitcoinACCTv1TradeBot.java
  2. 9
      src/main/java/org/qortal/controller/tradebot/DogecoinACCTv1TradeBot.java
  3. 9
      src/main/java/org/qortal/controller/tradebot/DogecoinACCTv2TradeBot.java
  4. 9
      src/main/java/org/qortal/controller/tradebot/DogecoinACCTv3TradeBot.java
  5. 9
      src/main/java/org/qortal/controller/tradebot/LitecoinACCTv1TradeBot.java
  6. 9
      src/main/java/org/qortal/controller/tradebot/LitecoinACCTv2TradeBot.java
  7. 9
      src/main/java/org/qortal/controller/tradebot/LitecoinACCTv3TradeBot.java

17
src/main/java/org/qortal/controller/tradebot/BitcoinACCTv1TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
break;
case ALICE_WAITING_FOR_P2SH_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForP2shA(repository, tradeBotData, atData, tradeData);
break;
@ -413,22 +416,22 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_P2SH_B:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForP2shB(repository, tradeBotData, atData, tradeData);
break;
case ALICE_WATCH_P2SH_B:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWatchingP2shB(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -437,12 +440,12 @@ public class BitcoinACCTv1TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_B:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shB(repository, tradeBotData, atData, tradeData);
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

9
src/main/java/org/qortal/controller/tradebot/DogecoinACCTv1TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class DogecoinACCTv1TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -416,7 +419,7 @@ public class DogecoinACCTv1TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

9
src/main/java/org/qortal/controller/tradebot/DogecoinACCTv2TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -401,12 +404,12 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -415,7 +418,7 @@ public class DogecoinACCTv2TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

9
src/main/java/org/qortal/controller/tradebot/DogecoinACCTv3TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class DogecoinACCTv3TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -416,7 +419,7 @@ public class DogecoinACCTv3TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

9
src/main/java/org/qortal/controller/tradebot/LitecoinACCTv1TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -413,12 +416,12 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -427,7 +430,7 @@ public class LitecoinACCTv1TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

9
src/main/java/org/qortal/controller/tradebot/LitecoinACCTv2TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class LitecoinACCTv2TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -416,7 +419,7 @@ public class LitecoinACCTv2TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

9
src/main/java/org/qortal/controller/tradebot/LitecoinACCTv3TradeBot.java
Unescape 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) {
case BOB_WAITING_FOR_AT_CONFIRM:
handleBobWaitingForAtConfirm(repository, tradeBotData);
@ -402,12 +405,12 @@ public class LitecoinACCTv3TradeBot implements AcctTradeBot {
break;
case ALICE_WAITING_FOR_AT_LOCK:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceWaitingForAtLock(repository, tradeBotData, atData, tradeData);
break;
case BOB_WAITING_FOR_AT_REDEEM:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleBobWaitingForAtRedeem(repository, tradeBotData, atData, tradeData);
break;
@ -416,7 +419,7 @@ public class LitecoinACCTv3TradeBot implements AcctTradeBot {
break;
case ALICE_REFUNDING_A:
TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
//TradeBot.getInstance().updatePresence(repository, tradeBotData, tradeData);
handleAliceRefundingP2shA(repository, tradeBotData, atData, tradeData);
break;

Write Preview
Loading…
Cancel
Save