@0xsequence/guard 1.4.9 → 1.5.0

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

@@ -215,15 +215,10 @@ class GuardSigner {
   async decorateTransactions(bundle, _metadata) {
     return bundle;
   }
-  async requestSignature(_id, message, metadata, callbacks) {
+  async sign(message, metadata) {
     var _metadata$parts;
-    const {
-      onSignature,
-      onRejection
-    } = callbacks;
     if (!core.commons.isWalletSignRequestMetadata(metadata)) {
-      onRejection('expected sequence signature request metadata');
-      return false;
+      throw new Error('expected sequence signature request metadata');
     }
     const guardTotpCode = metadata.guardTotpCode;
 
@@ -233,31 +228,18 @@ class GuardSigner {
     const {
       encoded
     } = coder.signature.encodeSigners(metadata.config, (_metadata$parts = metadata.parts) != null ? _metadata$parts : new Map(), [], metadata.chainId);
-    try {
-      const {
-        sig: signature
-      } = await this.guard.signWith({
-        signer: this.address,
-        request: {
-          msg: ethers.ethers.utils.hexlify(message),
-          auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-          chainId: ethers.ethers.BigNumber.from(metadata.chainId).toNumber()
-        },
-        token: guardTotpCode ? {
-          id: AuthMethod.TOTP,
-          token: guardTotpCode
-        } : undefined
-      });
-      if (ethers.ethers.utils.arrayify(signature).length === 0) {
-        throw new Error('guard response contained no signature data');
-      }
-      onSignature(signature);
-      return true;
-    } catch (error) {
-      var _ref, _error$message;
-      onRejection(`unable to request guard signature: ${(_ref = (_error$message = error.message) != null ? _error$message : error.msg) != null ? _ref : error}`);
-      return false;
-    }
+    return (await this.guard.signWith({
+      signer: this.address,
+      request: {
+        msg: ethers.ethers.utils.hexlify(message),
+        auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
+        chainId: ethers.ethers.BigNumber.from(metadata.chainId).toNumber()
+      },
+      token: guardTotpCode ? {
+        id: AuthMethod.TOTP,
+        token: guardTotpCode
+      } : undefined
+    })).sig;
   }
   notifyStatusChange(_id, _status, _metadata) {}
   async getAuthMethods(proof) {
@@ -411,19 +393,12 @@ async function signOwnershipProof(proof) {
     const timestamp = new Date();
     const typedData = getOwnershipProofTypedData(proof.walletAddress, timestamp);
     const digest = utils.encodeTypedDataDigest(typedData);
-    const randomId = ethers.ethers.utils.hexlify(ethers.ethers.utils.randomBytes(32));
-    return new Promise((resolve, reject) => signer.requestSignature(randomId, digest, {}, {
-      onSignature(signature) {
-        resolve({
-          walletAddress: proof.walletAddress,
-          timestamp,
-          signerAddress,
-          signature: ethers.ethers.utils.hexlify(signature)
-        });
-      },
-      onRejection: reject,
-      onStatus(_situation) {}
-    }));
+    return {
+      walletAddress: proof.walletAddress,
+      timestamp,
+      signerAddress,
+      signature: ethers.ethers.utils.hexlify(await signer.sign(digest, {}))
+    };
   }
 }
 async function signAuthUpdateProof(proof) {

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

@@ -215,15 +215,10 @@ class GuardSigner {
   async decorateTransactions(bundle, _metadata) {
     return bundle;
   }
-  async requestSignature(_id, message, metadata, callbacks) {
+  async sign(message, metadata) {
     var _metadata$parts;
-    const {
-      onSignature,
-      onRejection
-    } = callbacks;
     if (!core.commons.isWalletSignRequestMetadata(metadata)) {
-      onRejection('expected sequence signature request metadata');
-      return false;
+      throw new Error('expected sequence signature request metadata');
     }
     const guardTotpCode = metadata.guardTotpCode;
 
@@ -233,31 +228,18 @@ class GuardSigner {
     const {
       encoded
     } = coder.signature.encodeSigners(metadata.config, (_metadata$parts = metadata.parts) != null ? _metadata$parts : new Map(), [], metadata.chainId);
-    try {
-      const {
-        sig: signature
-      } = await this.guard.signWith({
-        signer: this.address,
-        request: {
-          msg: ethers.ethers.utils.hexlify(message),
-          auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-          chainId: ethers.ethers.BigNumber.from(metadata.chainId).toNumber()
-        },
-        token: guardTotpCode ? {
-          id: AuthMethod.TOTP,
-          token: guardTotpCode
-        } : undefined
-      });
-      if (ethers.ethers.utils.arrayify(signature).length === 0) {
-        throw new Error('guard response contained no signature data');
-      }
-      onSignature(signature);
-      return true;
-    } catch (error) {
-      var _ref, _error$message;
-      onRejection(`unable to request guard signature: ${(_ref = (_error$message = error.message) != null ? _error$message : error.msg) != null ? _ref : error}`);
-      return false;
-    }
+    return (await this.guard.signWith({
+      signer: this.address,
+      request: {
+        msg: ethers.ethers.utils.hexlify(message),
+        auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
+        chainId: ethers.ethers.BigNumber.from(metadata.chainId).toNumber()
+      },
+      token: guardTotpCode ? {
+        id: AuthMethod.TOTP,
+        token: guardTotpCode
+      } : undefined
+    })).sig;
   }
   notifyStatusChange(_id, _status, _metadata) {}
   async getAuthMethods(proof) {
@@ -411,19 +393,12 @@ async function signOwnershipProof(proof) {
     const timestamp = new Date();
     const typedData = getOwnershipProofTypedData(proof.walletAddress, timestamp);
     const digest = utils.encodeTypedDataDigest(typedData);
-    const randomId = ethers.ethers.utils.hexlify(ethers.ethers.utils.randomBytes(32));
-    return new Promise((resolve, reject) => signer.requestSignature(randomId, digest, {}, {
-      onSignature(signature) {
-        resolve({
-          walletAddress: proof.walletAddress,
-          timestamp,
-          signerAddress,
-          signature: ethers.ethers.utils.hexlify(signature)
-        });
-      },
-      onRejection: reject,
-      onStatus(_situation) {}
-    }));
+    return {
+      walletAddress: proof.walletAddress,
+      timestamp,
+      signerAddress,
+      signature: ethers.ethers.utils.hexlify(await signer.sign(digest, {}))
+    };
   }
 }
 async function signAuthUpdateProof(proof) {

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

@@ -211,15 +211,10 @@ class GuardSigner {
   async decorateTransactions(bundle, _metadata) {
     return bundle;
   }
-  async requestSignature(_id, message, metadata, callbacks) {
+  async sign(message, metadata) {
     var _metadata$parts;
-    const {
-      onSignature,
-      onRejection
-    } = callbacks;
     if (!commons.isWalletSignRequestMetadata(metadata)) {
-      onRejection('expected sequence signature request metadata');
-      return false;
+      throw new Error('expected sequence signature request metadata');
     }
     const guardTotpCode = metadata.guardTotpCode;
 
@@ -229,31 +224,18 @@ class GuardSigner {
     const {
       encoded
     } = coder.signature.encodeSigners(metadata.config, (_metadata$parts = metadata.parts) != null ? _metadata$parts : new Map(), [], metadata.chainId);
-    try {
-      const {
-        sig: signature
-      } = await this.guard.signWith({
-        signer: this.address,
-        request: {
-          msg: ethers.utils.hexlify(message),
-          auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
-          chainId: ethers.BigNumber.from(metadata.chainId).toNumber()
-        },
-        token: guardTotpCode ? {
-          id: AuthMethod.TOTP,
-          token: guardTotpCode
-        } : undefined
-      });
-      if (ethers.utils.arrayify(signature).length === 0) {
-        throw new Error('guard response contained no signature data');
-      }
-      onSignature(signature);
-      return true;
-    } catch (error) {
-      var _ref, _error$message;
-      onRejection(`unable to request guard signature: ${(_ref = (_error$message = error.message) != null ? _error$message : error.msg) != null ? _ref : error}`);
-      return false;
-    }
+    return (await this.guard.signWith({
+      signer: this.address,
+      request: {
+        msg: ethers.utils.hexlify(message),
+        auxData: this.packMsgAndSig(metadata.address, metadata.digest, encoded, metadata.chainId),
+        chainId: ethers.BigNumber.from(metadata.chainId).toNumber()
+      },
+      token: guardTotpCode ? {
+        id: AuthMethod.TOTP,
+        token: guardTotpCode
+      } : undefined
+    })).sig;
   }
   notifyStatusChange(_id, _status, _metadata) {}
   async getAuthMethods(proof) {
@@ -407,19 +389,12 @@ async function signOwnershipProof(proof) {
     const timestamp = new Date();
     const typedData = getOwnershipProofTypedData(proof.walletAddress, timestamp);
     const digest = encodeTypedDataDigest(typedData);
-    const randomId = ethers.utils.hexlify(ethers.utils.randomBytes(32));
-    return new Promise((resolve, reject) => signer.requestSignature(randomId, digest, {}, {
-      onSignature(signature) {
-        resolve({
-          walletAddress: proof.walletAddress,
-          timestamp,
-          signerAddress,
-          signature: ethers.utils.hexlify(signature)
-        });
-      },
-      onRejection: reject,
-      onStatus(_situation) {}
-    }));
+    return {
+      walletAddress: proof.walletAddress,
+      timestamp,
+      signerAddress,
+      signature: ethers.utils.hexlify(await signer.sign(digest, {}))
+    };
   }
 }
 async function signAuthUpdateProof(proof) {

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

@@ -14,11 +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>;
-    requestSignature(_id: string, message: BytesLike, metadata: object, callbacks: {
-        onSignature: (signature: BytesLike) => void;
-        onRejection: (error: string) => void;
-        onStatus: (situation: string) => void;
-    }): Promise<boolean>;
+    sign(message: BytesLike, metadata: object): Promise<BytesLike>;
     notifyStatusChange(_id: string, _status: Status, _metadata: object): void;
     getAuthMethods(proof: OwnershipProof): Promise<{
         methods: AuthMethod[];

package/package.json

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

package/src/signer.ts

@@ -37,21 +37,9 @@ export class GuardSigner implements signers.SapientSigner {
     return bundle
   }
 
-  async requestSignature(
-    _id: string,
-    message: BytesLike,
-    metadata: object,
-    callbacks: {
-      onSignature: (signature: BytesLike) => void
-      onRejection: (error: string) => void
-      onStatus: (situation: string) => void
-    }
-  ): Promise<boolean> {
-    const { onSignature, onRejection } = callbacks
-
+  async sign(message: BytesLike, metadata: object): Promise<BytesLike> {
     if (!commons.isWalletSignRequestMetadata(metadata)) {
-      onRejection('expected sequence signature request metadata')
-      return false
+      throw new Error('expected sequence signature request metadata')
     }
 
     const guardTotpCode = (metadata as { guardTotpCode?: string }).guardTotpCode
@@ -61,8 +49,8 @@ export class GuardSigner implements signers.SapientSigner {
     const coder = universal.genericCoderFor(metadata.config.version)
     const { encoded } = coder.signature.encodeSigners(metadata.config, metadata.parts ?? new Map(), [], metadata.chainId)
 
-    try {
-      const { sig: signature } = await this.guard.signWith({
+    return (
+      await this.guard.signWith({
         signer: this.address,
         request: {
           msg: ethers.utils.hexlify(message),
@@ -71,17 +59,7 @@ export class GuardSigner implements signers.SapientSigner {
         },
         token: guardTotpCode ? { id: AuthMethod.TOTP, token: guardTotpCode } : undefined
       })
-
-      if (ethers.utils.arrayify(signature).length === 0) {
-        throw new Error('guard response contained no signature data')
-      }
-
-      onSignature(signature)
-      return true
-    } catch (error) {
-      onRejection(`unable to request guard signature: ${error.message ?? error.msg ?? error}`)
-      return false
-    }
+    ).sig
   }
 
   notifyStatusChange(_id: string, _status: Status, _metadata: object): void {}
@@ -248,27 +226,13 @@ async function signOwnershipProof(
     const timestamp = new Date()
     const typedData = getOwnershipProofTypedData(proof.walletAddress, timestamp)
     const digest = encodeTypedDataDigest(typedData)
-    const randomId = ethers.utils.hexlify(ethers.utils.randomBytes(32))
-
-    return new Promise((resolve, reject) =>
-      signer.requestSignature(
-        randomId,
-        digest,
-        {},
-        {
-          onSignature(signature) {
-            resolve({
-              walletAddress: proof.walletAddress,
-              timestamp,
-              signerAddress,
-              signature: ethers.utils.hexlify(signature)
-            })
-          },
-          onRejection: reject,
-          onStatus(_situation) {}
-        }
-      )
-    )
+
+    return {
+      walletAddress: proof.walletAddress,
+      timestamp,
+      signerAddress,
+      signature: ethers.utils.hexlify(await signer.sign(digest, {}))
+    }
   }
 }