@0xsequence/guard 0.43.34 → 1.0.1

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

@@ -2,6 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var ethers = require('ethers');
+var core = require('@0xsequence/core');
+
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -18,7 +21,7 @@ function _extends() {
 }
 
 /* eslint-disable */
-// sequence-guard v0.4.0 98e0726794b2b5922a0e356280daac3a409602e4
+// sequence-guard v0.4.0 a29651d1d5f63268e8d03b51e46557e0632c144d
 // --
 // Code generated by webrpc-gen@v0.10.x-dev with typescript generator. DO NOT EDIT.
 //
@@ -31,19 +34,16 @@ const WebRPCVersion = "v1";
 const WebRPCSchemaVersion = "v0.4.0";
 
 // Schema hash generated from your RIDL schema
-const WebRPCSchemaHash = "98e0726794b2b5922a0e356280daac3a409602e4";
+const WebRPCSchemaHash = "a29651d1d5f63268e8d03b51e46557e0632c144d";
 
 //
 // Types
 //
-
 //
 // Client
 //
 class Guard {
   constructor(hostname, fetch) {
-    this.hostname = void 0;
-    this.fetch = void 0;
     this.path = '/rpc/Guard/';
     this.ping = headers => {
       return this.fetch(this.url('Ping'), createHTTPRequest({}, headers)).then(res => {
@@ -72,26 +72,26 @@ class Guard {
         });
       });
     };
-    this.getSequenceContext = headers => {
-      return this.fetch(this.url('GetSequenceContext'), createHTTPRequest({}, headers)).then(res => {
+    this.getSignerConfig = (args, headers) => {
+      return this.fetch(this.url('GetSignerConfig'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
-            data: _data.data
+            signerConfig: _data.signerConfig
           };
         });
       });
     };
-    this.getSignerConfig = headers => {
-      return this.fetch(this.url('GetSignerConfig'), createHTTPRequest({}, headers)).then(res => {
+    this.sign = (args, headers) => {
+      return this.fetch(this.url('Sign'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
-            signerConfig: _data.signerConfig
+            sig: _data.sig
           };
         });
       });
     };
-    this.sign = (args, headers) => {
-      return this.fetch(this.url('Sign'), createHTTPRequest(args, headers)).then(res => {
+    this.signWith = (args, headers) => {
+      return this.fetch(this.url('SignWith'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
             sig: _data.sig
@@ -135,7 +135,84 @@ const buildResponse = res => {
   });
 };
 
+class GuardSigner {
+  constructor(address, url, appendSuffix = false) {
+    this.requests = new Map();
+    this.address = address;
+    this.url = url;
+    this.appendSuffix = appendSuffix;
+    this.guard = new Guard(url, global.fetch);
+  }
+  async getAddress() {
+    return this.address;
+  }
+  async requestSignature(id, _message, metadata, callbacks) {
+    if (!core.commons.isWalletSignRequestMetadata(metadata)) {
+      callbacks.onRejection('Expected Sequence-like metadata');
+    } else {
+      // Queue the request first, this method only does that
+      // the requesting to the API is later handled on every status change
+      this.requests.set(id, callbacks);
+    }
+    return true;
+  }
+  notifyStatusChange(id, status, metadata) {
+    if (!this.requests.has(id)) return;
+    if (!core.commons.isWalletSignRequestMetadata(metadata)) {
+      this.requests.get(id).onRejection('Expected Sequence-like metadata (status update)');
+      return;
+    }
+    this.evaluateRequest(id, status.message, status, metadata);
+  }
+  packMsgAndSig(address, msg, sig, chainId) {
+    return ethers.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
+  }
+  keyOfRequest(signer, msg, auxData, chainId) {
+    return ethers.ethers.utils.solidityKeccak256(['address', 'uint256', 'bytes', 'bytes'], [signer, chainId, msg, auxData]);
+  }
+  async evaluateRequest(id, message, _, metadata) {
+    var _metadata$parts;
+    // Building auxData, notice: this uses the old v1 format
+    // TODO: We should update the guard API so we can pass the metadata directly
+    const coder = core.universal.genericCoderFor(metadata.config.version);
+    const {
+      encoded
+    } = coder.signature.encodeSigners(metadata.config, (_metadata$parts = metadata.parts) != null ? _metadata$parts : new Map(), [], metadata.chainId);
+    try {
+      var _this$requests$get;
+      const key = this.keyOfRequest(this.address, message, encoded, metadata.chainId);
+      const lastAttempt = (_this$requests$get = this.requests.get(id)) == null ? void 0 : _this$requests$get.lastAttempt;
+      if (lastAttempt === key) {
+        return;
+      }
+      this.requests.get(id).lastAttempt = key;
+      const result = 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() // TODO: This should be a string (in the API)
+        }
+      });
+
+      if (ethers.ethers.utils.arrayify(result.sig).length !== 0) {
+        this.requests.get(id).onSignature(result.sig);
+        this.requests.delete(id);
+      }
+    } catch (e) {
+      // The guard signer may reject the request for a number of reasons
+      // like for example, if it's being the first signer (it waits for other signers to sign first)
+      // for now we ignore all errors, but we should probably handle them
+      // TODO: Filter real errors from control flow errors
+    }
+  }
+  suffix() {
+    return this.appendSuffix ? [3] : [];
+  }
+}
+
 exports.Guard = Guard;
+exports.GuardSigner = GuardSigner;
 exports.WebRPCSchemaHash = WebRPCSchemaHash;
 exports.WebRPCSchemaVersion = WebRPCSchemaVersion;
 exports.WebRPCVersion = WebRPCVersion;

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

@@ -2,6 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var ethers = require('ethers');
+var core = require('@0xsequence/core');
+
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -18,7 +21,7 @@ function _extends() {
 }
 
 /* eslint-disable */
-// sequence-guard v0.4.0 98e0726794b2b5922a0e356280daac3a409602e4
+// sequence-guard v0.4.0 a29651d1d5f63268e8d03b51e46557e0632c144d
 // --
 // Code generated by webrpc-gen@v0.10.x-dev with typescript generator. DO NOT EDIT.
 //
@@ -31,19 +34,16 @@ const WebRPCVersion = "v1";
 const WebRPCSchemaVersion = "v0.4.0";
 
 // Schema hash generated from your RIDL schema
-const WebRPCSchemaHash = "98e0726794b2b5922a0e356280daac3a409602e4";
+const WebRPCSchemaHash = "a29651d1d5f63268e8d03b51e46557e0632c144d";
 
 //
 // Types
 //
-
 //
 // Client
 //
 class Guard {
   constructor(hostname, fetch) {
-    this.hostname = void 0;
-    this.fetch = void 0;
     this.path = '/rpc/Guard/';
     this.ping = headers => {
       return this.fetch(this.url('Ping'), createHTTPRequest({}, headers)).then(res => {
@@ -72,26 +72,26 @@ class Guard {
         });
       });
     };
-    this.getSequenceContext = headers => {
-      return this.fetch(this.url('GetSequenceContext'), createHTTPRequest({}, headers)).then(res => {
+    this.getSignerConfig = (args, headers) => {
+      return this.fetch(this.url('GetSignerConfig'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
-            data: _data.data
+            signerConfig: _data.signerConfig
           };
         });
       });
     };
-    this.getSignerConfig = headers => {
-      return this.fetch(this.url('GetSignerConfig'), createHTTPRequest({}, headers)).then(res => {
+    this.sign = (args, headers) => {
+      return this.fetch(this.url('Sign'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
-            signerConfig: _data.signerConfig
+            sig: _data.sig
           };
         });
       });
     };
-    this.sign = (args, headers) => {
-      return this.fetch(this.url('Sign'), createHTTPRequest(args, headers)).then(res => {
+    this.signWith = (args, headers) => {
+      return this.fetch(this.url('SignWith'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
             sig: _data.sig
@@ -135,7 +135,84 @@ const buildResponse = res => {
   });
 };
 
+class GuardSigner {
+  constructor(address, url, appendSuffix = false) {
+    this.requests = new Map();
+    this.address = address;
+    this.url = url;
+    this.appendSuffix = appendSuffix;
+    this.guard = new Guard(url, global.fetch);
+  }
+  async getAddress() {
+    return this.address;
+  }
+  async requestSignature(id, _message, metadata, callbacks) {
+    if (!core.commons.isWalletSignRequestMetadata(metadata)) {
+      callbacks.onRejection('Expected Sequence-like metadata');
+    } else {
+      // Queue the request first, this method only does that
+      // the requesting to the API is later handled on every status change
+      this.requests.set(id, callbacks);
+    }
+    return true;
+  }
+  notifyStatusChange(id, status, metadata) {
+    if (!this.requests.has(id)) return;
+    if (!core.commons.isWalletSignRequestMetadata(metadata)) {
+      this.requests.get(id).onRejection('Expected Sequence-like metadata (status update)');
+      return;
+    }
+    this.evaluateRequest(id, status.message, status, metadata);
+  }
+  packMsgAndSig(address, msg, sig, chainId) {
+    return ethers.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
+  }
+  keyOfRequest(signer, msg, auxData, chainId) {
+    return ethers.ethers.utils.solidityKeccak256(['address', 'uint256', 'bytes', 'bytes'], [signer, chainId, msg, auxData]);
+  }
+  async evaluateRequest(id, message, _, metadata) {
+    var _metadata$parts;
+    // Building auxData, notice: this uses the old v1 format
+    // TODO: We should update the guard API so we can pass the metadata directly
+    const coder = core.universal.genericCoderFor(metadata.config.version);
+    const {
+      encoded
+    } = coder.signature.encodeSigners(metadata.config, (_metadata$parts = metadata.parts) != null ? _metadata$parts : new Map(), [], metadata.chainId);
+    try {
+      var _this$requests$get;
+      const key = this.keyOfRequest(this.address, message, encoded, metadata.chainId);
+      const lastAttempt = (_this$requests$get = this.requests.get(id)) == null ? void 0 : _this$requests$get.lastAttempt;
+      if (lastAttempt === key) {
+        return;
+      }
+      this.requests.get(id).lastAttempt = key;
+      const result = 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() // TODO: This should be a string (in the API)
+        }
+      });
+
+      if (ethers.ethers.utils.arrayify(result.sig).length !== 0) {
+        this.requests.get(id).onSignature(result.sig);
+        this.requests.delete(id);
+      }
+    } catch (e) {
+      // The guard signer may reject the request for a number of reasons
+      // like for example, if it's being the first signer (it waits for other signers to sign first)
+      // for now we ignore all errors, but we should probably handle them
+      // TODO: Filter real errors from control flow errors
+    }
+  }
+  suffix() {
+    return this.appendSuffix ? [3] : [];
+  }
+}
+
 exports.Guard = Guard;
+exports.GuardSigner = GuardSigner;
 exports.WebRPCSchemaHash = WebRPCSchemaHash;
 exports.WebRPCSchemaVersion = WebRPCSchemaVersion;
 exports.WebRPCVersion = WebRPCVersion;

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

@@ -1,3 +1,6 @@
+import { ethers } from 'ethers';
+import { commons, universal } from '@0xsequence/core';
+
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -14,7 +17,7 @@ function _extends() {
 }
 
 /* eslint-disable */
-// sequence-guard v0.4.0 98e0726794b2b5922a0e356280daac3a409602e4
+// sequence-guard v0.4.0 a29651d1d5f63268e8d03b51e46557e0632c144d
 // --
 // Code generated by webrpc-gen@v0.10.x-dev with typescript generator. DO NOT EDIT.
 //
@@ -27,19 +30,16 @@ const WebRPCVersion = "v1";
 const WebRPCSchemaVersion = "v0.4.0";
 
 // Schema hash generated from your RIDL schema
-const WebRPCSchemaHash = "98e0726794b2b5922a0e356280daac3a409602e4";
+const WebRPCSchemaHash = "a29651d1d5f63268e8d03b51e46557e0632c144d";
 
 //
 // Types
 //
-
 //
 // Client
 //
 class Guard {
   constructor(hostname, fetch) {
-    this.hostname = void 0;
-    this.fetch = void 0;
     this.path = '/rpc/Guard/';
     this.ping = headers => {
       return this.fetch(this.url('Ping'), createHTTPRequest({}, headers)).then(res => {
@@ -68,26 +68,26 @@ class Guard {
         });
       });
     };
-    this.getSequenceContext = headers => {
-      return this.fetch(this.url('GetSequenceContext'), createHTTPRequest({}, headers)).then(res => {
+    this.getSignerConfig = (args, headers) => {
+      return this.fetch(this.url('GetSignerConfig'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
-            data: _data.data
+            signerConfig: _data.signerConfig
           };
         });
       });
     };
-    this.getSignerConfig = headers => {
-      return this.fetch(this.url('GetSignerConfig'), createHTTPRequest({}, headers)).then(res => {
+    this.sign = (args, headers) => {
+      return this.fetch(this.url('Sign'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
-            signerConfig: _data.signerConfig
+            sig: _data.sig
           };
         });
       });
     };
-    this.sign = (args, headers) => {
-      return this.fetch(this.url('Sign'), createHTTPRequest(args, headers)).then(res => {
+    this.signWith = (args, headers) => {
+      return this.fetch(this.url('SignWith'), createHTTPRequest(args, headers)).then(res => {
         return buildResponse(res).then(_data => {
           return {
             sig: _data.sig
@@ -131,4 +131,80 @@ const buildResponse = res => {
   });
 };
 
-export { Guard, WebRPCSchemaHash, WebRPCSchemaVersion, WebRPCVersion };
+class GuardSigner {
+  constructor(address, url, appendSuffix = false) {
+    this.requests = new Map();
+    this.address = address;
+    this.url = url;
+    this.appendSuffix = appendSuffix;
+    this.guard = new Guard(url, global.fetch);
+  }
+  async getAddress() {
+    return this.address;
+  }
+  async requestSignature(id, _message, metadata, callbacks) {
+    if (!commons.isWalletSignRequestMetadata(metadata)) {
+      callbacks.onRejection('Expected Sequence-like metadata');
+    } else {
+      // Queue the request first, this method only does that
+      // the requesting to the API is later handled on every status change
+      this.requests.set(id, callbacks);
+    }
+    return true;
+  }
+  notifyStatusChange(id, status, metadata) {
+    if (!this.requests.has(id)) return;
+    if (!commons.isWalletSignRequestMetadata(metadata)) {
+      this.requests.get(id).onRejection('Expected Sequence-like metadata (status update)');
+      return;
+    }
+    this.evaluateRequest(id, status.message, status, metadata);
+  }
+  packMsgAndSig(address, msg, sig, chainId) {
+    return ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bytes', 'bytes'], [address, chainId, msg, sig]);
+  }
+  keyOfRequest(signer, msg, auxData, chainId) {
+    return ethers.utils.solidityKeccak256(['address', 'uint256', 'bytes', 'bytes'], [signer, chainId, msg, auxData]);
+  }
+  async evaluateRequest(id, message, _, metadata) {
+    var _metadata$parts;
+    // Building auxData, notice: this uses the old v1 format
+    // TODO: We should update the guard API so we can pass the metadata directly
+    const coder = universal.genericCoderFor(metadata.config.version);
+    const {
+      encoded
+    } = coder.signature.encodeSigners(metadata.config, (_metadata$parts = metadata.parts) != null ? _metadata$parts : new Map(), [], metadata.chainId);
+    try {
+      var _this$requests$get;
+      const key = this.keyOfRequest(this.address, message, encoded, metadata.chainId);
+      const lastAttempt = (_this$requests$get = this.requests.get(id)) == null ? void 0 : _this$requests$get.lastAttempt;
+      if (lastAttempt === key) {
+        return;
+      }
+      this.requests.get(id).lastAttempt = key;
+      const result = 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() // TODO: This should be a string (in the API)
+        }
+      });
+
+      if (ethers.utils.arrayify(result.sig).length !== 0) {
+        this.requests.get(id).onSignature(result.sig);
+        this.requests.delete(id);
+      }
+    } catch (e) {
+      // The guard signer may reject the request for a number of reasons
+      // like for example, if it's being the first signer (it waits for other signers to sign first)
+      // for now we ignore all errors, but we should probably handle them
+      // TODO: Filter real errors from control flow errors
+    }
+  }
+  suffix() {
+    return this.appendSuffix ? [3] : [];
+  }
+}
+
+export { Guard, GuardSigner, WebRPCSchemaHash, WebRPCSchemaVersion, WebRPCVersion };

package/dist/declarations/src/guard.gen.d.ts

@@ -1,6 +1,6 @@
 export declare const WebRPCVersion = "v1";
 export declare const WebRPCSchemaVersion = "v0.4.0";
-export declare const WebRPCSchemaHash = "98e0726794b2b5922a0e356280daac3a409602e4";
+export declare const WebRPCSchemaHash = "a29651d1d5f63268e8d03b51e46557e0632c144d";
 export interface Version {
     webrpcVersion: string;
     schemaVersion: string;
@@ -15,17 +15,9 @@ export interface RuntimeStatus {
     branch: string;
     commitHash: string;
 }
-export interface SequenceContext {
-    factory: string;
-    mainModule: string;
-    mainModuleUpgradable: string;
-    guestModule: string;
-    utils: string;
-}
 export interface WalletConfig {
     address: string;
-    signers: Array<WalletSigner>;
-    threshold: number;
+    content: string;
 }
 export interface WalletSigner {
     address: string;
@@ -40,9 +32,9 @@ export interface Guard {
     ping(headers?: object): Promise<PingReturn>;
     version(headers?: object): Promise<VersionReturn>;
     runtimeStatus(headers?: object): Promise<RuntimeStatusReturn>;
-    getSequenceContext(headers?: object): Promise<GetSequenceContextReturn>;
-    getSignerConfig(headers?: object): Promise<GetSignerConfigReturn>;
+    getSignerConfig(args: GetSignerConfigArgs, headers?: object): Promise<GetSignerConfigReturn>;
     sign(args: SignArgs, headers?: object): Promise<SignReturn>;
+    signWith(args: SignWithArgs, headers?: object): Promise<SignWithReturn>;
 }
 export interface PingArgs {
 }
@@ -59,12 +51,8 @@ export interface RuntimeStatusArgs {
 export interface RuntimeStatusReturn {
     status: RuntimeStatus;
 }
-export interface GetSequenceContextArgs {
-}
-export interface GetSequenceContextReturn {
-    data: SequenceContext;
-}
 export interface GetSignerConfigArgs {
+    signer: string;
 }
 export interface GetSignerConfigReturn {
     signerConfig: WalletConfig;
@@ -75,6 +63,13 @@ export interface SignArgs {
 export interface SignReturn {
     sig: string;
 }
+export interface SignWithArgs {
+    signer: string;
+    request: SignRequest;
+}
+export interface SignWithReturn {
+    sig: string;
+}
 export declare class Guard implements Guard {
     protected hostname: string;
     protected fetch: Fetch;
@@ -84,9 +79,9 @@ export declare class Guard implements Guard {
     ping: (headers?: object | undefined) => Promise<PingReturn>;
     version: (headers?: object | undefined) => Promise<VersionReturn>;
     runtimeStatus: (headers?: object | undefined) => Promise<RuntimeStatusReturn>;
-    getSequenceContext: (headers?: object | undefined) => Promise<GetSequenceContextReturn>;
-    getSignerConfig: (headers?: object | undefined) => Promise<GetSignerConfigReturn>;
+    getSignerConfig: (args: GetSignerConfigArgs, headers?: object | undefined) => Promise<GetSignerConfigReturn>;
     sign: (args: SignArgs, headers?: object | undefined) => Promise<SignReturn>;
+    signWith: (args: SignWithArgs, headers?: object | undefined) => Promise<SignWithReturn>;
 }
 export interface WebRPCError extends Error {
     code: string;

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

@@ -1 +1,2 @@
 export * from './guard.gen';
+export * from './signer';

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

@@ -0,0 +1,21 @@
+import { signers, Status } from '@0xsequence/signhub';
+import { BytesLike } from 'ethers';
+export declare class GuardSigner implements signers.SapientSigner {
+    readonly address: string;
+    readonly url: string;
+    readonly appendSuffix: boolean;
+    private guard;
+    private requests;
+    constructor(address: string, url: string, appendSuffix?: boolean);
+    getAddress(): Promise<string>;
+    requestSignature(id: string, _message: BytesLike, metadata: Object, callbacks: {
+        onSignature: (signature: BytesLike) => void;
+        onRejection: (error: string) => void;
+        onStatus: (situation: string) => void;
+    }): Promise<boolean>;
+    notifyStatusChange(id: string, status: Status, metadata: Object): void;
+    private packMsgAndSig;
+    private keyOfRequest;
+    private evaluateRequest;
+    suffix(): BytesLike;
+}

package/package.json

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

package/src/guard.gen.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// sequence-guard v0.4.0 98e0726794b2b5922a0e356280daac3a409602e4
+// sequence-guard v0.4.0 a29651d1d5f63268e8d03b51e46557e0632c144d
 // --
 // Code generated by webrpc-gen@v0.10.x-dev with typescript generator. DO NOT EDIT.
 //
@@ -12,7 +12,7 @@ export const WebRPCVersion = "v1"
 export const WebRPCSchemaVersion = "v0.4.0"
 
 // Schema hash generated from your RIDL schema
-export const WebRPCSchemaHash = "98e0726794b2b5922a0e356280daac3a409602e4"
+export const WebRPCSchemaHash = "a29651d1d5f63268e8d03b51e46557e0632c144d"
 
 //
 // Types
@@ -35,18 +35,9 @@ export interface RuntimeStatus {
   commitHash: string
 }
 
-export interface SequenceContext {
-  factory: string
-  mainModule: string
-  mainModuleUpgradable: string
-  guestModule: string
-  utils: string
-}
-
 export interface WalletConfig {
   address: string
-  signers: Array<WalletSigner>
-  threshold: number
+  content: string
 }
 
 export interface WalletSigner {
@@ -64,9 +55,9 @@ export interface Guard {
   ping(headers?: object): Promise<PingReturn>
   version(headers?: object): Promise<VersionReturn>
   runtimeStatus(headers?: object): Promise<RuntimeStatusReturn>
-  getSequenceContext(headers?: object): Promise<GetSequenceContextReturn>
-  getSignerConfig(headers?: object): Promise<GetSignerConfigReturn>
+  getSignerConfig(args: GetSignerConfigArgs, headers?: object): Promise<GetSignerConfigReturn>
   sign(args: SignArgs, headers?: object): Promise<SignReturn>
+  signWith(args: SignWithArgs, headers?: object): Promise<SignWithReturn>
 }
 
 export interface PingArgs {
@@ -87,13 +78,8 @@ export interface RuntimeStatusArgs {
 export interface RuntimeStatusReturn {
   status: RuntimeStatus  
 }
-export interface GetSequenceContextArgs {
-}
-
-export interface GetSequenceContextReturn {
-  data: SequenceContext  
-}
 export interface GetSignerConfigArgs {
+  signer: string
 }
 
 export interface GetSignerConfigReturn {
@@ -106,6 +92,14 @@ export interface SignArgs {
 export interface SignReturn {
   sig: string  
 }
+export interface SignWithArgs {
+  signer: string
+  request: SignRequest
+}
+
+export interface SignWithReturn {
+  sig: string  
+}
 
 
   
@@ -165,35 +159,33 @@ export class Guard implements Guard {
     })
   }
   
-  getSequenceContext = (headers?: object): Promise<GetSequenceContextReturn> => {
+  getSignerConfig = (args: GetSignerConfigArgs, headers?: object): Promise<GetSignerConfigReturn> => {
     return this.fetch(
-      this.url('GetSequenceContext'),
-      createHTTPRequest({}, headers)
-      ).then((res) => {
+      this.url('GetSignerConfig'),
+      createHTTPRequest(args, headers)).then((res) => {
       return buildResponse(res).then(_data => {
         return {
-          data: <SequenceContext>(_data.data)
+          signerConfig: <WalletConfig>(_data.signerConfig)
         }
       })
     })
   }
   
-  getSignerConfig = (headers?: object): Promise<GetSignerConfigReturn> => {
+  sign = (args: SignArgs, headers?: object): Promise<SignReturn> => {
     return this.fetch(
-      this.url('GetSignerConfig'),
-      createHTTPRequest({}, headers)
-      ).then((res) => {
+      this.url('Sign'),
+      createHTTPRequest(args, headers)).then((res) => {
       return buildResponse(res).then(_data => {
         return {
-          signerConfig: <WalletConfig>(_data.signerConfig)
+          sig: <string>(_data.sig)
         }
       })
     })
   }
   
-  sign = (args: SignArgs, headers?: object): Promise<SignReturn> => {
+  signWith = (args: SignWithArgs, headers?: object): Promise<SignWithReturn> => {
     return this.fetch(
-      this.url('Sign'),
+      this.url('SignWith'),
       createHTTPRequest(args, headers)).then((res) => {
       return buildResponse(res).then(_data => {
         return {

package/src/index.ts

@@ -1 +1,2 @@
 export * from './guard.gen'
+export * from './signer'

package/src/signer.ts

@@ -0,0 +1,117 @@
+
+import { signers, Status } from '@0xsequence/signhub'
+import { BytesLike, ethers } from 'ethers'
+import { Guard } from './guard.gen'
+import { commons, universal } from '@0xsequence/core'
+
+export class GuardSigner implements signers.SapientSigner {
+  private guard: Guard
+  private requests: Map<string, {
+    lastAttempt?: string;
+    onSignature: (signature: BytesLike) => void;
+    onRejection: (error: string) => void;
+    onStatus: (situation: string) => void;
+  }> = new Map()
+
+  constructor(
+    public readonly address: string,
+    public readonly url: string,
+    public readonly appendSuffix: boolean = false
+  ) {
+    this.guard = new Guard(url, global.fetch)
+  }
+
+  async getAddress(): Promise<string> {
+    return this.address
+  }
+
+  async requestSignature(
+    id: string,
+    _message: BytesLike,
+    metadata: Object,
+    callbacks: {
+      onSignature: (signature: BytesLike) => void;
+      onRejection: (error: string) => void;
+      onStatus: (situation: string) => void;
+    }
+  ): Promise<boolean> {
+    if (!commons.isWalletSignRequestMetadata(metadata)) {
+      callbacks.onRejection('Expected Sequence-like metadata')
+    } else {
+      // Queue the request first, this method only does that
+      // the requesting to the API is later handled on every status change
+      this.requests.set(id, callbacks)
+    }
+
+    return true
+  }
+
+  notifyStatusChange(
+    id: string,
+    status: Status,
+    metadata: Object
+  ): void {
+    if (!this.requests.has(id)) return
+
+    if (!commons.isWalletSignRequestMetadata(metadata)) {
+      this.requests.get(id)!.onRejection('Expected Sequence-like metadata (status update)')
+      return
+    }
+
+    this.evaluateRequest(id, status.message, status, metadata)
+  }
+
+  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 keyOfRequest(signer: string, msg: BytesLike, auxData: BytesLike, chainId: ethers.BigNumberish): string {
+    return ethers.utils.solidityKeccak256(
+      ['address', 'uint256', 'bytes', 'bytes'],
+      [signer, chainId, msg, auxData]
+    )
+  }
+
+  private async evaluateRequest(id: string, message: BytesLike, _: Status, metadata: commons.WalletSignRequestMetadata): Promise<void> {
+    // Building auxData, notice: this uses the old v1 format
+    // TODO: We should update the guard API so we can pass the metadata directly
+    const coder = universal.genericCoderFor(metadata.config.version)
+    const { encoded } = coder.signature.encodeSigners(metadata.config, metadata.parts ?? new Map(), [], metadata.chainId)
+
+    try {
+      const key = this.keyOfRequest(this.address, message, encoded, metadata.chainId)
+      const lastAttempt = this.requests.get(id)?.lastAttempt
+      if (lastAttempt === key) {
+        return
+      }
+
+      this.requests.get(id)!.lastAttempt = key
+
+      const result = 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() // TODO: This should be a string (in the API)
+        }
+      })
+
+      if (ethers.utils.arrayify(result.sig).length !== 0) {
+        this.requests.get(id)!.onSignature(result.sig)
+        this.requests.delete(id)
+      }
+    } catch (e) {
+      // The guard signer may reject the request for a number of reasons
+      // like for example, if it's being the first signer (it waits for other signers to sign first)
+      // for now we ignore all errors, but we should probably handle them
+      // TODO: Filter real errors from control flow errors
+    }
+  }
+
+  suffix(): BytesLike {
+    return this.appendSuffix ? [ 3 ] : []
+  }
+}