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

use safe-buffer

Browse source
This commit is contained in:
Daniel Cousens 2018-04-13 16:06:41 +10:00
parent c16847434c
commit 90a73e195e
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -41,7 +41,7 @@
"merkle-lib": "^2.0.10", "merkle-lib": "^2.0.10",
"pushdata-bitcoin": "^1.0.1", "pushdata-bitcoin": "^1.0.1",
"randombytes": "^2.0.1", "randombytes": "^2.0.1",
"safe-buffer": "^5.0.1", "safe-buffer": "^5.1.1",
"typeforce": "^1.11.3", "typeforce": "^1.11.3",
"varuint-bitcoin": "^1.0.4", "varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1" "wif": "^2.0.1"

7
src/script_signature.js
View file

@ -1,5 +1,6 @@
var bip66 = require('bip66') var bip66 = require('bip66')
var BigInteger = require('bigi') var BigInteger = require('bigi')
var Buffer = require('safe-buffer').Buffer
var typeforce = require('typeforce') var typeforce = require('typeforce')
var types = require('./types') var types = require('./types')
@ -39,11 +40,11 @@ function encode (signature, hashType) {
var hashTypeMod = hashType & ~0x80 var hashTypeMod = hashType & ~0x80
if (hashTypeMod <= 0 || hashTypeMod >= 4) throw new Error('Invalid hashType ' + hashType) if (hashTypeMod <= 0 || hashTypeMod >= 4) throw new Error('Invalid hashType ' + hashType)
var hashTypeBuffer = new Buffer(1) var hashTypeBuffer = Buffer.allocUnsafe(1)
hashTypeBuffer.writeUInt8(hashType, 0) hashTypeBuffer.writeUInt8(hashType, 0)
var r = new Buffer(signature.r.toDERInteger()) var r = Buffer.from(signature.r.toDERInteger())
var s = new Buffer(signature.s.toDERInteger()) var s = Buffer.from(signature.s.toDERInteger())
return Buffer.concat([ return Buffer.concat([
bip66.encode(r, s), bip66.encode(r, s),

5
test/signature.js → test/script_signature.js
View file

@ -3,6 +3,7 @@
var assert = require('assert') var assert = require('assert')
var bscriptSig = require('../src/script').signature var bscriptSig = require('../src/script').signature
var BigInteger = require('bigi') var BigInteger = require('bigi')
var Buffer = require('safe-buffer').Buffer
var fixtures = require('./fixtures/signature.json') var fixtures = require('./fixtures/signature.json')
describe('Script Signatures', function () { describe('Script Signatures', function () {
@ -45,7 +46,7 @@ describe('Script Signatures', function () {
describe('decode', function () { describe('decode', function () {
fixtures.valid.forEach(function (f) { fixtures.valid.forEach(function (f) {
it('decodes ' + f.hex, function () { it('decodes ' + f.hex, function () {
var decode = bscriptSig.decode(new Buffer(f.hex, 'hex')) var decode = bscriptSig.decode(Buffer.from(f.hex, 'hex'))
assert.deepEqual(toRaw(decode.signature), f.raw) assert.deepEqual(toRaw(decode.signature), f.raw)
assert.strictEqual(decode.hashType, f.hashType) assert.strictEqual(decode.hashType, f.hashType)
@ -54,7 +55,7 @@ describe('Script Signatures', function () {
fixtures.invalid.forEach(function (f) { fixtures.invalid.forEach(function (f) {
it('throws on ' + f.hex, function () { it('throws on ' + f.hex, function () {
var buffer = new Buffer(f.hex, 'hex') var buffer = Buffer.from(f.hex, 'hex')
assert.throws(function () { assert.throws(function () {
bscriptSig.decode(buffer) bscriptSig.decode(buffer)