update with new ark psbt fields

louisinger · louisinger · commit 28110ab19bd6 · 2025-10-02T15:20:01.000+02:00
diff --git a/go.mod b/go.mod
@@ -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.20251002131351-3a7a7145b80f
 	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
diff --git a/go.sum b/go.sum
@@ -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.20251002131351-3a7a7145b80f h1:cQmC727D/UiTCewkK9bWTUApefcI5YfodRB0y7F5Fvk=
+github.com/arkade-os/arkd/pkg/ark-lib v0.7.2-0.20251002131351-3a7a7145b80f/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=
diff --git a/redemption/redeem.go b/redemption/redeem.go
@@ -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 {
diff --git a/utils.go b/utils.go
@@ -351,7 +351,7 @@ func toIntentInputs(
 		arkFields = append(arkFields, []*psbt.Unknown{
 			{
 				Value: taptree,
-				Key:   txutils.VTXO_TAPROOT_TREE_KEY,
+				Key:   txutils.ArkFieldTaprootTree,
 			},
 		})
 	}
@@ -386,7 +386,7 @@ func toIntentInputs(
 		arkFields = append(arkFields, []*psbt.Unknown{
 			{
 				Value: taptree,
-				Key:   txutils.VTXO_TAPROOT_TREE_KEY,
+				Key:   txutils.ArkFieldTaprootTree,
 			},
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -113,18 +113,22 @@ func (r *CovenantlessRedeemBranch) NextRedeemTx() (string, error) {`
`113`	`113`	`return "", err`
`114`	`114`	`}`
`115`	`115`
`116`		`- conditionWitness, err := txutils.GetConditionWitness(input)`
	`116`	`+ conditionWitnessFields, err := txutils.GetArkPsbtFields(`
	`117`	`+ tx,`
	`118`	`+ i,`
	`119`	`+ txutils.ConditionWitnessField,`
	`120`	`+ )`
`117`	`121`	`if err != nil {`
`118`	`122`	`return "", err`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`args := make(map[string][]byte)`
`122`		`- if len(conditionWitness) > 0 {`
	`126`	`+ if len(conditionWitnessFields) > 0 {`
`123`	`127`	`var conditionWitnessBytes bytes.Buffer`
`124`		`- if err := psbt.WriteTxWitness(&conditionWitnessBytes, conditionWitness); err != nil {`
	`128`	`+ if err := psbt.WriteTxWitness(&conditionWitnessBytes, conditionWitnessFields[0]); err != nil {`
`125`	`129`	`return "", err`
`126`	`130`	`}`
`127`		`- args[string(txutils.CONDITION_WITNESS_KEY_PREFIX)] = conditionWitnessBytes.Bytes()`
	`131`	`+ args[string(txutils.ArkFieldConditionWitness)] = conditionWitnessBytes.Bytes()`
`128`	`132`	`}`
`129`	`133`
`130`	`134`	`for _, sig := range input.TaprootScriptSpendSig {`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ func toIntentInputs(`
`351`	`351`	`arkFields = append(arkFields, []*psbt.Unknown{`
`352`	`352`	`{`
`353`	`353`	`Value: taptree,`
`354`		`- Key: txutils.VTXO_TAPROOT_TREE_KEY,`
	`354`	`+ Key: txutils.ArkFieldTaprootTree,`
`355`	`355`	`},`
`356`	`356`	`})`
`357`	`357`	`}`
`@@ -386,7 +386,7 @@ func toIntentInputs(`
`386`	`386`	`arkFields = append(arkFields, []*psbt.Unknown{`
`387`	`387`	`{`
`388`	`388`	`Value: taptree,`
`389`		`- Key: txutils.VTXO_TAPROOT_TREE_KEY,`
	`389`	`+ Key: txutils.ArkFieldTaprootTree,`
`390`	`390`	`},`
`391`	`391`	`})`
`392`	`392`	`}`