viem 0.0.0-portable-types-20230522163654 → 0.0.0-tmm-sign-typed-data-types.20230619T221425

package/src/utils/unit/parseUnits.ts

@@ -12,13 +12,23 @@ export function parseUnits(value: `${number}`, decimals: number) {
     integer = `${Math.round(Number(`${integer}.${fraction}`))}`
     fraction = ''
   } else if (fraction.length > decimals) {
-    const [before, after] = [
-      fraction.slice(0, decimals),
+    const [left, unit, right] = [
+      fraction.slice(0, decimals - 1),
+      fraction.slice(decimals - 1, decimals),
       fraction.slice(decimals),
     ]
-    fraction = `${
-      /^0+$/.test(before) ? before.slice(0, before.length - 1) : ''
-    }${Math.round(Number(`${before}.${after}`))}`
+
+    const rounded = Math.round(Number(`${unit}.${right}`))
+    if (rounded > 9)
+      fraction = `${BigInt(left) + BigInt(1)}0`.padStart(left.length + 1, '0')
+    else fraction = `${left}${rounded}`
+
+    if (fraction.length > decimals) {
+      fraction = fraction.slice(1)
+      integer = `${BigInt(integer) + 1n}`
+    }
+
+    fraction = fraction.slice(0, decimals)
   } else {
     fraction = fraction.padEnd(decimals, '0')
   }

package/dist/cjs/adapters/ethers.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ethersWalletToAccount = void 0;
-const toAccount_js_1 = require("../accounts/toAccount.js");
-const toBytes_js_1 = require("../utils/encoding/toBytes.js");
-const ethersWalletToAccount = (wallet) => (0, toAccount_js_1.toAccount)({
-    address: wallet.address,
-    async signMessage({ message }) {
-        return (await wallet.signMessage((0, toBytes_js_1.toBytes)(message)));
-    },
-    async signTransaction(txn) {
-        let type = null;
-        if (txn.type === 'legacy') {
-            type = 0;
-        }
-        else if (txn.type === 'eip1559') {
-            type = 2;
-        }
-        else if (txn.type === 'eip2930') {
-            type = 1;
-        }
-        return (await wallet.signTransaction({
-            chainId: txn.chainId,
-            data: txn.data,
-            gasLimit: txn.gas,
-            gasPrice: txn.gasPrice,
-            nonce: txn.nonce,
-            to: txn.to,
-            type,
-            value: txn.value,
-            ...(txn.type && txn.accessList ? { accessList: txn.accessList } : {}),
-            ...(txn.type === 'eip1559' && txn.maxPriorityFeePerGas
-                ? { maxPriorityFeePerGas: txn.maxPriorityFeePerGas }
-                : {}),
-            ...(txn.type === 'eip1559' && txn.maxFeePerGas
-                ? { maxFeePerGas: txn.maxFeePerGas }
-                : {}),
-        }));
-    },
-    async signTypedData({ domain, types: types_, message }) {
-        const { EIP712Domain: _, ...types } = types_;
-        const signTypedData = wallet.signTypedData
-            ? wallet.signTypedData.bind(wallet)
-            : wallet._signTypedData.bind(wallet);
-        return (await signTypedData(domain ?? {}, types, message));
-    },
-});
-exports.ethersWalletToAccount = ethersWalletToAccount;
-//# sourceMappingURL=ethers.js.map

package/dist/cjs/adapters/ethers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethers.js","sourceRoot":"","sources":["../../../src/adapters/ethers.ts"],"names":[],"mappings":";;;AAEA,2DAAoD;AAEpD,6DAAsD;AAwC/C,MAAM,qBAAqB,GAAG,CAAC,MAAoB,EAAE,EAAE,CAC5D,IAAA,wBAAS,EAAC;IACR,OAAO,EAAE,MAAM,CAAC,OAAkB;IAClC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;QAC3B,OAAO,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,IAAA,oBAAO,EAAC,OAAO,CAAC,CAAC,CAAS,CAAA;IAC7D,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,GAAG;QAGvB,IAAI,IAAI,GAAG,IAAI,CAAA;QACf,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;YACzB,IAAI,GAAG,CAAC,CAAA;SACT;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACjC,IAAI,GAAG,CAAC,CAAA;SACT;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACjC,IAAI,GAAG,CAAC,CAAA;SACT;QACD,OAAO,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC;YAEnC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,GAAG;YACjB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI;YACJ,KAAK,EAAE,GAAG,CAAC,KAAK;YAEhB,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAErE,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,oBAAoB;gBACpD,CAAC,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,EAAE;gBACpD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,YAAY;gBAC5C,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE;gBACpC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAS,CAAA;IACb,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;QACpD,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,MAAa,CAAA;QACnD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa;YACxC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;YACnC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtC,OAAO,CAAC,MAAM,aAAa,CACzB,MAAM,IAAI,EAAE,EACZ,KAAyC,EACzC,OAAO,CACR,CAAS,CAAA;IACZ,CAAC;CACF,CAAC,CAAA;AAjDS,QAAA,qBAAqB,yBAiD9B"}

package/dist/cjs/ethers.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ethersWalletToAccount = void 0;
-var ethers_js_1 = require("./adapters/ethers.js");
-Object.defineProperty(exports, "ethersWalletToAccount", { enumerable: true, get: function () { return ethers_js_1.ethersWalletToAccount; } });
-//# sourceMappingURL=ethers.js.map

package/dist/cjs/ethers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethers.js","sourceRoot":"","sources":["../../src/ethers.ts"],"names":[],"mappings":";;;AAAA,kDAA4D;AAAnD,kHAAA,qBAAqB,OAAA"}

package/dist/esm/adapters/ethers.js

@@ -1,45 +0,0 @@
-import { toAccount } from '../accounts/toAccount.js';
-import { toBytes } from '../utils/encoding/toBytes.js';
-export const ethersWalletToAccount = (wallet) => toAccount({
-    address: wallet.address,
-    async signMessage({ message }) {
-        return (await wallet.signMessage(toBytes(message)));
-    },
-    async signTransaction(txn) {
-        let type = null;
-        if (txn.type === 'legacy') {
-            type = 0;
-        }
-        else if (txn.type === 'eip1559') {
-            type = 2;
-        }
-        else if (txn.type === 'eip2930') {
-            type = 1;
-        }
-        return (await wallet.signTransaction({
-            chainId: txn.chainId,
-            data: txn.data,
-            gasLimit: txn.gas,
-            gasPrice: txn.gasPrice,
-            nonce: txn.nonce,
-            to: txn.to,
-            type,
-            value: txn.value,
-            ...(txn.type && txn.accessList ? { accessList: txn.accessList } : {}),
-            ...(txn.type === 'eip1559' && txn.maxPriorityFeePerGas
-                ? { maxPriorityFeePerGas: txn.maxPriorityFeePerGas }
-                : {}),
-            ...(txn.type === 'eip1559' && txn.maxFeePerGas
-                ? { maxFeePerGas: txn.maxFeePerGas }
-                : {}),
-        }));
-    },
-    async signTypedData({ domain, types: types_, message }) {
-        const { EIP712Domain: _, ...types } = types_;
-        const signTypedData = wallet.signTypedData
-            ? wallet.signTypedData.bind(wallet)
-            : wallet._signTypedData.bind(wallet);
-        return (await signTypedData(domain ?? {}, types, message));
-    },
-});
-//# sourceMappingURL=ethers.js.map

package/dist/esm/adapters/ethers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethers.js","sourceRoot":"","sources":["../../../src/adapters/ethers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAwCtD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAoB,EAAE,EAAE,CAC5D,SAAS,CAAC;IACR,OAAO,EAAE,MAAM,CAAC,OAAkB;IAClC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;QAC3B,OAAO,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAS,CAAA;IAC7D,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,GAAG;QAGvB,IAAI,IAAI,GAAG,IAAI,CAAA;QACf,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;YACzB,IAAI,GAAG,CAAC,CAAA;SACT;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACjC,IAAI,GAAG,CAAC,CAAA;SACT;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;YACjC,IAAI,GAAG,CAAC,CAAA;SACT;QACD,OAAO,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC;YAEnC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,GAAG;YACjB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI;YACJ,KAAK,EAAE,GAAG,CAAC,KAAK;YAEhB,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAErE,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,oBAAoB;gBACpD,CAAC,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,EAAE;gBACpD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,YAAY;gBAC5C,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE;gBACpC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAS,CAAA;IACb,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE;QACpD,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,MAAa,CAAA;QACnD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa;YACxC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;YACnC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtC,OAAO,CAAC,MAAM,aAAa,CACzB,MAAM,IAAI,EAAE,EACZ,KAAyC,EACzC,OAAO,CACR,CAAS,CAAA;IACZ,CAAC;CACF,CAAC,CAAA"}

package/dist/esm/ethers.js

@@ -1,2 +0,0 @@
-export { ethersWalletToAccount } from './adapters/ethers.js';
-//# sourceMappingURL=ethers.js.map

package/dist/esm/ethers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethers.js","sourceRoot":"","sources":["../../src/ethers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA"}

package/dist/types/adapters/ethers.d.ts

@@ -1,27 +0,0 @@
-type BigNumberish = string | number | bigint;
-type BytesLike = string | Uint8Array;
-type TypedDataDomain = {
-    name?: string;
-    version?: string;
-    chainId?: BigNumberish;
-    verifyingContract?: string;
-    salt?: BytesLike;
-};
-type TypedDataField = {
-    name: string;
-    type: string;
-};
-type EthersWallet = {
-    address: string;
-    signMessage(message: Uint8Array): Promise<string>;
-    signTransaction(txn: any): Promise<string>;
-} & ({
-    signTypedData(domain: TypedDataDomain, types: Record<string, TypedDataField[]>, value: Record<string, any>): Promise<string>;
-    _signTypedData?: never;
-} | {
-    signTypedData?: never;
-    _signTypedData(domain: TypedDataDomain, types: Record<string, TypedDataField[]>, value: Record<string, any>): Promise<string>;
-});
-export declare const ethersWalletToAccount: (wallet: EthersWallet) => import("../index.js").LocalAccount;
-export {};
-//# sourceMappingURL=ethers.d.ts.map

package/dist/types/adapters/ethers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethers.d.ts","sourceRoot":"","sources":["../../../src/adapters/ethers.ts"],"names":[],"mappings":"AAMA,KAAK,YAAY,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;AAC5C,KAAK,SAAS,GAAG,MAAM,GAAG,UAAU,CAAA;AAEpC,KAAK,eAAe,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB,CAAA;AACD,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CAC3C,GAAG,CACA;IACE,aAAa,CACX,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,EACvC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACzB,OAAO,CAAC,MAAM,CAAC,CAAA;IAClB,cAAc,CAAC,EAAE,KAAK,CAAA;CACvB,GACD;IACE,aAAa,CAAC,EAAE,KAAK,CAAA;IACrB,cAAc,CACZ,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,EACvC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACzB,OAAO,CAAC,MAAM,CAAC,CAAA;CACnB,CACJ,CAAA;AAED,eAAO,MAAM,qBAAqB,WAAY,YAAY,uCAiDtD,CAAA"}

package/dist/types/ethers.d.ts

@@ -1,2 +0,0 @@
-export { ethersWalletToAccount } from './adapters/ethers.js';
-//# sourceMappingURL=ethers.d.ts.map

package/dist/types/ethers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethers.d.ts","sourceRoot":"","sources":["../../src/ethers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA"}

package/ethers/package.json

@@ -1,5 +0,0 @@
-{
-  "types": "../dist/types/ethers.d.ts",
-  "module": "../dist/esm/ethers.js",
-  "main": "../dist/cjs/ethers.js"
-}

package/src/adapters/ethers.ts

@@ -1,94 +0,0 @@
-import type { Address } from 'abitype'
-
-import { toAccount } from '../accounts/toAccount.js'
-import type { Hash } from '../types/misc.js'
-import { toBytes } from '../utils/encoding/toBytes.js'
-
-type BigNumberish = string | number | bigint
-type BytesLike = string | Uint8Array
-
-type TypedDataDomain = {
-  name?: string
-  version?: string
-  chainId?: BigNumberish
-  verifyingContract?: string
-  salt?: BytesLike
-}
-type TypedDataField = {
-  name: string
-  type: string
-}
-
-type EthersWallet = {
-  address: string
-  signMessage(message: Uint8Array): Promise<string>
-  signTransaction(txn: any): Promise<string>
-} & (
-  | {
-      signTypedData(
-        domain: TypedDataDomain,
-        types: Record<string, TypedDataField[]>,
-        value: Record<string, any>,
-      ): Promise<string>
-      _signTypedData?: never
-    }
-  | {
-      signTypedData?: never
-      _signTypedData(
-        domain: TypedDataDomain,
-        types: Record<string, TypedDataField[]>,
-        value: Record<string, any>,
-      ): Promise<string>
-    }
-)
-
-export const ethersWalletToAccount = (wallet: EthersWallet) =>
-  toAccount({
-    address: wallet.address as Address,
-    async signMessage({ message }) {
-      return (await wallet.signMessage(toBytes(message))) as Hash
-    },
-    async signTransaction(txn) {
-      // ethers type mappings
-      // https://github.com/ethers-io/ethers.js/blob/0802b70a724321f56d4c170e4c8a46b7804dfb48/src.ts/transaction/transaction.ts#L394
-      let type = null
-      if (txn.type === 'legacy') {
-        type = 0
-      } else if (txn.type === 'eip1559') {
-        type = 2
-      } else if (txn.type === 'eip2930') {
-        type = 1
-      }
-      return (await wallet.signTransaction({
-        // allowed fields for `ethers.TransactionRequest`
-        chainId: txn.chainId,
-        data: txn.data,
-        gasLimit: txn.gas,
-        gasPrice: txn.gasPrice,
-        nonce: txn.nonce,
-        to: txn.to,
-        type,
-        value: txn.value,
-        // untyped transactions do not support accessList
-        ...(txn.type && txn.accessList ? { accessList: txn.accessList } : {}),
-        // eip1559 properties
-        ...(txn.type === 'eip1559' && txn.maxPriorityFeePerGas
-          ? { maxPriorityFeePerGas: txn.maxPriorityFeePerGas }
-          : {}),
-        ...(txn.type === 'eip1559' && txn.maxFeePerGas
-          ? { maxFeePerGas: txn.maxFeePerGas }
-          : {}),
-      })) as Hash
-    },
-    async signTypedData({ domain, types: types_, message }) {
-      const { EIP712Domain: _, ...types } = types_ as any
-      const signTypedData = wallet.signTypedData
-        ? wallet.signTypedData.bind(wallet)
-        : wallet._signTypedData.bind(wallet)
-      return (await signTypedData(
-        domain ?? {},
-        types as Record<string, TypedDataField[]>,
-        message,
-      )) as Hash
-    },
-  })

package/src/ethers.ts

@@ -1 +0,0 @@
-export { ethersWalletToAccount } from './adapters/ethers.js'