Merge branch 'master' into fix/remove-deps

Author: AlexV525

.env

@@ -15,3 +15,4 @@ WALLET_PATH=./wallets
 WALLET_FILE=wallet.json
 # testnet or livenet or regtest
 NETWORK=livenet
+DISABLE_DONATE_QUOTE=false

.env.example

@@ -15,3 +15,4 @@ WALLET_PATH=./wallets
 WALLET_FILE=wallet.json
 # testnet or livenet or regtest
 NETWORK=livenet
+DISABLE_DONATE_QUOTE=false

lib/cli.ts

@@ -12,19 +12,52 @@ import { fileReader, jsonFileReader, jsonFileWriter } from './utils/file-utils';
 import * as cbor from 'borc';
 import { toOutputScript } from 'bitcoinjs-lib/src/address';
 import { compactIdToOutpoint, outpointToCompactId } from './utils/atomical-format-helpers';
+import * as quotes from 'success-motivational-quotes'; 
+import * as chalk from 'chalk';
+ 
 dotenv.config();
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // General Helper Functions
 /////////////////////////////////////////////////////////////////////////////////////////////
-function printOperationResult(data: any, error?: boolean) {
+function printSuccess(data: any, showDonation?: boolean) {
+  console.log(JSON.stringify(data, null, 2));
+  if (!showDonation) {
+    return;
+  }
+
+  if (process.env.DISABLE_DONATE_QUOTE && process.env.DISABLE_DONATE_QUOTE === 'true') {
+    return;
+  }
+  console.log(chalk.blue("\n\n------------------------------------------------------------------------------"));
+
+  let q = 'Recommend to your children virtue; that alone can make them happy, not gold.';
+  let by = 'Ludwig van Beethoven';
+  try {
+    const quoteObj = quotes.getTodaysQuote();
+    q = quoteObj.body;
+    by = quoteObj.by;
+  } catch (ex) {
+    // Lib not installed
+  }
+  console.log(chalk.green(q));
+  console.log(chalk.green('- ' + by));
+  console.log(chalk.blue("------------------------------------------------------------------------------\n"))
+  const donate = 'bc1pl6k2z5ra403zfeyevzsu7llh0mdqqn4802p4uqfhz6l7qzddq2mqduqvc6';
+  console.log('Thank you for your support and contributions to Atomicals CLI development! ❤️');
+  console.log(`Donation address: ${donate}\n`);
+  console.log(`Even a little goes a long way!\n`);
+  console.log(`Scan QR Code to Donate:`);
+  qrcode.generate(donate, { small: true });
+}
+function printFailure(data: any) {
   console.log(JSON.stringify(data, null, 2));
 }
-function handleResultLogging(result: any) {
-  if (!result || !result.success) {
-    printOperationResult(result, true);
+function handleResultLogging(result: any, showDonation?: boolean) {
+  if (!result || !result.success || !result.data) {
+    printFailure(result);
   } else {
-    printOperationResult(result.data);
+    printSuccess(result.data, showDonation);
   }
 }
 
@@ -1022,7 +1055,7 @@ program.command('mint-item')
         bitworkr: options.bitworkr,
         disableMiningChalk: options.disablechalk,
       }, containerName, itemName, manifestFile, initialOwnerAddress.address, fundingRecord.WIF, ownerWalletRecord);
-      handleResultLogging(result);
+      handleResultLogging(result, true);
     } catch (error) {
       console.log(error);
     }
@@ -1171,6 +1204,7 @@ program.command('splat')
     }
   });
 
+/*
 program.command('split')
   .description('Split operation to separate the FT Atomicals at a single UTXOs.')
   .argument('<locationId>', 'string')
@@ -1194,6 +1228,7 @@ program.command('split')
       console.log(error);
     }
   });
+*/
 
 program.command('get')
   .description('Get the status of an Atomical')
@@ -1206,7 +1241,7 @@ program.command('get')
       const atomicals = new Atomicals(ElectrumApi.createClient(process.env.ELECTRUMX_PROXY_BASE_URL || ''));
       const verbose = options.verbose ? true : false;
       const result = await atomicals.resolveAtomical(atomicalAliasOrId, AtomicalsGetFetchType.GET, undefined, verbose);
-      handleResultLogging(result);
+      handleResultLogging(result, true);
     } catch (error) {
       console.log(error);
     }
@@ -1539,7 +1574,7 @@ program.command('mint-dft')
         satsbyte: parseInt(options.satsbyte),
         disableMiningChalk: options.disablechalk,
       }, walletRecord.address, ticker, fundingRecord.WIF);
-      handleResultLogging(result);
+      handleResultLogging(result, true);
     } catch (error) {
       console.log(error);
     }
@@ -1624,7 +1659,7 @@ program.command('mint-realm')
         parentOwner: parentOwnerRecord,
         disableMiningChalk: options.disablechalk,
       }, realm, initialOwnerAddress.address, fundingRecord.WIF);
-      handleResultLogging(result);
+      handleResultLogging(result, true);
     } catch (error) {
       console.log(error);
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "atomicals-js",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "description": "Atomicals Javascript Library and CLI - atomicals.xyz",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -75,6 +75,7 @@
     "path": "^0.12.7",
     "qrcode-terminal": "^0.12.0",
     "rpc-websockets": "^7.5.0",
+    "success-motivational-quotes": "^1.0.8",
     "terminal-image": "^2.0.0",
     "tiny-secp256k1": "^2.2.1",
     "varuint-bitcoin": "^1.1.2"
@@ -86,4 +87,4 @@
     "lib": "lib",
     "test": "test"
   }
-}
+}

yarn.lock

@@ -6026,6 +6026,11 @@ strtok3@^6.2.4:
     "@tokenizer/token" "^0.3.0"
     peek-readable "^4.1.0"
 
+success-motivational-quotes@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/success-motivational-quotes/-/success-motivational-quotes-1.0.8.tgz#4a5c31c4a8f48e4f240e28f12f7f36009555f434"
+  integrity sha512-EfLnDThsqCQg+dJoDntdPY/OSDGag8hE+O/cuHnGbOv8pzmrZeiyKn0X00LSTNAHWfNETo0XRvsEXVoxqsNclw==
+
 [email protected]:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"