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

Support connectors validation client-side & Minor fixes (#126)

Browse Source 
* Validate connectors client-side when sending offchain

* Minor fixes

* validate connector input in forfeit txs

---------

Co-authored-by: Louis <louis@vulpem.com>
This commit is contained in:
Pietralberto Mazza
2024-03-05 13:04:32 +01:00
committed by GitHub
parent 066e8eeabb
commit fb64bd35d8
8 changed files with 234 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/common.go
View File

@@ -407,8 +407,8 @@ func handleRoundStream(
pingStop()
fmt.Println("round finalization started")
poolTxStr := e.GetPoolPartialTx()
poolTx, err := psetv2.NewPsetFromBase64(poolTxStr)
poolTx := e.GetPoolTx()
ptx, err := psetv2.NewPsetFromBase64(poolTx)
if err != nil {
return "", err
}
@@ -418,6 +418,8 @@ func handleRoundStream(
return "", err
}
connectors := e.GetConnectors()
aspPubkey, err := getAspPublicKey()
if err != nil {
return "", err
@@ -430,12 +432,16 @@ func handleRoundStream(
// validate the congestion tree
if err := tree.ValidateCongestionTree(
congestionTree, poolTxStr, aspPubkey, int64(roundLifetime),
congestionTree, poolTx, aspPubkey, int64(roundLifetime),
); err != nil {
return "", err
}
exitDelay, err := getUnilateralExitDelay()
if err := common.ValidateConnectors(poolTx, connectors); err != nil {
return "", err
}
unilateralExitDelay, err := getUnilateralExitDelay()
if err != nil {
return "", err
}
@@ -452,7 +458,7 @@ func handleRoundStream(
// collaborative exit case
// search for the output in the pool tx
found := false
for _, output := range poolTx.Outputs {
for _, output := range ptx.Outputs {
if bytes.Equal(output.Script, onchainScript) {
if output.Value != receiver.Amount {
return "", fmt.Errorf(
@@ -481,7 +487,7 @@ func handleRoundStream(
// compute the receiver output taproot key
outputTapKey, _, err := computeVtxoTaprootScript(
userPubkey, aspPubkey, uint(exitDelay),
userPubkey, aspPubkey, uint(unilateralExitDelay),
)
if err != nil {
return "", err
@@ -531,6 +537,15 @@ func handleRoundStream(
explorer := NewExplorer()
connectorsTxids := make([]string, 0, len(connectors))
for _, connector := range connectors {
p, _ := psetv2.NewPsetFromBase64(connector)
utx, _ := p.UnsignedTx()
txid := utx.TxHash().String()
connectorsTxids = append(connectorsTxids, txid)
}
for _, forfeit := range forfeits {
pset, err := psetv2.NewPsetFromBase64(forfeit)
if err != nil {
@@ -543,6 +558,20 @@ func handleRoundStream(
for _, coin := range vtxosToSign {
// check if it contains one of the input to sign
if inputTxid == coin.txid {
// verify that the connector is in the connectors list
connectorTxid := chainhash.Hash(pset.Inputs[0].PreviousTxid).String()
connectorFound := false
for _, txid := range connectorsTxids {
if txid == connectorTxid {
connectorFound = true
break
}
}
if !connectorFound {
return "", fmt.Errorf("connector txid %s not found in the connectors list", connectorTxid)
}
if err := signPset(pset, explorer, secKey); err != nil {
return "", err
}