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

Vars and fields renaming (#387)

Browse Source 
* Rename asp > server

* Rename pool > round

* Consolidate naming for pubkey/prvkey vars and types

* Fix

* Fix

* Fix wasm

* Rename congestionTree > vtxoTree

* Fix wasm

* Rename payment > request

* Rename congestionTree > vtxoTree after syncing with master

* Fix Send API in SDK

* Fix wasm

* Fix wasm

* Fixes

* Fixes after review

* Fix

* Fix naming

* Fix

* Fix e2e tests
This commit is contained in:
Pietralberto Mazza
2024-11-26 15:57:16 +01:00
committed by GitHub
parent 12d666bfdf
commit 7f937e8418
109 changed files with 2292 additions and 2325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/tree/builder.go
View File

@@ -12,15 +12,15 @@ import (
"github.com/vulpemventures/go-elements/taproot"
)
func CraftCongestionTree(
asset string, aspPubkey *secp256k1.PublicKey, receivers []VtxoLeaf,
func BuildVtxoTree(
asset string, serverPubkey *secp256k1.PublicKey, receivers []VtxoLeaf,
feeSatsPerNode uint64, roundLifetime int64,
) (
buildCongestionTree TreeFactory,
factoryFn TreeFactory,
sharedOutputScript []byte, sharedOutputAmount uint64, err error,
) {
root, err := createPartialCongestionTree(
asset, aspPubkey, receivers, feeSatsPerNode, roundLifetime,
root, err := buildTreeNodes(
asset, serverPubkey, receivers, feeSatsPerNode, roundLifetime,
)
if err != nil {
return
@@ -36,7 +36,7 @@ func CraftCongestionTree(
return
}
sharedOutputAmount = root.getAmount() + root.feeSats
buildCongestionTree = root.createFinalCongestionTree()
factoryFn = root.buildVtxoTree()
return
}
@@ -321,16 +321,16 @@ func (n *node) getTx(
return pset, nil
}
func (n *node) createFinalCongestionTree() TreeFactory {
return func(poolTxInput psetv2.InputArgs) (CongestionTree, error) {
congestionTree := make(CongestionTree, 0)
func (n *node) buildVtxoTree() TreeFactory {
return func(roundTxInput psetv2.InputArgs) (VtxoTree, error) {
vtxoTree := make(VtxoTree, 0)
_, taprootTree, err := n.getWitnessData()
if err != nil {
return nil, err
}
ins := []psetv2.InputArgs{poolTxInput}
ins := []psetv2.InputArgs{roundTxInput}
inTrees := []*taproot.IndexedElementsTapScriptTree{taprootTree}
nodes := []*node{n}
@@ -366,7 +366,7 @@ func (n *node) createFinalCongestionTree() TreeFactory {
}
}
congestionTree = append(congestionTree, treeLevel)
vtxoTree = append(vtxoTree, treeLevel)
nodes = append([]*node{}, nextNodes...)
ins = append([]psetv2.InputArgs{}, nextInputsArgs...)
inTrees = append(
@@ -374,12 +374,12 @@ func (n *node) createFinalCongestionTree() TreeFactory {
)
}
return congestionTree, nil
return vtxoTree, nil
}
}
func createPartialCongestionTree(
asset string, aspPubkey *secp256k1.PublicKey, receivers []VtxoLeaf,
func buildTreeNodes(
asset string, serverPubkey *secp256k1.PublicKey, receivers []VtxoLeaf,
feeSatsPerNode uint64, roundLifetime int64,
) (root *node, err error) {
if len(receivers) == 0 {
@@ -388,7 +388,7 @@ func createPartialCongestionTree(
nodes := make([]*node, 0, len(receivers))
for _, r := range receivers {
pubkeyBytes, err := hex.DecodeString(r.Pubkey)
pubkeyBytes, err := hex.DecodeString(r.PubKey)
if err != nil {
return nil, err
}
@@ -399,7 +399,7 @@ func createPartialCongestionTree(
}
leafNode := &node{
sweepKey: aspPubkey,
sweepKey: serverPubkey,
receivers: []vtxoOutput{{pubkey, r.Amount}},
asset: asset,
feeSats: feeSatsPerNode,