@0xsequence/provider 1.1.9 → 1.1.10

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

@@ -3788,6 +3788,10 @@ class SequenceClient {
   // Working with sendAsync is less idiomatic
   // but transport uses it instead of send, so we wrap it
   send(request, chainId) {
+    // Internally when sending requests we use `legacy_sign`
+    // to avoid the default EIP6492 behavior overriding an explicit
+    // "legacy sign" request, so we map the method here.
+    request.method = this.mapSignMethod(request.method);
     return new Promise((resolve, reject) => {
       this.transport.sendAsync(request, (error, response) => {
         if (error) {
@@ -3814,14 +3818,48 @@ class SequenceClient {
     }
     return connectedSession.networks;
   }
-  usesEIP6492(options) {
+
+  // NOTICE: `legacy_sign` will get overriden by `send`
+  // it is done this way to ensure that:
+  //  - `send` handles `personal_sign` as a request for the default sign method
+  //  - explicit `personal_sign` is not replaced by `sequence_sign` (if default is EI6492)
+  signMethod(options) {
+    if ((options == null ? void 0 : options.eip6492) === undefined) {
+      return 'personal_sign';
+    }
+    return options.eip6492 ? 'sequence_sign' : 'legacy_sign';
+  }
+  signTypedDataMethod(options) {
     if ((options == null ? void 0 : options.eip6492) === undefined) {
-      return this.defaultEIP6492;
+      return 'eth_signTypedData_v4';
+    }
+    return options.eip6492 ? 'sequence_signTypedData_v4' : 'legacy_signTypedData_v4';
+  }
+  mapSignMethod(method) {
+    if (method === 'personal_sign') {
+      if (this.defaultEIP6492) {
+        return 'sequence_sign';
+      } else {
+        return 'personal_sign';
+      }
+    }
+    if (method === 'eth_signTypedData_v4') {
+      if (this.defaultEIP6492) {
+        return 'sequence_signTypedData_v4';
+      } else {
+        return 'eth_signTypedData_v4';
+      }
+    }
+    if (method === 'legacy_sign') {
+      return 'personal_sign';
+    }
+    if (method === 'legacy_signTypedData_v4') {
+      return 'eth_signTypedData_v4';
     }
-    return options.eip6492;
+    return method;
   }
   async signMessage(message, options) {
-    const method = this.usesEIP6492(options) ? 'sequence_sign' : 'personal_sign';
+    const method = this.signMethod(options);
 
     // Address is ignored by the wallet webapp
     return this.send({
@@ -3830,7 +3868,7 @@ class SequenceClient {
     }, options == null ? void 0 : options.chainId);
   }
   async signTypedData(typedData, options) {
-    const method = this.usesEIP6492(options) ? 'sequence_signTypedData_v4' : 'eth_signTypedData_v4';
+    const method = this.signTypedDataMethod(options);
 
     // TODO: Stop using ethers for this, this is the only place where we use it
     // and it makes the client depend on ethers.

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

@@ -3788,6 +3788,10 @@ class SequenceClient {
   // Working with sendAsync is less idiomatic
   // but transport uses it instead of send, so we wrap it
   send(request, chainId) {
+    // Internally when sending requests we use `legacy_sign`
+    // to avoid the default EIP6492 behavior overriding an explicit
+    // "legacy sign" request, so we map the method here.
+    request.method = this.mapSignMethod(request.method);
     return new Promise((resolve, reject) => {
       this.transport.sendAsync(request, (error, response) => {
         if (error) {
@@ -3814,14 +3818,48 @@ class SequenceClient {
     }
     return connectedSession.networks;
   }
-  usesEIP6492(options) {
+
+  // NOTICE: `legacy_sign` will get overriden by `send`
+  // it is done this way to ensure that:
+  //  - `send` handles `personal_sign` as a request for the default sign method
+  //  - explicit `personal_sign` is not replaced by `sequence_sign` (if default is EI6492)
+  signMethod(options) {
+    if ((options == null ? void 0 : options.eip6492) === undefined) {
+      return 'personal_sign';
+    }
+    return options.eip6492 ? 'sequence_sign' : 'legacy_sign';
+  }
+  signTypedDataMethod(options) {
     if ((options == null ? void 0 : options.eip6492) === undefined) {
-      return this.defaultEIP6492;
+      return 'eth_signTypedData_v4';
+    }
+    return options.eip6492 ? 'sequence_signTypedData_v4' : 'legacy_signTypedData_v4';
+  }
+  mapSignMethod(method) {
+    if (method === 'personal_sign') {
+      if (this.defaultEIP6492) {
+        return 'sequence_sign';
+      } else {
+        return 'personal_sign';
+      }
+    }
+    if (method === 'eth_signTypedData_v4') {
+      if (this.defaultEIP6492) {
+        return 'sequence_signTypedData_v4';
+      } else {
+        return 'eth_signTypedData_v4';
+      }
+    }
+    if (method === 'legacy_sign') {
+      return 'personal_sign';
+    }
+    if (method === 'legacy_signTypedData_v4') {
+      return 'eth_signTypedData_v4';
     }
-    return options.eip6492;
+    return method;
   }
   async signMessage(message, options) {
-    const method = this.usesEIP6492(options) ? 'sequence_sign' : 'personal_sign';
+    const method = this.signMethod(options);
 
     // Address is ignored by the wallet webapp
     return this.send({
@@ -3830,7 +3868,7 @@ class SequenceClient {
     }, options == null ? void 0 : options.chainId);
   }
   async signTypedData(typedData, options) {
-    const method = this.usesEIP6492(options) ? 'sequence_signTypedData_v4' : 'eth_signTypedData_v4';
+    const method = this.signTypedDataMethod(options);
 
     // TODO: Stop using ethers for this, this is the only place where we use it
     // and it makes the client depend on ethers.

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

@@ -3784,6 +3784,10 @@ class SequenceClient {
   // Working with sendAsync is less idiomatic
   // but transport uses it instead of send, so we wrap it
   send(request, chainId) {
+    // Internally when sending requests we use `legacy_sign`
+    // to avoid the default EIP6492 behavior overriding an explicit
+    // "legacy sign" request, so we map the method here.
+    request.method = this.mapSignMethod(request.method);
     return new Promise((resolve, reject) => {
       this.transport.sendAsync(request, (error, response) => {
         if (error) {
@@ -3810,14 +3814,48 @@ class SequenceClient {
     }
     return connectedSession.networks;
   }
-  usesEIP6492(options) {
+
+  // NOTICE: `legacy_sign` will get overriden by `send`
+  // it is done this way to ensure that:
+  //  - `send` handles `personal_sign` as a request for the default sign method
+  //  - explicit `personal_sign` is not replaced by `sequence_sign` (if default is EI6492)
+  signMethod(options) {
+    if ((options == null ? void 0 : options.eip6492) === undefined) {
+      return 'personal_sign';
+    }
+    return options.eip6492 ? 'sequence_sign' : 'legacy_sign';
+  }
+  signTypedDataMethod(options) {
     if ((options == null ? void 0 : options.eip6492) === undefined) {
-      return this.defaultEIP6492;
+      return 'eth_signTypedData_v4';
+    }
+    return options.eip6492 ? 'sequence_signTypedData_v4' : 'legacy_signTypedData_v4';
+  }
+  mapSignMethod(method) {
+    if (method === 'personal_sign') {
+      if (this.defaultEIP6492) {
+        return 'sequence_sign';
+      } else {
+        return 'personal_sign';
+      }
+    }
+    if (method === 'eth_signTypedData_v4') {
+      if (this.defaultEIP6492) {
+        return 'sequence_signTypedData_v4';
+      } else {
+        return 'eth_signTypedData_v4';
+      }
+    }
+    if (method === 'legacy_sign') {
+      return 'personal_sign';
+    }
+    if (method === 'legacy_signTypedData_v4') {
+      return 'eth_signTypedData_v4';
     }
-    return options.eip6492;
+    return method;
   }
   async signMessage(message, options) {
-    const method = this.usesEIP6492(options) ? 'sequence_sign' : 'personal_sign';
+    const method = this.signMethod(options);
 
     // Address is ignored by the wallet webapp
     return this.send({
@@ -3826,7 +3864,7 @@ class SequenceClient {
     }, options == null ? void 0 : options.chainId);
   }
   async signTypedData(typedData, options) {
-    const method = this.usesEIP6492(options) ? 'sequence_signTypedData_v4' : 'eth_signTypedData_v4';
+    const method = this.signTypedDataMethod(options);
 
     // TODO: Stop using ethers for this, this is the only place where we use it
     // and it makes the client depend on ethers.

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

@@ -71,7 +71,9 @@ export declare class SequenceClient {
     disconnect(): Promise<void>;
     send(request: JsonRpcRequest, chainId?: number): Promise<any>;
     getNetworks(pull?: boolean): Promise<NetworkConfig[]>;
-    private usesEIP6492;
+    private signMethod;
+    private signTypedDataMethod;
+    private mapSignMethod;
     signMessage(message: ethers.BytesLike, options?: OptionalEIP6492 & OptionalChainId): Promise<string>;
     signTypedData(typedData: TypedData, options?: OptionalEIP6492 & OptionalChainId): Promise<string>;
     sendTransaction(tx: ethers.providers.TransactionRequest[] | ethers.providers.TransactionRequest, options?: OptionalChainId): Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -11,15 +11,15 @@
   "dependencies": {
     "eventemitter2": "^6.4.5",
     "webextension-polyfill": "^0.10.0",
-    "@0xsequence/abi": "1.1.9",
-    "@0xsequence/auth": "1.1.9",
-    "@0xsequence/core": "1.1.9",
-    "@0xsequence/migration": "1.1.9",
-    "@0xsequence/account": "1.1.9",
-    "@0xsequence/network": "1.1.9",
-    "@0xsequence/relayer": "1.1.9",
-    "@0xsequence/wallet": "1.1.9",
-    "@0xsequence/utils": "1.1.9"
+    "@0xsequence/abi": "1.1.10",
+    "@0xsequence/auth": "1.1.10",
+    "@0xsequence/core": "1.1.10",
+    "@0xsequence/migration": "1.1.10",
+    "@0xsequence/account": "1.1.10",
+    "@0xsequence/network": "1.1.10",
+    "@0xsequence/relayer": "1.1.10",
+    "@0xsequence/utils": "1.1.10",
+    "@0xsequence/wallet": "1.1.10"
   },
   "peerDependencies": {
     "ethers": ">=5.5 < 6"

package/src/client.ts

@@ -132,11 +132,7 @@ export class SequenceClient {
 
   public readonly defaultEIP6492: boolean
 
-  constructor(
-    transport: ProviderTransport | MuxTransportTemplate,
-    store: ItemStore,
-    options?: SequenceClientOptions | number
-  ) {
+  constructor(transport: ProviderTransport | MuxTransportTemplate, store: ItemStore, options?: SequenceClientOptions | number) {
     if (isMuxTransportTemplate(transport)) {
       this.transport = MuxMessageProvider.new(transport)
     } else if (isProviderTransport(transport)) {
@@ -348,6 +344,12 @@ export class SequenceClient {
   // Working with sendAsync is less idiomatic
   // but transport uses it instead of send, so we wrap it
   send(request: JsonRpcRequest, chainId?: number): Promise<any> {
+
+    // Internally when sending requests we use `legacy_sign`
+    // to avoid the default EIP6492 behavior overriding an explicit
+    // "legacy sign" request, so we map the method here.
+    request.method = this.mapSignMethod(request.method)
+
     return new Promise((resolve, reject) => {
       this.transport.sendAsync(
         request,
@@ -380,23 +382,63 @@ export class SequenceClient {
     return connectedSession.networks
   }
 
-  private usesEIP6492(options?: OptionalEIP6492): boolean {
+  // NOTICE: `legacy_sign` will get overriden by `send`
+  // it is done this way to ensure that:
+  //  - `send` handles `personal_sign` as a request for the default sign method
+  //  - explicit `personal_sign` is not replaced by `sequence_sign` (if default is EI6492)
+  private signMethod(options?: OptionalEIP6492) {
+    if (options?.eip6492 === undefined) {
+      return 'personal_sign'
+    }
+
+    return options.eip6492 ? 'sequence_sign' : 'legacy_sign'
+  }
+
+  private signTypedDataMethod(options?: OptionalEIP6492) {
     if (options?.eip6492 === undefined) {
-      return this.defaultEIP6492
+      return 'eth_signTypedData_v4'
+    }
+
+    return options.eip6492 ? 'sequence_signTypedData_v4' : 'legacy_signTypedData_v4'
+  }
+
+  private mapSignMethod(method: string): string {
+    if (method === 'personal_sign') {
+      if (this.defaultEIP6492) {
+        return 'sequence_sign'
+      } else {
+        return 'personal_sign'
+      }
+    }
+
+    if (method === 'eth_signTypedData_v4') {
+      if (this.defaultEIP6492) {
+        return 'sequence_signTypedData_v4'
+      } else {
+        return 'eth_signTypedData_v4'
+      }
+    }
+
+    if (method === 'legacy_sign') {
+      return 'personal_sign'
+    }
+
+    if (method === 'legacy_signTypedData_v4') {
+      return 'eth_signTypedData_v4'
     }
 
-    return options.eip6492
+    return method
   }
 
   async signMessage(message: ethers.BytesLike, options?: OptionalEIP6492 & OptionalChainId): Promise<string> {
-    const method = this.usesEIP6492(options) ? 'sequence_sign' : 'personal_sign'
+    const method = this.signMethod(options)
 
     // Address is ignored by the wallet webapp
     return this.send({ method, params: [message, this.getAddress()] }, options?.chainId)
   }
 
   async signTypedData(typedData: TypedData, options?: OptionalEIP6492 & OptionalChainId): Promise<string> {
-    const method = this.usesEIP6492(options) ? 'sequence_signTypedData_v4' : 'eth_signTypedData_v4'
+    const method = this.signTypedDataMethod(options)
 
     // TODO: Stop using ethers for this, this is the only place where we use it
     // and it makes the client depend on ethers.

package/src/init.ts

@@ -118,14 +118,10 @@ export const initWallet = (partialConfig?: Partial<ProviderConfig>) => {
   const itemStore = config.localStorage || useBestStore()
 
   // Create client, provider and return signer
-  const client = new SequenceClient(
-    config.transports,
-    itemStore,
-    {
-      defaultChainId: defaultNetwork,
-      defaultEIP6492: config.defaultEIP6492
-    }
-  )
+  const client = new SequenceClient(config.transports, itemStore, {
+    defaultChainId: defaultNetwork,
+    defaultEIP6492: config.defaultEIP6492
+  })
 
   sequenceWalletProvider = new SequenceProvider(client, providerForChainId)
   return sequenceWalletProvider