@0xsequence/replacer 1.10.14 → 2.0.0

package/dist/0xsequence-replacer.cjs.dev.js

@@ -61,7 +61,7 @@ function eip1271Contract(address, provider) {
 async function isValidSignature(address, provider, digest, signature) {
   // First we try to validate the signature using Ethers
   try {
-    const addr = ethers.ethers.utils.recoverAddress(digest, signature);
+    const addr = ethers.ethers.recoverAddress(digest, ethers.ethers.hexlify(signature));
     if (addr.toLowerCase() === address.toLowerCase()) return true;
   } catch (_unused) {}
 
@@ -95,9 +95,11 @@ async function runByEIP5719(address, provider, digest, signature, solver, tries
   } catch (_unused4) {}
   const altUri = await tryAwait(eip5719Contract(address, provider).getAlternativeSignature(digest));
   if (!altUri || altUri === '') throw new Error('EIP5719 - Invalid signature and no alternative signature');
-  const altSignature = ethers.ethers.utils.hexlify(await (solver || new URISolverIPFS()).resolve(altUri));
+  const altSignature = ethers.ethers.hexlify(await (solver || new URISolverIPFS()).resolve(altUri));
   if (!altSignature || altSignature === '') throw new Error('EIP5719 - Empty alternative signature');
-  if (altSignature === ethers.ethers.utils.hexlify(signature)) throw new Error('EIP5719 - Alternative signature is invalid or the same');
+  if (altSignature === ethers.ethers.hexlify(signature)) {
+    throw new Error('EIP5719 - Alternative signature is invalid or the same');
+  }
   return runByEIP5719(address, provider, digest, altSignature, solver, tries + 1);
 }
 class URISolverIPFS {

package/dist/0xsequence-replacer.cjs.prod.js

@@ -61,7 +61,7 @@ function eip1271Contract(address, provider) {
 async function isValidSignature(address, provider, digest, signature) {
   // First we try to validate the signature using Ethers
   try {
-    const addr = ethers.ethers.utils.recoverAddress(digest, signature);
+    const addr = ethers.ethers.recoverAddress(digest, ethers.ethers.hexlify(signature));
     if (addr.toLowerCase() === address.toLowerCase()) return true;
   } catch (_unused) {}
 
@@ -95,9 +95,11 @@ async function runByEIP5719(address, provider, digest, signature, solver, tries
   } catch (_unused4) {}
   const altUri = await tryAwait(eip5719Contract(address, provider).getAlternativeSignature(digest));
   if (!altUri || altUri === '') throw new Error('EIP5719 - Invalid signature and no alternative signature');
-  const altSignature = ethers.ethers.utils.hexlify(await (solver || new URISolverIPFS()).resolve(altUri));
+  const altSignature = ethers.ethers.hexlify(await (solver || new URISolverIPFS()).resolve(altUri));
   if (!altSignature || altSignature === '') throw new Error('EIP5719 - Empty alternative signature');
-  if (altSignature === ethers.ethers.utils.hexlify(signature)) throw new Error('EIP5719 - Alternative signature is invalid or the same');
+  if (altSignature === ethers.ethers.hexlify(signature)) {
+    throw new Error('EIP5719 - Alternative signature is invalid or the same');
+  }
   return runByEIP5719(address, provider, digest, altSignature, solver, tries + 1);
 }
 class URISolverIPFS {

package/dist/0xsequence-replacer.esm.js

@@ -57,7 +57,7 @@ function eip1271Contract(address, provider) {
 async function isValidSignature(address, provider, digest, signature) {
   // First we try to validate the signature using Ethers
   try {
-    const addr = ethers.utils.recoverAddress(digest, signature);
+    const addr = ethers.recoverAddress(digest, ethers.hexlify(signature));
     if (addr.toLowerCase() === address.toLowerCase()) return true;
   } catch (_unused) {}
 
@@ -91,9 +91,11 @@ async function runByEIP5719(address, provider, digest, signature, solver, tries
   } catch (_unused4) {}
   const altUri = await tryAwait(eip5719Contract(address, provider).getAlternativeSignature(digest));
   if (!altUri || altUri === '') throw new Error('EIP5719 - Invalid signature and no alternative signature');
-  const altSignature = ethers.utils.hexlify(await (solver || new URISolverIPFS()).resolve(altUri));
+  const altSignature = ethers.hexlify(await (solver || new URISolverIPFS()).resolve(altUri));
   if (!altSignature || altSignature === '') throw new Error('EIP5719 - Empty alternative signature');
-  if (altSignature === ethers.utils.hexlify(signature)) throw new Error('EIP5719 - Alternative signature is invalid or the same');
+  if (altSignature === ethers.hexlify(signature)) {
+    throw new Error('EIP5719 - Alternative signature is invalid or the same');
+  }
   return runByEIP5719(address, provider, digest, altSignature, solver, tries + 1);
 }
 class URISolverIPFS {

package/dist/declarations/src/cached.d.ts

@@ -1,10 +1,10 @@
 import { ethers } from 'ethers';
 import { URISolver } from "./index.js";
 export declare class CachedEIP5719 {
-    provider: ethers.providers.Provider;
+    provider: ethers.Provider;
     solver?: URISolver | undefined;
     window: number;
-    constructor(provider: ethers.providers.Provider, solver?: URISolver | undefined, window?: number);
+    constructor(provider: ethers.Provider, solver?: URISolver | undefined, window?: number);
     private pending;
     runByEIP5719(address: string, digest: ethers.BytesLike, signature: ethers.BytesLike): Promise<ethers.BytesLike>;
 }

package/dist/declarations/src/index.d.ts

@@ -1,12 +1,12 @@
 import { ethers } from 'ethers';
 export * from "./cached.js";
-export declare function eip5719Contract(address: string, provider: ethers.providers.Provider): ethers.Contract;
-export declare function eip1271Contract(address: string, provider: ethers.providers.Provider): ethers.Contract;
-export declare function isValidSignature(address: string, provider: ethers.providers.Provider, digest: ethers.BytesLike, signature: ethers.BytesLike): Promise<boolean>;
+export declare function eip5719Contract(address: string, provider: ethers.Provider): ethers.Contract;
+export declare function eip1271Contract(address: string, provider: ethers.Provider): ethers.Contract;
+export declare function isValidSignature(address: string, provider: ethers.Provider, digest: ethers.BytesLike, signature: ethers.BytesLike): Promise<boolean>;
 export interface URISolver {
     resolve: (uri: string) => Promise<string>;
 }
-export declare function runByEIP5719(address: string, provider: ethers.providers.Provider, digest: ethers.BytesLike, signature: ethers.BytesLike, solver?: URISolver, tries?: number): Promise<ethers.BytesLike>;
+export declare function runByEIP5719(address: string, provider: ethers.Provider, digest: ethers.BytesLike, signature: ethers.BytesLike, solver?: URISolver, tries?: number): Promise<ethers.BytesLike>;
 export declare class URISolverIPFS implements URISolver {
     gateway: string;
     constructor(gateway?: string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/replacer",
-  "version": "1.10.14",
+  "version": "2.0.0",
   "description": "EIP-5719 client implementation",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/replacer",
   "source": "src/index.ts",
@@ -9,11 +9,11 @@
   "author": "Horizon Blockchain Games",
   "license": "Apache-2.0",
   "dependencies": {
-    "@0xsequence/abi": "1.10.14",
-    "@0xsequence/core": "1.10.14"
+    "@0xsequence/abi": "2.0.0",
+    "@0xsequence/core": "2.0.0"
   },
   "peerDependencies": {
-    "ethers": ">=5.5"
+    "ethers": ">=6"
   },
   "devDependencies": {},
   "files": [

package/src/cached.ts

@@ -3,7 +3,7 @@ import { runByEIP5719, URISolver } from '.'
 
 export class CachedEIP5719 {
   constructor(
-    public provider: ethers.providers.Provider,
+    public provider: ethers.Provider,
     public solver?: URISolver,
     public window: number = 1000
   ) {}

package/src/index.ts

@@ -5,7 +5,7 @@ import { commons } from '@0xsequence/core'
 
 export * from './cached'
 
-export function eip5719Contract(address: string, provider: ethers.providers.Provider): ethers.Contract {
+export function eip5719Contract(address: string, provider: ethers.Provider): ethers.Contract {
   // TODO: for some reason walletContracts is not being loaded from local
   // remove this code once fixed
   const abi = [
@@ -31,19 +31,19 @@ export function eip5719Contract(address: string, provider: ethers.providers.Prov
   return new ethers.Contract(address, abi, provider)
 }
 
-export function eip1271Contract(address: string, provider: ethers.providers.Provider): ethers.Contract {
+export function eip1271Contract(address: string, provider: ethers.Provider): ethers.Contract {
   return new ethers.Contract(address, walletContracts.erc1271.abi, provider)
 }
 
 export async function isValidSignature(
   address: string,
-  provider: ethers.providers.Provider,
+  provider: ethers.Provider,
   digest: ethers.BytesLike,
   signature: ethers.BytesLike
 ): Promise<boolean> {
   // First we try to validate the signature using Ethers
   try {
-    const addr = ethers.utils.recoverAddress(digest, signature)
+    const addr = ethers.recoverAddress(digest, ethers.hexlify(signature))
     if (addr.toLowerCase() === address.toLowerCase()) return true
   } catch {}
 
@@ -72,7 +72,7 @@ async function tryAwait<T>(promise: Promise<T>): Promise<T | undefined> {
 
 export async function runByEIP5719(
   address: string,
-  provider: ethers.providers.Provider,
+  provider: ethers.Provider,
   digest: ethers.BytesLike,
   signature: ethers.BytesLike,
   solver?: URISolver,
@@ -94,10 +94,11 @@ export async function runByEIP5719(
   const altUri = await tryAwait(eip5719Contract(address, provider).getAlternativeSignature(digest) as Promise<string>)
   if (!altUri || altUri === '') throw new Error('EIP5719 - Invalid signature and no alternative signature')
 
-  const altSignature = ethers.utils.hexlify(await (solver || new URISolverIPFS()).resolve(altUri))
+  const altSignature = ethers.hexlify(await (solver || new URISolverIPFS()).resolve(altUri))
   if (!altSignature || altSignature === '') throw new Error('EIP5719 - Empty alternative signature')
-  if (altSignature === ethers.utils.hexlify(signature)) throw new Error('EIP5719 - Alternative signature is invalid or the same')
-
+  if (altSignature === ethers.hexlify(signature)) {
+    throw new Error('EIP5719 - Alternative signature is invalid or the same')
+  }
   return runByEIP5719(address, provider, digest, altSignature, solver, tries + 1)
 }