Skip to content

Fix commit script internal key handling #13

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

Open
brianorwhatever wants to merge 1 commit into
base: fix-metadata
Choose a base branch
from
Open

Fix commit script internal key handling #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/ordinalsplus/src/inscription/p2tr/key-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export interface P2TRAddressInfo {
/** The output script for the P2TR address */
script: Uint8Array;
/** The internal key used in the P2TR address */
internalKey: Uint8Array;
internalKey?: Uint8Array;
}

/**
Expand Down
11 changes: 5 additions & 6 deletions packages/ordinalsplus/src/inscription/scripts/ordinal-reveal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ export function prepareInscription(params: PrepareInscriptionParams): PreparedIn
const scriptInfo = extractScriptInfo(scriptTree);

// Generate commit address
// Use recovery key if provided, otherwise use reveal key
const internalKey = recoveryPublicKey || pubKey;
// Use recovery key if provided; otherwise leave internal key undefined
const internalKey = recoveryPublicKey;

// Get network object
const btcNetwork = getScureNetwork(network);
Expand All @@ -211,10 +211,9 @@ export function prepareInscription(params: PrepareInscriptionParams): PreparedIn
}

// Create script from output
const script = p2tr.script || btc.OutScript.encode({
type: 'tr',
pubkey: internalKey
});
const script = p2tr.script || (internalKey
? btc.OutScript.encode({ type: 'tr', pubkey: internalKey })
: new Uint8Array());

return {
commitAddress: {
Expand Down
8 changes: 3 additions & 5 deletions packages/ordinalsplus/src/transactions/reveal-transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ export async function createRevealTransaction(params: RevealTransactionParams):
'Missing commit address, script, or inscription data in prepared inscription for reveal'
);
}
const commitScript = preparedInscription.commitAddress.script;
const commitAddress = preparedInscription.commitAddress.address;
const inscriptionObject = preparedInscription.inscription;
const pubKey = preparedInscription.revealPublicKey;
Expand All @@ -166,7 +165,6 @@ export async function createRevealTransaction(params: RevealTransactionParams):
ORDINAL_CUSTOM_SCRIPTS
);

console.log(`[DEBUG-REVEAL-FIX] Using PRE-CALCULATED commit script for witness: ${Buffer.from(commitScript).toString('hex')}`);
console.log(`[DEBUG-REVEAL-FIX] Expected Commit Address from prep: ${commitAddress}`);
console.log(`[DEBUG-REVEAL-FIX] Reveal Payment Script (for input): ${revealPayment.script ? Buffer.from(revealPayment.script).toString('hex') : 'undefined'}`);
// Log the entire revealPayment object to inspect its structure for tapleaf info
Expand All @@ -177,9 +175,9 @@ export async function createRevealTransaction(params: RevealTransactionParams):
...revealPayment,
txid: selectedUTXO.txid,
index: selectedUTXO.vout,
witnessUtxo: {
script: commitScript,
amount: inputAmount
witnessUtxo: {
script: revealPayment.script,
amount: inputAmount
},
// Removed incorrect redeemScript property.
// We need to inspect revealPayment object structure to find where
Expand Down