@@ -16,10 +16,9 @@ var validbase58 = require('./data/bitcoind/base58_keys_valid.json');
1616var invalidbase58 = require ( './data/bitcoind/base58_keys_invalid.json' ) ;
1717
1818describe ( 'Address' , function ( ) {
19-
20- var pubkeyhash = new Buffer ( '3c3fa3d4adcaf8f52d5b1843975e122548269937' , 'hex' ) ;
21- var buf = Buffer . concat ( [ new Buffer ( [ 48 ] ) , pubkeyhash ] ) ;
22- var str = 'LQiX3WFFnc6JDULSRRG3Dsjza3VmhJ5pCP' ;
19+ var pubkeyhash = Buffer . from ( '4a0529a63fcc33e4f51688311b89b97371b5c76c' , 'hex' ) ;
20+ var buf = Buffer . concat ( [ Buffer . from ( [ 30 ] ) , pubkeyhash ] ) ;
21+ var str = 'DBtUjAUFWHqS1y8CgetQtPW6YKDhffyFT4' ;
2322
2423 it ( 'can\'t build without data' , function ( ) {
2524 ( function ( ) {
@@ -68,36 +67,36 @@ describe('Address', function() {
6867
6968 // livenet valid
7069 var PKHLivenet = [
71- 'LQ9hsXxwkqG7C8rwjUktmvRUvhat7Qh8BQ ' ,
72- 'LUKs9ECLs954h36VXz4CAEknH9ysUnPFeK ' ,
73- 'LW3Z5seTcn3EgxNUHiCpxwRT4Dag3gy41e ' ,
74- 'LdCzEQjTA6h54qNe1PAPDtWAsr8KrrFuMy ' ,
75- ' LdCzEQjTA6h54qNe1PAPDtWAsr8KrrFuMy \t\n'
70+ 'D77Z1nmgSZxJTmtN65n2MVF9yvLSB4MpiC ' ,
71+ 'DGYdw7jC17b9SappjsrAsaghhDTS8sV5Mx ' ,
72+ 'DExWunrSkF2P9NAzW4JpEeC38uC3z36cCk ' ,
73+ 'DMYFDsuFamS4kogsiqxQRXK9diCfmJzNLh ' ,
74+ ' DQJXChtyuN3aiU3W6pG4mgnykisHH5hqst \t\n'
7675 ] ;
7776
7877 // livenet p2sh
7978 var P2SHLivenet = [
80- 'MAEpCKqAsN9619X9HnyQnar4AUpP4cDRLk' ,
81- 'MA92SP8F2rjGoWM4NdVSRt1eJqxGzML8LA' ,
82- 'MDexQKL1vBbvRX4J7BUReK5vwJspyKC14q' ,
83- 'MWwgqasit2aZdtrRPLSrQjC8rQEKMrGPit' ,
84- '\t \nMWwgqasit2aZdtrRPLSrQjC8rQEKMrGPit \r'
79+ 'A7HRQk3GFCW2QasvdZxXuYj8kkQK5QrYLs' ,
80+ 'A3RHoAQLPDSuBewbuvt5NMqEKasqs9ty3C' ,
81+ 'A3YUuiZjn3FzW2i6KqFVgHaN5r5fjvwEJ1' ,
82+ 'AFVkW8WgPP2rsTdAeyogFK9k8gXJ1LZwrb' ,
83+ 'A2CUbyEtqGUjngAjxpGmM5Nwhrz72gh23v' ,
84+ '\t \AD21pKoCWcrqrUW4oRv5xUaGwCfXhiyx6y \r'
8585 ] ;
8686
8787 // testnet p2sh
8888 var P2SHTestnet = [
89- 'Qacg4vM9pZEwMSPtnfBM2tDKyjnnXXYc77 ' ,
90- 'Qhrz7JPBZBcexJxT8hD8tbonVDeYUnGspZ ' ,
91- 'QS39xXsxUoZ8wkFnmRqGgvWnChGYCmqoPJ ' ,
92- 'QeTneucyqtDYVsSxLE5bKaq26NR9uWbqPL '
89+ '2MsvyG12kxxipe276Au4zKqvd2xdrBuHWb3 ' ,
90+ '2MvY1BBau2C6jRC1hNX5LmviLrpvVG386TM ' ,
91+ '2N22vuiMGhfqD77vPqsXPiALBfn6oUTtFtH ' ,
92+ '2N1Gz97rN7P6VCj9xf64wWFqQZgpUng1mM3 '
9393 ] ;
9494
9595 //livenet bad checksums
9696 var badChecksums = [
97- '15vkcKf7gB23wLAnZLmbVuMiiVDc3nq4a2' ,
98- '1A6ut1tWnUq1SEQLMr4ttDh24wcbj4w2TT' ,
99- '1BpbpfLdY7oBS9gK7aDXgvMgr1DpvNH3B2' ,
100- '1Jz2yCRd5ST1p2gUqFB5wsSQfdmEJaffg7'
97+ '461QQ2sYWxU7H2PV4oBwJGNch8XVTYYbZxU' ,
98+ '461QQ2sYWxASd2PV4oBwJGNch8XVTYYbZxU' ,
99+ 'DRjyUS2uuieEPkhZNdQz8hE5YycxVEqSXA' , ///////
101100 ] ;
102101
103102 //livenet non-base58
@@ -110,26 +109,26 @@ describe('Address', function() {
110109
111110 //testnet valid
112111 var PKHTestnet = [
113- 'n28S35tqEMbt6vNad7A5K3mZ7vdn8dZ86X ' ,
114- 'n45x3R2w2jaSC62BMa9MeJCd3TXxgvDEmm ' ,
115- 'mursDVxqNQmmwWHACpM9VHwVVSfTddGsEM ' ,
116- 'mtX8nPZZdJ8d3QNLRJ1oJTiEi26Sj6LQXS '
112+ 'ngbSgr1dhCqsLg6Z5tpsaCspwrH72x2Zk3 ' ,
113+ 'ngao4q8auS6YuDKYPkzjt7zKYYT8LzkGZS ' ,
114+ 'nbo7vyCuiMxiYW4thwwuaTHQdCoqinmzJz ' ,
115+ 'nagGnGDKWYpvnphf9rgo3xtQhAxiEM1QGD '
117116 ] ;
118117
119118 describe ( 'validation' , function ( ) {
120119
121120 it ( 'getValidationError detects network mismatchs' , function ( ) {
122- var error = Address . getValidationError ( 'MDPj1iqqCy23rLccUFvgC8HZq41fB8EH4y ' , 'testnet' ) ;
121+ var error = Address . getValidationError ( 'D77Z1nmgSZxJTmtN65n2MVF9yvLSB4MpiC ' , 'testnet' ) ;
123122 should . exist ( error ) ;
124123 } ) ;
125124
126125 it ( 'isValid returns true on a valid address' , function ( ) {
127- var valid = Address . isValid ( 'MDPj1iqqCy23rLccUFvgC8HZq41fB8EH4y ' , 'livenet' ) ;
126+ var valid = Address . isValid ( 'D77Z1nmgSZxJTmtN65n2MVF9yvLSB4MpiC ' , 'livenet' ) ;
128127 valid . should . equal ( true ) ;
129128 } ) ;
130129
131130 it ( 'isValid returns false on network mismatch' , function ( ) {
132- var valid = Address . isValid ( 'MDPj1iqqCy23rLccUFvgC8HZq41fB8EH4y ' , 'testnet' ) ;
131+ var valid = Address . isValid ( 'D77Z1nmgSZxJTmtN65n2MVF9yvLSB4MpiC ' , 'testnet' ) ;
133132 valid . should . equal ( false ) ;
134133 } ) ;
135134
@@ -214,10 +213,10 @@ describe('Address', function() {
214213 } ) ;
215214
216215 it ( 'addresses with whitespace are validated correctly' , function ( ) {
217- var ws = ' \r \t \n LUKs9ECLs954h36VXz4CAEknH9ysUnPFeK \t \n \r' ;
216+ var ws = ' \r \t \n DD4KSSuBJqcjuTcvUg1CgUKeurPUFeEZkE \t \n \r' ;
218217 var error = Address . getValidationError ( ws ) ;
219218 should . not . exist ( error ) ;
220- Address . fromString ( ws ) . toString ( ) . should . equal ( 'LUKs9ECLs954h36VXz4CAEknH9ysUnPFeK ' ) ;
219+ Address . fromString ( ws ) . toString ( ) . should . equal ( 'DD4KSSuBJqcjuTcvUg1CgUKeurPUFeEZkE ' ) ;
221220 } ) ;
222221 } ) ;
223222
@@ -330,24 +329,23 @@ describe('Address', function() {
330329 } ) ;
331330
332331 it ( 'should make this address from a compressed pubkey' , function ( ) {
333- var pubkey = new PublicKey ( '0285e9737a74c30a873f74df05124f2aa6f53042c2fc0a130d6cbd7d16b944b004 ' ) ;
332+ var pubkey = new PublicKey ( '02789418bb8aee5a63471c09d3402b9d06a1c3d7975635a4a5258e89dff3547079 ' ) ;
334333 var address = Address . fromPublicKey ( pubkey , 'livenet' ) ;
335- address . toString ( ) . should . equal ( 'LTuEM81fckTP7hSdGEPAqQYKrCpu5Wp7F2 ' ) ;
334+ address . toString ( ) . should . equal ( 'DKLLdArnsyhkuPhxDbWYEBgLpQDLerRNrZ ' ) ;
336335 } ) ;
337336
338337 it ( 'should use the default network for pubkey' , function ( ) {
339- var pubkey = new PublicKey ( '0285e9737a74c30a873f74df05124f2aa6f53042c2fc0a130d6cbd7d16b944b004 ' ) ;
338+ var pubkey = new PublicKey ( '02789418bb8aee5a63471c09d3402b9d06a1c3d7975635a4a5258e89dff3547079 ' ) ;
340339 var address = Address . fromPublicKey ( pubkey ) ;
341340 address . network . should . equal ( Networks . defaultNetwork ) ;
342341 } ) ;
343342
344343 it ( 'should make this address from an uncompressed pubkey' , function ( ) {
345- var pubkey = new PublicKey ( '0485e9737a74c30a873f74df05124f2aa6f53042c2fc0a130d6cbd7d16b944b00' +
346- '4833fef26c8be4c4823754869ff4e46755b85d851077771c220e2610496a29d98' ) ;
344+ var pubkey = new PublicKey ( '0450A38BD7F0AC212FEBA77354A9B036A32E0F7C81FC4E0C5ADCA7C549C4505D2522458C2D9AE3CEFD684E039194B72C8A10F9CB9D4764AB26FCC2718D421D3B84' ) ;
347345 var a = Address . fromPublicKey ( pubkey , 'livenet' ) ;
348- a . toString ( ) . should . equal ( 'LQXV3vGZP8x1vneE9EGN9Ggj4uFQwZkqgZ ' ) ;
346+ a . toString ( ) . should . equal ( 'DFJ1z7FVd8CEodkQ41w54bmCDYhrNd24Dv ' ) ;
349347 var b = new Address ( pubkey , 'livenet' , 'pubkeyhash' ) ;
350- b . toString ( ) . should . equal ( 'LQXV3vGZP8x1vneE9EGN9Ggj4uFQwZkqgZ ' ) ;
348+ b . toString ( ) . should . equal ( 'DFJ1z7FVd8CEodkQ41w54bmCDYhrNd24Dv ' ) ;
351349 } ) ;
352350
353351 it ( 'should classify from a custom network' , function ( ) {
@@ -379,29 +377,30 @@ describe('Address', function() {
379377 } ) ;
380378 it ( 'should make this address from a p2pkh output script' , function ( ) {
381379 var s = new Script ( 'OP_DUP OP_HASH160 20 ' +
382- '0xc8e11b0eb0d2ad5362d894f048908341fa61b6e1 OP_EQUALVERIFY OP_CHECKSIG' ) ;
380+ '0xc8e11b0eb0d2ad5362d894f048908341fa61b6e1 OP_EQUALVERIFY OP_CHECKSIG' ) ;
383381 var buf = s . toBuffer ( ) ;
384382 var a = Address . fromScript ( s , 'livenet' ) ;
385- a . toString ( ) . should . equal ( 'LdY75CNRKwNfGgnVwrfzZbsCSVKKTLTvNT ' ) ;
383+ a . toString ( ) . should . equal ( 'DPTFMF1EYh2tYtGwWJgFqLy37QgLdSSDQW ' ) ;
386384 var b = new Address ( s , 'livenet' ) ;
387- b . toString ( ) . should . equal ( 'LdY75CNRKwNfGgnVwrfzZbsCSVKKTLTvNT ' ) ;
385+ b . toString ( ) . should . equal ( 'DPTFMF1EYh2tYtGwWJgFqLy37QgLdSSDQW ' ) ;
388386 } ) ;
389387
390388 it ( 'should make this address from a p2sh input script' , function ( ) {
391389 var s = Script . fromString ( 'OP_HASH160 20 0xa6ed4af315271e657ee307828f54a4365fa5d20f OP_EQUAL' ) ;
392390 var a = Address . fromScript ( s , 'livenet' ) ;
393- a . toString ( ) . should . equal ( 'MP7nffWprdM6CxdxdCAc4ESzb3XsQQPZMp ' ) ;
391+ a . toString ( ) . should . equal ( 'A7eu6dAkyaNZJpjXwSqgUipxxvKTTjJKzY ' ) ;
394392 var b = new Address ( s , 'livenet' ) ;
395- b . toString ( ) . should . equal ( 'MP7nffWprdM6CxdxdCAc4ESzb3XsQQPZMp ' ) ;
393+ b . toString ( ) . should . equal ( 'A7eu6dAkyaNZJpjXwSqgUipxxvKTTjJKzY ' ) ;
396394 } ) ;
397395
398396 it ( 'returns the same address if the script is a pay to public key hash out' , function ( ) {
399- var address = 'LQXV3vGZP8x1vneE9EGN9Ggj4uFQwZkqgZ ' ;
397+ var address = 'D77Z1nmgSZxJTmtN65n2MVF9yvLSB4MpiC ' ;
400398 var script = Script . buildPublicKeyHashOut ( new Address ( address ) ) ;
399+ console . log ( script ) ;
401400 Address ( script , Networks . livenet ) . toString ( ) . should . equal ( address ) ;
402401 } ) ;
403402 it ( 'returns the same address if the script is a pay to script hash out' , function ( ) {
404- var address = 'MHkuYq6Sz31ofGwL5eqMau2grNwBCLJo11 ' ;
403+ var address = 'A7eu6dAkyaNZJpjXwSqgUipxxvKTTjJKzY ' ;
405404 var script = Script . buildScriptHashOut ( new Address ( address ) ) ;
406405 Address ( script , Networks . livenet ) . toString ( ) . should . equal ( address ) ;
407406 } ) ;
@@ -487,7 +486,7 @@ describe('Address', function() {
487486 describe ( '#inspect' , function ( ) {
488487 it ( 'should output formatted output correctly' , function ( ) {
489488 var address = new Address ( str ) ;
490- var output = '<Address: LQiX3WFFnc6JDULSRRG3Dsjza3VmhJ5pCP , type: pubkeyhash, network: livenet>' ;
489+ var output = '<Address: DBtUjAUFWHqS1y8CgetQtPW6YKDhffyFT4 , type: pubkeyhash, network: livenet>' ;
491490 address . inspect ( ) . should . equal ( output ) ;
492491 } ) ;
493492 } ) ;
@@ -535,14 +534,14 @@ describe('Address', function() {
535534
536535 it ( 'can create an address from a set of public keys' , function ( ) {
537536 var address = Address . createMultisig ( publics , 2 , Networks . livenet ) ;
538- address . toString ( ) . should . equal ( 'MN6yhK8peWnHTd3PaKkKWcoUocPcWD9Cmx ' ) ;
537+ address . toString ( ) . should . equal ( 'A6e68GnkmTokZV8xtaRPw7BTBVBCeFFwuT ' ) ;
539538 address = new Address ( publics , 2 , Networks . livenet ) ;
540- address . toString ( ) . should . equal ( 'MN6yhK8peWnHTd3PaKkKWcoUocPcWD9Cmx ' ) ;
539+ address . toString ( ) . should . equal ( 'A6e68GnkmTokZV8xtaRPw7BTBVBCeFFwuT ' ) ;
541540 } ) ;
542541
543542 it ( 'works on testnet also' , function ( ) {
544543 var address = Address . createMultisig ( publics , 2 , Networks . testnet ) ;
545- address . toString ( ) . should . equal ( 'QaooaBX8KxVJ16A5mgQsPcymqeTAFqTmhh ' ) ;
544+ address . toString ( ) . should . equal ( '2N7T3TAetJrSCruQ39aNrJvYLhG1LJosujf ' ) ;
546545 } ) ;
547546
548547 it ( 'can also be created by Address.createMultisig' , function ( ) {
0 commit comments