theQRL · jplomas · Nov 25, 2020 · Jun 6, 2020 · Jun 18, 2020 · Jun 18, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build_wallet:
     macos:
-      xcode: "9.0"
+      xcode: "12.2.0"
 
     steps:
       # Checkout repo
@@ -40,6 +40,10 @@ jobs:
       #     name: update npm to latest
       #     command: |
       #       npm i npm@latest -g
+      - run:
+          name: install snyk globally
+          command: |
+            npm i snyk -g && sudo chown -R $USER:$(id -gn $USER) /Users/distiller/.config
       - run:
           name: install dependencies
           command: |

diff --git a/.electrify/assets/dmgBackground.png b/.electrify/assets/dmgBackground.png
diff --git a/.electrify/assets/qrl.icns b/.electrify/assets/qrl.icns
diff --git a/.electrify/assets/qrl.ico b/.electrify/assets/qrl.ico
diff --git a/.electrify/assets/qrl.png b/.electrify/assets/qrl.png
diff --git a/.electrify/assets/splashScreen.png b/.electrify/assets/splashScreen.png
diff --git a/.electrify/index.js b/.electrify/index.js
@@ -32,7 +32,7 @@ app.on('ready', function() {
     if (process.platform === 'darwin') {
       app.setAboutPanelOptions({
         applicationName: "QRL Wallet",
-        applicationVersion: "1.5.0",
+        applicationVersion: "1.6.5",
         version: "Electron 1.8.8",
         copyright: "Die QRL Stiftung, Zug Switzerland",
         credits: "The QRL Developers"

diff --git a/.electrify/loading.html b/.electrify/loading.html
@@ -4,7 +4,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>QRL Wallet - Loading</title>
 </head>
-<body>
+<body style="background-color: #0b181e;">
 	<img src="loading.png" alt="QRL Wallet Loading" style="width: 800px;"/>
 	<script type="text/javascript">
 		var pageTitle = "QRL Wallet - Loading";

diff --git a/.electrify/loading.png b/.electrify/loading.png
diff --git a/.electrify/package-lock.json b/.electrify/package-lock.json
diff --git a/.electrify/package.json b/.electrify/package.json
@@ -2,7 +2,7 @@
   "name": "QRLWallet",
   "productName": "QRLWallet",
   "projectName": "qrl-wallet",
-  "version": "1.5.0",
+  "version": "1.6.5",
   "main": "index.js",
   "dependencies": {
     "electrify-qrl": "0.2.3",

diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -31,6 +31,7 @@ rules:
   prefer-template: 0
   dot-notation: 0
   func-names: 0
+  comma-dangle: 0
   prefer-arrow-callback: 0
   arrow-parens: 0
   import/no-extraneous-dependencies: 0

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ local.json
 /.deploy
 .DS_Store
 .snap
+/mainnet.json
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,7 @@
+// prettier.config.js or .prettierrc.js
+module.exports = {
+  trailingComma: "es5",
+  tabWidth: 2,
+  semi: false,
+  singleQuote: true,
+}
diff --git a/.snyk b/.snyk
@@ -1,5 +1,5 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.14.1
+version: v1.13.5
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
   'npm:shelljs:20140723':
@@ -22,21 +22,21 @@ ignore:
     - meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
         reason: None given
         expires: '2020-03-30T09:35:41.982Z'
-      meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
-        reason: None given
-        expires: '2020-09-28T14:57:26.056Z'
     - meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
         reason: None given
         expires: '2020-03-30T09:35:41.982Z'
-      meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
-        reason: None given
-        expires: '2020-09-28T14:57:26.056Z'
     - meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
         reason: None given
         expires: '2020-05-05T09:42:09.703Z'
     - meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
         reason: None given
         expires: '2020-05-05T09:42:09.703Z'
+    - meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
+        reason: None given
+        expires: '2020-09-28T14:57:26.056Z'
+    - meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
+        reason: None given
+        expires: '2020-09-28T14:57:26.056Z'
   'npm:plist:20180219':
     - electrify-qrl > electron-packager > plist:
         reason: None given
@@ -45,9 +45,6 @@ ignore:
     - grpc > node-pre-gyp > mkdirp > minimist:
         reason: None given
         expires: '2020-05-05T09:42:09.702Z'
-      ledger-qrl-js > mocha > mkdirp > minimist:
-        reason: None given
-        expires: '2020-09-28T14:57:26.056Z'
     - grpc > node-pre-gyp > tar > mkdirp > minimist:
         reason: None given
         expires: '2020-05-05T09:42:09.702Z'
@@ -60,6 +57,9 @@ ignore:
     - xolvio-sync-webdriverio > webdriverio > optimist > minimist:
         reason: None given
         expires: '2020-05-05T09:42:09.703Z'
+    - ledger-qrl-js > mocha > mkdirp > minimist:
+        reason: None given
+        expires: '2020-09-28T14:57:26.056Z'
   'npm:hoek:20180212':
     - phantomjs-prebuilt > request > hawk > cryptiles > boom > hoek:
         reason: None given

diff --git a/client/head.html b/client/head.html
@@ -2,5 +2,5 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>QRL Wallet</title>
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3/build/web/hack-subset.css">
+  <!-- <l ink rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3/build/web/hack-subset.css"> -->
 </head>
diff --git a/client/site/globals/site.variables.import.less b/client/site/globals/site.variables.import.less
@@ -13,13 +13,13 @@
 @pageFont          : @fontName, 'Helvetica Neue', Arial, Helvetica, sans-serif;
 
 @googleFontName    : @fontName;
-@importGoogleFonts : true;
+@importGoogleFonts : false;
 @googleFontSizes   : '400,700,400italic,700italic';
 @googleSubset      : 'latin';
 
-@googleProtocol    : 'https://';
+/* @googleProtocol    : 'https://';
 @googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';
-
+*/
 /*-------------------
       Base Sizes
 --------------------*/

diff --git a/client/themes/default/globals/site.variables.import.less b/client/themes/default/globals/site.variables.import.less
@@ -17,13 +17,13 @@
 @pageFont          : @fontName, 'Helvetica Neue', Arial, Helvetica, sans-serif;
 
 @googleFontName    : @fontName;
-@importGoogleFonts : true;
+@importGoogleFonts : false;
 @googleFontSizes   : '400,700,400italic,700italic';
 @googleSubset      : 'latin';
 
-@googleProtocol    : 'https://';
+/* @googleProtocol    : 'https://';
 @googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';
-
+*/
 /*-------------------
       Base Sizes
 --------------------*/

diff --git a/devnet.json b/devnet.json
@@ -19,5 +19,5 @@
       }
     ]
   },
-  "allowUnchecksummedNodes": false
+  "allowUnchecksummedNodes": true
 }