Skip to content

Commit

Permalink
fixes batch wallet tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@yash1io
yash1io committed Jul 15, 2024
1 parent 015d275 commit 3344e6b
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 29 deletions.
30 changes: 4 additions & 26 deletions btc/cpfp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var _ = Describe("BatchWallet:CPFP", Ordered, func() {
},
}

id, err := wallet.Send(context.Background(), req, nil)
id, err := wallet.Send(context.Background(), req, nil, nil)
Expect(err).To(BeNil())

var tx btc.Transaction
Expand Down Expand Up @@ -116,7 +116,7 @@ var _ = Describe("BatchWallet:CPFP", Ordered, func() {
},
}

id, err := wallet.Send(context.Background(), req, nil)
id, err := wallet.Send(context.Background(), req, nil, nil)
Expect(err).To(BeNil())

var tx btc.Transaction
Expand All @@ -142,10 +142,9 @@ var _ = Describe("BatchWallet:CPFP", Ordered, func() {
})

It("should be able to spend multiple scripts and send to multiple parties", func() {
Skip("signing is not working") // will be fixed by merging master
amount := int64(100000)

p2wshSigCheckScript, p2wshSigCheckScriptAddr, err := sigCheckScript(*chainParams)
p2wshSigCheckScript, p2wshSigCheckScriptAddr, err := sigCheckScript(*chainParams, privateKey)
Expect(err).To(BeNil())

p2wshAdditionScript, p2wshScriptAddr, err := additionScript(*chainParams)
Expand All @@ -163,26 +162,6 @@ var _ = Describe("BatchWallet:CPFP", Ordered, func() {
p2trScriptAddr.EncodeAddress(),
checkSigScriptAddr.EncodeAddress(),
})

By("Fund the scripts")
_, err = wallet.Send(context.Background(), []btc.SendRequest{
{
Amount: amount,
To: p2wshScriptAddr,
},
{
Amount: amount,
To: p2wshSigCheckScriptAddr,
},
{
Amount: amount,
To: p2trScriptAddr,
},
{
Amount: amount,
To: checkSigScriptAddr,
},
}, nil)
Expect(err).To(BeNil())

By("Let's create recipients")
Expand Down Expand Up @@ -220,7 +199,6 @@ var _ = Describe("BatchWallet:CPFP", Ordered, func() {
{
Witness: [][]byte{
btc.AddSignatureSegwitOp,
btc.AddPubkeyCompressedOp,
p2wshSigCheckScript,
},
Script: p2wshSigCheckScript,
Expand All @@ -247,7 +225,7 @@ var _ = Describe("BatchWallet:CPFP", Ordered, func() {
ScriptAddress: checkSigScriptAddr,
HashType: txscript.SigHashAll,
},
})
}, nil)
Expect(err).To(BeNil())
Expect(id).ShouldNot(BeEmpty())

Expand Down
151 changes: 148 additions & 3 deletions btc/rbf_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import (
"time"

"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/btcec/v2/schnorr"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/catalogfi/blockchain/btc"
"github.com/catalogfi/blockchain/localnet"
. "github.com/onsi/ginkgo/v2"
Expand All @@ -17,7 +20,7 @@ import (

var _ = Describe("BatchWallet:RBF", Ordered, func() {

chainParams := chaincfg.RegressionNetParams
chainParams := &chaincfg.RegressionNetParams
logger, err := zap.NewDevelopment()
Expect(err).To(BeNil())

Expand All @@ -28,12 +31,19 @@ var _ = Describe("BatchWallet:RBF", Ordered, func() {

mockFeeEstimator := NewMockFeeEstimator(10)
cache := NewTestCache()
wallet, err := btc.NewBatcherWallet(privateKey, indexer, mockFeeEstimator, &chainParams, cache, logger, btc.WithPTI(5*time.Second), btc.WithStrategy(btc.RBF))
wallet, err := btc.NewBatcherWallet(privateKey, indexer, mockFeeEstimator, chainParams, cache, logger, btc.WithPTI(5*time.Second), btc.WithStrategy(btc.RBF))
Expect(err).To(BeNil())

faucet, err := btc.NewSimpleWallet(privateKey, chainParams, indexer, mockFeeEstimator, btc.HighFee)
Expect(err).To(BeNil())

BeforeAll(func() {
_, err := localnet.FundBitcoin(wallet.Address().EncodeAddress(), indexer)
Expect(err).To(BeNil())

_, err = localnet.FundBitcoin(faucet.Address().EncodeAddress(), indexer)
Expect(err).To(BeNil())

err = wallet.Start(context.Background())
Expect(err).To(BeNil())
})
Expand All @@ -51,7 +61,7 @@ var _ = Describe("BatchWallet:RBF", Ordered, func() {
},
}

id, err := wallet.Send(context.Background(), req, nil)
id, err := wallet.Send(context.Background(), req, nil, nil)
Expect(err).To(BeNil())

var tx btc.Transaction
Expand Down Expand Up @@ -80,4 +90,139 @@ var _ = Describe("BatchWallet:RBF", Ordered, func() {
mockFeeEstimator.UpdateFee(20)
time.Sleep(10 * time.Second)
})

It("should be able to spend multiple scripts and send to multiple parties", func() {
amount := int64(100000)

p2wshSigCheckScript, p2wshSigCheckScriptAddr, err := sigCheckScript(*chainParams, privateKey)
Expect(err).To(BeNil())

p2wshAdditionScript, p2wshScriptAddr, err := additionScript(*chainParams)
Expect(err).To(BeNil())

p2trAdditionScript, p2trScriptAddr, cb, err := additionTapscript(*chainParams)
Expect(err).To(BeNil())

checkSigScript, checkSigScriptAddr, checkSigScriptCb, err := sigCheckTapScript(*chainParams, schnorr.SerializePubKey(privateKey.PubKey()))
Expect(err).To(BeNil())

faucetTx, err := faucet.Send(context.Background(), []btc.SendRequest{
{
Amount: amount,
To: p2wshSigCheckScriptAddr,
},
{
Amount: amount,
To: p2wshScriptAddr,
},
{
Amount: amount,
To: p2trScriptAddr,
},
{
Amount: amount,
To: checkSigScriptAddr,
},
}, nil, nil)
Expect(err).To(BeNil())
fmt.Println("funded scripts", "txid :", faucetTx)

_, err = localnet.FundBitcoin(faucet.Address().EncodeAddress(), indexer)
Expect(err).To(BeNil())

By("Let's create recipients")
pk1, err := btcec.NewPrivateKey()
Expect(err).To(BeNil())
address1, err := btc.PublicKeyAddress(chainParams, waddrmgr.WitnessPubKey, pk1.PubKey())
Expect(err).To(BeNil())

pk2, err := btcec.NewPrivateKey()
Expect(err).To(BeNil())
address2, err := btc.PublicKeyAddress(chainParams, waddrmgr.WitnessPubKey, pk2.PubKey())
Expect(err).To(BeNil())

By("Send funds to Bob and Dave by spending the scripts")
id, err := wallet.Send(context.Background(), []btc.SendRequest{
{
Amount: amount,
To: address1,
},
{
Amount: amount,
To: address1,
},
{
Amount: amount,
To: address1,
},
{
Amount: amount,
To: address2,
},
}, []btc.SpendRequest{
{
Witness: [][]byte{
{0x1},
{0x1},
p2wshAdditionScript,
},
Script: p2wshAdditionScript,
ScriptAddress: p2wshScriptAddr,
HashType: txscript.SigHashAll,
},
{
Witness: [][]byte{
btc.AddSignatureSegwitOp,
p2wshSigCheckScript,
},
Script: p2wshSigCheckScript,
ScriptAddress: p2wshSigCheckScriptAddr,
HashType: txscript.SigHashAll,
},
{
Witness: [][]byte{
{0x1},
{0x1},
p2trAdditionScript,
cb,
},
Leaf: txscript.NewTapLeaf(0xc0, p2trAdditionScript),
ScriptAddress: p2trScriptAddr,
},
{
Witness: [][]byte{
btc.AddSignatureSchnorrOp,
checkSigScript,
checkSigScriptCb,
},
Leaf: txscript.NewTapLeaf(0xc0, checkSigScript),
ScriptAddress: checkSigScriptAddr,
HashType: txscript.SigHashAll,
},
}, nil)
Expect(err).To(BeNil())
Expect(id).ShouldNot(BeEmpty())

for {
fmt.Println("waiting for tx", id)
tx, ok, err := wallet.Status(context.Background(), id)
Expect(err).To(BeNil())
if ok {
Expect(tx).ShouldNot(BeNil())
break
}
time.Sleep(5 * time.Second)
}

By("The tx should have 3 outputs")
tx, _, err := wallet.Status(context.Background(), id)
Expect(err).To(BeNil())
Expect(tx).ShouldNot(BeNil())
Expect(tx.VOUTs).Should(HaveLen(5))
Expect(tx.VOUTs[0].ScriptPubKeyAddress).Should(Equal(address1.EncodeAddress()))
Expect(tx.VOUTs[1].ScriptPubKeyAddress).Should(Equal(address1.EncodeAddress()))
Expect(tx.VOUTs[2].ScriptPubKeyAddress).Should(Equal(address1.EncodeAddress()))
Expect(tx.VOUTs[3].ScriptPubKeyAddress).Should(Equal(address2.EncodeAddress()))

})
})

0 comments on commit 3344e6b

Please sign in to comment.