balanceofsatoshis 23.1.1 → 23.1.3

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## 23.1.1
+## 23.1.3
+
+- Dependency cleanup: remove crypto js dependency
+
+## 23.1.2
 
 - Add `--avoid-append` to add failing edges to an avoid list based on formula
 - Add support for LND 0.20.2

package/encryption/index.js

@@ -1,6 +1,5 @@
 const certExpiration = require('./cert_expiration');
 const decryptCiphertext = require('./decrypt_ciphertext');
-const decryptPayload = require('./decrypt_payload');
 const decryptWithNode = require('./decrypt_with_node');
 const derAsPem = require('./der_as_pem');
 const encryptToNode = require('./encrypt_to_node');
@@ -10,7 +9,6 @@ const pemAsDer = require('./pem_as_der');
 module.exports = {
   certExpiration,
   decryptCiphertext,
-  decryptPayload,
   decryptWithNode,
   derAsPem,
   encryptToNode,

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/alexbosworth/balanceofsatoshis/issues"
   },
   "dependencies": {
-    "@alexbosworth/blockchain": "3.2.0",
+    "@alexbosworth/blockchain": "4.0.0",
     "@alexbosworth/caporal": "2.0.0",
     "@alexbosworth/fiat": "2.0.0",
     "@alexbosworth/formulas": "1.4.0",
@@ -28,8 +28,7 @@
     "bolt07": "1.9.5",
     "cbor": "10.0.12",
     "colorette": "2.0.20",
-    "crypto-js": "4.2.0",
-    "csv-parse": "7.0.1",
+    "csv-parse": "7.0.2",
     "goldengate": "16.0.4",
     "grammy": "1.45.1",
     "import-lazy": "4.0.0",
@@ -38,10 +37,10 @@
     "ln-accounting": "10.0.4",
     "ln-service": "59.2.3",
     "ln-sync": "8.0.3",
-    "ln-telegram": "8.0.4",
+    "ln-telegram": "8.0.5",
     "minimist": "1.2.8",
     "moment": "2.30.1",
-    "paid-services": "8.0.4",
+    "paid-services": "8.0.5",
     "probing": "7.0.0",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.4",
@@ -80,5 +79,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "node --experimental-test-coverage --test test/arrays/*.js test/balances/*.js test/chain/*.js test/display/*.js test/encryption/*.js test/lnd/*.js test/network/*.js test/nodes/*.js test/peers/*.js test/responses/*.js test/routing/*.js test/services/*.js test/swaps/*.js test/tags/*.js test/telegram/*.js test/wallets/*.js"
   },
-  "version": "23.1.1"
+  "version": "23.1.3"
 }

package/encryption/decrypt_payload.js

@@ -1,54 +0,0 @@
-const {AES} = require('crypto-js');
-const {enc} = require('crypto-js');
-const {lib} = require('crypto-js');
-const {mode} = require('crypto-js');
-const {pad} = require('crypto-js');
-
-const {decrypt} = AES;
-const {Hex} = enc;
-const padding = pad.NoPadding;
-const takeCipherWords = words => words.slice(4);
-const takeIvWords = words => words.slice(0, 4);
-const trim = (hex, index) => hex.slice(0, index === 0 ? undefined : index);
-const {WordArray} = lib;
-const zeroIndex = h => h.split('').slice().reverse().findIndex(n => n !== '0');
-
-/** Decrypt encrypted payload
-
-  {
-    encrypted: <Encrypted Data Hex String>
-    secret: <Secret Key String>
-  }
-
-  @throws
-  <Error>
-
-  @returns
-  {
-    payload: <UTF8 Payload String>
-  }
-*/
-module.exports = ({encrypted, secret}) => {
-  if (!encrypted) {
-    throw new Error('ExpectedEncryptedPayloadToDecrypt');
-  }
-
-  if (!secret) {
-    throw new Error('ExpectedDecryptionSecretKeyToDecrypt');
-  }
-
-  const [key, payload] = [secret, encrypted].map(Hex.parse);
-
-  const hex = WordArray.create(takeCipherWords(payload.words)).toString(Hex);
-  const iv = WordArray.create(takeIvWords(payload.words));
-
-  const ciphertext = Hex.parse(trim(hex, hex.length - zeroIndex(hex)));
-
-  try {
-    const clear = decrypt({ciphertext}, key, {iv, padding, mode: mode.CFB});
-
-    return {payload: clear.toString(enc.Utf8)};
-  } catch (err) {
-    throw new Error('FailedToDecryptCipherTextWithSecretKey');
-  }
-};

package/test/encryption/test_decrypt_payload.js

@@ -1,55 +0,0 @@
-const {equal} = require('node:assert').strict;
-const test = require('node:test');
-const {throws} = require('node:assert').strict;
-
-const {decryptPayload} = require('./../../encryption');
-const {encrypted} = require('./fixtures');
-const {secret} = require('./fixtures');
-
-const {parse} = JSON;
-
-const tests = [
-  {
-    args: {},
-    description: 'An encrypted payload is required',
-    error: 'ExpectedEncryptedPayloadToDecrypt',
-  },
-  {
-    args: {encrypted},
-    description: 'A secret key is required',
-    error: 'ExpectedDecryptionSecretKeyToDecrypt',
-  },
-  {
-    args: {encrypted, secret: 'ff'},
-    description: 'A valid secret key is required',
-    error: 'FailedToDecryptCipherTextWithSecretKey',
-  },
-  {
-    args: {
-      secret,
-      encrypted: Buffer.from(encrypted, 'base64').toString('hex'),
-    },
-    description: 'Paylaod is decrypted',
-    expected: {
-      pair: 'BTCUSD',
-      price: 4004.14,
-      timestamp: '2019-01-10T00:00:11.000Z',
-    },
-  },
-];
-
-tests.forEach(({args, description, error, expected}) => {
-  return test(description, (t, end) => {
-    if (!!error) {
-      throws(() => decryptPayload(args), new Error(error), 'Got error');
-    } else {
-      const [{pair, price, timestamp}] = parse(decryptPayload(args).payload);
-
-      equal(pair, expected.pair, 'Got expected pair');
-      equal(price, expected.price, 'Got expectd price');
-      equal(timestamp, expected.timestamp, 'Got expected timestamp');
-    }
-
-    return end();
-  });
-});