chore: ledger-v backport

.changeset/twenty-humans-beg.md

@@ -0,0 +1,6 @@
+---
+'@celo/wallet-ledger': patch
+'@celo/viem-account-ledger': patch
+---
+
+Safer handling of v from device

.prettierignore

@@ -7,6 +7,7 @@ package.json
 
 packages/**/dist
 packages/**/lib
+packages/**/lib-es
 
 # Needed because we have packages/celotool/src/lib
 !packages/celotool/src/**

docs/sdk/wallet-ledger/classes/ledger_signer.LedgerSigner.md

@@ -72,7 +72,7 @@ Signer.computeSharedSecret
 
 #### Defined in
 
-[wallet-ledger/src/ledger-signer.ts:190](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L190)
+[wallet-ledger/src/ledger-signer.ts:207](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L207)
 
 ___
 
@@ -96,7 +96,7 @@ Signer.decrypt
 
 #### Defined in
 
-[wallet-ledger/src/ledger-signer.ts:184](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L184)
+[wallet-ledger/src/ledger-signer.ts:201](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L201)
 
 ___
 
@@ -138,7 +138,7 @@ Signer.signPersonalMessage
 
 #### Defined in
 
-[wallet-ledger/src/ledger-signer.ts:79](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L79)
+[wallet-ledger/src/ledger-signer.ts:96](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L96)
 
 ___
 
@@ -187,4 +187,4 @@ Signer.signTypedData
 
 #### Defined in
 
-[wallet-ledger/src/ledger-signer.ts:99](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L99)
+[wallet-ledger/src/ledger-signer.ts:116](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts#L116)

packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts

@@ -49,16 +49,33 @@ export class LedgerSigner implements Signer {
     try {
       const validatedDerivationPath = await this.getValidatedDerivationPath()
       await this.checkForKnownToken(encodedTx)
-      const signature = await this.ledger!.signTransaction(
+      let {
+        r,
+        s,
+        v: _v,
+      } = await this.ledger!.signTransaction(
         validatedDerivationPath,
         trimLeading0x(encodedTx.rlpEncode), // the ledger requires the rlpEncode without the leading 0x
         null
       )
 
+      if (typeof _v === 'string' && (_v === '' || _v === '0x')) {
+        console.warn(
+          `ledger-signer@signTransaction: signature \`v\` was malformed \`${_v}\`. Replaced with "0x0"`
+        )
+        _v = '0x0'
+      }
+      const v = typeof _v === 'string' ? parseInt(ensureLeading0x(_v), 16) : _v
+      if (isNaN(v)) {
+        throw new Error(
+          `ledger-signer@signTransaction: signature \`v\` was malformed and was parsed to NaN \`${_v}\``
+        )
+      }
+
       return {
-        v: parseInt(signature.v, 16),
-        r: ethUtil.toBuffer(ensureLeading0x(signature.r)),
-        s: ethUtil.toBuffer(ensureLeading0x(signature.s)),
+        v,
+        r: ethUtil.toBuffer(ensureLeading0x(r)),
+        s: ethUtil.toBuffer(ensureLeading0x(s)),
       }
     } catch (error: unknown) {
       if (error instanceof TransportStatusError) {

packages/viem-account-ledger/.gitignore

@@ -1,4 +1,5 @@
 lib/
+lib-es/
 tmp/
 .tmp/
-.env
+.env

packages/viem-account-ledger/package.json

@@ -3,10 +3,9 @@
   "version": "1.0.0-beta.1",
   "description": "Helper library to make ledger<->viem interactions easier",
   "type": "module",
-  "exports": {
-    ".": "./lib/index.js"
-  },
-  "types": "./lib/index.d.ts",
+  "main": "lib/index.js",
+  "module": "lib-es/index.js",
+  "types": "lib/index.d.ts",
   "author": "cLabs",
   "license": "Apache-2.0",
   "homepage": "https://docs.celo.org/developer/tools",
@@ -18,12 +17,14 @@
     "ledger"
   ],
   "scripts": {
-    "build": "yarn run --top-level tsc -b .",
-    "clean": "yarn run --top-level tsc -b . --clean",
-    "docs": "yarn run --top-level typedoc",
+    "build": "yarn build:cjs && yarn build:esm",
+    "build:cjs": "yarn --top-level run tsc -m commonjs",
+    "build:esm": "yarn --top-level run tsc -m ES6 --outDir lib-es",
+    "clean": "yarn --top-level run tsc -b . --clean && yarn run rimraf lib lib-es",
+    "docs": "yarn --top-level run typedoc",
     "test": "yarn run vitest",
-    "lint": "yarn run --top-level eslint -c .eslintrc.cjs ",
-    "prepublishOnly": "yarn build"
+    "lint": "yarn --top-level run eslint -c .eslintrc.cjs ",
+    "prepublishOnly": "yarn clean && yarn build"
   },
   "peerDependencies": {
     "@ledgerhq/hw-transport-node-hid": "^6.x",
@@ -45,6 +46,7 @@
     "@ledgerhq/hw-transport-node-hid": "^6.29.5",
     "@vitest/coverage-v8": "2.1.2",
     "dotenv": "^8.2.0",
+    "rimraf": "^4.4.1",
     "viem": "^2.21.14",
     "vitest": "^2.1.2"
   },