aljaz/ark
1
0
Fork 0
mirror of https://github.com/aljazceru/ark.git synced 2025-12-18 04:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix: restore vtxos watch & handle dust when crafting pool tx (#89)

Browse Source 
* Add check before printing log

* Check for uncofirmed or confirmed utxos (vtxos)

* Handle dust amount when crafting pool tx

* Clean
This commit is contained in:
Pietralberto Mazza
2024-02-08 16:08:53 +01:00
committed by GitHub
parent 940214f699
commit 58aa36b7e7
3 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asp/internal/core/application/service.go
View File

@@ -375,7 +375,9 @@ func (s *service) listenToRedemptions() {
time.Sleep(100 * time.Millisecond)
continue
}
log.Debugf("redeemed %d vtxos", len(vtxos))
if len(vtxos) > 0 {
log.Debugf("redeemed %d vtxos", len(vtxos))
}
break
}
}

3
asp/internal/infrastructure/ocean-wallet/service.go
View File

@@ -107,7 +107,8 @@ func (s *service) listenToNotificaitons() {
return
}
if msg.GetEventType() != pb.UtxoEventType_UTXO_EVENT_TYPE_NEW {
if msg.GetEventType() != pb.UtxoEventType_UTXO_EVENT_TYPE_NEW &&
msg.GetEventType() != pb.UtxoEventType_UTXO_EVENT_TYPE_CONFIRMED {
continue
}
vtxos := toVtxos(msg.GetUtxos())

77
asp/internal/infrastructure/tx-builder/covenant/builder.go
View File

@@ -17,6 +17,7 @@ import (
const (
connectorAmount = uint64(450)
dustLimit = uint64(450)
)
type txBuilder struct {
@@ -184,12 +185,18 @@ func (b *txBuilder) createPoolTx(
return nil, err
}
var dust uint64
if change > 0 {
outputs = append(outputs, psetv2.OutputArgs{
Asset: b.net.AssetID,
Amount: change,
Script: aspScript,
})
if change < dustLimit {
dust = change
change = 0
} else {
outputs = append(outputs, psetv2.OutputArgs{
Asset: b.net.AssetID,
Amount: change,
Script: aspScript,
})
}
}
ptx, err := psetv2.New(nil, outputs, nil)
@@ -216,37 +223,45 @@ func (b *txBuilder) createPoolTx(
return nil, err
}
if feeAmount == change {
// fees = change, remove change output
ptx.Outputs = ptx.Outputs[:len(ptx.Outputs)-1]
} else if feeAmount < change {
// change covers the fees, reduce change amount
ptx.Outputs[len(ptx.Outputs)-1].Value = change - feeAmount
if dust > feeAmount {
feeAmount = dust
} else {
// change is not enough to cover fees, re-select utxos
if change > 0 {
// remove change output if present
ptx.Outputs = ptx.Outputs[:len(ptx.Outputs)-1]
}
newUtxos, change, err := b.wallet.SelectUtxos(ctx, b.net.AssetID, feeAmount-change)
if err != nil {
return nil, err
}
feeAmount += dust
}
if change > 0 {
if err := updater.AddOutputs([]psetv2.OutputArgs{
{
Asset: b.net.AssetID,
Amount: change,
Script: aspScript,
},
}); err != nil {
if dust == 0 {
if feeAmount == change {
// fees = change, remove change output
ptx.Outputs = ptx.Outputs[:len(ptx.Outputs)-1]
} else if feeAmount < change {
// change covers the fees, reduce change amount
ptx.Outputs[len(ptx.Outputs)-1].Value = change - feeAmount
} else {
// change is not enough to cover fees, re-select utxos
if change > 0 {
// remove change output if present
ptx.Outputs = ptx.Outputs[:len(ptx.Outputs)-1]
}
newUtxos, change, err := b.wallet.SelectUtxos(ctx, b.net.AssetID, feeAmount-change)
if err != nil {
return nil, err
}
}
if err := addInputs(updater, newUtxos); err != nil {
return nil, err
if change > 0 {
if err := updater.AddOutputs([]psetv2.OutputArgs{
{
Asset: b.net.AssetID,
Amount: change,
Script: aspScript,
},
}); err != nil {
return nil, err
}
}
if err := addInputs(updater, newUtxos); err != nil {
return nil, err
}
}
}