privacycash 1.0.7 → 1.0.12

package/.github/workflows/npm-publish.yml

@@ -1,67 +1,55 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
-
-name: Publish to npm
+name: Publish to npm when version changes
 
 on:
   push:
     branches:
       - main
+      - master
+    paths:
+      - "package.json"
+
+permissions:
+  id-token: write
+  contents: read
 
 jobs:
   publish:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
-          registry-url: "https://registry.npmjs.org"
-          cache: "npm"
+          node-version: 24
+          registry-url: https://registry.npmjs.org/
 
-      # Get previous version from the last commit in origin/main
-      - name: Get previous package.json version
-        run: |
-          PREV=$(git show origin/main~1:package.json | jq -r .version)
-          echo "Previous version: $PREV"
-          echo "PREV_VERSION=$PREV" >> $GITHUB_ENV
-
-      # Get current version from package.json
-      - name: Get current package.json version
-        run: |
-          CURR=$(jq -r .version package.json)
-          echo "CURR_VERSION=$CURR"
-          echo "CURR_VERSION=$CURR" >> $GITHUB_ENV
+      - name: Get current package version
+        id: pkg
+        run: echo "version=$(node -p 'require(\"./package.json\").version')" >> $GITHUB_OUTPUT
 
-      # Compare previous and current versions
-      - name: Compare versions
+      - name: Check if version already exists on npm
+        id: check
         run: |
-          if [ "$PREV_VERSION" = "$CURR_VERSION" ]; then
-            echo "Version unchanged, skip publish"
-            echo "SHOULD_PUBLISH=false" >> $GITHUB_ENV
+          PKG_NAME=$(node -p 'require("./package.json").name')
+          PUBLISHED=$(npm view $PKG_NAME versions --json | grep -o "\"${{ steps.pkg.outputs.version }}\"" || true)
+          if [ -n "$PUBLISHED" ]; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            echo "Version ${{ steps.pkg.outputs.version }} already exists on npm. Skipping publish."
           else
-            echo "Version changed, will publish"
-            echo "SHOULD_PUBLISH=true" >> $GITHUB_ENV
+            echo "exists=false" >> $GITHUB_OUTPUT
           fi
 
-      # Install dependencies only if publish is needed
       - name: Install dependencies
-        if: env.SHOULD_PUBLISH == 'true'
-        run: npm ci
+        run: npm install
 
-      # Run build script before publishing
-      - name: Build project
-        if: env.SHOULD_PUBLISH == 'true'
-        run: npm run build
+      - name: Build source
+        run: npm run build || echo "No build script defined."
 
-      # Publish to npm
       - name: Publish to npm
-        if: env.SHOULD_PUBLISH == 'true'
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        if: steps.check.outputs.exists == 'false'
+        run: |
+          echo "Publishing version ${{ steps.pkg.outputs.version }}..."
+          npm publish --access public

package/dist/getUtxos.js

@@ -60,6 +60,7 @@ export async function getUtxos({ publicKey, connection, encryptionService, stora
                         const spentFlags = await areUtxosSpent(connection, nonZeroUtxos);
                         for (let i = 0; i < nonZeroUtxos.length; i++) {
                             if (!spentFlags[i]) {
+                                logger.debug(`found unspent encrypted_output ${nonZeroEncrypted[i]}`);
                                 am += nonZeroUtxos[i].amount.toNumber();
                                 valid_utxos.push(nonZeroUtxos[i]);
                                 valid_strings.push(nonZeroEncrypted[i]);
@@ -80,7 +81,9 @@ export async function getUtxos({ publicKey, connection, encryptionService, stora
                 getMyUtxosPromise = null;
             }
             // store valid strings
+            logger.debug(`valid_strings len before set: ${valid_strings.length}`);
             valid_strings = [...new Set(valid_strings)];
+            logger.debug(`valid_strings len after set: ${valid_strings.length}`);
             storage.setItem(LSK_ENCRYPTED_OUTPUTS + localstorageKey(publicKey), JSON.stringify(valid_strings));
             return valid_utxos;
         })();

package/dist/withdraw.js

@@ -74,6 +74,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
         amount: '0'
     });
     const inputs = [firstInput, secondInput];
+    logger.debug(`firstInput index: ${firstInput.index}, commitment: ${firstInput.getCommitment()}`);
+    logger.debug(`secondInput index: ${secondInput.index}, commitment: ${secondInput.getCommitment()}`);
     const totalInputAmount = firstInput.amount.add(secondInput.amount);
     logger.debug(`Using UTXO with amount: ${firstInput.amount.toString()} and ${secondInput.amount.gt(new BN(0)) ? 'second UTXO with amount: ' + secondInput.amount.toString() : 'dummy UTXO'}`);
     if (totalInputAmount.toNumber() === 0) {
@@ -146,6 +148,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     await outputs[0].log();
     logger.debug(`\nOutput[1] (empty):`);
     await outputs[1].log();
+    logger.debug(`Encrypted output 1: ${encryptedOutput1.toString('hex')}`);
+    logger.debug(`Encrypted output 2: ${encryptedOutput2.toString('hex')}`);
     logger.debug(`\nEncrypted output 1 size: ${encryptedOutput1.length} bytes`);
     logger.debug(`Encrypted output 2 size: ${encryptedOutput2.length} bytes`);
     logger.debug(`Total encrypted outputs size: ${encryptedOutput1.length + encryptedOutput2.length} bytes`);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "privacycash",
-  "version": "1.0.7",
+  "version": "1.0.12",
   "description": "",
   "main": "dist/index.js",
+  "repository": "https://github.com/Privacy-Cash/privacy-cash-sdk",
   "exports": {
     ".": "./dist/index.js",
     "./utils": "./dist/exportUtils.js"

package/src/getUtxos.ts

@@ -90,6 +90,7 @@ export async function getUtxos({ publicKey, connection, encryptionService, stora
                         const spentFlags = await areUtxosSpent(connection, nonZeroUtxos);
                         for (let i = 0; i < nonZeroUtxos.length; i++) {
                             if (!spentFlags[i]) {
+                                logger.debug(`found unspent encrypted_output ${nonZeroEncrypted[i]}`)
                                 am += nonZeroUtxos[i].amount.toNumber();
                                 valid_utxos.push(nonZeroUtxos[i]);
                                 valid_strings.push(nonZeroEncrypted[i]);
@@ -108,7 +109,9 @@ export async function getUtxos({ publicKey, connection, encryptionService, stora
                 getMyUtxosPromise = null
             }
             // store valid strings
+            logger.debug(`valid_strings len before set: ${valid_strings.length}`)
             valid_strings = [...new Set(valid_strings)];
+            logger.debug(`valid_strings len after set: ${valid_strings.length}`)
             storage.setItem(LSK_ENCRYPTED_OUTPUTS + localstorageKey(publicKey), JSON.stringify(valid_strings))
             return valid_utxos
         })()

package/src/withdraw.ts

@@ -107,6 +107,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     });
 
     const inputs = [firstInput, secondInput];
+    logger.debug(`firstInput index: ${firstInput.index}, commitment: ${firstInput.getCommitment()}`)
+    logger.debug(`secondInput index: ${secondInput.index}, commitment: ${secondInput.getCommitment()}`)
     const totalInputAmount = firstInput.amount.add(secondInput.amount);
     logger.debug(`Using UTXO with amount: ${firstInput.amount.toString()} and ${secondInput.amount.gt(new BN(0)) ? 'second UTXO with amount: ' + secondInput.amount.toString() : 'dummy UTXO'}`);
     if (totalInputAmount.toNumber() === 0) {
@@ -192,7 +194,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     await outputs[0].log();
     logger.debug(`\nOutput[1] (empty):`);
     await outputs[1].log();
-
+    logger.debug(`Encrypted output 1: ${encryptedOutput1.toString('hex')}`)
+    logger.debug(`Encrypted output 2: ${encryptedOutput2.toString('hex')}`)
     logger.debug(`\nEncrypted output 1 size: ${encryptedOutput1.length} bytes`);
     logger.debug(`Encrypted output 2 size: ${encryptedOutput2.length} bytes`);
     logger.debug(`Total encrypted outputs size: ${encryptedOutput1.length + encryptedOutput2.length} bytes`);