Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-07-19 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

unsigned fee event handling now provides address

Browse Source
This commit is contained in:
kennycud 2025-04-27 15:02:28 -07:00
parent 17b2bf3848
commit 4b74bb37dc
4 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/qortal/api/websocket/UnsignedFeesSocket.java
View File

@ -40,8 +40,8 @@ public class UnsignedFeesSocket extends ApiWebSocket implements Listener {
return;
for (Session session : getSessions()) {
boolean positive = ((FeeWaitingEvent) event).isPositive();
sendUnsignedFeeEvent(session, new UnsignedFeeEvent(positive));
FeeWaitingEvent feeWaitingEvent = (FeeWaitingEvent) event;
sendUnsignedFeeEvent(session, new UnsignedFeeEvent(feeWaitingEvent.isPositive(), feeWaitingEvent.getAddress()));
}
}

48
src/main/java/org/qortal/controller/ForeignFeesManager.java
View File

@ -257,8 +257,8 @@ public class ForeignFeesManager implements Listener {
this.needToBackupRequiredForeignFees.compareAndSet(false, true);
if( processLocalForeignFeesForCoin(((RequiredFeeUpdateEvent) event).getBitcoiny()) ) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(true));
for( String address : processLocalForeignFeesForCoin(((RequiredFeeUpdateEvent) event).getBitcoiny()) ) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(true, address));
}
}
//
@ -283,7 +283,7 @@ public class ForeignFeesManager implements Listener {
this.offersByAddress.computeIfAbsent( offer.qortalCreator, x -> new ArrayList<>()).add(offer);
if( processTradeOfferInWaiting(now, data) ) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(true));
EventBus.INSTANCE.notify(new FeeWaitingEvent(true, data.getCreatorAddress()));
}
}
else {
@ -434,6 +434,22 @@ public class ForeignFeesManager implements Listener {
this.signedByAT.put(atAddress, Optional.of(foreignFeeToImport));
this.needToBackupSignedForeignFees.compareAndSet(false, true);
this.unsignedByAT.remove(atAddress);
String tradeOfferCreatorAddress = Crypto.toAddress(publicKey);
boolean allSignedForCreatorAddress
= this.offersByAddress
.get(tradeOfferCreatorAddress).stream()
.map(data -> data.qortalAtAddress)
.filter(qortalAtAddress -> this.unsignedByAT.contains(qortalAtAddress))
.findAny()
.isEmpty();
LOGGER.info("tradeOfferCreatorAddress = " + tradeOfferCreatorAddress);
LOGGER.info("allSignedForCreatorAddress = " + allSignedForCreatorAddress);
if(allSignedForCreatorAddress) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(false, tradeOfferCreatorAddress));
}
}
// otherwise this fee will get discarded
else {
@ -451,10 +467,6 @@ public class ForeignFeesManager implements Listener {
// now that this fee has been processed, remove it from the process queue
foreignFeesToRemove.add(foreignFeeToImport);
}
if( this.unsignedByAT.isEmpty() ) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(false));
}
} catch (Exception e) {
LOGGER.error("Repository issue while verifying foreign fees", e);
} finally {
@ -686,7 +698,7 @@ public class ForeignFeesManager implements Listener {
*/
private void processLocalForeignFeesForAll() {
boolean feeSignaturesNeeded = false;
Set<String> addressesThatNeedSignatures = new HashSet<>();
List<String> names
= Arrays.stream(SupportedBlockchain.values())
@ -697,12 +709,12 @@ public class ForeignFeesManager implements Listener {
ForeignBlockchain blockchain = SupportedBlockchain.getAcctByName(name).getBlockchain();
if( blockchain instanceof Bitcoiny ) {
feeSignaturesNeeded = processLocalForeignFeesForCoin((Bitcoiny) blockchain) || feeSignaturesNeeded;
addressesThatNeedSignatures.addAll( processLocalForeignFeesForCoin((Bitcoiny) blockchain) );
}
}
if( feeSignaturesNeeded ) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(true));
for( String addressThatNeedsSignature : addressesThatNeedSignatures ) {
EventBus.INSTANCE.notify(new FeeWaitingEvent(true, addressThatNeedsSignature));
}
}
@ -713,17 +725,17 @@ public class ForeignFeesManager implements Listener {
*
* @param bitcoiny the coin
*
* @return if any fee signatures are needed after this process
* @return addresses that need fee signatures
*/
private boolean processLocalForeignFeesForCoin(final Bitcoiny bitcoiny) {
private Set<String> processLocalForeignFeesForCoin(final Bitcoiny bitcoiny) {
boolean feeSignaturesNeeded = false;
Set<String> addressesThatNeedSignatures = new HashSet<>();
LOGGER.info("processing local foreign fees ...");
Optional<Long> nowDetermined = determineNow();
if (nowDetermined.isEmpty()){
return false;
return new HashSet<>(0);
}
long now = nowDetermined.get();
@ -745,13 +757,15 @@ public class ForeignFeesManager implements Listener {
// process trade offer first,
// then reset the fee signatures needed status next relative to prior status
feeSignaturesNeeded = processTradeOfferInWaiting(now, tradeOfferWaiting) || feeSignaturesNeeded;
if(processTradeOfferInWaiting(now, tradeOfferWaiting) ) {
addressesThatNeedSignatures.add(tradeOfferWaiting.getCreatorAddress());
}
}
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
}
return feeSignaturesNeeded;
return addressesThatNeedSignatures;
}
/**

10
src/main/java/org/qortal/data/crosschain/UnsignedFeeEvent.java
View File

@ -8,14 +8,22 @@ public class UnsignedFeeEvent {
private boolean positive;
private String address;
public UnsignedFeeEvent() {
}
public UnsignedFeeEvent(boolean positive) {
public UnsignedFeeEvent(boolean positive, String address) {
this.positive = positive;
this.address = address;
}
public boolean isPositive() {
return positive;
}
public String getAddress() {
return address;
}
}

9
src/main/java/org/qortal/event/FeeWaitingEvent.java
View File

@ -8,16 +8,23 @@ public class FeeWaitingEvent implements Event{
private boolean positive;
private String address;
public FeeWaitingEvent() {
}
public FeeWaitingEvent(boolean positive) {
public FeeWaitingEvent(boolean positive, String address) {
this.positive = positive;
this.address = address;
}
public boolean isPositive() {
return positive;
}
public String getAddress() {
return address;
}
}