LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use function keyword

Browse source
This commit is contained in:
junderw 2019-07-09 10:57:41 +09:00
parent e15b515367
commit 09fcb1c6ee
No known key found for this signature in database
GPG key ID: B256185D3A971908
2 changed files with 68 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/psbt.js
View file

@ -591,7 +591,7 @@ function checkScriptForPubkey(pubkey, script, action) {
);
}
}
const getHashForSig = (inputIndex, input, unsignedTx, cache) => {
function getHashForSig(inputIndex, input, unsignedTx, cache) {
const sighashType =
input.sighashType || transaction_1.Transaction.SIGHASH_ALL;
let hash;
@ -672,45 +672,45 @@ const getHashForSig = (inputIndex, input, unsignedTx, cache) => {
sighashType,
hash,
};
};
const scriptCheckerFactory = (payment, paymentScriptName) => (
inputIndex,
scriptPubKey,
redeemScript,
) => {
const redeemScriptOutput = payment({
redeem: { output: redeemScript },
}).output;
if (!scriptPubKey.equals(redeemScriptOutput)) {
throw new Error(
`${paymentScriptName} for input #${inputIndex} doesn't match the scriptPubKey in the prevout`,
);
}
};
}
function scriptCheckerFactory(payment, paymentScriptName) {
return (inputIndex, scriptPubKey, redeemScript) => {
const redeemScriptOutput = payment({
redeem: { output: redeemScript },
}).output;
if (!scriptPubKey.equals(redeemScriptOutput)) {
throw new Error(
`${paymentScriptName} for input #${inputIndex} doesn't match the scriptPubKey in the prevout`,
);
}
};
}
const checkRedeemScript = scriptCheckerFactory(payments.p2sh, 'Redeem script');
const checkWitnessScript = scriptCheckerFactory(
payments.p2wsh,
'Witness script',
);
const isPaymentFactory = payment => script => {
try {
payment({ output: script });
return true;
} catch (err) {
return false;
}
};
function isPaymentFactory(payment) {
return script => {
try {
payment({ output: script });
return true;
} catch (err) {
return false;
}
};
}
const isP2WPKH = isPaymentFactory(payments.p2wpkh);
const isP2PKH = isPaymentFactory(payments.p2pkh);
const isP2MS = isPaymentFactory(payments.p2ms);
const isP2PK = isPaymentFactory(payments.p2pk);
const classifyScript = script => {
function classifyScript(script) {
if (isP2WPKH(script)) return 'witnesspubkeyhash';
if (isP2PKH(script)) return 'pubkeyhash';
if (isP2MS(script)) return 'multisig';
if (isP2PK(script)) return 'pubkey';
return 'nonstandard';
};
}
function getScriptFromInput(inputIndex, input, unsignedTx, cache) {
const res = {
script: null,
@ -748,11 +748,11 @@ function getScriptFromInput(inputIndex, input, unsignedTx, cache) {
}
return res;
}
const hasSigs = (neededSigs, partialSig) => {
function hasSigs(neededSigs, partialSig) {
if (!partialSig) return false;
if (partialSig.length > neededSigs) throw new Error('Too many signatures');
return partialSig.length === neededSigs;
};
}
function witnessStackToScriptWitness(witness) {
let buffer = Buffer.allocUnsafe(0);
function writeSlice(slice) {
@ -797,7 +797,9 @@ function scriptWitnessToWitnessStack(buffer) {
}
return readVector();
}
const range = n => [...Array(n).keys()];
function range(n) {
return [...Array(n).keys()];
}
function checkTxEmpty(tx) {
const isEmpty = tx.ins.every(
input =>

70
ts_src/psbt.ts
View file

@ -749,12 +749,12 @@ interface HashForSigData {
sighashType: number;
}
const getHashForSig = (
function getHashForSig(
inputIndex: number,
input: PsbtInput,
unsignedTx: Transaction,
cache: PsbtCache,
): HashForSigData => {
): HashForSigData {
const sighashType = input.sighashType || Transaction.SIGHASH_ALL;
let hash: Buffer;
let script: Buffer;
@ -839,28 +839,30 @@ const getHashForSig = (
sighashType,
hash,
};
};
}
type ScriptCheckerFunction = (idx: number, spk: Buffer, rs: Buffer) => void;
const scriptCheckerFactory = (
function scriptCheckerFactory(
payment: any,
paymentScriptName: string,
): ScriptCheckerFunction => (
inputIndex: number,
scriptPubKey: Buffer,
redeemScript: Buffer,
): void => {
const redeemScriptOutput = payment({
redeem: { output: redeemScript },
}).output as Buffer;
): ScriptCheckerFunction {
return (
inputIndex: number,
scriptPubKey: Buffer,
redeemScript: Buffer,
): void => {
const redeemScriptOutput = payment({
redeem: { output: redeemScript },
}).output as Buffer;
if (!scriptPubKey.equals(redeemScriptOutput)) {
throw new Error(
`${paymentScriptName} for input #${inputIndex} doesn't match the scriptPubKey in the prevout`,
);
}
};
if (!scriptPubKey.equals(redeemScriptOutput)) {
throw new Error(
`${paymentScriptName} for input #${inputIndex} doesn't match the scriptPubKey in the prevout`,
);
}
};
}
const checkRedeemScript = scriptCheckerFactory(payments.p2sh, 'Redeem script');
const checkWitnessScript = scriptCheckerFactory(
@ -870,28 +872,28 @@ const checkWitnessScript = scriptCheckerFactory(
type isPaymentFunction = (script: Buffer) => boolean;
const isPaymentFactory = (payment: any): isPaymentFunction => (
script: Buffer,
): boolean => {
try {
payment({ output: script });
return true;
} catch (err) {
return false;
}
};
function isPaymentFactory(payment: any): isPaymentFunction {
return (script: Buffer): boolean => {
try {
payment({ output: script });
return true;
} catch (err) {
return false;
}
};
}
const isP2WPKH = isPaymentFactory(payments.p2wpkh);
const isP2PKH = isPaymentFactory(payments.p2pkh);
const isP2MS = isPaymentFactory(payments.p2ms);
const isP2PK = isPaymentFactory(payments.p2pk);
const classifyScript = (script: Buffer): string => {
function classifyScript(script: Buffer): string {
if (isP2WPKH(script)) return 'witnesspubkeyhash';
if (isP2PKH(script)) return 'pubkeyhash';
if (isP2MS(script)) return 'multisig';
if (isP2PK(script)) return 'pubkey';
return 'nonstandard';
};
}
interface GetScriptReturn {
script: Buffer | null;
@ -942,11 +944,11 @@ function getScriptFromInput(
return res;
}
const hasSigs = (neededSigs: number, partialSig?: any[]): boolean => {
function hasSigs(neededSigs: number, partialSig?: any[]): boolean {
if (!partialSig) return false;
if (partialSig.length > neededSigs) throw new Error('Too many signatures');
return partialSig.length === neededSigs;
};
}
function witnessStackToScriptWitness(witness: Buffer[]): Buffer {
let buffer = Buffer.allocUnsafe(0);
@ -1006,7 +1008,9 @@ function scriptWitnessToWitnessStack(buffer: Buffer): Buffer[] {
return readVector();
}
const range = (n: number): number[] => [...Array(n).keys()];
function range(n: number): number[] {
return [...Array(n).keys()];
}
function checkTxEmpty(tx: Transaction): void {
const isEmpty = tx.ins.every(