[bisq-network/bisq] Confiscation tracking (#1940)

[Manfred Karrer]

ManfredKarrer approved this pull request.

ACK

I push a few small fixes

> @@ -150,6 +150,14 @@
         this(defaultValue, paramType, 1, 1);
     }
 
+    /**
+     * Whether the BSQ fee and phase is valid for a transaction.

I don't understand the meaning of that line...

> @@ -189,8 +189,7 @@ public static DaoState fromProto(PB.BsqState proto) {
                 .collect(Collectors.toMap(e -> TxOutputKey.getKeyFromString(e.getKey()), e -> TxOutput.fromProto(e.getValue())));
         Map<TxOutputKey, SpentInfo> spentInfoMap = proto.getSpentInfoMapMap().entrySet().stream()
                 .collect(Collectors.toMap(e -> TxOutputKey.getKeyFromString(e.getKey()), e -> SpentInfo.fromProto(e.getValue())));
-        Map<TxOutputKey, TxOutput> confiscatedTxOutputMap = proto.getConfiscatedTxOutputMapMap().entrySet().stream()
-                .collect(Collectors.toMap(e -> TxOutputKey.getKeyFromString(e.getKey()), e -> TxOutput.fromProto(e.getValue())));
+        List<String> confiscatedLockupTxList = proto.getConfiscatedLockupTxListList();

Protobuffer lists are unmodifyable lists, so we need to wrap it into an arraylist

> @@ -189,8 +189,7 @@ public static DaoState fromProto(PB.BsqState proto) {
                 .collect(Collectors.toMap(e -> TxOutputKey.getKeyFromString(e.getKey()), e -> TxOutput.fromProto(e.getValue())));
         Map<TxOutputKey, SpentInfo> spentInfoMap = proto.getSpentInfoMapMap().entrySet().stream()
                 .collect(Collectors.toMap(e -> TxOutputKey.getKeyFromString(e.getKey()), e -> SpentInfo.fromProto(e.getValue())));
-        Map<TxOutputKey, TxOutput> confiscatedTxOutputMap = proto.getConfiscatedTxOutputMapMap().entrySet().stream()
-                .collect(Collectors.toMap(e -> TxOutputKey.getKeyFromString(e.getKey()), e -> TxOutput.fromProto(e.getValue())));
+        List<String> confiscatedLockupTxList = proto.getConfiscatedLockupTxListList();

I will push that change...

> @@ -679,6 +680,11 @@ public long getTotalLockupAmount() {
 
 
     // Unlock
+    public boolean isUnlockOutput(TxOutputKey key) {

We should add unspent to the method name

> @@ -106,6 +107,7 @@ public void initialize() {
         totalLockedUpAmountTextField = FormBuilder.addTopLabelReadOnlyTextField(root, gridRow, columnIndex, Res.get("dao.wallet.dashboard.totalLockedUpAmount"), Layout.FIRST_ROW_AND_GROUP_DISTANCE).second;
         totalUnlockingAmountTextField = FormBuilder.addTopLabelReadOnlyTextField(root, ++gridRow, columnIndex, Res.get("dao.wallet.dashboard.totalUnlockingAmount")).second;
         totalUnlockedAmountTextField = FormBuilder.addTopLabelReadOnlyTextField(root, ++gridRow, columnIndex, Res.get("dao.wallet.dashboard.totalUnlockedAmount")).second;
+        totalConfiscatedAmountTextField = FormBuilder.addTopLabelReadOnlyTextField(root, ++gridRow, columnIndex, Res.get("dao.wallet.dashboard.totalConfiscatedAmount")).second;
         gridRow++;

one gridRow++; need to be removed now

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/1940#pullrequestreview-176094742
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20181118/9f24a3de/attachment.html>