Merge branch 'dev' into refactor/distributed-metadata

.changeset/long-toys-act.md

@@ -0,0 +1,5 @@
+---
+"@talismn/chain-connector": patch
+---
+
+Improved error handling in Websocket connector

.changeset/moody-moons-teach.md

@@ -0,0 +1,8 @@
+---
+"@talismn/balances-evm-native": patch
+"@talismn/chain-connector-evm": patch
+"@talismn/balances-evm-erc20": patch
+"@talismn/util": patch
+---
+
+replace ethers by viem

.changeset/quiet-papayas-cheat.md

@@ -0,0 +1,6 @@
+---
+"@talismn/chain-connector": patch
+"@talismn/util": patch
+---
+
+Error handling improvements

.changeset/witty-spiders-rhyme.md

@@ -0,0 +1,6 @@
+---
+"@talismn/chain-connector-evm": minor
+"@talismn/on-chain-id": minor
+---
+
+replace ethers by viem

apps/extension/package.json

@@ -9,12 +9,13 @@
     "@babel/eslint-parser": "^7.19.1",
     "@dnd-kit/core": "6.0.7",
     "@dnd-kit/sortable": "7.0.2",
+    "@eth-optimism/contracts-ts": "^0.17.0",
     "@ethereumjs/util": "8.0.3",
     "@floating-ui/react": "0.24.3",
     "@floating-ui/react-dom": "2.0.1",
     "@headlessui/react": "1.7.13",
     "@hookform/resolvers": "2.9.11",
-    "@ledgerhq/hw-app-eth": "6.33.3",
+    "@ledgerhq/hw-app-eth": "6.34.8",
     "@ledgerhq/hw-transport-webusb": "6.27.14",
     "@metamask/browser-passworder": "4.1.0",
     "@metamask/eth-sig-util": "5.1.0",
@@ -92,7 +93,6 @@
     "dotenv-webpack": "^7.1.1",
     "downshift": "^6.1.12",
     "eth-phishing-detect": "latest",
-    "ethers": "5.7.2",
     "fork-ts-checker-notifier-webpack-plugin": "^6.0.0",
     "fork-ts-checker-webpack-plugin": "^7.2.14",
     "framer-motion": "10.12.18",
@@ -129,6 +129,7 @@
     "scale-codec": "^0.11.0",
     "semver": "^7.5.4",
     "style-loader": "3.3.3",
+    "subshape": "^0.14.0",
     "talisman-ui": "workspace:*",
     "terser-webpack-plugin": "5.3.9",
     "toml": "^3.0.0",
@@ -137,6 +138,7 @@
     "typescript": "^5.2.2",
     "url-join": "^5.0.0",
     "uuid": "^8.3.2",
+    "viem": "^1.18.9",
     "webextension-polyfill": "0.8.0",
     "webpack": "^5.88.1",
     "webpack-cli": "^4.10.0",

apps/extension/src/@talisman/util/formatEthValue.ts

@@ -1,9 +1,7 @@
-import { formatDecimals } from "@talismn/util"
-import { BigNumber, BigNumberish } from "ethers"
-import { formatUnits } from "ethers/lib/utils"
+import { formatDecimals, planckToTokens } from "@talismn/util"
 
-export const formatEtherValue = (value: BigNumberish, decimals: number, symbol?: string) => {
-  return `${formatDecimals(formatUnits(BigNumber.from(value), decimals))}${
+export const formatEthValue = (value: bigint, decimals: number, symbol?: string) => {
+  return `${formatDecimals(planckToTokens(value.toString(), decimals))}${
     symbol ? ` ${symbol}` : ""
   }`
 }

apps/extension/src/core/config/sentry.ts

@@ -22,6 +22,10 @@ export const initSentry = (sentry: typeof SentryBrowser | typeof SentryReact) =>
     release: process.env.RELEASE,
     sampleRate: 1,
     maxBreadcrumbs: 20,
+    ignoreErrors: [
+      /(No window with id: )(\d+).?/,
+      /(disconnected from wss)[(]?:\/\/[\w./:-]+: \d+:: Normal Closure[)]?/,
+    ],
     // prevents sending the event if user has disabled error tracking
     beforeSend: async (event) => ((await firstValueFrom(useErrorTracking)) ? event : null),
     // eslint-disable-next-line @typescript-eslint/no-unused-vars

apps/extension/src/core/domains/accounts/handler.ts

@@ -437,11 +437,11 @@ export default class AccountsHandler extends ExtensionHandler {
     const { err, val } = await getPairForAddressSafely(address, async (pair) => {
       assert(pair.type === "ethereum", "Private key cannot be exported for this account type")
 
-      const pk = getPrivateKey(pair, pw as string)
+      const pk = getPrivateKey(pair, pw as string, "hex")
 
       talismanAnalytics.capture("account export", { type: pair.type, mode: "pk" })
 
-      return pk.toString("hex")
+      return pk
     })
 
     if (err) throw new Error(val as string)

apps/extension/src/core/domains/encrypt/handler.ts

@@ -27,7 +27,7 @@ export default class EncryptHandler extends ExtensionHandler {
       const pw = this.stores.password.getPassword()
       assert(pw, "Unable to retreive password from store.")
 
-      const pk = getPrivateKey(pair, pw)
+      const pk = getPrivateKey(pair, pw, "u8a")
       const kp = { publicKey: pair.publicKey, secretKey: u8aToU8a(pk) } as Keypair
 
       assert(kp.secretKey.length === 64, "Talisman secretKey is incorrect length")
@@ -66,7 +66,7 @@ export default class EncryptHandler extends ExtensionHandler {
       const pw = this.stores.password.getPassword()
       assert(pw, "Unable to retreive password from store.")
 
-      const pk = getPrivateKey(pair, pw)
+      const pk = getPrivateKey(pair, pw, "u8a")
 
       assert(pk.length === 64, "Talisman secretKey is incorrect length")
 

apps/extension/src/core/domains/ethereum/__tests__/ethereum.helpers.ts

@@ -1,4 +1,4 @@
-import { ethers } from "ethers"
+import { parseGwei } from "viem"
 
 import {
   getEthDerivationPath,
@@ -8,78 +8,71 @@ import {
   isSafeImageUrl,
 } from "../helpers"
 
-const baseFeePerGas = ethers.utils.parseUnits("2", "gwei")
-const maxPriorityFeePerGas = ethers.utils.parseUnits("8", "gwei")
+const baseFeePerGas = parseGwei("2")
+const maxPriorityFeePerGas = parseGwei("8")
 
 describe("Test ethereum helpers", () => {
   test("getMaxFeePerGas 0 block", async () => {
-    const result = getMaxFeePerGas(baseFeePerGas, maxPriorityFeePerGas, 0).toString()
-    const expected = ethers.utils.parseUnits("10", "gwei").toString()
+    const result = getMaxFeePerGas(baseFeePerGas, maxPriorityFeePerGas, 0)
+    const expected = parseGwei("10")
 
     expect(result).toEqual(expected)
   })
 
   test("getMaxFeePerGas 8 block", async () => {
-    const result = getMaxFeePerGas(baseFeePerGas, maxPriorityFeePerGas, 8).toString()
-    const expected = ethers.utils.parseUnits("13131569026", "wei").toString()
+    const result = getMaxFeePerGas(baseFeePerGas, maxPriorityFeePerGas, 8)
 
-    expect(result).toEqual(expected)
+    expect(result).toEqual(13131569026n)
   })
 
   test("getTotalFeesFromGasSettings - EIP1559 maxFee lower than baseFee", () => {
     const { estimatedFee, maxFee } = getTotalFeesFromGasSettings(
       {
-        type: 2,
-        maxFeePerGas: ethers.utils.parseUnits("1.5", "gwei"),
-        maxPriorityFeePerGas: ethers.utils.parseUnits("0.5", "gwei"),
-        gasLimit: 22000,
+        type: "eip1559",
+        maxFeePerGas: parseGwei("1.5"),
+        maxPriorityFeePerGas: parseGwei("0.5"),
+        gas: 22000n,
       },
-      21000,
-      baseFeePerGas
-    ) //
-
-    const expectedEstimatedFee = ethers.utils.parseUnits("42000000000000", "wei").toString()
-    const expectedMaxFee = ethers.utils.parseUnits("44000000000000", "wei").toString()
+      21000n,
+      baseFeePerGas,
+      0n
+    )
 
-    expect(estimatedFee.toString()).toEqual(expectedEstimatedFee)
-    expect(maxFee.toString()).toEqual(expectedMaxFee)
+    expect(estimatedFee).toEqual(42000000000000n)
+    expect(maxFee).toEqual(44000000000000n)
   })
 
   test("getTotalFeesFromGasSettings - EIP1559 classic", () => {
     const { estimatedFee, maxFee } = getTotalFeesFromGasSettings(
       {
-        type: 2,
-        maxFeePerGas: ethers.utils.parseUnits("3.5", "gwei"),
-        maxPriorityFeePerGas: ethers.utils.parseUnits("0.5", "gwei"),
-        gasLimit: 22000,
+        type: "eip1559",
+        maxFeePerGas: parseGwei("3.5"),
+        maxPriorityFeePerGas: parseGwei("0.5"),
+        gas: 22000n,
       },
-      21000,
-      baseFeePerGas
+      21000n,
+      baseFeePerGas,
+      0n
     )
 
-    const expectedEstimatedFee = ethers.utils.parseUnits("52500000000000", "wei").toString()
-    const expectedMaxFee = ethers.utils.parseUnits("88000000000000", "wei").toString()
-
-    expect(estimatedFee.toString()).toEqual(expectedEstimatedFee)
-    expect(maxFee.toString()).toEqual(expectedMaxFee)
+    expect(estimatedFee).toEqual(52500000000000n)
+    expect(maxFee).toEqual(88000000000000n)
   })
 
   test("getTotalFeesFromGasSettings - Legacy", () => {
     const { estimatedFee, maxFee } = getTotalFeesFromGasSettings(
       {
-        type: 0,
-        gasPrice: baseFeePerGas.add(maxPriorityFeePerGas),
-        gasLimit: 22000,
+        type: "legacy",
+        gasPrice: baseFeePerGas + maxPriorityFeePerGas,
+        gas: 22000n,
       },
-      21000,
-      baseFeePerGas
+      21000n,
+      baseFeePerGas,
+      0n
     )
 
-    const expectedEstimatedFee = ethers.utils.parseUnits("210000", "gwei").toString()
-    const expectedMaxFee = ethers.utils.parseUnits("220000", "gwei").toString()
-
-    expect(estimatedFee.toString()).toEqual(expectedEstimatedFee)
-    expect(maxFee.toString()).toEqual(expectedMaxFee)
+    expect(estimatedFee).toEqual(parseGwei("210000"))
+    expect(maxFee).toEqual(parseGwei("220000"))
   })
 
   test("getEthDerivationPath", () => {