X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Fbitcoinjs-3.3.2.js;h=23901688cd68493b16fc14d3bb8e3b0805d2d77a;hb=55b878d8d55639cea6d5cd0755194e0e768ba4de;hp=de75eaf033f5f21a2d9d0269af4c2c645f08e1ad;hpb=b777ff554de2075015e7df0108e33808005b99e9;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git diff --git a/src/js/bitcoinjs-3.3.2.js b/src/js/bitcoinjs-3.3.2.js index de75eaf..2390168 100644 --- a/src/js/bitcoinjs-3.3.2.js +++ b/src/js/bitcoinjs-3.3.2.js @@ -8662,13 +8662,24 @@ function fromBech32 (address) { } function toBase58Check (hash, version) { - typeforce(types.tuple(types.Hash160bit, types.UInt8), arguments) + if (version < 256){ + typeforce(types.tuple(types.Hash160bit, types.UInt8), arguments) - var payload = Buffer.allocUnsafe(21) - payload.writeUInt8(version, 0) - hash.copy(payload, 1) + var payload = Buffer.allocUnsafe(21) + payload.writeUInt8(version, 0) + hash.copy(payload, 1) - return bs58check.encode(payload) + return bs58check.encode(payload) + } + else{ + typeforce(types.tuple(types.Hash160bit, types.UInt16), arguments) + + var payload = Buffer.allocUnsafe(22) + payload.writeUInt16BE(version, 0) + hash.copy(payload, 2) + + return bs58check.encode(payload) + } } function toBech32 (data, version, prefix) { @@ -12162,8 +12173,8 @@ var Network = typeforce.compile({ public: typeforce.UInt32, private: typeforce.UInt32 }, - pubKeyHash: typeforce.UInt8, - scriptHash: typeforce.UInt8, + pubKeyHash: typeforce.oneOf(typeforce.UInt8, typeforce.UInt16), + scriptHash: typeforce.oneOf(typeforce.UInt8, typeforce.UInt16), wif: typeforce.UInt8 })