-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bitcoinj upgrade 0.16.2 -> 0.17 #7
base: main
Are you sure you want to change the base?
Conversation
@@ -65,7 +65,7 @@ public Output(@Nullable final Coin amount, final Script script) { | |||
public static Output valueOf(final PaymentProtocol.Output output) | |||
throws PaymentProtocolException.InvalidOutputs { | |||
try { | |||
final Script script = new Script(output.scriptData); | |||
final Script script = Script.parse(output.scriptData); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if this is the same as new Script(output.scriptData)
@@ -76,7 +77,7 @@ public void run() { | |||
is.readFully(msg); | |||
|
|||
try { | |||
final Transaction tx = new Transaction(Constants.NETWORK_PARAMETERS, msg); | |||
final Transaction tx = Transaction.read(ByteBuffer.wrap(msg)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if this is the same as new Transaction(Constants.NETWORK_PARAMETERS, msg)
@@ -655,7 +654,7 @@ protected void onSuccess(final HostAndPort hostAndPort, final InetSocketAddress | |||
log.info("trusted peer '{}' resolved to {}", hostAndPort, | |||
socketAddress.getAddress().getHostAddress()); | |||
if (socketAddress != null) { | |||
peerGroup.addAddress(new PeerAddress(Constants.NETWORK_PARAMETERS, socketAddress), 10); | |||
peerGroup.addAddress(PeerAddress.simple(socketAddress), 10); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if this is the same as new PeerAddress(Constants.NETWORK_PARAMETERS, socketAddress)
* implemented new KeyStoreKeyCrypter and biometric authentication, untested * added KeyStore features
Merging main into GUI branch to implement the usage of the new KeyStore KeyCrypter along side the spending pin
…iometric authentication
…ut period. if decrypt needs to authenticate the user the app freezes i.e. the UI thread doesn't responde
f98bde1
to
2fdaca6
Compare
…ter to use new EncryptionType, rework CryptActivity layout
… code for readability and remove unused code
# This is the 1st commit message: added new strings for upcoming keystore support # This is the commit message #2: moved from spending pin menu to wallet protection menu # This is the commit message #3: added prototype for supporting keystore and spending pin in a dialog fragment # This is the commit message #4: KeyStoreKeyCrypter with biometric authentication (#9) * implemented new KeyStoreKeyCrypter and biometric authentication, untested * added KeyStore features # This is the commit message #5: added a working version that supports both keycrypters without user biometric authentication # This is the commit message #6: small change* # This is the commit message #7: wip # This is the commit message #8: working version for encrypt but decrypt only works if its in the timout period. if decrypt needs to authenticate the user the app freezes i.e. the UI thread doesn't responde # This is the commit message #9: wip # This is the commit message #10: rebase2 # This is the commit message #11: upgrade build successful, not tested # This is the commit message #12: rebase # This is the commit message #13: fixed tx declaration # This is the commit message #14: rebase # This is the commit message #15: rebase # This is the commit message #16: wip, implemented KeyCrypterFactory # This is the commit message #17: backup with keystorekeycrypter # This is the commit message #18: small changes for 0.17 upgrade + context propagation in cryptactivity # This is the commit message #19: sending funds when keystore encrypted fix # This is the commit message #20: removed button from CryptActivity, fixed backup export and import # This is the commit message bitcoin-wallet#21: added strings # This is the commit message bitcoin-wallet#22: fixed backup with keystore # This is the commit message bitcoin-wallet#23: added string resources and new EncryptionType # This is the commit message bitcoin-wallet#24: removed scrypt params from KeyStoreKeyCrypter
No description provided.