Merge pull request #4305 from sqrrm/sign-same-name

Sign same name

core/src/main/java/bisq/core/account/sign/SignedWitnessService.java

@@ -213,6 +213,12 @@ public class SignedWitnessService {
         log.info("Arbitrator signed witness {}", signedWitness.toString());
     }
 
+    public void selfSignAccountAgeWitness(AccountAgeWitness accountAgeWitness) throws CryptoException {
+        log.info("Sign own accountAgeWitness {}", accountAgeWitness);
+        signAccountAgeWitness(MINIMUM_TRADE_AMOUNT_FOR_SIGNING, accountAgeWitness,
+                keyRing.getSignatureKeyPair().getPublic());
+    }
+
     // Any peer can sign with DSA key
     public void signAccountAgeWitness(Coin tradeAmount,
                                       AccountAgeWitness accountAgeWitness,

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java

@@ -177,17 +177,23 @@ public class AccountAgeWitnessService {
         });
 
         if (p2PService.isBootstrapped()) {
-            republishAllFiatAccounts();
+            onBootStrapped();
         } else {
             p2PService.addP2PServiceListener(new BootstrapListener() {
                 @Override
                 public void onUpdatedDataReceived() {
-                    republishAllFiatAccounts();
+                    onBootStrapped();
                 }
             });
         }
     }
 
+    private void onBootStrapped() {
+        republishAllFiatAccounts();
+        signSameNameAccounts();
+    }
+
+
     // At startup we re-publish the witness data of all fiat accounts to ensure we got our data well distributed.
     private void republishAllFiatAccounts() {
         if (user.getPaymentAccounts() != null)
@@ -773,6 +779,30 @@ public class AccountAgeWitnessService {
         }
     }
 
+    public void signSameNameAccounts() {
+        // Collect accounts that have ownerId to sign unsigned accounts with the same ownderId
+        var signerAccounts = Objects.requireNonNull(user.getPaymentAccounts()).stream()
+                .filter(account -> account.getOwnerId() != null &&
+                        accountIsSigner(getMyWitness(account.getPaymentAccountPayload())))
+                .collect(Collectors.toSet());
+        var unsignedAccounts = user.getPaymentAccounts().stream()
+                .filter(account -> account.getOwnerId() != null &&
+                        !signedWitnessService.isSignedAccountAgeWitness(
+                                getMyWitness(account.getPaymentAccountPayload())))
+                .collect(Collectors.toSet());
+
+        signerAccounts.forEach(signer -> unsignedAccounts.forEach(unsigned -> {
+            if (signer.getOwnerId().equals(unsigned.getOwnerId())) {
+                try {
+                    signedWitnessService.selfSignAccountAgeWitness(
+                            getMyWitness(unsigned.getPaymentAccountPayload()));
+                } catch (CryptoException e) {
+                    log.warn("Self signing failed, exception {}", e.toString());
+                }
+            }
+        }));
+    }
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Debug logs
     ///////////////////////////////////////////////////////////////////////////////////////////

core/src/main/java/bisq/core/payment/PaymentAccount.java

@@ -169,4 +169,8 @@ public abstract class PaymentAccount implements PersistablePayload {
     public String getSaltAsHex() {
         return Utilities.bytesAsHexString(getSalt());
     }
+
+    public String getOwnerId() {
+        return paymentAccountPayload.getOwnerId();
+    }
 }

core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java

@@ -179,4 +179,9 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
 
         return super.getAgeWitnessInputData(all.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java

@@ -224,4 +224,9 @@ public class CashDepositAccountPayload extends CountryBasedPaymentAccountPayload
 
         return super.getAgeWitnessInputData(all.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java

@@ -106,4 +106,9 @@ public final class ChaseQuickPayAccountPayload extends PaymentAccountPayload {
         // slight changes in holder name (e.g. add or remove middle name)
         return super.getAgeWitnessInputData(email.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java

@@ -106,4 +106,9 @@ public final class ClearXchangeAccountPayload extends PaymentAccountPayload {
         // slight changes in holder name (e.g. add or remove middle name)
         return super.getAgeWitnessInputData(emailOrMobileNr.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java

@@ -120,4 +120,9 @@ public final class InteracETransferAccountPayload extends PaymentAccountPayload
                 ArrayUtils.addAll(question.getBytes(StandardCharsets.UTF_8),
                         answer.getBytes(StandardCharsets.UTF_8))));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java

@@ -135,4 +135,8 @@ public abstract class PaymentAccountPayload implements NetworkPayload, UsedForTr
     protected byte[] getAgeWitnessInputData(byte[] data) {
         return ArrayUtils.addAll(paymentMethodId.getBytes(StandardCharsets.UTF_8), data);
     }
+
+    public String getOwnerId() {
+        return null;
+    }
 }

core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java

@@ -103,4 +103,9 @@ public final class PopmoneyAccountPayload extends PaymentAccountPayload {
     public byte[] getAgeWitnessInputData() {
         return super.getAgeWitnessInputData(accountId.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java

@@ -158,4 +158,8 @@ public final class SepaAccountPayload extends CountryBasedPaymentAccountPayload
         // slight changes in holder name (e.g. add or remove middle name)
         return super.getAgeWitnessInputData(ArrayUtils.addAll(iban.getBytes(StandardCharsets.UTF_8), bic.getBytes(StandardCharsets.UTF_8)));
     }
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java

@@ -153,4 +153,9 @@ public final class SepaInstantAccountPayload extends CountryBasedPaymentAccountP
         // slight changes in holder name (e.g. add or remove middle name)
         return super.getAgeWitnessInputData(ArrayUtils.addAll(iban.getBytes(StandardCharsets.UTF_8), bic.getBytes(StandardCharsets.UTF_8)));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java

@@ -104,4 +104,9 @@ public final class SwishAccountPayload extends PaymentAccountPayload {
         // slight changes in holder name (e.g. add or remove middle name)
         return super.getAgeWitnessInputData(mobileNr.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java

@@ -107,4 +107,9 @@ public final class USPostalMoneyOrderAccountPayload extends PaymentAccountPayloa
         return super.getAgeWitnessInputData(ArrayUtils.addAll(holderName.getBytes(StandardCharsets.UTF_8),
                 postalAddress.getBytes(StandardCharsets.UTF_8)));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java

@@ -106,4 +106,9 @@ public final class VenmoAccountPayload extends PaymentAccountPayload {
     public byte[] getAgeWitnessInputData() {
         return super.getAgeWitnessInputData(venmoUserName.getBytes(StandardCharsets.UTF_8));
     }
+
+    @Override
+    public String getOwnerId() {
+        return holderName;
+    }
 }

desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsDataModel.java

@@ -130,6 +130,7 @@ class FiatAccountsDataModel extends ActivatableDataModel {
         user.addPaymentAccount(paymentAccount);
 
         accountAgeWitnessService.publishMyAccountAgeWitness(paymentAccount.getPaymentAccountPayload());
+        accountAgeWitnessService.signSameNameAccounts();
     }
 
     public boolean onDeleteAccount(PaymentAccount paymentAccount) {