Sync

.github/workflows/gradle.yml

@@ -1,4 +1,4 @@
-name: Java CI
+name: Gradle Build
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [ '11', '12' ]
+        java: [ '11', '14' ]
       fail-fast: false
     name: ${{ matrix.os }} JDK ${{ matrix.java }}
     steps:
@@ -17,8 +17,10 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
+    - name: Verify Gradle Wrapper
+      uses: gradle/wrapper-validation-action@v1
     - name: Build with Gradle
-      run: ./gradlew -Ddownload.jpackage=true buildCI consensusj-netwallet-fx:jpackage --info --stacktrace
+      run: ./gradlew -D"download.jpackage"=true buildCI consensusj-netwallet-fx:jpackage --info --stacktrace
     - name: Upload jpackage directory as artifact
       uses: actions/upload-artifact@master
       with:

.gitlab-ci.yml

@@ -6,11 +6,11 @@ variables:
 before_script:
   - apt-get update
   - apt-get -y upgrade
-  - apt-get -y install openjdk-11-jdk curl rpm fakeroot wget gnupg2 software-properties-common
-  # Install AdoptOpenJDK 12 following instructions from here: https://adoptopenjdk.net/installation.html
+  - apt-get -y install openjdk-11-jdk binutils curl rpm fakeroot wget gnupg2 software-properties-common
+  # Install AdoptOpenJDK 14
   - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
   - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-  - apt-get -y install adoptopenjdk-12-hotspot
+  - apt-get -y install adoptopenjdk-14-hotspot
 
 build:
   script:
@@ -19,8 +19,8 @@ build:
     - ./gradlew -Ddownload.jpackage=true buildCI consensusj-netwallet-fx:jpackage --stacktrace
   artifacts:
     paths:
-      - airgapfx-wallet/build/jpackage
-      - airgapfx-wallet/build/libs
+      - consensusj-netwallet-fx/build/jpackage
+      - consensusj-signwallet-fx/build/jpackage
 
 # Note: You can test changes to this file locally with:
 # gitlab-runner exec docker --docker-privileged build

CHANGELOG.adoc

@@ -3,6 +3,37 @@
 
 A high-level view of the changes in each wallet-framework binary release.
 
+== v0.1.8-SNAPSHOT
+
+Released: Not yet
+
+* Upgrade to Gradle 6.3
+
+== v0.1.7
+
+Released: 2019.10.28
+
+* `airgaplib` now is JDK 8+ with automatic module name
+
+== v0.1.6
+
+Released: 2019.10.28
+
+* Libraries published to Bintray
+* Other changes, to be documented
+
+== v0.1.5
+
+Released: 2019.10.23
+
+* Put Unsigned Transaction QR and QR Scanner window in same pop-up view
+* Transaction list view is now populated with (minimal) transaction information
+* `airgapfx-wallet` subproject is now `consensusj-netwallet-fx`
+* Airgap Wallet rebranded with ConsensusJ name and logo
+* Update Gradle to 6.0-rc-1 (so we can build with JDK 13)
+* Several dependency updates
+* Support for CI builds with Github Actions
+
 == v0.1.4
 
 Released: 2019.08.20

airgapfx/build.gradle

@@ -3,10 +3,12 @@ plugins {
     id 'java-library'
     id 'maven'
     id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.8'
-    id 'org.javamodularity.moduleplugin' version "1.5.0"
+    id 'org.openjfx.javafxplugin' version '0.0.9'
 }
 
+sourceCompatibility = 9
+targetCompatibility = 9
+
 dependencies {
     implementation project(':airgaplib')
 
@@ -26,6 +28,7 @@ dependencies {
 }
 
 javafx {
+    version = javaFxVersion
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing' ]
 }
 

airgapfx/src/main/java/org/consensusj/airgap/fx/camera/CameraService.java

@@ -34,6 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
 
@@ -57,7 +58,7 @@ public CameraService(Webcam camera, WebcamResolution resolution) {
         camera.setViewSize(resolution.getSize());
         if (logViewSizes) {
             log.info("Camera supports the following sizes:");
-            for (var size : camera.getViewSizes()) {
+            for (Dimension size : camera.getViewSizes()) {
                 log.info(size.toString());
             }
         }

airgapfx/src/main/java/org/consensusj/airgap/fx/components/QrCaptureView.java

@@ -26,7 +26,6 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import javafx.stage.Window;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +36,8 @@
  */
 public class QrCaptureView extends BorderPane {
     private static final Logger log = LoggerFactory.getLogger(QrCaptureView.class);
-    private final Consumer<String> listener;
+    private final Consumer<String> scanListener;
+    private final Consumer<Object> closeListener;
     private final CameraView cameraView;
     private final CameraService service;
     private TextArea previewText;
@@ -46,11 +46,19 @@ public class QrCaptureView extends BorderPane {
     private Button acceptButton;
 
     private String previewResult;
-
-    public QrCaptureView(CameraService cameraService,  Consumer<String> listener) {
+
+    /**
+     * JavaFX View with UI for a WebCam-based QR Code Scanner
+     * 
+     * @param cameraService QR Code Capturing Camera Service
+     * @param scanListener Listener called when QR code is accepted (accept button)
+     * @param closeListener Listener called when view is closed (cancel or accept button)
+     */
+    public QrCaptureView(CameraService cameraService,  Consumer<String> scanListener, Consumer<Object> closeListener) {
         service = cameraService;
         cameraView = new CameraView(cameraService);
-        this.listener = listener;
+        this.scanListener = scanListener;
+        this.closeListener = closeListener;
 
         setCenter(cameraView);
 
@@ -94,15 +102,12 @@ private HBox buttonBox() {
     }
 
     private void acceptAction(ActionEvent actionEvent) {
-        listener.accept(previewResult);
-        closeParentWindow();
+        scanListener.accept(previewResult);
+        closeParent();
     }
 
     private void cancelAction(ActionEvent actionEvent) {
-        if (service.isRunning()) {
-            service.cancel();
-        }
-        closeParentWindow();
+        closeParent();
     }
 
     private void rescanAction(ActionEvent e) {
@@ -131,11 +136,15 @@ private void scan() {
         rescanButton.setDisable(true);
     }
 
-    private void closeParentWindow() {
-        Window stage = this.getScene().getWindow();
-        if (stage != null) {
-            stage.hide();
+    private void stopCameraService() {
+        if (service.isRunning()) {
+            service.cancel();
         }
     }
 
+    private void closeParent() {
+        stopCameraService();
+        closeListener.accept(null);
+    }
+
 }

airgapfx/src/main/java/org/consensusj/airgap/fx/demoapp/DemoQRScannerApplication.java

@@ -32,6 +32,7 @@ public class DemoQRScannerApplication extends Application {
     private static final Logger log = LoggerFactory.getLogger(DemoQRScannerApplication.class);
 
     private CameraService cameraService;
+    private Stage primaryStage;
 
     @Override
     public void init() {
@@ -42,7 +43,8 @@ public void init() {
 
     @Override
     public void start(Stage primaryStage) {
-        QrCaptureView captureView  = new QrCaptureView(cameraService, this::scanListener);
+        this.primaryStage = primaryStage;
+        QrCaptureView captureView  = new QrCaptureView(cameraService, this::scanListener, this::closeListener);
 
         Scene scene = new Scene(captureView);
         primaryStage.setScene(scene);
@@ -53,6 +55,11 @@ private void scanListener(String result) {
         System.out.println("Result: " + result);
     }
 
+    private void closeListener(Object result) {
+        if (primaryStage != null) {
+            primaryStage.hide();
+        }
+    }
 
     public static void main(String[] args) {
         launch(args);

airgaplib/build.gradle

@@ -1,31 +1,35 @@
 plugins {
-    id 'java'
-    id 'groovy'
     id 'java-library'
+    id 'groovy'
     id 'maven'
     id 'eclipse'
-    id 'org.javamodularity.moduleplugin' version "1.5.0"
+    id 'org.javamodularity.moduleplugin' version "1.7.0"
 }
 
-def jacksonVersion = '2.9.8'
-
-/*
- * TODO: This module should really be JDK 8 compatible, perhaps a multi-release jar
- * Currently the only feature we're using that requires 9 is the module header
+/**
+ * Java 9 compatibility (We may switch back to Java 8 for use on Android)
  */
 sourceCompatibility = 9
 targetCompatibility = 9
 
 dependencies {
     api "${bitcoinjGroup}:${bitcoinjArtifact}:${bitcoinjVersion}"
-
-    implementation 'com.google.guava:guava:27.1-android'
-
+
     implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile 'com.msgilligan:bitcoinj-dsl:0.4.0'
+    testCompile 'com.msgilligan:bitcoinj-dsl:0.5.0'
+}
+
+ext.moduleName = 'org.consensusj.airgap'
+
+jar {
+    inputs.property('moduleName', moduleName)
+    manifest {
+        attributes  'Automatic-Module-Name': moduleName,
+                'Implementation-Version': archiveVersion
+    }
 }

airgaplib/src/main/java/module-info.java

@@ -1,15 +1,13 @@
 /**
- *
+ * Java Platform Module System dependencies and exports for airgaplib.
+ * Note: We may backport this library to Java 8 and eliminate this file.
  */
 module org.consensusj.airgap {
     requires org.bitcoinj.core;
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.core;
-    requires jackson.annotations;
     requires org.slf4j;
-
-    requires com.google.common;
-
+
     exports org.consensusj.airgap;
     exports org.consensusj.airgap.json;
     exports org.consensusj.airgap.keychain;

airgaplib/src/main/java/org/consensusj/airgap/AirGapTransactionSigner.java

@@ -11,7 +11,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.Transaction;
@@ -98,6 +97,18 @@ public TransactionSignatureResponse signatureResponseFromSigningRequest(Transact
         return response;
     }
 
+    /**
+     * Create a signature response Json string (without display or confirmation) for a signing request Json string
+     *
+     * @param requestJsonString Request Json string
+     * @return Signed response Json string
+     */
+    public String signatureResponseFromSigningRequestJson(String requestJsonString) {
+        TransactionSigningRequest request = parseSigningRequestJson(requestJsonString);
+        TransactionSignatureResponse response = signatureResponseFromSigningRequest(request);
+        return serializeResponse(response);
+    }
+
     /**
      * Create an {@code InputSignature} for transaction input
      *
@@ -139,10 +150,12 @@ public Transaction signTransaction(TransactionSigningRequest request) {
             TransactionOutPoint outPoint = new TransactionOutPoint(netParams,
                         input.getIndex(),
                         Sha256Hash.wrap(input.getTxHash()));
-            Address fromAddr = LegacyAddress.fromBase58(netParams, input.getSender());
+            Address fromAddr = Address.fromString(netParams, input.getSender());
             DeterministicKey fromKey = keyChain.findKeyFromPubHash(fromAddr.getHash());
             tx.addSignedInput(outPoint, ScriptBuilder.createOutputScript(fromAddr), fromKey);
         }
         return tx;
     }
+
+
 }

airgaplib/src/main/java/org/consensusj/airgap/BipStandardKeyChainGroupStructure.java

@@ -6,8 +6,6 @@
 import org.bitcoinj.script.Script;
 import org.bitcoinj.wallet.KeyChainGroupStructure;
 
-import java.util.Collections;
-
 /**
  * KeyChainGroupStructure that supports BIP44, etc. This should be part of bitcoinj.
  */
@@ -25,8 +23,8 @@ public class BipStandardKeyChainGroupStructure implements KeyChainGroupStructure
     public static ChildNumber CHANGE_RECEIVING = new ChildNumber(0, false);
     public static ChildNumber CHANGE_CHANGE = new ChildNumber(1, false);
 
-    private static final HDPath BIP44_PARENT = new HDPath(true, Collections.singletonList(PURPOSE_BIP44));
-    private static final HDPath BIP84_PARENT = new HDPath(true, Collections.singletonList(PURPOSE_BIP84));
+    private static final HDPath BIP44_PARENT = HDPath.m(PURPOSE_BIP44);
+    private static final HDPath BIP84_PARENT = HDPath.m(PURPOSE_BIP84);
 
     public BipStandardKeyChainGroupStructure(NetworkParameters networkParameters) {
         if (networkParameters.getId().equals(NetworkParameters.ID_MAINNET)) {