Skip to content

Support every type of tapscript closure #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kukks merged 2 commits into from
Mar 16, 2026
Merged

Support every type of tapscript closure #30

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e49ebb1
support every type of tapscript closure
louisinger Mar 16, 2026
f1dca6b
unit tests: ReadArkadeScript
louisinger Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions pkg/arkade/script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,29 @@ func ReadArkadeScript(ptx *psbt.Packet, inputIndex int, signerPublicKey *btcec.P
expectedPublicKey := ComputeArkadeScriptPublicKey(signerPublicKey, scriptHash)
expectedPublicKeyXonly := schnorr.SerializePubKey(expectedPublicKey)

// TODO: allow any type of closure (condition, cltv ...)
var tapscript scriptlib.MultisigClosure
valid, err := tapscript.Decode(spendingTapscript.Script)
closure, err := scriptlib.DecodeClosure(spendingTapscript.Script)
if err != nil {
return nil, fmt.Errorf("unexpected error while decoding tapscript: %w", err)
return nil, fmt.Errorf("failed to decode tapscript: %w", err)
}
if !valid {
return nil, fmt.Errorf("spendingtapscript is not a MultisigClosure")

var pubkeys []*btcec.PublicKey
switch c := closure.(type) {
case *scriptlib.MultisigClosure:
pubkeys = c.PubKeys
case *scriptlib.CSVMultisigClosure:
pubkeys = c.PubKeys
case *scriptlib.CLTVMultisigClosure:
pubkeys = c.PubKeys
case *scriptlib.ConditionMultisigClosure:
pubkeys = c.PubKeys
case *scriptlib.ConditionCSVMultisigClosure:
pubkeys = c.PubKeys
default:
return nil, fmt.Errorf("unsupported closure type: %T", closure)
}

found := false
for _, pubkey := range tapscript.PubKeys {
for _, pubkey := range pubkeys {
xonly := schnorr.SerializePubKey(pubkey)
if bytes.Equal(xonly, expectedPublicKeyXonly) {
found = true
Expand Down
17 changes: 1 addition & 16 deletions test/tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,24 +934,9 @@ func TestIntrospectorRejectsInvalidArkadeScript(t *testing.T) {
ptx.Inputs[0].TaprootLeafScript = nil
},
},
{
name: "non-multisig tapscript",
contains: "spendingtapscript is not a MultisigClosure",
entry: arkade.IntrospectorEntry{
Vin: 0,
Script: arkadeScript,
},
mutateTx: func(t *testing.T, ptx *psbt.Packet) {
t.Helper()
require.NotEmpty(t, ptx.Inputs)
require.NotEmpty(t, ptx.Inputs[0].TaprootLeafScript)
require.NotNil(t, ptx.Inputs[0].TaprootLeafScript[0])
ptx.Inputs[0].TaprootLeafScript[0].Script = []byte{txscript.OP_TRUE}
},
},
{
name: "malformed tapscript decode",
contains: "unexpected error while decoding tapscript",
contains: "failed to decode tapscript",
entry: arkade.IntrospectorEntry{
Vin: 0,
Script: arkadeScript,
Expand Down
Loading