BitGo specific

Author: reardencode

src/index.d.ts

@@ -4,7 +4,8 @@ import * as networks from './networks';
 import * as payments from './payments';
 import * as script from './script';
 import * as taproot from './taproot';
-export { address, crypto, networks, payments, script, taproot };
+import * as ScriptSignature from './script_signature';
+export { ScriptSignature, address, crypto, networks, payments, script, taproot, };
 export { Block } from './block';
 export { TaggedHashPrefix } from './crypto';
 export { Psbt, PsbtTxInput, PsbtTxOutput, Signer, SignerAsync, HDSigner, HDSignerAsync, } from './psbt';

src/index.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.Transaction = exports.opcodes = exports.Psbt = exports.Block = exports.taproot = exports.script = exports.payments = exports.networks = exports.crypto = exports.address = void 0;
+exports.Transaction = exports.opcodes = exports.Psbt = exports.Block = exports.taproot = exports.script = exports.payments = exports.networks = exports.crypto = exports.address = exports.ScriptSignature = void 0;
 const address = require('./address');
 exports.address = address;
 const crypto = require('./crypto');
@@ -13,6 +13,8 @@ const script = require('./script');
 exports.script = script;
 const taproot = require('./taproot');
 exports.taproot = taproot;
+const ScriptSignature = require('./script_signature');
+exports.ScriptSignature = ScriptSignature;
 var block_1 = require('./block');
 Object.defineProperty(exports, 'Block', {
   enumerable: true,

src/script.js

@@ -167,7 +167,7 @@ function isCanonicalPubKey(buffer) {
 }
 exports.isCanonicalPubKey = isCanonicalPubKey;
 function isDefinedHashType(hashType) {
-  const hashTypeMod = hashType & ~0x80;
+  const hashTypeMod = hashType & ~0xc0;
   // return hashTypeMod > SIGHASH_ALL && hashTypeMod < SIGHASH_SINGLE
   return hashTypeMod > 0x00 && hashTypeMod < 0x04;
 }

src/script_signature.js

@@ -23,7 +23,7 @@ function fromDER(x) {
 // BIP62: 1 byte hashType flag (only 0x01, 0x02, 0x03, 0x81, 0x82 and 0x83 are allowed)
 function decode(buffer) {
   const hashType = buffer.readUInt8(buffer.length - 1);
-  const hashTypeMod = hashType & ~0x80;
+  const hashTypeMod = hashType & ~0xc0;
   if (hashTypeMod <= 0 || hashTypeMod >= 4)
     throw new Error('Invalid hashType ' + hashType);
   const decoded = bip66.decode(buffer.slice(0, -1));
@@ -41,7 +41,7 @@ function encode(signature, hashType) {
     },
     { signature, hashType },
   );
-  const hashTypeMod = hashType & ~0x80;
+  const hashTypeMod = hashType & ~0xc0;
   if (hashTypeMod <= 0 || hashTypeMod >= 4)
     throw new Error('Invalid hashType ' + hashType);
   const hashTypeBuffer = Buffer.allocUnsafe(1);

ts_src/index.ts

@@ -4,8 +4,17 @@ import * as networks from './networks';
 import * as payments from './payments';
 import * as script from './script';
 import * as taproot from './taproot';
+import * as ScriptSignature from './script_signature';
 
-export { address, crypto, networks, payments, script, taproot };
+export {
+  ScriptSignature,
+  address,
+  crypto,
+  networks,
+  payments,
+  script,
+  taproot,
+};
 
 export { Block } from './block';
 export { TaggedHashPrefix } from './crypto';

ts_src/script.ts

@@ -196,7 +196,7 @@ export function isCanonicalPubKey(buffer: Buffer): boolean {
 }
 
 export function isDefinedHashType(hashType: number): boolean {
-  const hashTypeMod = hashType & ~0x80;
+  const hashTypeMod = hashType & ~0xc0;
 
   // return hashTypeMod > SIGHASH_ALL && hashTypeMod < SIGHASH_SINGLE
   return hashTypeMod > 0x00 && hashTypeMod < 0x04;

ts_src/script_signature.ts

@@ -28,7 +28,7 @@ interface ScriptSignature {
 // BIP62: 1 byte hashType flag (only 0x01, 0x02, 0x03, 0x81, 0x82 and 0x83 are allowed)
 export function decode(buffer: Buffer): ScriptSignature {
   const hashType = buffer.readUInt8(buffer.length - 1);
-  const hashTypeMod = hashType & ~0x80;
+  const hashTypeMod = hashType & ~0xc0;
   if (hashTypeMod <= 0 || hashTypeMod >= 4)
     throw new Error('Invalid hashType ' + hashType);
 
@@ -49,7 +49,7 @@ export function encode(signature: Buffer, hashType: number): Buffer {
     { signature, hashType },
   );
 
-  const hashTypeMod = hashType & ~0x80;
+  const hashTypeMod = hashType & ~0xc0;
   if (hashTypeMod <= 0 || hashTypeMod >= 4)
     throw new Error('Invalid hashType ' + hashType);