@0xsequence/guard 1.10.15 → 2.0.1

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

@@ -480,9 +480,9 @@ class GuardSigner {
     return (await this.guard.signWith({
       signer: this.address,
       request: {
-        msg: ethers.ethers.utils.hexlify(message),
+        msg: ethers.ethers.hexlify(message),
         auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-        chainId: ethers.ethers.BigNumber.from(metadata.chainId).toNumber()
+        chainId: Number(metadata.chainId)
       },
       token: guardTotpCode ? {
         id: AuthMethod.TOTP,
@@ -610,10 +610,10 @@ class GuardSigner {
     return codes;
   }
   packMsgAndSig(address, msg, sig, chainId) {
-    return ethers.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
+    return ethers.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
   }
   suffix() {
-    return this.appendSuffix ? [3] : [];
+    return new Uint8Array(this.appendSuffix ? [3] : []);
   }
 }
 let AuthMethod = /*#__PURE__*/function (AuthMethod) {
@@ -646,7 +646,7 @@ async function signOwnershipProof(proof) {
       walletAddress: proof.walletAddress,
       timestamp,
       signerAddress,
-      signature: ethers.ethers.utils.hexlify(await signer.sign(digest, {}))
+      signature: ethers.ethers.hexlify(await signer.sign(digest, {}))
     };
   }
 }
@@ -678,7 +678,7 @@ function getOwnershipProofTypedData(wallet, timestamp) {
       }]
     },
     message: {
-      wallet: ethers.ethers.utils.getAddress(wallet),
+      wallet: ethers.ethers.getAddress(wallet),
       timestamp: toUTCString(timestamp)
     }
   };

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

@@ -480,9 +480,9 @@ class GuardSigner {
     return (await this.guard.signWith({
       signer: this.address,
       request: {
-        msg: ethers.ethers.utils.hexlify(message),
+        msg: ethers.ethers.hexlify(message),
         auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-        chainId: ethers.ethers.BigNumber.from(metadata.chainId).toNumber()
+        chainId: Number(metadata.chainId)
       },
       token: guardTotpCode ? {
         id: AuthMethod.TOTP,
@@ -610,10 +610,10 @@ class GuardSigner {
     return codes;
   }
   packMsgAndSig(address, msg, sig, chainId) {
-    return ethers.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
+    return ethers.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
   }
   suffix() {
-    return this.appendSuffix ? [3] : [];
+    return new Uint8Array(this.appendSuffix ? [3] : []);
   }
 }
 let AuthMethod = /*#__PURE__*/function (AuthMethod) {
@@ -646,7 +646,7 @@ async function signOwnershipProof(proof) {
       walletAddress: proof.walletAddress,
       timestamp,
       signerAddress,
-      signature: ethers.ethers.utils.hexlify(await signer.sign(digest, {}))
+      signature: ethers.ethers.hexlify(await signer.sign(digest, {}))
     };
   }
 }
@@ -678,7 +678,7 @@ function getOwnershipProofTypedData(wallet, timestamp) {
       }]
     },
     message: {
-      wallet: ethers.ethers.utils.getAddress(wallet),
+      wallet: ethers.ethers.getAddress(wallet),
       timestamp: toUTCString(timestamp)
     }
   };

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

@@ -476,9 +476,9 @@ class GuardSigner {
     return (await this.guard.signWith({
       signer: this.address,
       request: {
-        msg: ethers.utils.hexlify(message),
+        msg: ethers.hexlify(message),
         auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-        chainId: ethers.BigNumber.from(metadata.chainId).toNumber()
+        chainId: Number(metadata.chainId)
       },
       token: guardTotpCode ? {
         id: AuthMethod.TOTP,
@@ -606,10 +606,10 @@ class GuardSigner {
     return codes;
   }
   packMsgAndSig(address, msg, sig, chainId) {
-    return ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
+    return ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
   }
   suffix() {
-    return this.appendSuffix ? [3] : [];
+    return new Uint8Array(this.appendSuffix ? [3] : []);
   }
 }
 let AuthMethod = /*#__PURE__*/function (AuthMethod) {
@@ -642,7 +642,7 @@ async function signOwnershipProof(proof) {
       walletAddress: proof.walletAddress,
       timestamp,
       signerAddress,
-      signature: ethers.utils.hexlify(await signer.sign(digest, {}))
+      signature: ethers.hexlify(await signer.sign(digest, {}))
     };
   }
 }
@@ -674,7 +674,7 @@ function getOwnershipProofTypedData(wallet, timestamp) {
       }]
     },
     message: {
-      wallet: ethers.utils.getAddress(wallet),
+      wallet: ethers.getAddress(wallet),
       timestamp: toUTCString(timestamp)
     }
   };

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

@@ -2,7 +2,7 @@ import { Account } from '@0xsequence/account';
 import { commons } from '@0xsequence/core';
 import { signers, Status } from '@0xsequence/signhub';
 import { TypedData } from '@0xsequence/utils';
-import { BytesLike, ethers } from 'ethers';
+import { ethers } from 'ethers';
 import { RecoveryCode as GuardRecoveryCode } from "./guard.gen.js";
 export declare class GuardSigner implements signers.SapientSigner {
     readonly address: string;
@@ -14,7 +14,7 @@ export declare class GuardSigner implements signers.SapientSigner {
     buildDeployTransaction(_metadata: object): Promise<commons.transaction.TransactionBundle | undefined>;
     predecorateSignedTransactions(_metadata: object): Promise<commons.transaction.SignedTransactionBundle[]>;
     decorateTransactions(bundle: commons.transaction.IntendedTransactionBundle, _metadata: object): Promise<commons.transaction.IntendedTransactionBundle>;
-    sign(message: BytesLike, metadata: object): Promise<BytesLike>;
+    sign(message: ethers.BytesLike, metadata: object): Promise<ethers.BytesLike>;
     notifyStatusChange(_id: string, _status: Status, _metadata: object): void;
     getAuthMethods(proof: OwnershipProof): Promise<{
         methods: AuthMethod[];
@@ -29,7 +29,7 @@ export declare class GuardSigner implements signers.SapientSigner {
     getRecoveryCodes(proof: AuthUpdateProof): Promise<RecoveryCode[]>;
     resetRecoveryCodes(proof: AuthUpdateProof): Promise<RecoveryCode[]>;
     private packMsgAndSig;
-    suffix(): BytesLike;
+    suffix(): ethers.BytesLike;
 }
 export type RecoveryCode = GuardRecoveryCode;
 export declare enum AuthMethod {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/guard",
-  "version": "1.10.15",
+  "version": "2.0.1",
   "description": "guard sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/guard",
   "source": "src/index.ts",
@@ -9,11 +9,11 @@
   "author": "Horizon Blockchain Games",
   "license": "Apache-2.0",
   "dependencies": {
-    "ethers": "^5.7.2",
-    "@0xsequence/account": "1.10.15",
-    "@0xsequence/core": "1.10.15",
-    "@0xsequence/signhub": "1.10.15",
-    "@0xsequence/utils": "1.10.15"
+    "ethers": "^6.13.0",
+    "@0xsequence/account": "2.0.1",
+    "@0xsequence/core": "2.0.1",
+    "@0xsequence/signhub": "2.0.1",
+    "@0xsequence/utils": "2.0.1"
   },
   "files": [
     "src",

package/src/signer.ts

@@ -2,7 +2,7 @@ import { Account } from '@0xsequence/account'
 import { commons, universal } from '@0xsequence/core'
 import { signers, Status } from '@0xsequence/signhub'
 import { encodeTypedDataDigest, TypedData } from '@0xsequence/utils'
-import { BytesLike, ethers, TypedDataDomain } from 'ethers'
+import { ethers } from 'ethers'
 import { AuthMethodsReturn, Guard, RecoveryCode as GuardRecoveryCode } from './guard.gen'
 
 const fetch = globalThis.fetch
@@ -37,7 +37,7 @@ export class GuardSigner implements signers.SapientSigner {
     return bundle
   }
 
-  async sign(message: BytesLike, metadata: object): Promise<BytesLike> {
+  async sign(message: ethers.BytesLike, metadata: object): Promise<ethers.BytesLike> {
     if (!commons.isWalletSignRequestMetadata(metadata)) {
       throw new Error('expected sequence signature request metadata')
     }
@@ -53,9 +53,9 @@ export class GuardSigner implements signers.SapientSigner {
       await this.guard.signWith({
         signer: this.address,
         request: {
-          msg: ethers.utils.hexlify(message),
+          msg: ethers.hexlify(message),
           auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-          chainId: ethers.BigNumber.from(metadata.chainId).toNumber()
+          chainId: Number(metadata.chainId)
         },
         token: guardTotpCode ? { id: AuthMethod.TOTP, token: guardTotpCode } : undefined
       })
@@ -170,12 +170,12 @@ export class GuardSigner implements signers.SapientSigner {
     return codes
   }
 
-  private packMsgAndSig(address: string, msg: BytesLike, sig: BytesLike, chainId: ethers.BigNumberish): string {
-    return ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig])
+  private packMsgAndSig(address: string, msg: ethers.BytesLike, sig: ethers.BytesLike, chainId: ethers.BigNumberish): string {
+    return ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig])
   }
 
-  suffix(): BytesLike {
-    return this.appendSuffix ? [3] : []
+  suffix(): ethers.BytesLike {
+    return new Uint8Array(this.appendSuffix ? [3] : [])
   }
 }
 
@@ -229,7 +229,7 @@ export async function signOwnershipProof(proof: Exclude<OwnershipProof, { jwt: s
       walletAddress: proof.walletAddress,
       timestamp,
       signerAddress,
-      signature: ethers.utils.hexlify(await signer.sign(digest, {}))
+      signature: ethers.hexlify(await signer.sign(digest, {}))
     }
   }
 }
@@ -265,7 +265,7 @@ export function getOwnershipProofTypedData(wallet: string, timestamp: Date): Typ
       ]
     },
     message: {
-      wallet: ethers.utils.getAddress(wallet),
+      wallet: ethers.getAddress(wallet),
       timestamp: toUTCString(timestamp)
     }
   }
@@ -283,7 +283,7 @@ export function getAuthUpdateProofTypedData(timestamp: Date): TypedData {
   }
 }
 
-const domain: TypedDataDomain = {
+const domain: ethers.TypedDataDomain = {
   name: 'Sequence Guard',
   version: '1',
   chainId: 1