make KK parse its own TXes to avoid type hell #363
Conversation
|
This pull request is being automatically deployed with Vercel (learn more). 🔍 Inspect: https://vercel.com/shapeshift/hdwallet/2WJCMZCfJ6Z6MV7QNws9YwYgyqKu |
| @@ -28,7 +30,6 @@ export interface BitcoinScriptSig { | |||
| * Deserialized representation of an already-signed input of a transaction. | |||
| */ | |||
| interface BitcoinInputBase { | |||
| valueSat: number; | |||
There was a problem hiding this comment.
no clue where this came from, but we don't use it anywhere.
| }; | ||
|
|
||
| type BTCSignTxInputKKNonSegwit = BTCSignTxInputKKBase & { | ||
| scriptType: Exclude<BTCInputScriptType, BTCSignTxInputKKSegwit["scriptType"]>; | ||
| tx: BitcoinTx; |
There was a problem hiding this comment.
this whole BitcoinTx type is non-standard and used only here. We should deprecate it in a later breaking change, and nuke it entirely.
| @@ -106,12 +107,19 @@ type BTCSignTxInputKKBase = BTCSignTxInputBase & { | |||
|
|
|||
| type BTCSignTxInputKKSegwit = BTCSignTxInputKKBase & { | |||
| scriptType: BTCInputScriptType.SpendWitness | BTCInputScriptType.SpendP2SHWitness | BTCInputScriptType.External; | |||
| hex?: string; | |||
There was a problem hiding this comment.
this is just to make GuardedUnion happy with BTCSignTxInputSafe, but I don't really care at this point
| const prevTx = ((): core.BitcoinTx => { | ||
| if (inputTx.tx) return inputTx.tx; | ||
| if (!inputTx.hex) throw new Error("non-segwit inputs must have the associated prev tx"); | ||
| const tx = bitcoinjs.Transaction.fromHex(inputTx.hex); | ||
| return { | ||
| version: tx.version, | ||
| locktime: tx.locktime, | ||
| vin: tx.ins.map((input) => ({ | ||
| txid: Buffer.from(input.hash).reverse().toString("hex"), | ||
| vout: input.index, | ||
| scriptSig: { | ||
| hex: input.script.toString("hex"), | ||
| }, | ||
| sequence: input.sequence, | ||
| })), | ||
| vout: tx.outs.map((output, i) => ({ | ||
| value: String(output.value), | ||
| scriptPubKey: { | ||
| hex: output.script.toString("hex"), | ||
| }, | ||
| })), | ||
| }; | ||
| })(); |
There was a problem hiding this comment.
parts adapted from bitcoinjs/bitcoinjs-lib#1606 (comment)
mrnerdhair
force-pushed
the
avoid-type-hell
branch
from
6ed43a7 to
ee00ffc
Compare
mrnerdhair
force-pushed
the
avoid-type-hell
branch
from
9a3c452 to
91cf696
Compare
Resolves #362