Skip to content

update ark-lib with new ark PSBT fields #23

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
merged 2 commits into from
Oct 3, 2025
Merged

update ark-lib with new ark PSBT fields #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28110ab
update with new ark psbt fields
louisinger Oct 2, 2025
cbde4f7
Bump deps
altafan Oct 3, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.6
replace github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.3

require (
github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20250930111159-7f278b58e00f
github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20251003162148-53e6f346f766
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
github.com/btcsuite/btcd/btcec/v2 v2.3.4
github.com/btcsuite/btcd/btcutil v1.1.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20250930111159-7f278b58e00f h1:ydO6fi5O21pa24X+wjBSSu7tftyZoMPKGgMZGRh8kXk=
github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20250930111159-7f278b58e00f/go.mod h1:WtND6j3BA5KcYWCCHkI5k5UZS2UU+GZHDwqMVn6SD2s=
github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20251003162148-53e6f346f766 h1:Sui1QdDibNhUJpC/wJwtaEqYSLNw64syz+vqkdfJt5Q=
github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20251003162148-53e6f346f766/go.mod h1:WtND6j3BA5KcYWCCHkI5k5UZS2UU+GZHDwqMVn6SD2s=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
Expand Down
12 changes: 8 additions & 4 deletions redemption/redeem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,22 @@ func (r *CovenantlessRedeemBranch) NextRedeemTx() (string, error) {
return "", err
}

conditionWitness, err := txutils.GetConditionWitness(input)
conditionWitnessFields, err := txutils.GetArkPsbtFields(
tx,
i,
txutils.ConditionWitnessField,
)
if err != nil {
return "", err
}

args := make(map[string][]byte)
if len(conditionWitness) > 0 {
if len(conditionWitnessFields) > 0 {
var conditionWitnessBytes bytes.Buffer
if err := psbt.WriteTxWitness(&conditionWitnessBytes, conditionWitness); err != nil {
if err := psbt.WriteTxWitness(&conditionWitnessBytes, conditionWitnessFields[0]); err != nil {
return "", err
}
args[string(txutils.CONDITION_WITNESS_KEY_PREFIX)] = conditionWitnessBytes.Bytes()
args[string(txutils.ArkFieldConditionWitness)] = conditionWitnessBytes.Bytes()
}

for _, sig := range input.TaprootScriptSpendSig {
Expand Down
4 changes: 2 additions & 2 deletions utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func toIntentInputs(
arkFields = append(arkFields, []*psbt.Unknown{
{
Value: taptree,
Key: txutils.VTXO_TAPROOT_TREE_KEY,
Key: txutils.ArkFieldTaprootTree,
},
})
}
Expand Down Expand Up @@ -386,7 +386,7 @@ func toIntentInputs(
arkFields = append(arkFields, []*psbt.Unknown{
{
Value: taptree,
Key: txutils.VTXO_TAPROOT_TREE_KEY,
Key: txutils.ArkFieldTaprootTree,
},
})
}
Expand Down