Merge cargo toml

cli/mkrelease.sh

@@ -32,7 +32,7 @@ cargo clean
 cargo build --release 
 
 # For Windows and Linux, build via docker
-docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.1 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-musl && cargo build --release --target x86_64-pc-windows-gnu"
+docker run --rm -v $(pwd)/..:/opt/zecpaperwallet rust/zecpaperwallet:v0.2 bash -c "cd /opt/zecpaperwallet/cli && cargo build --release --target x86_64-unknown-linux-musl && cargo build --release --target x86_64-pc-windows-gnu && cargo build --release --target aarch64-unknown-linux-gnu"
 
 # Now sign and zip the binaries
 #macOS
@@ -72,3 +72,17 @@ gsha256sum zecpaperwallet.exe > sha256sum.txt
 cd ..
 zip -r Windows-zecpaperwallet-v$APP_VERSION.zip Windows-zecpaperwallet-v$APP_VERSION 
 cd ..
+
+
+# aarch64 (armv8)
+rm -rf target/aarch64-zecpaperwallet-v$APP_VERSION
+mkdir -p target/aarch64-zecpaperwallet-v$APP_VERSION
+cp target/aarch64-unknown-linux-gnu/release/zecpaperwallet target/aarch64-zecpaperwallet-v$APP_VERSION/
+gpg --batch --output target/aarch64-zecpaperwallet-v$APP_VERSION/zecpaperwallet.sig --detach-sig target/aarch64-zecpaperwallet-v$APP_VERSION/zecpaperwallet
+cd target
+cd aarch64-zecpaperwallet-v$APP_VERSION
+gsha256sum zecpaperwallet > sha256sum.txt
+cd ..
+zip -r aarch64-zecpaperwallet-v$APP_VERSION.zip aarch64-zecpaperwallet-v$APP_VERSION 
+cd ..
+

lib/Cargo.toml

@@ -16,3 +16,6 @@ secp256k1 = { version = "0.13.0", features = ["rand", "serde"] }
 ripemd160 = "0.8.0"
 sha2 = "0.8.0"
 base58 = "0.1.0"
+
+[dev-dependencies]
+array2d = "0.1.0"

lib/src/pdf.rs

@@ -219,6 +219,58 @@ fn split_to_max(s: &str, max: usize, blocksize: usize) -> Vec<String> {
 
 #[cfg(test)]
 mod tests {
+
+    #[test]
+    fn test_qrcode_scale() {
+        use array2d::Array2D;
+        use qrcode::QrCode;
+        use crate::pdf::qrcode_scaled;
+
+        let testdata = "This is some testdata";
+        let code = QrCode::new(testdata.as_bytes()).unwrap();
+        let width = code.width();
+
+        let factor  = 10;
+        let padding = 10;
+
+        let (scaled, size) = qrcode_scaled(testdata, factor);
+        let scaled_size = (width * factor)+(2*padding);
+
+        assert_eq!(size, scaled_size);
+
+        // 3 bytes per pixel
+        let scaled_qrcode = Array2D::from_row_major(&scaled, scaled_size, scaled_size*3); 
+
+        for i in 0..scaled_size {
+            for j in 0..scaled_size {                
+                // The padding should be white
+                if i < padding || i >= (width*factor) + padding ||
+                    j < padding || j >= (width*factor) + padding {
+                        for px in 0..3 {
+                            assert_eq!(scaled_qrcode[(i, j*3+px)], 255u8);
+                        }
+                } else {
+                    // Should match the QR code module
+                    let module_i = (i-padding)/factor;
+                    let module_j = (j-padding)/factor;
+                    
+                    // This should really be (i,j), but I think there's a bug in the qrcode
+                    // module that is returning it the other way.
+                    let color = if code[(module_j, module_i)] == qrcode::Color::Light {
+                        // Light color is white
+                        255u8
+                    } else {
+                        // Dark color is black
+                        0u8
+                    };
+
+                    for px in 0..3 {
+                        assert_eq!(scaled_qrcode[(i, j*3+px)], color);
+                    }
+                }
+            }
+        }
+    }
     
     #[test]
     fn test_split() {