tests on push

cashubtc · Nov 30, 2023 · 848a0f5 · 848a0f5
1 parent 66be50b
commit 848a0f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -3,7 +3,11 @@
 
 name: Node.js CI
 
-on: 
+on:
+  # push for all branches
+  push:
+    branches:
+      - '*'
   pull_request:
     types:
       - ready_for_review
@@ -27,4 +31,4 @@ jobs:
           cache: 'npm'
       - run: npm ci
       - run: npm run compile
-      - run: npm test
+      - run: npm test
diff --git a/src/utils.ts b/src/utils.ts
@@ -127,12 +127,13 @@ function handleTokens(token: string): Token {
  * @returns
  */
 export function deriveKeysetId(keys: MintKeys) {
-	const pubkeysConcat = Object.entries(keys)
+	const pubkeysConcat = Object.entries(keys.keys)
 		.sort((a, b) => +a[0] - +b[0])
 		.map(([, pubKey]) => pubKey)
 		.join('');
 	const hash = sha256(new TextEncoder().encode(pubkeysConcat));
-	return Buffer.from(hash).toString('base64').slice(0, 12);
+	const hashHex = bytesToHex(hash);
+	return "00" + hashHex.slice(0, 12);
 }
 /**
  * merge proofs from same mint,

diff --git a/test/integration.test.ts b/test/integration.test.ts
@@ -2,7 +2,7 @@ import { CashuMint } from '../src/CashuMint.js';
 import { CashuWallet } from '../src/CashuWallet.js';
 
 import dns from 'node:dns';
-import { getEncodedToken } from '../src/utils.js';
+import { deriveKeysetId, getEncodedToken } from '../src/utils.js';
 dns.setDefaultResultOrder('ipv4first');
 
 const externalInvoice =