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

Cleanup (#121)

Browse Source 
* Cleanup common

* Cleanup client

* Cleanup server

* Renamings

* Tidy up proto

* Update ocean protos

* Fixes

* Fixes
This commit is contained in:
Pietralberto Mazza
2024-02-28 18:05:03 +01:00
committed by GitHub
parent 1650ea5935
commit 6d0d03e316
31 changed files with 2475 additions and 2217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
common/tree/builder.go
View File

@@ -13,14 +13,14 @@ import (
)
func CraftCongestionTree(
asset string, aspPublicKey *secp256k1.PublicKey,
receivers []Receiver, feeSatsPerNode uint64, roundLifetime int64, exitDelay int64,
asset string, aspPubkey *secp256k1.PublicKey, receivers []Receiver,
feeSatsPerNode uint64, roundLifetime, unilateralExitDelay int64,
) (
buildCongestionTree TreeFactory,
sharedOutputScript []byte, sharedOutputAmount uint64, err error,
) {
root, err := createPartialCongestionTree(
receivers, aspPublicKey, asset, feeSatsPerNode, roundLifetime, exitDelay,
asset, aspPubkey, receivers, feeSatsPerNode, roundLifetime, unilateralExitDelay,
)
if err != nil {
return
@@ -42,14 +42,14 @@ func CraftCongestionTree(
}
type node struct {
sweepKey *secp256k1.PublicKey
receivers []Receiver
left *node
right *node
asset string
feeSats uint64
roundLifetime int64
exitDelay int64
sweepKey *secp256k1.PublicKey
receivers []Receiver
left *node
right *node
asset string
feeSats uint64
roundLifetime int64
unilateralExitDelay int64
_inputTaprootKey *secp256k1.PublicKey
_inputTaprootTree *taproot.IndexedElementsTapScriptTree
@@ -260,7 +260,7 @@ func (n *node) getVtxoWitnessData() (
redeemClosure := &CSVSigClosure{
Pubkey: pubkey,
Seconds: uint(n.exitDelay),
Seconds: uint(n.unilateralExitDelay),
}
redeemLeaf, err := redeemClosure.Leaf()
@@ -412,12 +412,8 @@ func (n *node) createFinalCongestionTree() TreeFactory {
}
func createPartialCongestionTree(
receivers []Receiver,
aspPublicKey *secp256k1.PublicKey,
asset string,
feeSatsPerNode uint64,
roundLifetime int64,
exitDelay int64,
asset string, aspPubkey *secp256k1.PublicKey, receivers []Receiver,
feeSatsPerNode uint64, roundLifetime, unilateralExitDelay int64,
) (root *node, err error) {
if len(receivers) == 0 {
return nil, fmt.Errorf("no receivers provided")
@@ -426,12 +422,12 @@ func createPartialCongestionTree(
nodes := make([]*node, 0, len(receivers))
for _, r := range receivers {
leafNode := &node{
sweepKey: aspPublicKey,
receivers: []Receiver{r},
asset: asset,
feeSats: feeSatsPerNode,
roundLifetime: roundLifetime,
exitDelay: exitDelay,
sweepKey: aspPubkey,
receivers: []Receiver{r},
asset: asset,
feeSats: feeSatsPerNode,
roundLifetime: roundLifetime,
unilateralExitDelay: unilateralExitDelay,
}
nodes = append(nodes, leafNode)
}
@@ -476,7 +472,9 @@ func createUpperLevel(nodes []*node) ([]*node, error) {
}
func taprootOutputScript(taprootKey *secp256k1.PublicKey) ([]byte, error) {
return txscript.NewScriptBuilder().AddOp(txscript.OP_1).AddData(schnorr.SerializePubKey(taprootKey)).Script()
return txscript.NewScriptBuilder().AddOp(txscript.OP_1).AddData(
schnorr.SerializePubKey(taprootKey),
).Script()
}
func getPsetId(pset *psetv2.Pset) (string, error) {
@@ -488,10 +486,8 @@ func getPsetId(pset *psetv2.Pset) (string, error) {
return utx.TxHash().String(), nil
}
// wrapper of updater methods adding a taproot input to the pset with all the necessary data to spend it via any taproot script
func addTaprootInput(
updater *psetv2.Updater,
input psetv2.InputArgs,
updater *psetv2.Updater, input psetv2.InputArgs,
internalTaprootKey *secp256k1.PublicKey,
taprootTree *taproot.IndexedElementsTapScriptTree,
) error {
@@ -499,7 +495,9 @@ func addTaprootInput(
return err
}
if err := updater.AddInTapInternalKey(0, schnorr.SerializePubKey(internalTaprootKey)); err != nil {
if err := updater.AddInTapInternalKey(
0, schnorr.SerializePubKey(internalTaprootKey),
); err != nil {
return err
}