@bsv/sdk 1.1.27 → 1.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/sdk",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "type": "module",
   "description": "BSV Blockchain Software Development Kit",
   "main": "dist/cjs/mod.js",
@@ -133,6 +133,9 @@
       "import": "./dist/esm/src/totp/*.js",
       "require": "./dist/cjs/src/totp/*.js",
       "types": "./dist/types/src/totp/*.d.ts"
+    },
+    "./umd": {
+      "import": "./dist/umd/bundle.js"
     }
   },
   "scripts": {
@@ -140,7 +143,9 @@
     "test:watch": "npm run build && jest --watch",
     "test:coverage": "npm run build && jest --coverage",
     "lint": "ts-standard --fix src/**/*.ts",
-    "build": "tsc -b && tsconfig-to-dual-package tsconfig.cjs.json",
+    "build": "npm run build:ts && npm run build:umd",
+    "build:ts": "tsc -b && tsconfig-to-dual-package tsconfig.cjs.json",
+    "build:umd": "webpack --config webpack.config.js",
     "dev": "tsc -b -w",
     "prepublish": "npm run build",
     "doc": "ts2md --inputFilename=src/script/index.ts --outputFilename=docs/script.md --filenameSubString=script --firstHeadingLevel=1 && ts2md --inputFilename=src/primitives/index.ts --outputFilename=docs/primitives.md --filenameSubString=primitives --firstHeadingLevel=1 && ts2md --inputFilename=src/transaction/index.ts --outputFilename=docs/transaction.md --filenameSubString=transaction --firstHeadingLevel=1 && ts2md --inputFilename=src/messages/index.ts --outputFilename=docs/messages.md --filenameSubString=messages --firstHeadingLevel=1 && ts2md --inputFilename=src/compat/index.ts --outputFilename=docs/compat.md --filenameSubString=compat --firstHeadingLevel=1"
@@ -166,9 +171,12 @@
     "@types/jest": "^29.5.5",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
+    "ts-loader": "^9.5.1",
     "ts-standard": "^12.0.2",
     "ts2md": "^0.2.0",
     "tsconfig-to-dual-package": "^1.2.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "webpack": "^5.95.0",
+    "webpack-cli": "^5.1.4"
   }
 }

package/src/compat/ECIES.ts

@@ -46,9 +46,9 @@ function AES (key) {
       decKey[j] = tmp
     } else {
       decKey[j] = decTable[0][sbox[tmp >>> 24]] ^
-                decTable[1][sbox[tmp >> 16 & 255]] ^
-                decTable[2][sbox[tmp >> 8 & 255]] ^
-                decTable[3][sbox[tmp & 255]]
+        decTable[1][sbox[tmp >> 16 & 255]] ^
+        decTable[2][sbox[tmp >> 8 & 255]] ^
+        decTable[3][sbox[tmp & 255]]
     }
   }
 }
@@ -162,11 +162,11 @@ AES.prototype = {
     // Last round.
     for (i = 0; i < 4; i++) {
       out[dir ? 3 & -i : i] =
-                sbox[a >>> 24] << 24 ^
-                sbox[b >> 16 & 255] << 16 ^
-                sbox[c >> 8 & 255] << 8 ^
-                sbox[d & 255] ^
-                key[kIndex++]
+        sbox[a >>> 24] << 24 ^
+        sbox[b >> 16 & 255] << 16 ^
+        sbox[c >> 8 & 255] << 8 ^
+        sbox[d & 255] ^
+        key[kIndex++]
       a2 = a; a = b; b = c; c = d; d = a2
     }
 
@@ -200,10 +200,10 @@ class AESWrapper {
     const words = []
     for (let i = 0; i < buf.length / 4; i++) {
       const val =
-                (buf[i * 4] * 0x1000000) + // Shift the first byte by 24 bits
-                ((buf[i * 4 + 1] << 16) | // Shift the second byte by 16 bits
-                    (buf[i * 4 + 2] << 8) | // Shift the third byte by 8 bits
-                    buf[i * 4 + 3]) // The fourth byte
+        (buf[i * 4] * 0x1000000) + // Shift the first byte by 24 bits
+        ((buf[i * 4 + 1] << 16) | // Shift the second byte by 16 bits
+          (buf[i * 4 + 2] << 8) | // Shift the third byte by 8 bits
+          buf[i * 4 + 3]) // The fourth byte
       words.push(val)
     }
     return words
@@ -477,12 +477,32 @@ export default class ECIES {
       throw new Error('Invalid Magic')
     }
     let offset = 4
-    if (!fromPublicKey) {
-      // BIE1 use compressed public key, length is always 33.
-      const pub = encBuf.slice(4, 37)
-      fromPublicKey = PublicKey.fromString(toHex(pub))
-      offset = 37
+
+    // Determine if the sender's public key is included in encBuf
+    let Rbuf: number[] | null = null
+    if (encBuf.length - offset - tagLength >= 33) {
+      const firstByte = encBuf[offset]
+      if (firstByte === 0x02 || firstByte === 0x03) {
+        // Compressed public key
+        Rbuf = encBuf.slice(offset, offset + 33)
+        offset += 33
+      } else if (firstByte === 0x04) {
+        // Uncompressed public key
+        Rbuf = encBuf.slice(offset, offset + 65)
+        offset += 65
+      }
+    }
+
+    if (Rbuf) {
+      if (!fromPublicKey) {
+        fromPublicKey = PublicKey.fromString(toHex(Rbuf))
+      }
+    } else {
+      if (!fromPublicKey) {
+        throw new Error('Sender public key is required')
+      }
     }
+
     const { iv, kE, kM } = ECIES.ivkEkM(toPrivateKey, fromPublicKey)
     const ciphertext = encBuf.slice(offset, encBuf.length - tagLength)
     const hmac = encBuf.slice(encBuf.length - tagLength, encBuf.length)
@@ -492,6 +512,7 @@ export default class ECIES {
     if (toHex(hmac) !== toHex(hmac2)) {
       throw new Error('Invalid checksum')
     }
+
     return AESCBC.decrypt(ciphertext, kE, iv)
   }
 

package/src/compat/__tests/ECIES.test.ts

@@ -1,7 +1,7 @@
 import ECIES from '../../../dist/cjs/src/compat/ECIES'
 import * as Hash from '../../../dist/cjs/src/primitives/Hash'
 import PrivateKey from '../../../dist/cjs/src/primitives/PrivateKey'
-import { toArray, toHex, encode, toBase64 } from '../../../dist/cjs/src/primitives/utils'
+import { toArray, toHex, encode, toBase64, toUTF8 } from '../../../dist/cjs/src/primitives/utils'
 
 describe('#ECIES', () => {
   it('should make a new ECIES object', () => {
@@ -93,5 +93,27 @@ describe('#ECIES', () => {
       expect(ECIES.electrumDecrypt(encryptedMessage, bobPrivateKey))
         .toEqual(message)
     })
+
+    it('should encrypt and decrypt message with counterparty public key', () => {
+      const wif = 'L211enC224G1kV8pyyq7bjVd9SxZebnRYEzzM3i7ZHCc1c5E7dQu'
+      const senderPrivateKey = PrivateKey.fromWif(wif)
+      const senderPublicKey = senderPrivateKey.toPublicKey()
+      const msgStr = 'hello world'
+      const messageBuf = toArray(msgStr, 'utf8')
+
+      // Create a random counterparty (recipient) public/private key pair
+      const recipientPrivateKey = PrivateKey.fromRandom()
+      const recipientPublicKey = recipientPrivateKey.toPublicKey()
+
+      // Encrypt the message using electrumEncrypt
+      const encryptedMessage = ECIES.electrumEncrypt(messageBuf, recipientPublicKey, senderPrivateKey)
+
+      // Decrypt the message using electrumDecrypt
+      const decryptedMessageBuf = ECIES.electrumDecrypt(encryptedMessage, recipientPrivateKey, senderPublicKey)
+
+      const decryptedMsgStr = toUTF8(decryptedMessageBuf)
+
+      expect(decryptedMsgStr).toEqual(msgStr)
+    })
   })
 })