@dynamic-labs/global-wallet 4.0.0-alpha.3 → 4.0.0-alpha.31

package/package.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var version = "4.0.0-alpha.31";
+
+exports.version = version;

package/package.js

@@ -0,0 +1,4 @@
+'use client'
+var version = "4.0.0-alpha.31";
+
+export { version };

package/package.json

@@ -1,16 +1,7 @@
 {
   "name": "@dynamic-labs/global-wallet",
-  "version": "4.0.0-alpha.3",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
-    "directory": "packages/global-wallet"
-  },
+  "version": "4.0.0-alpha.31",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
-  "bugs": {
-    "url": "https://github.com/dynamic-labs/DynamicAuth/issues"
-  },
-  "homepage": "https://github.com/dynamic-labs/DynamicAuth#readme",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
   "main": "./index.cjs",
@@ -25,12 +16,15 @@
     },
     "./package.json": "./package.json"
   },
+  "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
     "@walletconnect/core": "2.13.1",
     "@walletconnect/utils": "2.13.1",
     "@walletconnect/web3wallet": "1.12.1",
     "jsqr": "1.4.0",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.3"
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.31",
+    "@dynamic-labs/ethereum-core": "4.0.0-alpha.31",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.31"
   },
   "peerDependencies": {
     "viem": "^2.7.6",

package/src/GlobalWalletConnector.cjs

@@ -7,8 +7,9 @@ var _tslib = require('../_virtual/_tslib.cjs');
 var core = require('@walletconnect/core');
 var utils = require('@walletconnect/utils');
 var web3wallet = require('@walletconnect/web3wallet');
-var viem = require('viem');
 var jsQR = require('jsqr');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var ethereumCore = require('@dynamic-labs/ethereum-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -42,6 +43,7 @@ const GlobalWalletExtension = {
         let web3wallet$1;
         let WCListenersOn = false;
         let pendingSessionProposal;
+        const signer = (yield connector.getSigner());
         const globalWallet = {
             confirmPairing: (confirm) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 const { params, id } = pendingSessionProposal;
@@ -108,16 +110,18 @@ const GlobalWalletExtension = {
                     const { request, chainId } = params;
                     // since we cant listen to chain events from the dapp, just change when a request comes in
                     const [requestParamsMessage, typedDataToSign] = request.params;
-                    const signer = (yield connector.getSigner());
                     const handleRequest = (handler) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                        let response;
                         try {
+                            // tell wallet ui utils that the transaction is coming from global connectivity
+                            // so we can force the confirmation ui to be on
                             connector.isGlobalTransaction = true;
                             const result = yield handler();
-                            connector.isGlobalTransaction = false;
-                            return { id, jsonrpc: '2.0', result };
+                            response = { id, jsonrpc: '2.0', result };
                         }
                         catch (e) {
-                            return {
+                            walletConnectorCore.logger.error('Error listening to session request', e);
+                            response = {
                                 error: {
                                     code: 5000,
                                     message: 'User rejected.',
@@ -126,6 +130,10 @@ const GlobalWalletExtension = {
                                 jsonrpc: '2.0',
                             };
                         }
+                        finally {
+                            connector.isGlobalTransaction = false;
+                        }
+                        return response;
                     });
                     let response;
                     if (request.method === 'eth_signTypedData_v4') {
@@ -144,9 +152,15 @@ const GlobalWalletExtension = {
                             });
                         }
                         response = yield handleRequest(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                            return signer.sendTransaction(Object.assign(Object.assign({}, requestParamsMessage), { gas: viem.fromHex(requestParamsMessage.gas, 'bigint'), value: requestParamsMessage.value
-                                    ? viem.fromHex(requestParamsMessage.value, 'bigint')
-                                    : BigInt(0) }));
+                            const estimatedFeesPerGas = yield (yield connector.getPublicClient()).estimateFeesPerGas();
+                            const type = (estimatedFeesPerGas === null || estimatedFeesPerGas === void 0 ? void 0 : estimatedFeesPerGas.maxFeePerGas)
+                                ? 'eip1559'
+                                : 'legacy';
+                            return signer.sendTransaction(ethereumCore.unFormatTransaction(Object.assign(Object.assign({}, requestParamsMessage), { 
+                                // strip the gasPrice if it should be a eip1559 tx or tx will fail
+                                gasPrice: estimatedFeesPerGas && estimatedFeesPerGas.maxFeePerGas
+                                    ? undefined
+                                    : requestParamsMessage.gasPrice, type, value: requestParamsMessage.value })));
                         }));
                     }
                     if (response) {

package/src/GlobalWalletConnector.js

@@ -3,8 +3,9 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { Core } from '@walletconnect/core';
 import { getSdkError, buildApprovedNamespaces } from '@walletconnect/utils';
 import { Web3Wallet } from '@walletconnect/web3wallet';
-import { fromHex } from 'viem';
 import jsQR from 'jsqr';
+import { logger } from '@dynamic-labs/wallet-connector-core';
+import { unFormatTransaction } from '@dynamic-labs/ethereum-core';
 
 /* eslint-disable import/no-extraneous-dependencies */
 const buildCombinedNamespaces = (params) => {
@@ -34,6 +35,7 @@ const GlobalWalletExtension = {
         let web3wallet;
         let WCListenersOn = false;
         let pendingSessionProposal;
+        const signer = (yield connector.getSigner());
         const globalWallet = {
             confirmPairing: (confirm) => __awaiter(void 0, void 0, void 0, function* () {
                 const { params, id } = pendingSessionProposal;
@@ -100,16 +102,18 @@ const GlobalWalletExtension = {
                     const { request, chainId } = params;
                     // since we cant listen to chain events from the dapp, just change when a request comes in
                     const [requestParamsMessage, typedDataToSign] = request.params;
-                    const signer = (yield connector.getSigner());
                     const handleRequest = (handler) => __awaiter(void 0, void 0, void 0, function* () {
+                        let response;
                         try {
+                            // tell wallet ui utils that the transaction is coming from global connectivity
+                            // so we can force the confirmation ui to be on
                             connector.isGlobalTransaction = true;
                             const result = yield handler();
-                            connector.isGlobalTransaction = false;
-                            return { id, jsonrpc: '2.0', result };
+                            response = { id, jsonrpc: '2.0', result };
                         }
                         catch (e) {
-                            return {
+                            logger.error('Error listening to session request', e);
+                            response = {
                                 error: {
                                     code: 5000,
                                     message: 'User rejected.',
@@ -118,6 +122,10 @@ const GlobalWalletExtension = {
                                 jsonrpc: '2.0',
                             };
                         }
+                        finally {
+                            connector.isGlobalTransaction = false;
+                        }
+                        return response;
                     });
                     let response;
                     if (request.method === 'eth_signTypedData_v4') {
@@ -136,9 +144,15 @@ const GlobalWalletExtension = {
                             });
                         }
                         response = yield handleRequest(() => __awaiter(void 0, void 0, void 0, function* () {
-                            return signer.sendTransaction(Object.assign(Object.assign({}, requestParamsMessage), { gas: fromHex(requestParamsMessage.gas, 'bigint'), value: requestParamsMessage.value
-                                    ? fromHex(requestParamsMessage.value, 'bigint')
-                                    : BigInt(0) }));
+                            const estimatedFeesPerGas = yield (yield connector.getPublicClient()).estimateFeesPerGas();
+                            const type = (estimatedFeesPerGas === null || estimatedFeesPerGas === void 0 ? void 0 : estimatedFeesPerGas.maxFeePerGas)
+                                ? 'eip1559'
+                                : 'legacy';
+                            return signer.sendTransaction(unFormatTransaction(Object.assign(Object.assign({}, requestParamsMessage), { 
+                                // strip the gasPrice if it should be a eip1559 tx or tx will fail
+                                gasPrice: estimatedFeesPerGas && estimatedFeesPerGas.maxFeePerGas
+                                    ? undefined
+                                    : requestParamsMessage.gasPrice, type, value: requestParamsMessage.value })));
                         }));
                     }
                     if (response) {

package/src/index.cjs

@@ -3,9 +3,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
 var GlobalWalletConnector = require('./GlobalWalletConnector.cjs');
 
-
+assertPackageVersion.assertPackageVersion('@dynamic-labs/global-wallet', _package.version);
 
 exports.GlobalWalletExtension = GlobalWalletConnector.GlobalWalletExtension;
 exports.buildCombinedNamespaces = GlobalWalletConnector.buildCombinedNamespaces;

package/src/index.js

@@ -1,2 +1,6 @@
 'use client'
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
 export { GlobalWalletExtension, buildCombinedNamespaces } from './GlobalWalletConnector.js';
+
+assertPackageVersion('@dynamic-labs/global-wallet', version);