@0xsequence/provider 2.0.0 → 2.0.1

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

@@ -1461,7 +1461,7 @@ class UnrealMessageProvider extends BaseProviderTransport {
   // all lowercase is an annoying limitation of Unreal CEF BindUObject
   sendMessage(message) {
     var _window$ue3;
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message;
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, utils.bigintReplacer) : message;
     console.log('Sending message to wallet:', postedMessage);
     (_window$ue3 = window.ue) == null || (_window$ue3 = _window$ue3.sequencewallettransport) == null || _window$ue3.sendmessagetowallet(postedMessage);
   }
@@ -1560,7 +1560,7 @@ class UnrealMessageHandler extends BaseWalletTransport {
       return;
     }
     // prepare payload
-    const payload = JSON.stringify(message);
+    const payload = JSON.stringify(message, utils.bigintReplacer);
 
     // post-message to app.
     (_window$ue3 = window.ue) == null || (_window$ue3 = _window$ue3.sequencewallettransport) == null || _window$ue3.sendmessagetosequencejs(payload);
@@ -1835,7 +1835,7 @@ class WindowMessageProvider extends BaseProviderTransport {
       }
       let message;
       try {
-        message = JSON.parse(event.data);
+        message = JSON.parse(event.data, utils.bigintReviver);
       } catch (err) {
         // event is not a ProviderMessage JSON object, skip
         return;
@@ -1859,7 +1859,7 @@ class WindowMessageProvider extends BaseProviderTransport {
       utils.logger.warn('WindowMessageProvider: sendMessage failed as walletWindow is unavailable');
       return;
     }
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message;
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, utils.bigintReplacer) : message;
     this.walletWindow.postMessage(postedMessage, this.walletURL.origin);
   }
 }
@@ -1886,13 +1886,7 @@ class WindowMessageHandler extends BaseWalletTransport {
       // Wallet always expects json-rpc request messages from a dapp
       let request;
       try {
-        request = JSON.parse(event.data, (key, value) => {
-          // BigNumber compatibility with older versions of sequence.js
-          if (isBigNumberSerialized(value)) {
-            return BigInt(value.hex);
-          }
-          return value;
-        });
+        request = JSON.parse(event.data, utils.bigintReviver);
       } catch (err) {
         // event is not a ProviderMessage JSON object, skip
         return;
@@ -1982,7 +1976,7 @@ class WindowMessageHandler extends BaseWalletTransport {
   // postMessage sends message to the dapp window
   sendMessage(message) {
     // prepare payload
-    const payload = JSON.stringify(message);
+    const payload = JSON.stringify(message, utils.bigintReplacer);
 
     // post-message to app.
     // only for init requests, we send to '*' origin
@@ -2014,9 +2008,6 @@ class WindowMessageHandler extends BaseWalletTransport {
     }
   }
 }
-const isBigNumberSerialized = value => {
-  return typeof value === 'object' && value.type === 'BigNumber' && ethers.ethers.isHexString(value.hex);
-};
 
 function isMuxTransportTemplate(obj) {
   return obj && typeof obj === 'object' && (obj.windowTransport && typeof obj.windowTransport === 'object' || obj.proxyTransport && typeof obj.proxyTransport === 'object' || obj.extensionTransport && typeof obj.extensionTransport === 'object' || obj.unrealTransport && typeof obj.unrealTransport === 'object') && (
@@ -4004,7 +3995,10 @@ class SequenceClient {
     // 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 this.transport.request(request);
+    const result = await this.transport.request(request);
+
+    // We may need to unwrap the response if it's a JSON-RPC response. ie. older universal wallet versions
+    return unwrapJsonRpcResponse(result);
   }
   async getNetworks(pull) {
     const connectedSession = this.session.connectedSession();
@@ -4136,6 +4130,14 @@ class SequenceClient {
   // exclusively used for Sequence specific methods
 }
 
+// Unwrap a JsonRpcResponse result
+const unwrapJsonRpcResponse = response => {
+  if (response && typeof response === 'object' && 'jsonrpc' in response && 'result' in response) {
+    return response.result;
+  }
+  return response;
+};
+
 const DefaultProviderConfig = {
   transports: {
     walletAppURL: 'https://sequence.app',

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

@@ -1461,7 +1461,7 @@ class UnrealMessageProvider extends BaseProviderTransport {
   // all lowercase is an annoying limitation of Unreal CEF BindUObject
   sendMessage(message) {
     var _window$ue3;
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message;
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, utils.bigintReplacer) : message;
     console.log('Sending message to wallet:', postedMessage);
     (_window$ue3 = window.ue) == null || (_window$ue3 = _window$ue3.sequencewallettransport) == null || _window$ue3.sendmessagetowallet(postedMessage);
   }
@@ -1560,7 +1560,7 @@ class UnrealMessageHandler extends BaseWalletTransport {
       return;
     }
     // prepare payload
-    const payload = JSON.stringify(message);
+    const payload = JSON.stringify(message, utils.bigintReplacer);
 
     // post-message to app.
     (_window$ue3 = window.ue) == null || (_window$ue3 = _window$ue3.sequencewallettransport) == null || _window$ue3.sendmessagetosequencejs(payload);
@@ -1835,7 +1835,7 @@ class WindowMessageProvider extends BaseProviderTransport {
       }
       let message;
       try {
-        message = JSON.parse(event.data);
+        message = JSON.parse(event.data, utils.bigintReviver);
       } catch (err) {
         // event is not a ProviderMessage JSON object, skip
         return;
@@ -1859,7 +1859,7 @@ class WindowMessageProvider extends BaseProviderTransport {
       utils.logger.warn('WindowMessageProvider: sendMessage failed as walletWindow is unavailable');
       return;
     }
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message;
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, utils.bigintReplacer) : message;
     this.walletWindow.postMessage(postedMessage, this.walletURL.origin);
   }
 }
@@ -1886,13 +1886,7 @@ class WindowMessageHandler extends BaseWalletTransport {
       // Wallet always expects json-rpc request messages from a dapp
       let request;
       try {
-        request = JSON.parse(event.data, (key, value) => {
-          // BigNumber compatibility with older versions of sequence.js
-          if (isBigNumberSerialized(value)) {
-            return BigInt(value.hex);
-          }
-          return value;
-        });
+        request = JSON.parse(event.data, utils.bigintReviver);
       } catch (err) {
         // event is not a ProviderMessage JSON object, skip
         return;
@@ -1982,7 +1976,7 @@ class WindowMessageHandler extends BaseWalletTransport {
   // postMessage sends message to the dapp window
   sendMessage(message) {
     // prepare payload
-    const payload = JSON.stringify(message);
+    const payload = JSON.stringify(message, utils.bigintReplacer);
 
     // post-message to app.
     // only for init requests, we send to '*' origin
@@ -2014,9 +2008,6 @@ class WindowMessageHandler extends BaseWalletTransport {
     }
   }
 }
-const isBigNumberSerialized = value => {
-  return typeof value === 'object' && value.type === 'BigNumber' && ethers.ethers.isHexString(value.hex);
-};
 
 function isMuxTransportTemplate(obj) {
   return obj && typeof obj === 'object' && (obj.windowTransport && typeof obj.windowTransport === 'object' || obj.proxyTransport && typeof obj.proxyTransport === 'object' || obj.extensionTransport && typeof obj.extensionTransport === 'object' || obj.unrealTransport && typeof obj.unrealTransport === 'object') && (
@@ -4004,7 +3995,10 @@ class SequenceClient {
     // 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 this.transport.request(request);
+    const result = await this.transport.request(request);
+
+    // We may need to unwrap the response if it's a JSON-RPC response. ie. older universal wallet versions
+    return unwrapJsonRpcResponse(result);
   }
   async getNetworks(pull) {
     const connectedSession = this.session.connectedSession();
@@ -4136,6 +4130,14 @@ class SequenceClient {
   // exclusively used for Sequence specific methods
 }
 
+// Unwrap a JsonRpcResponse result
+const unwrapJsonRpcResponse = response => {
+  if (response && typeof response === 'object' && 'jsonrpc' in response && 'result' in response) {
+    return response.result;
+  }
+  return response;
+};
+
 const DefaultProviderConfig = {
   transports: {
     walletAppURL: 'https://sequence.app',

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

@@ -2,7 +2,7 @@ import { walletContracts } from '@0xsequence/abi';
 import { commons, VERSION } from '@0xsequence/core';
 import { ethers } from 'ethers';
 import { EventEmitter2 } from 'eventemitter2';
-import { logger, encodeMessageDigest, encodeTypedDataDigest, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject, toHexString } from '@0xsequence/utils';
+import { logger, encodeMessageDigest, encodeTypedDataDigest, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, bigintReplacer, base64DecodeObject, bigintReviver, toHexString } from '@0xsequence/utils';
 import { findSupportedNetwork, ChainId, findNetworkConfig, allNetworks, JsonRpcProvider, loggingProviderMiddleware, exceptionProviderMiddleware, CachedProvider } from '@0xsequence/network';
 import { signAuthorization } from '@0xsequence/auth';
 import { isBrowser, Databeat } from '@databeat/tracker';
@@ -1457,7 +1457,7 @@ class UnrealMessageProvider extends BaseProviderTransport {
   // all lowercase is an annoying limitation of Unreal CEF BindUObject
   sendMessage(message) {
     var _window$ue3;
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message;
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, bigintReplacer) : message;
     console.log('Sending message to wallet:', postedMessage);
     (_window$ue3 = window.ue) == null || (_window$ue3 = _window$ue3.sequencewallettransport) == null || _window$ue3.sendmessagetowallet(postedMessage);
   }
@@ -1556,7 +1556,7 @@ class UnrealMessageHandler extends BaseWalletTransport {
       return;
     }
     // prepare payload
-    const payload = JSON.stringify(message);
+    const payload = JSON.stringify(message, bigintReplacer);
 
     // post-message to app.
     (_window$ue3 = window.ue) == null || (_window$ue3 = _window$ue3.sequencewallettransport) == null || _window$ue3.sendmessagetosequencejs(payload);
@@ -1831,7 +1831,7 @@ class WindowMessageProvider extends BaseProviderTransport {
       }
       let message;
       try {
-        message = JSON.parse(event.data);
+        message = JSON.parse(event.data, bigintReviver);
       } catch (err) {
         // event is not a ProviderMessage JSON object, skip
         return;
@@ -1855,7 +1855,7 @@ class WindowMessageProvider extends BaseProviderTransport {
       logger.warn('WindowMessageProvider: sendMessage failed as walletWindow is unavailable');
       return;
     }
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message;
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, bigintReplacer) : message;
     this.walletWindow.postMessage(postedMessage, this.walletURL.origin);
   }
 }
@@ -1882,13 +1882,7 @@ class WindowMessageHandler extends BaseWalletTransport {
       // Wallet always expects json-rpc request messages from a dapp
       let request;
       try {
-        request = JSON.parse(event.data, (key, value) => {
-          // BigNumber compatibility with older versions of sequence.js
-          if (isBigNumberSerialized(value)) {
-            return BigInt(value.hex);
-          }
-          return value;
-        });
+        request = JSON.parse(event.data, bigintReviver);
       } catch (err) {
         // event is not a ProviderMessage JSON object, skip
         return;
@@ -1978,7 +1972,7 @@ class WindowMessageHandler extends BaseWalletTransport {
   // postMessage sends message to the dapp window
   sendMessage(message) {
     // prepare payload
-    const payload = JSON.stringify(message);
+    const payload = JSON.stringify(message, bigintReplacer);
 
     // post-message to app.
     // only for init requests, we send to '*' origin
@@ -2010,9 +2004,6 @@ class WindowMessageHandler extends BaseWalletTransport {
     }
   }
 }
-const isBigNumberSerialized = value => {
-  return typeof value === 'object' && value.type === 'BigNumber' && ethers.isHexString(value.hex);
-};
 
 function isMuxTransportTemplate(obj) {
   return obj && typeof obj === 'object' && (obj.windowTransport && typeof obj.windowTransport === 'object' || obj.proxyTransport && typeof obj.proxyTransport === 'object' || obj.extensionTransport && typeof obj.extensionTransport === 'object' || obj.unrealTransport && typeof obj.unrealTransport === 'object') && (
@@ -4000,7 +3991,10 @@ class SequenceClient {
     // 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 this.transport.request(request);
+    const result = await this.transport.request(request);
+
+    // We may need to unwrap the response if it's a JSON-RPC response. ie. older universal wallet versions
+    return unwrapJsonRpcResponse(result);
   }
   async getNetworks(pull) {
     const connectedSession = this.session.connectedSession();
@@ -4132,6 +4126,14 @@ class SequenceClient {
   // exclusively used for Sequence specific methods
 }
 
+// Unwrap a JsonRpcResponse result
+const unwrapJsonRpcResponse = response => {
+  if (response && typeof response === 'object' && 'jsonrpc' in response && 'result' in response) {
+    return response.result;
+  }
+  return response;
+};
+
 const DefaultProviderConfig = {
   transports: {
     walletAppURL: 'https://sequence.app',

package/package.json

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

package/src/client.ts

@@ -385,7 +385,10 @@ export class SequenceClient {
     // "legacy sign" request, so we map the method here.
     request.method = this.mapSignMethod(request.method)
 
-    return this.transport.request(request)
+    const result = await this.transport.request(request)
+
+    // We may need to unwrap the response if it's a JSON-RPC response. ie. older universal wallet versions
+    return unwrapJsonRpcResponse(result)
   }
 
   async getNetworks(pull?: boolean): Promise<NetworkConfig[]> {
@@ -511,3 +514,12 @@ export class SequenceClient {
   // wallet-webapp does implement them, but this client is meant to be
   // exclusively used for Sequence specific methods
 }
+
+// Unwrap a JsonRpcResponse result
+const unwrapJsonRpcResponse = (response: any): any => {
+  if (response && typeof response === 'object' && 'jsonrpc' in response && 'result' in response) {
+    return response.result
+  }
+
+  return response
+}

package/src/transports/unreal-transport/unreal-message-handler.ts

@@ -10,7 +10,7 @@ import {
 } from '../../types'
 import { WalletRequestHandler } from '../wallet-request-handler'
 import { BaseWalletTransport } from '../base-wallet-transport'
-import { logger, base64DecodeObject } from '@0xsequence/utils'
+import { logger, base64DecodeObject, bigintReplacer } from '@0xsequence/utils'
 import { overrideLogs } from './overridelogs'
 
 // all lowercase is an annoying limitation of Unreal CEF BindUObject
@@ -104,7 +104,7 @@ export class UnrealMessageHandler extends BaseWalletTransport {
       return
     }
     // prepare payload
-    const payload = JSON.stringify(message)
+    const payload = JSON.stringify(message, bigintReplacer)
 
     // post-message to app.
     window.ue?.sequencewallettransport?.sendmessagetosequencejs(payload)

package/src/transports/unreal-transport/unreal-message-provider.ts

@@ -1,6 +1,6 @@
 import { OpenWalletIntent, ProviderMessage, InitState, WindowSessionParams } from '../../types'
 import { BaseProviderTransport } from '../base-provider-transport'
-import { base64EncodeObject } from '@0xsequence/utils'
+import { base64EncodeObject, bigintReplacer } from '@0xsequence/utils'
 import { overrideLogs } from './overridelogs'
 
 let registeredUnrealMessageProvider: UnrealMessageProvider | undefined
@@ -114,7 +114,7 @@ export class UnrealMessageProvider extends BaseProviderTransport {
 
   // all lowercase is an annoying limitation of Unreal CEF BindUObject
   sendMessage(message: ProviderMessage<unknown>) {
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, bigintReplacer) : message
     console.log('Sending message to wallet:', postedMessage)
     window.ue?.sequencewallettransport?.sendmessagetowallet(postedMessage)
   }

package/src/transports/window-transport/window-message-handler.ts

@@ -10,7 +10,7 @@ import {
 } from '../../types'
 import { WalletRequestHandler } from '../wallet-request-handler'
 import { BaseWalletTransport } from '../base-wallet-transport'
-import { logger, base64DecodeObject } from '@0xsequence/utils'
+import { logger, base64DecodeObject, bigintReviver, bigintReplacer } from '@0xsequence/utils'
 import { ethers } from 'ethers'
 
 export class WindowMessageHandler extends BaseWalletTransport {
@@ -93,14 +93,7 @@ export class WindowMessageHandler extends BaseWalletTransport {
     // Wallet always expects json-rpc request messages from a dapp
     let request: ProviderMessageRequest
     try {
-      request = JSON.parse(event.data, (key, value) => {
-        // BigNumber compatibility with older versions of sequence.js
-        if (isBigNumberSerialized(value)) {
-          return BigInt(value.hex)
-        }
-
-        return value
-      })
+      request = JSON.parse(event.data, bigintReviver)
     } catch (err) {
       // event is not a ProviderMessage JSON object, skip
       return
@@ -125,7 +118,7 @@ export class WindowMessageHandler extends BaseWalletTransport {
   // postMessage sends message to the dapp window
   sendMessage(message: ProviderMessage<any>) {
     // prepare payload
-    const payload = JSON.stringify(message)
+    const payload = JSON.stringify(message, bigintReplacer)
 
     // post-message to app.
     // only for init requests, we send to '*' origin
@@ -169,7 +162,3 @@ export class WindowMessageHandler extends BaseWalletTransport {
     }
   }
 }
-
-const isBigNumberSerialized = (value: any): boolean => {
-  return typeof value === 'object' && value.type === 'BigNumber' && ethers.isHexString(value.hex)
-}

package/src/transports/window-transport/window-message-provider.ts

@@ -1,6 +1,6 @@
 import { OpenWalletIntent, ProviderMessage, InitState, WindowSessionParams } from '../../types'
 import { BaseProviderTransport } from '../base-provider-transport'
-import { logger, base64EncodeObject } from '@0xsequence/utils'
+import { logger, base64EncodeObject, bigintReplacer, bigintReviver } from '@0xsequence/utils'
 import { isBrowserExtension, isUnityPlugin } from '../../utils'
 
 // ..
@@ -172,7 +172,7 @@ export class WindowMessageProvider extends BaseProviderTransport {
 
     let message: ProviderMessage<any>
     try {
-      message = JSON.parse(event.data)
+      message = JSON.parse(event.data, bigintReviver)
     } catch (err) {
       // event is not a ProviderMessage JSON object, skip
       return
@@ -191,7 +191,7 @@ export class WindowMessageProvider extends BaseProviderTransport {
       logger.warn('WindowMessageProvider: sendMessage failed as walletWindow is unavailable')
       return
     }
-    const postedMessage = typeof message !== 'string' ? JSON.stringify(message) : message
+    const postedMessage = typeof message !== 'string' ? JSON.stringify(message, bigintReplacer) : message
     this.walletWindow.postMessage(postedMessage, this.walletURL.origin)
   }
 }