viem 0.0.0-w-20230720223152 → 0.0.0-w-20230802141753

package/src/utils/promise/withCache.ts

@@ -27,8 +27,8 @@ export function getCache<TData>(cacheKey: string) {
 export type WithCacheParameters = {
   /** The key to cache the data against. */
   cacheKey: string
-  /** The maximum age (in ms) of the cached value. Default: Infinity (no expiry) */
-  maxAge?: number
+  /** The time that cached data will remain in memory. Default: Infinity (no expiry) */
+  cacheTime?: number
 }
 
 /**
@@ -37,7 +37,7 @@ export type WithCacheParameters = {
  */
 export async function withCache<TData>(
   fn: () => Promise<TData>,
-  { cacheKey, maxAge = Infinity }: WithCacheParameters,
+  { cacheKey, cacheTime = Infinity }: WithCacheParameters,
 ) {
   const cache = getCache<TData>(cacheKey)
 
@@ -45,9 +45,9 @@ export async function withCache<TData>(
   // and do not invoke the promise.
   // If the max age is 0, the cache is disabled.
   const response = cache.response.get()
-  if (response && maxAge > 0) {
+  if (response && cacheTime > 0) {
     const age = new Date().getTime() - response.created.getTime()
-    if (age < maxAge) return response.data
+    if (age < cacheTime) return response.data
   }
 
   let promise = cache.promise.get()

package/src/utils/signature/hexToSignature.ts

@@ -0,0 +1,20 @@
+import { secp256k1 } from '@noble/curves/secp256k1'
+
+import type { Hex, Signature } from '../../types/misc.js'
+import { numberToHex } from '../../utils/encoding/toHex.js'
+
+/**
+ * @description Parses a hex formatted signature into a structured signature.
+ *
+ * @param signatureHex Signature in hex format.
+ * @returns The structured signature.
+ *
+ * @example
+ * hexToSignature('0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81c')
+ * // { r: '0x...', s: '0x...', v: 28n }
+ */
+export function hexToSignature(signatureHex: Hex): Signature {
+  const { r, s } = secp256k1.Signature.fromCompact(signatureHex.slice(2, 130))
+  const v = BigInt(`0x${signatureHex.slice(130)}`)
+  return { r: numberToHex(r), s: numberToHex(s), v }
+}

package/src/utils/signature/signatureToHex.ts

@@ -0,0 +1,26 @@
+import { secp256k1 } from '@noble/curves/secp256k1'
+
+import type { Hex, Signature } from '../../types/misc.js'
+import { hexToBigInt } from '../../utils/encoding/fromHex.js'
+import { toHex } from '../../utils/encoding/toHex.js'
+
+/**
+ * @description Converts a signature into hex format.
+ *
+ * @param signature The signature to convert.
+ * @returns The signature in hex format.
+ *
+ * @example
+ * signatureToHex({
+ *   r: '0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf',
+ *   s: '0x4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8',
+ *   v: 28n
+ * })
+ * // "0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81c"
+ */
+export function signatureToHex({ r, s, v }: Signature): Hex {
+  return `0x${new secp256k1.Signature(
+    hexToBigInt(r),
+    hexToBigInt(s),
+  ).toCompactHex()}${toHex(v).slice(2)}`
+}

package/src/utils/unit/parseUnits.ts

@@ -9,7 +9,8 @@ export function parseUnits(value: string, decimals: number) {
 
   // round off if the fraction is larger than the number of decimals.
   if (decimals === 0) {
-    integer = `${Math.round(Number(`${integer}.${fraction}`))}`
+    if (Math.round(Number(`.${fraction}`)) === 1)
+      integer = `${BigInt(integer) + 1n}`
     fraction = ''
   } else if (fraction.length > decimals) {
     const [left, unit, right] = [

package/dist/cjs/accounts/utils/signatureToHex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signatureToHex.js","sourceRoot":"","sources":["../../../../src/accounts/utils/signatureToHex.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAGnD,gEAA6D;AAC7D,4DAAqD;AAErD,SAAgB,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAa;IACnD,OAAO,KAAK,IAAI,qBAAS,CAAC,SAAS,CACjC,IAAA,wBAAW,EAAC,CAAC,CAAC,EACd,IAAA,wBAAW,EAAC,CAAC,CAAC,CACf,CAAC,YAAY,EAAE,GAAG,IAAA,gBAAK,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;AACxC,CAAC;AALD,wCAKC"}

package/dist/esm/accounts/utils/signatureToHex.js

@@ -1,7 +0,0 @@
-import { secp256k1 } from '@noble/curves/secp256k1';
-import { hexToBigInt } from '../../utils/encoding/fromHex.js';
-import { toHex } from '../../utils/encoding/toHex.js';
-export function signatureToHex({ r, s, v }) {
-    return `0x${new secp256k1.Signature(hexToBigInt(r), hexToBigInt(s)).toCompactHex()}${toHex(v).slice(2)}`;
-}
-//# sourceMappingURL=signatureToHex.js.map

package/dist/esm/accounts/utils/signatureToHex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signatureToHex.js","sourceRoot":"","sources":["../../../../src/accounts/utils/signatureToHex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AAErD,MAAM,UAAU,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAa;IACnD,OAAO,KAAK,IAAI,SAAS,CAAC,SAAS,CACjC,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,CACf,CAAC,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;AACxC,CAAC"}

package/dist/types/accounts/utils/signatureToHex.d.ts

@@ -1,3 +0,0 @@
-import type { Hex, Signature } from '../../types/misc.js';
-export declare function signatureToHex({ r, s, v }: Signature): Hex;
-//# sourceMappingURL=signatureToHex.d.ts.map

package/dist/types/accounts/utils/signatureToHex.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"signatureToHex.d.ts","sourceRoot":"","sources":["../../../../src/accounts/utils/signatureToHex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAIzD,wBAAgB,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,GAAG,GAAG,CAK1D"}

package/src/accounts/utils/signatureToHex.ts

@@ -1,12 +0,0 @@
-import { secp256k1 } from '@noble/curves/secp256k1'
-
-import type { Hex, Signature } from '../../types/misc.js'
-import { hexToBigInt } from '../../utils/encoding/fromHex.js'
-import { toHex } from '../../utils/encoding/toHex.js'
-
-export function signatureToHex({ r, s, v }: Signature): Hex {
-  return `0x${new secp256k1.Signature(
-    hexToBigInt(r),
-    hexToBigInt(s),
-  ).toCompactHex()}${toHex(v).slice(2)}`
-}