mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-18 13:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to protobuf-java 3.5.1.

Browse Source 
In the test data for DeterministicKeyChainTest all occurences of the (often invisible) 0x7f
character is replaced by its numerical literal "\177". This change is needed because a bug of
previous versions was fixed, which caused this character not being printed as text.
This commit is contained in:
Andreas Schildbach 2018-03-13 21:06:40 +01:00
parent dbc4c35209
commit 8ee5e48171
17 changed files with 78 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/pom.xml
View File

@ -193,7 +193,7 @@
<urn>com.google.errorprone:error_prone_annotations:2.1.3:jar:null:compile:39b109f2cd352b2d71b52a3b5a1a9850e1dc304b</urn>
<urn>com.google.j2objc:j2objc-annotations:1.1:jar:null:compile:ed28ded51a8b1c6b112568def5f4b455e6809019</urn>
<urn>org.codehaus.mojo:animal-sniffer-annotations:1.14:jar:null:compile:775b7e22fb10026eed3f86e8dc556dfafe35f2d5</urn>
<urn>com.google.protobuf:protobuf-java:2.6.1:jar:null:compile:d9521f2aecb909835746b7a5facf612af5e890e8</urn>
<urn>com.google.protobuf:protobuf-java:3.5.1:jar:null:compile:8c3492f7662fa1cbf8ca76a0f5eb1146f7725acd</urn>
<urn>com.h2database:h2:1.3.167:jar:null:compile:d3867d586f087e53eb12fc65e5693d8ee9a5da17</urn>
<urn>com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87</urn>
<urn>com.madgag.spongycastle:core:1.58.0.0:jar:null:compile:e08789f8f1e74f155db8b69c3575b5cb213c156c</urn>
@ -391,7 +391,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.6.1</version>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

2
core/src/main/proto/paymentchannel.proto
View File

@ -22,6 +22,8 @@
* - To regenerate after editing, run mvn clean package -DupdateProtobuf
*/
syntax = "proto2";
package paymentchannels;
option java_package = "org.bitcoin.paymentchannel";

3
core/src/main/proto/paymentrequest.proto
View File

@ -30,7 +30,10 @@
// https://en.bitcoin.it/wiki/Payment_Request
//
syntax = "proto2";
package payments;
option java_package = "org.bitcoin.protocols.payments";
option java_outer_classname = "Protos";

6
core/src/main/proto/peerseeds.proto
View File

@ -1,9 +1,11 @@
package org.bitcoin.crawler;
//
// A simple protocol for describing signed sets of IP addresses. Intended to be distributed via HTTP[S] or in files.
//
syntax = "proto2";
package org.bitcoin.crawler;
option java_package = "org.bitcoin.crawler";
option java_outer_classname = "PeerSeedProtos";

3
core/src/main/proto/storedclientpaymentchannel.proto
View File

@ -22,12 +22,13 @@
* - To regenerate after editing, run mvn clean package -DupdateProtobuf
*/
syntax = "proto2";
package paymentchannels;
option java_package = "org.bitcoinj.protocols.channels";
option java_outer_classname = "ClientState";
// A set of StoredPaymentChannel's
message StoredClientPaymentChannels {
repeated StoredClientPaymentChannel channels = 1;

3
core/src/main/proto/storedserverpaymentchannel.proto
View File

@ -22,12 +22,13 @@
* - To regenerate after editing, run mvn clean package -DupdateProtobuf
*/
syntax = "proto2";
package paymentchannels;
option java_package = "org.bitcoinj.protocols.channels";
option java_outer_classname = "ServerState";
// A set of StoredPaymentChannel's
message StoredServerPaymentChannels {
repeated StoredServerPaymentChannel channels = 1;

2
core/src/main/proto/wallet.proto
View File

@ -23,6 +23,8 @@
* - To regenerate after editing, run: mvn generate-sources -DupdateProtobuf
*/
syntax = "proto2";
package wallet;
option java_package = "org.bitcoinj.wallet";

14
core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-bip44-serialization.txt
View File

@ -57,7 +57,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
secret_bytes: "\311\327\205Q\005\346\030\365\026\0331\356\346\036\234\024\b\322\202\3726I\351\001 \373\200\003\260\276\216\000"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\364"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
deterministic_key {
chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
path: 2147483692
@ -70,7 +70,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\232\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
deterministic_key {
chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
path: 2147483692
@ -114,7 +114,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334#"
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
deterministic_key {
chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
path: 2147483692
@ -125,7 +125,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002-7\rx2zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
deterministic_key {
chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
path: 2147483692
@ -248,7 +248,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
deterministic_key {
chain_code: "9\214\315\275\300\206\253U;\235\002fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
path: 2147483692
path: 2147483649
path: 2147483648
@ -312,7 +312,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002!\032\210\034\267\234\t\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
deterministic_key {
chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
path: 2147483692
@ -325,7 +325,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
deterministic_key {
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321U\003\r]"
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
path: 2147483692
path: 2147483649
path: 2147483648

14
core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-serialization.txt
View File

@ -16,7 +16,7 @@ type: DETERMINISTIC_KEY
secret_bytes: "\354B\331\275;\000\254?\3428\006\220G\365\243\333s\260s\213R\313\307\377f\331B\351\327=\001\333"
public_key: "\002\357\\\252\376]\023\315\'\316`\317\362\032@\232\"\360\331\335\221] `\016,\351<\b\300\225\032m"
deterministic_key {
chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!J \323\'\264s\203\314\321\v\346"
chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!\177J \323\'\264s\203\314\321\v\346"
path: 2147483648
}
@ -162,7 +162,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317J\364\331\2345\220)\362\334\216\202\\"
public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317\177J\364\331\2345\220)\362\334\216\202\\"
deterministic_key {
chain_code: "\202:\344\3109?\350\345\001\314(\244q\370\233Rk\261}\302(\275\326\305R\342:\246\036\nV\330"
path: 2147483648
@ -171,7 +171,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003>K!8\222VEL\371\305 z\aD8\020\233\330S\251T\330\201V\026-k2\227\266;"
public_key: "\003>K!8\222VEL\371\305 z\aD\1778\020\233\330S\251T\330\201V\026-k2\227\266;"
deterministic_key {
chain_code: "\223\265.\200\316\361\241{\223\342c\212\0213ym+\032=#\360\333X\003\2770Z\311\335\267\342\313"
path: 2147483648
@ -207,9 +207,9 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\333\344\340t"
public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\177\333\344\340t"
deterministic_key {
chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\372\b\\o\303\204D#}\266"
chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\177\372\b\\o\303\204D#}\266"
path: 2147483648
path: 1
path: 5
@ -218,7 +218,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002c\034w@c\225\257n~G\330\002\241^\264\231\030\025\220gr\202`u\b\262\361\312\246\202J\341"
deterministic_key {
chain_code: "\\\2542\003\022\254\361*\a/4\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
chain_code: "\\\2542\003\022\254\361*\a/4\177\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
path: 2147483648
path: 1
path: 6
@ -243,7 +243,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
public_key: "\003\177\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
deterministic_key {
chain_code: "\345\365\034\261\316\2121R\226/+\267K\326C&\236\246],\224\001\220\347\334\351\223K\023\252\360\023"
path: 2147483648

8
core/src/test/resources/org/bitcoinj/wallet/spending-wallet-account-two-serialization.txt
View File

@ -106,14 +106,14 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\003\327\366\0233\245*\036\020\313$\026\030\037z\221\033\202\243Kg\232\377K\202z\232N>\342\030\005^"
deterministic_key {
chain_code: "\027\200\234\377q\263\221H\a\303\274y\rw\327\310Fb\326G\255f\231\213O\270 %c\371\251"
chain_code: "\027\200\234\377q\263\221H\a\303\274y\rw\327\310Fb\326\177G\255f\231\213O\270 %c\371\251"
path: 2147483650
path: 0
path: 8
}
type: DETERMINISTIC_KEY
public_key: "\002\302\310T\314\340p\n\223\332=7R&\217#>\331x\031\225\205S\360\371b\025\200V\000\243\335"
public_key: "\002\177\302\310T\314\340p\n\223\332=7R&\217#>\331x\031\225\205S\360\371b\025\200V\000\243\335"
deterministic_key {
chain_code: "\256\370\271\335\305mh\240\337\"\352\227\203\232\263\304A\237\331\032\201k\203rH\345B@\366\230\354Z"
path: 2147483650
@ -212,7 +212,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\037\325;\235Ix\304\306\0215W8\344=a\2505J\a-\242M\307\004\355\351B6y\256\371"
public_key: "\002\037\325;\235Ix\304\306\021\1775W8\344=a\2505J\a-\242M\307\004\355\351B6y\256\371"
deterministic_key {
chain_code: "\227q!\v!\333\254\034W\3051\340V\316xJ\025\361\353Pf\355\341\352VD\b\027\360\270\034\v"
path: 2147483650
@ -259,7 +259,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002l\255\003\316\3273l\034\241\r\003b\250y\201H\261\024\325$\302\351\226\224\345a\245\270\232%v\241"
deterministic_key {
chain_code: "~\020\352Z\325\2674\245\272\003\221$\r\"\362\\\344\320\227\267\316\330\272.\"\272\031o\241\027\334"
chain_code: "~\020\352Z\325\2674\245\272\003\221$\177\r\"\362\\\344\320\227\267\316\330\272.\"\272\031o\241\027\334"
path: 2147483650
path: 1
path: 12

14
core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization-two.txt
View File

@ -25,7 +25,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
secret_bytes: "\311\327\205Q\005\346\030\365\026\0331\356\346\036\234\024\b\322\202\3726I\351\001 \373\200\003\260\276\216\000"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\364"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
deterministic_key {
chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
path: 2147483692
@ -38,7 +38,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\232\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
deterministic_key {
chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
path: 2147483692
@ -82,7 +82,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334#"
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
deterministic_key {
chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
path: 2147483692
@ -93,7 +93,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002-7\rx2zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
deterministic_key {
chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
path: 2147483692
@ -216,7 +216,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
deterministic_key {
chain_code: "9\214\315\275\300\206\253U;\235\002fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
path: 2147483692
path: 2147483649
path: 2147483648
@ -280,7 +280,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002!\032\210\034\267\234\t\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
deterministic_key {
chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
path: 2147483692
@ -293,7 +293,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
deterministic_key {
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321U\003\r]"
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
path: 2147483692
path: 2147483649
path: 2147483648

14
core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization.txt
View File

@ -21,7 +21,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
secret_bytes: "\311\327\205Q\005\346\030\365\026\0331\356\346\036\234\024\b\322\202\3726I\351\001 \373\200\003\260\276\216\000"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\364"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
deterministic_key {
chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
path: 2147483648
@ -32,7 +32,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\232\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
deterministic_key {
chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
path: 2147483648
@ -68,7 +68,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334#"
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
deterministic_key {
chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
path: 2147483648
@ -77,7 +77,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002-7\rx2zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
deterministic_key {
chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
path: 2147483648
@ -178,7 +178,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
deterministic_key {
chain_code: "9\214\315\275\300\206\253U;\235\002fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
path: 2147483648
path: 1
path: 3
@ -230,7 +230,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002!\032\210\034\267\234\t\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
deterministic_key {
chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
path: 2147483648
@ -241,7 +241,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
deterministic_key {
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321U\003\r]"
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
path: 2147483648
path: 1
path: 10

14
core/src/test/resources/org/bitcoinj/wallet/spending-wallet-serialization.txt
View File

@ -3,7 +3,7 @@ secret_bytes: "\354B\331\275;\000\254?\3428\006\220G\365\243\333s\260s\213R\313\
public_key: "\002\357\\\252\376]\023\315\'\316`\317\362\032@\232\"\360\331\335\221] `\016,\351<\b\300\225\032m"
creation_timestamp: 100000000
deterministic_key {
chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!J \323\'\264s\203\314\321\v\346"
chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!\177J \323\'\264s\203\314\321\v\346"
path: 2147483648
}
@ -149,7 +149,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317J\364\331\2345\220)\362\334\216\202\\"
public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317\177J\364\331\2345\220)\362\334\216\202\\"
deterministic_key {
chain_code: "\202:\344\3109?\350\345\001\314(\244q\370\233Rk\261}\302(\275\326\305R\342:\246\036\nV\330"
path: 2147483648
@ -158,7 +158,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003>K!8\222VEL\371\305 z\aD8\020\233\330S\251T\330\201V\026-k2\227\266;"
public_key: "\003>K!8\222VEL\371\305 z\aD\1778\020\233\330S\251T\330\201V\026-k2\227\266;"
deterministic_key {
chain_code: "\223\265.\200\316\361\241{\223\342c\212\0213ym+\032=#\360\333X\003\2770Z\311\335\267\342\313"
path: 2147483648
@ -194,9 +194,9 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\333\344\340t"
public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\177\333\344\340t"
deterministic_key {
chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\372\b\\o\303\204D#}\266"
chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\177\372\b\\o\303\204D#}\266"
path: 2147483648
path: 1
path: 5
@ -205,7 +205,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002c\034w@c\225\257n~G\330\002\241^\264\231\030\025\220gr\202`u\b\262\361\312\246\202J\341"
deterministic_key {
chain_code: "\\\2542\003\022\254\361*\a/4\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
chain_code: "\\\2542\003\022\254\361*\a/4\177\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
path: 2147483648
path: 1
path: 6
@ -230,7 +230,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
public_key: "\003\177\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
deterministic_key {
chain_code: "\345\365\034\261\316\2121R\226/+\267K\326C&\236\246],\224\001\220\347\334\351\223K\023\252\360\023"
path: 2147483648

14
core/src/test/resources/org/bitcoinj/wallet/watching-wallet-arbitrary-path-serialization.txt
View File

@ -22,7 +22,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\364"
public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
deterministic_key {
chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
path: 2147483692
@ -35,7 +35,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\232\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
deterministic_key {
chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
path: 2147483692
@ -79,7 +79,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334#"
public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
deterministic_key {
chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
path: 2147483692
@ -90,7 +90,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002-7\rx2zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
deterministic_key {
chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
path: 2147483692
@ -213,7 +213,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
deterministic_key {
chain_code: "9\214\315\275\300\206\253U;\235\002fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
path: 2147483692
path: 2147483649
path: 2147483648
@ -277,7 +277,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002!\032\210\034\267\234\t\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
deterministic_key {
chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
path: 2147483692
@ -290,7 +290,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
deterministic_key {
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321U\003\r]"
chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
path: 2147483692
path: 2147483649
path: 2147483648

8
core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization-account-one.txt
View File

@ -38,7 +38,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002-\264\264X2\272\227\032&\313\027O\242\f\f\032\3041\330]s\200\236\206\324\235AF\337\356\260"
public_key: "\002-\264\264X2\272\227\032&\313\027O\242\f\f\032\3041\330]s\200\236\177\206\324\235AF\337\356\260"
deterministic_key {
chain_code: "\311\031\200\276\242te\217\3703%\227|V\341E\025D\244cd\277\022<\260\2350i4\236\220\367"
path: 1
@ -112,7 +112,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\003;\234\200F\370\217\277\2652\265Y\276%\020\226\304x\321\350\313v\316J,\373.\224\213\317\367\326\353"
deterministic_key {
chain_code: "\260\3533#\203\322\376\322\301\233\260B\334\304\235_\342=\246\300\266\0234\345r\203\213\2576|\311"
chain_code: "\260\3533#\203\322\376\322\301\233\177\260B\334\304\235_\342=\246\300\266\0234\345r\203\213\2576|\311"
path: 1
path: 0
path: 9
@ -121,7 +121,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002\274Q\024Q\312\364\244\363~J\346\2250\nl\334\274\200\247\016\345;4u&\022tAY#MN"
deterministic_key {
chain_code: "\357\025!\243\025Z\3614\327\310\211\3624\026\n\032\233\256\362\250\376\370>\tb)\340\357\3621\362"
chain_code: "\357\025!\243\025Z\3614\327\310\211\3624\026\n\032\233\256\362\250\376\370>\tb)\340\357\177\3621\362"
path: 1
path: 0
path: 10
@ -238,7 +238,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002\\\207\256\270oNU\203M\f/z\334\003\353\310A\226m#\321!\313E\237\361\310\211\255\376\316\262"
deterministic_key {
chain_code: "\245\336+\332\307\342q\356)0\350\004mz\215\321\001U\2059g\200\247\240\252\fQ\341\276J\303"
chain_code: "\245\336+\332\307\342q\356)0\350\004mz\215\321\001U\2059g\200\177\247\240\252\fQ\341\276J\303"
path: 1
path: 1
path: 10

14
core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization.txt
View File

@ -2,7 +2,7 @@ type: DETERMINISTIC_KEY
public_key: "\002\357\\\252\376]\023\315\'\316`\317\362\032@\232\"\360\331\335\221] `\016,\351<\b\300\225\032m"
creation_timestamp: 100000000
deterministic_key {
chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!J \323\'\264s\203\314\321\v\346"
chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!\177J \323\'\264s\203\314\321\v\346"
path: 2147483648
}
@ -146,7 +146,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317J\364\331\2345\220)\362\334\216\202\\"
public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317\177J\364\331\2345\220)\362\334\216\202\\"
deterministic_key {
chain_code: "\202:\344\3109?\350\345\001\314(\244q\370\233Rk\261}\302(\275\326\305R\342:\246\036\nV\330"
path: 2147483648
@ -155,7 +155,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003>K!8\222VEL\371\305 z\aD8\020\233\330S\251T\330\201V\026-k2\227\266;"
public_key: "\003>K!8\222VEL\371\305 z\aD\1778\020\233\330S\251T\330\201V\026-k2\227\266;"
deterministic_key {
chain_code: "\223\265.\200\316\361\241{\223\342c\212\0213ym+\032=#\360\333X\003\2770Z\311\335\267\342\313"
path: 2147483648
@ -191,9 +191,9 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\333\344\340t"
public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\177\333\344\340t"
deterministic_key {
chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\372\b\\o\303\204D#}\266"
chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\177\372\b\\o\303\204D#}\266"
path: 2147483648
path: 1
path: 5
@ -202,7 +202,7 @@ deterministic_key {
type: DETERMINISTIC_KEY
public_key: "\002c\034w@c\225\257n~G\330\002\241^\264\231\030\025\220gr\202`u\b\262\361\312\246\202J\341"
deterministic_key {
chain_code: "\\\2542\003\022\254\361*\a/4\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
chain_code: "\\\2542\003\022\254\361*\a/4\177\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
path: 2147483648
path: 1
path: 6
@ -227,7 +227,7 @@ deterministic_key {
}
type: DETERMINISTIC_KEY
public_key: "\003\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
public_key: "\003\177\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
deterministic_key {
chain_code: "\345\365\034\261\316\2121R\226/+\267K\326C&\236\246],\224\001\220\347\334\351\223K\023\252\360\023"
path: 2147483648

6
wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
View File

@ -16,7 +16,6 @@
package wallettemplate;
import com.google.protobuf.*;
import javafx.application.*;
import javafx.event.*;
import javafx.fxml.*;
@ -26,9 +25,12 @@ import org.bitcoinj.crypto.*;
import org.bitcoinj.wallet.*;
import org.slf4j.*;
import org.spongycastle.crypto.params.*;
import com.google.protobuf.ByteString;
import wallettemplate.utils.*;
import java.time.*;
import java.time.Duration;
import java.util.concurrent.*;
import static wallettemplate.utils.GuiUtils.*;