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

Dynamic min-relay-fee and dust amount (#280)

Browse Source 
* [btc-embedded] add chainfee.Estimator and extraAPI interfaces

* dynamic fee amount

* dynamic dust amount

* [client] fix linter errors

* [domain] fix unit tests

* [server] return dust amount in GetInfo RPC

* [sdk] fix lnd dependencie

* go work sync

* fix witness stack size forfeit tx size estimator

* remove hardcoded fee values in covenant txbuilder

* lower liquid feerate

* fix after reviews

* go work sync
This commit is contained in:
Louis Singer
2024-09-10 17:22:09 +02:00
committed by GitHub
parent a8cf0ed204
commit 0fb34cb13d
75 changed files with 2061 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
server/internal/infrastructure/tx-builder/covenant/builder.go
View File

@@ -24,7 +24,6 @@ import (
const (
connectorAmount = uint64(450)
dustLimit = uint64(450)
)
type txBuilder struct {
@@ -101,14 +100,18 @@ func (b *txBuilder) BuildSweepTx(inputs []ports.SweepInput) (signedSweepTx strin
}
func (b *txBuilder) BuildForfeitTxs(
aspPubkey *secp256k1.PublicKey, poolTx string, payments []domain.Payment, minRelayFee uint64,
) (connectors []string, forfeitTxs []string, err error) {
aspPubkey *secp256k1.PublicKey, poolTx string, payments []domain.Payment) (connectors []string, forfeitTxs []string, err error) {
connectorAddress, err := b.getConnectorAddress(poolTx)
if err != nil {
return nil, nil, err
}
connectorTxs, err := b.createConnectors(poolTx, payments, connectorAddress, minRelayFee)
connectorFeeAmount, err := b.minRelayFeeConnectorTx()
if err != nil {
return nil, nil, err
}
connectorTxs, err := b.createConnectors(poolTx, payments, connectorAddress, connectorFeeAmount)
if err != nil {
return nil, nil, err
}
@@ -129,7 +132,6 @@ func (b *txBuilder) BuildPoolTx(
aspPubkey *secp256k1.PublicKey,
payments []domain.Payment,
boardingInputs []ports.BoardingInput,
minRelayFee uint64,
sweptRounds []domain.Round,
_ ...*secp256k1.PublicKey, // cosigners are not used in the covenant
) (poolTx string, congestionTree tree.CongestionTree, connectorAddress string, err error) {
@@ -150,11 +152,16 @@ func (b *txBuilder) BuildPoolTx(
var treeFactoryFn tree.TreeFactory
if !isOnchainOnly(payments) {
feeSatsPerNode, err := b.wallet.MinRelayFee(context.Background(), uint64(common.CovenantTreeTxSize))
if err != nil {
return "", nil, "", err
}
treeFactoryFn, sharedOutputScript, sharedOutputAmount, err = tree.CraftCongestionTree(
b.onchainNetwork().AssetID, aspPubkey, getOffchainReceivers(payments), minRelayFee, b.roundLifetime, b.exitDelay,
b.onchainNetwork().AssetID, aspPubkey, getOffchainReceivers(payments), feeSatsPerNode, b.roundLifetime, b.exitDelay,
)
if err != nil {
return
return "", nil, "", err
}
}
@@ -164,7 +171,7 @@ func (b *txBuilder) BuildPoolTx(
}
ptx, err := b.createPoolTx(
sharedOutputAmount, sharedOutputScript, payments, boardingInputs, aspPubkey, connectorAddress, minRelayFee, sweptRounds,
sharedOutputAmount, sharedOutputScript, payments, boardingInputs, aspPubkey, connectorAddress, sweptRounds,
)
if err != nil {
return
@@ -345,7 +352,7 @@ func (b *txBuilder) FindLeaves(
}
func (b *txBuilder) BuildAsyncPaymentTransactions(
_ []domain.Vtxo, _ *secp256k1.PublicKey, _ []domain.Receiver, _ uint64,
_ []domain.Vtxo, _ *secp256k1.PublicKey, _ []domain.Receiver,
) (*domain.AsyncPaymentTxs, error) {
return nil, fmt.Errorf("not implemented")
}
@@ -394,7 +401,7 @@ func (b *txBuilder) createPoolTx(
sharedOutputScript []byte,
payments []domain.Payment,
boardingInputs []ports.BoardingInput,
aspPubKey *secp256k1.PublicKey, connectorAddress string, minRelayFee uint64,
aspPubKey *secp256k1.PublicKey, connectorAddress string,
sweptRounds []domain.Round,
) (*psetv2.Pset, error) {
aspScript, err := p2wpkhScript(aspPubKey, b.onchainNetwork())
@@ -407,11 +414,16 @@ func (b *txBuilder) createPoolTx(
return nil, err
}
connectorMinRelayFee, err := b.minRelayFeeConnectorTx()
if err != nil {
return nil, err
}
receivers := getOnchainReceivers(payments)
nbOfInputs := countSpentVtxos(payments)
connectorsAmount := (connectorAmount + minRelayFee) * nbOfInputs
connectorsAmount := (connectorAmount + connectorMinRelayFee) * nbOfInputs
if nbOfInputs > 1 {
connectorsAmount -= minRelayFee
connectorsAmount -= connectorMinRelayFee
}
targetAmount := connectorsAmount
@@ -454,6 +466,12 @@ func (b *txBuilder) createPoolTx(
targetAmount -= in.GetAmount()
}
ctx := context.Background()
dustLimit, err := b.wallet.GetDustAmount(ctx)
if err != nil {
return nil, err
}
utxos, change, err := b.selectUtxos(ctx, sweptRounds, targetAmount)
if err != nil {
return nil, err
@@ -632,6 +650,10 @@ func (b *txBuilder) createPoolTx(
return ptx, nil
}
func (b *txBuilder) minRelayFeeConnectorTx() (uint64, error) {
return b.wallet.MinRelayFee(context.Background(), uint64(common.ConnectorTxSize))
}
// This method aims to verify and add partial signature from boarding input
func (b *txBuilder) VerifyAndCombinePartialTx(dest string, src string) (string, error) {
roundPset, err := psetv2.NewPsetFromBase64(dest)
@@ -704,7 +726,7 @@ func (b *txBuilder) VerifyAndCombinePartialTx(dest string, src string) (string,
}
func (b *txBuilder) createConnectors(
poolTx string, payments []domain.Payment, connectorAddress string, minRelayFee uint64,
poolTx string, payments []domain.Payment, connectorAddress string, feeAmount uint64,
) ([]*psetv2.Pset, error) {
txid, _ := getTxid(poolTx)
@@ -728,7 +750,7 @@ func (b *txBuilder) createConnectors(
if numberOfConnectors == 1 {
outputs := []psetv2.OutputArgs{connectorOutput}
connectorTx, err := craftConnectorTx(previousInput, aspScript, outputs, minRelayFee)
connectorTx, err := craftConnectorTx(previousInput, aspScript, outputs, feeAmount)
if err != nil {
return nil, err
}
@@ -736,16 +758,16 @@ func (b *txBuilder) createConnectors(
return []*psetv2.Pset{connectorTx}, nil
}
totalConnectorAmount := (connectorAmount + minRelayFee) * numberOfConnectors
totalConnectorAmount := (connectorAmount + feeAmount) * numberOfConnectors
if numberOfConnectors > 1 {
totalConnectorAmount -= minRelayFee
totalConnectorAmount -= feeAmount
}
connectors := make([]*psetv2.Pset, 0, numberOfConnectors-1)
for i := uint64(0); i < numberOfConnectors-1; i++ {
outputs := []psetv2.OutputArgs{connectorOutput}
totalConnectorAmount -= connectorAmount
totalConnectorAmount -= minRelayFee
totalConnectorAmount -= feeAmount
if totalConnectorAmount > 0 {
outputs = append(outputs, psetv2.OutputArgs{
Asset: b.onchainNetwork().AssetID,
@@ -753,7 +775,7 @@ func (b *txBuilder) createConnectors(
Amount: totalConnectorAmount,
})
}
connectorTx, err := craftConnectorTx(previousInput, aspScript, outputs, minRelayFee)
connectorTx, err := craftConnectorTx(previousInput, aspScript, outputs, feeAmount)
if err != nil {
return nil, err
}
@@ -814,7 +836,7 @@ func (b *txBuilder) createForfeitTxs(
}
for _, connector := range connectors {
txs, err := craftForfeitTxs(
txs, err := b.craftForfeitTxs(
connector, vtxo, *forfeitProof, vtxoScript, aspScript,
)
if err != nil {