Bump covenant signer to require signature in request (#21)

Author: KonradStaniec

go.mod

@@ -47,7 +47,7 @@ require (
 )
 
 require (
-	github.com/babylonchain/covenant-signer v0.0.0-20240507155851-64756e393be2
+	github.com/babylonchain/covenant-signer v0.0.0-20240509110821-b6017a54332f
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
 	github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0

go.sum

@@ -281,6 +281,8 @@ github.com/babylonchain/babylon v0.8.6-0.20240426101001-7778c798e236 h1:Ydna4VcP
 github.com/babylonchain/babylon v0.8.6-0.20240426101001-7778c798e236/go.mod h1:lfeASLNJgcUsX7LEns3HRUv0k+MjzcB2q2AMasfz38M=
 github.com/babylonchain/covenant-signer v0.0.0-20240507155851-64756e393be2 h1:v5h+81bOlENEw/cyXv/6+/5laUs/EOvxAfZTdWbOW5A=
 github.com/babylonchain/covenant-signer v0.0.0-20240507155851-64756e393be2/go.mod h1:alX7NoDE2m7gW4O17hLAsluU30P0XaP5RlThAco8Y9Q=
+github.com/babylonchain/covenant-signer v0.0.0-20240509110821-b6017a54332f h1:UKNyeBlPZgLB5+1ZUA1YCL6bPtREA+oP1OT6ibNadw0=
+github.com/babylonchain/covenant-signer v0.0.0-20240509110821-b6017a54332f/go.mod h1:alX7NoDE2m7gW4O17hLAsluU30P0XaP5RlThAco8Y9Q=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=

internal/services/expected_interfaces.go

@@ -14,6 +14,8 @@ import (
 type SignRequest struct {
 	// Unbonding transaction which should be signed
 	UnbondingTransaction *wire.MsgTx
+	// Staker signature of the unbonding transaction
+	StakerUnbondingSig *schnorr.Signature
 	// Staking output which was used to fund unbonding transaction
 	FundingOutput *wire.TxOut
 	// Script of the path which should be execute - unbonding path
@@ -29,12 +31,14 @@ type SignResult struct {
 
 func NewSignRequest(
 	tx *wire.MsgTx,
+	stakerSig *schnorr.Signature,
 	fundingOutput *wire.TxOut,
 	script []byte,
 	pubKey *btcec.PublicKey,
 ) *SignRequest {
 	return &SignRequest{
 		UnbondingTransaction: tx,
+		StakerUnbondingSig:   stakerSig,
 		FundingOutput:        fundingOutput,
 		UnbondingScript:      script,
 		SignerPubKey:         pubKey,

internal/services/remote_signer.go

@@ -39,6 +39,7 @@ func (rs *RemoteSigner) SignUnbondingTransaction(req *SignRequest) (*PubKeySigPa
 		url,
 		rs.timeout,
 		req.UnbondingTransaction,
+		req.StakerUnbondingSig,
 		req.SignerPubKey,
 		req.UnbondingScript,
 	)

internal/services/unbonding_pipeline.go

@@ -133,6 +133,7 @@ func NewUnbondingPipeline(
 // covenant signers in a concurrent manner
 func (up *UnbondingPipeline) signUnbondingTransaction(
 	unbondingTransaction *wire.MsgTx,
+	stakerSig *schnorr.Signature,
 	fundingOutput *wire.TxOut,
 	unbondingScript []byte,
 	params *SystemParams,
@@ -142,6 +143,7 @@ func (up *UnbondingPipeline) signUnbondingTransaction(
 	for _, pk := range params.CovenantPublicKeys {
 		req := NewSignRequest(
 			unbondingTransaction,
+			stakerSig,
 			fundingOutput,
 			unbondingScript,
 			pk,
@@ -262,6 +264,7 @@ func (up *UnbondingPipeline) processUnbondingTransactions(
 
 		sigs, err := up.signUnbondingTransaction(
 			utx.UnbondingTransaction,
+			utx.UnbondingTransactionSig,
 			stakingOutputRecovered,
 			stakingOutputRecovered.PkScript,
 			params,

itest/e2e_test.go

@@ -6,6 +6,7 @@ package e2etest
 import (
 	"context"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"math"
 	"testing"
@@ -518,7 +519,7 @@ func (tm *TestManager) updateSchnorSigInDb(newSig *schnorr.Signature, txHash *ch
 	require.NoError(tm.t, err)
 }
 
-func TestReSendingFailedTransactions(t *testing.T) {
+func TestHandlingCriticalError(t *testing.T) {
 	m := StartManager(t, 10)
 	d := defaultStakingData()
 
@@ -553,26 +554,10 @@ func TestReSendingFailedTransactions(t *testing.T) {
 
 	// 2. Run pipeline
 	err = m.pipeLine.ProcessNewTransactions(context.Background())
-	require.NoError(t, err)
-
-	// 3. There should be one failed transaction
-	failedTx, err := m.testStoreController.GetFailedUnbondingTransactions(context.TODO())
-	require.NoError(t, err)
-	require.Len(t, failedTx, 1)
+	require.Error(t, err)
+	// With invalid signature in db, signers will refuse to sign it, which should end
+	// with critical error
+	require.True(t, errors.Is(err, services.ErrCriticalError))
 
-	// 4. Fix sig in db
-	unbondingTxHash := unbondingTx.unbondingTx.TxHash()
-	m.updateSchnorSigInDb(unbondingTx.signature, &unbondingTxHash)
-
-	// 5. Run pipeline for failed tx
-	err = m.pipeLine.ProcessFailedTransactions(context.Background())
-	require.NoError(t, err)
-
-	failedTxNew, err := m.testStoreController.GetFailedUnbondingTransactions(context.TODO())
-	require.NoError(t, err)
-	require.Len(t, failedTxNew, 0)
-
-	sendUnbondingTx, err := m.testStoreController.GetSendUnbondingTransactions(context.TODO())
-	require.NoError(t, err)
-	require.Len(t, sendUnbondingTx, 1)
+	// TODO:Find a way to simulate bitcoind not accepting transaction
 }