@dynamic-labs/embedded-wallet-solana 3.6.1 → 3.6.2

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+### [3.6.2](https://github.com/dynamic-labs/DynamicAuth/compare/v3.6.1...v3.6.2) (2024-11-13)
+
+
+### Bug Fixes
+
+* **client:** convert the wallet when using wallets.embedded.getWallet ([#7434](https://github.com/dynamic-labs/DynamicAuth/issues/7434)) ([4f77a2a](https://github.com/dynamic-labs/DynamicAuth/commit/4f77a2ae0eb615a3fe2281ce43bc03d3e8bdbab1))
+* issue with SollanaWalletConnectorWithConfig embedded wallets ([#7406](https://github.com/dynamic-labs/DynamicAuth/issues/7406)) ([d2008f6](https://github.com/dynamic-labs/DynamicAuth/commit/d2008f6052f9b53b009ed86fad83f1278429f762))
+* refresh blockhash for solana embedded and use confirmed commitment ([#7429](https://github.com/dynamic-labs/DynamicAuth/issues/7429)) ([7d1674d](https://github.com/dynamic-labs/DynamicAuth/commit/7d1674dd4a2ea6c79e7d552353f0fd1b45375e37))
+
 ### [3.6.1](https://github.com/dynamic-labs/DynamicAuth/compare/v3.6.0...v3.6.1) (2024-11-08)
 
 

package/package.cjs

@@ -3,12 +3,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "3.6.1";
+var version = "3.6.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.563",
-	"@dynamic-labs/utils": "3.6.1",
-	"@dynamic-labs/logger": "3.6.1",
-	"@dynamic-labs/types": "3.6.1",
+	"@dynamic-labs/utils": "3.6.2",
+	"@dynamic-labs/logger": "3.6.2",
+	"@dynamic-labs/types": "3.6.2",
 	eventemitter3: "5.0.1",
 	"@solana/web3.js": "1.92.1",
 	"@turnkey/http": "2.12.2",

package/package.js

@@ -1,10 +1,10 @@
 'use client'
-var version = "3.6.1";
+var version = "3.6.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.563",
-	"@dynamic-labs/utils": "3.6.1",
-	"@dynamic-labs/logger": "3.6.1",
-	"@dynamic-labs/types": "3.6.1",
+	"@dynamic-labs/utils": "3.6.2",
+	"@dynamic-labs/logger": "3.6.2",
+	"@dynamic-labs/types": "3.6.2",
 	eventemitter3: "5.0.1",
 	"@solana/web3.js": "1.92.1",
 	"@turnkey/http": "2.12.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/embedded-wallet-solana",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,22 +27,22 @@
   },
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.563",
-    "@dynamic-labs/utils": "3.6.1",
-    "@dynamic-labs/logger": "3.6.1",
-    "@dynamic-labs/types": "3.6.1",
+    "@dynamic-labs/utils": "3.6.2",
+    "@dynamic-labs/logger": "3.6.2",
+    "@dynamic-labs/types": "3.6.2",
     "eventemitter3": "5.0.1",
     "@solana/web3.js": "1.92.1",
     "@turnkey/http": "2.12.2",
     "@turnkey/iframe-stamper": "2.0.0",
     "@turnkey/solana": "0.3.9",
     "@turnkey/webauthn-stamper": "0.5.0",
-    "@dynamic-labs/assert-package-version": "3.6.1",
-    "@dynamic-labs/embedded-wallet": "3.6.1",
-    "@dynamic-labs/rpc-providers": "3.6.1",
-    "@dynamic-labs/solana-core": "3.6.1",
-    "@dynamic-labs/wallet-book": "3.6.1",
-    "@dynamic-labs/wallet-connector-core": "3.6.1",
-    "@dynamic-labs/webauthn": "3.6.1",
+    "@dynamic-labs/assert-package-version": "3.6.2",
+    "@dynamic-labs/embedded-wallet": "3.6.2",
+    "@dynamic-labs/rpc-providers": "3.6.2",
+    "@dynamic-labs/solana-core": "3.6.2",
+    "@dynamic-labs/wallet-book": "3.6.2",
+    "@dynamic-labs/wallet-connector-core": "3.6.2",
+    "@dynamic-labs/webauthn": "3.6.2",
     "react-dom": "18.2.0",
     "viem": "2.9.25"
   },

package/src/TurnkeySolanaWalletConnectors.cjs

@@ -10,7 +10,11 @@ const TurnkeySolanaWalletConnectors = (props) => {
     var _a;
     if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.turnkey) {
         return [
-            TurnkeySolanaWalletConnector.TurnkeySolanaWalletConnector.bind(null, embeddedWallet.TurnkeyWalletConnectorInfo.TurnkeyHD),
+            class extends TurnkeySolanaWalletConnector.TurnkeySolanaWalletConnector {
+                constructor(innerProps) {
+                    super(embeddedWallet.TurnkeyWalletConnectorInfo.TurnkeyHD, Object.assign(Object.assign({}, props), innerProps));
+                }
+            },
         ];
     }
     return [];

package/src/TurnkeySolanaWalletConnectors.js

@@ -6,7 +6,11 @@ const TurnkeySolanaWalletConnectors = (props) => {
     var _a;
     if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.turnkey) {
         return [
-            TurnkeySolanaWalletConnector.bind(null, TurnkeyWalletConnectorInfo.TurnkeyHD),
+            class extends TurnkeySolanaWalletConnector {
+                constructor(innerProps) {
+                    super(TurnkeyWalletConnectorInfo.TurnkeyHD, Object.assign(Object.assign({}, props), innerProps));
+                }
+            },
         ];
     }
     return [];

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.cjs

@@ -295,7 +295,7 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             if (!this.turnkeyAddress)
                 throw new utils.DynamicError('No turnkey account');
             const uiTransaction = new solanaCore.SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from: this.turnkeyAddress,
                 multipleTransactions: [transaction],
                 onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignTransaction(transaction); }),
@@ -307,7 +307,7 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             yield this.validateActiveWallet(from);
             const transaction = new solanaCore.SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from,
                 onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
                     if (!transaction)
@@ -352,7 +352,7 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
             if (!this.turnkeyAddress)
                 throw new utils.DynamicError('No turnkey account');
             const uiTransaction = new solanaCore.SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from: this.turnkeyAddress,
                 multipleTransactions: transactions,
                 onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAllTransactions(transactions); }),
@@ -391,7 +391,7 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
                 throw new utils.DynamicError('Solana wallet not found');
             const optimizedTransaction = yield this.optimizeTransaction(transaction);
             const uiTransaction = new solanaCore.SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from: this.turnkeyAddress,
                 multipleTransactions: [optimizedTransaction],
                 onSubmit: () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(optimizedTransaction, options); }),
@@ -442,16 +442,10 @@ class TurnkeySolanaWalletConnector extends embeddedWallet.TurnkeyWalletConnector
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
             let optimizedTransaction = transaction;
-            let alreadySigned = false;
-            if ('version' in transaction) {
-                alreadySigned = transaction.signatures.some((sig) => !sig.every((byte) => byte === 0));
-            }
-            else {
-                alreadySigned = transaction.signatures.some((sig) => sig.signature);
-            }
             try {
                 // we cannot optimize partially signed transactions as once a tx is modified the signatures are no longer valid
-                if ((yield this.getNetwork()) === 'mainnet' && !alreadySigned) {
+                if ((yield this.getNetwork()) === 'mainnet' &&
+                    !solanaCore.isTxAlreadySigned(transaction)) {
                     optimizedTransaction = (yield api.optimizeSolanaTransaction(this.getEnvId(), transaction, (_a = this.turnkeyAddress) !== null && _a !== void 0 ? _a : ''));
                 }
             }

package/src/lib/TurnkeySolanaWalletConnector/TurnkeySolanaWalletConnector.js

@@ -6,7 +6,7 @@ import { IframeStamper } from '@turnkey/iframe-stamper';
 import { TurnkeySigner } from '@turnkey/solana';
 import { WebauthnStamper } from '@turnkey/webauthn-stamper';
 import { TurnkeyWalletConnectorBase, findTurnkeyVerifiedCredentials, PasskeyService, TURNKEY_API_BASE_URL, TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS, logger } from '@dynamic-labs/embedded-wallet';
-import { SolanaWallet, ProviderChain, getGenesisHashLSKey, SolanaUiTransaction } from '@dynamic-labs/solana-core';
+import { SolanaWallet, ProviderChain, getGenesisHashLSKey, SolanaUiTransaction, isTxAlreadySigned } from '@dynamic-labs/solana-core';
 import { DynamicError, getTLD, PlatformService, bufferToBase64 } from '@dynamic-labs/utils';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { createSolanaConnection } from '../utils/createSolanaConnection/createSolanaConnection.js';
@@ -291,7 +291,7 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             if (!this.turnkeyAddress)
                 throw new DynamicError('No turnkey account');
             const uiTransaction = new SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from: this.turnkeyAddress,
                 multipleTransactions: [transaction],
                 onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignTransaction(transaction); }),
@@ -303,7 +303,7 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.validateActiveWallet(from);
             const transaction = new SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from,
                 onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () {
                     if (!transaction)
@@ -348,7 +348,7 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
             if (!this.turnkeyAddress)
                 throw new DynamicError('No turnkey account');
             const uiTransaction = new SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from: this.turnkeyAddress,
                 multipleTransactions: transactions,
                 onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignAllTransactions(transactions); }),
@@ -387,7 +387,7 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
                 throw new DynamicError('Solana wallet not found');
             const optimizedTransaction = yield this.optimizeTransaction(transaction);
             const uiTransaction = new SolanaUiTransaction({
-                connection: this.getConnection(),
+                connection: this.getConnection('confirmed'),
                 from: this.turnkeyAddress,
                 multipleTransactions: [optimizedTransaction],
                 onSubmit: () => __awaiter(this, void 0, void 0, function* () { return this.internalSignAndSendTransaction(optimizedTransaction, options); }),
@@ -438,16 +438,10 @@ class TurnkeySolanaWalletConnector extends TurnkeyWalletConnectorBase {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             let optimizedTransaction = transaction;
-            let alreadySigned = false;
-            if ('version' in transaction) {
-                alreadySigned = transaction.signatures.some((sig) => !sig.every((byte) => byte === 0));
-            }
-            else {
-                alreadySigned = transaction.signatures.some((sig) => sig.signature);
-            }
             try {
                 // we cannot optimize partially signed transactions as once a tx is modified the signatures are no longer valid
-                if ((yield this.getNetwork()) === 'mainnet' && !alreadySigned) {
+                if ((yield this.getNetwork()) === 'mainnet' &&
+                    !isTxAlreadySigned(transaction)) {
                     optimizedTransaction = (yield optimizeSolanaTransaction(this.getEnvId(), transaction, (_a = this.turnkeyAddress) !== null && _a !== void 0 ? _a : ''));
                 }
             }