@dynamic-labs/starknet 1.2.0 → 1.3.0

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+## [1.3.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.2.0...v1.3.0) (2024-03-05)
+
+
+### Features
+
+* add okx and bitget starknet wallets ([#4837](https://github.com/dynamic-labs/DynamicAuth/issues/4837)) ([181a111](https://github.com/dynamic-labs/DynamicAuth/commit/181a111b787306e5ac24616e5d3387db7db8fd18))
+
+
+### Bug Fixes
+
+* improve offline error handling ([80386bf](https://github.com/dynamic-labs/DynamicAuth/commit/80386bfe538dc5a24be0692b3cdf49e8b264b41c))
+
 ## [1.2.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.2.0-alpha.1...v1.2.0) (2024-02-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/starknet",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -31,11 +31,11 @@
     "text-encoding": "0.7.0",
     "starknetkit": "1.1.3",
     "@dynamic-labs/sdk-api": "0.0.363",
-    "@dynamic-labs/rpc-providers": "1.2.0",
-    "@dynamic-labs/types": "1.2.0",
-    "@dynamic-labs/utils": "1.2.0",
-    "@dynamic-labs/wallet-book": "1.2.0",
-    "@dynamic-labs/wallet-connector-core": "1.2.0"
+    "@dynamic-labs/rpc-providers": "1.3.0",
+    "@dynamic-labs/types": "1.3.0",
+    "@dynamic-labs/utils": "1.3.0",
+    "@dynamic-labs/wallet-book": "1.3.0",
+    "@dynamic-labs/wallet-connector-core": "1.3.0"
   },
   "peerDependencies": {}
 }

package/src/index.cjs

@@ -6,6 +6,8 @@ var argentx = require('./wallets/argentx.cjs');
 var braavos = require('./wallets/braavos.cjs');
 var argentxMobile = require('./wallets/argentxMobile.cjs');
 var argentxWeb = require('./wallets/argentxWeb.cjs');
+var bitget = require('./wallets/bitget.cjs');
+var okx = require('./wallets/okx.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const StarknetWalletConnectors = (props) => [
@@ -13,6 +15,8 @@ const StarknetWalletConnectors = (props) => [
     braavos.Braavos,
     argentxMobile.ArgentXMobile,
     argentxWeb.ArgentXWeb,
+    okx.Okx,
+    bitget.Bitget,
 ];
 
 exports.StarknetWalletConnectors = StarknetWalletConnectors;

package/src/index.js

@@ -2,6 +2,8 @@ import { ArgentX } from './wallets/argentx.js';
 import { Braavos } from './wallets/braavos.js';
 import { ArgentXMobile } from './wallets/argentxMobile.js';
 import { ArgentXWeb } from './wallets/argentxWeb.js';
+import { Bitget } from './wallets/bitget.js';
+import { Okx } from './wallets/okx.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const StarknetWalletConnectors = (props) => [
@@ -9,6 +11,8 @@ const StarknetWalletConnectors = (props) => [
     Braavos,
     ArgentXMobile,
     ArgentXWeb,
+    Okx,
+    Bitget,
 ];
 
 export { StarknetWalletConnectors };

package/src/starknetWalletConnector.cjs

@@ -47,6 +47,13 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
             };
         });
     }
+    // abstracting this method to a function due to some wallets (bitget)
+    // having non-standard use of the isConnected flag. This allows for us to use other flags to determine connectivity
+    isProviderConnected() {
+        var _a;
+        const wallet = this.getWallet();
+        return (_a = wallet === null || wallet === void 0 ? void 0 : wallet.isConnected) !== null && _a !== void 0 ? _a : false;
+    }
     getPublicClient() {
         var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -74,7 +81,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
             if (!wallet) {
                 return Promise.resolve(undefined);
             }
-            if (!wallet.isConnected) {
+            if (!this.isProviderConnected()) {
                 yield wallet.enable({ starknetVersion: this.STARKNET_VERSION });
             }
             return Promise.resolve((_a = wallet.provider) === null || _a === void 0 ? void 0 : _a.getChainId());
@@ -84,7 +91,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
             try {
-                if (wallet && !wallet.isConnected) {
+                if (wallet && !this.isProviderConnected()) {
                     yield wallet.enable({ starknetVersion: this.STARKNET_VERSION });
                     localStorage.setItem('dynamic_should_have_wallet', 'true');
                 }
@@ -97,7 +104,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            if (wallet && !(wallet === null || wallet === void 0 ? void 0 : wallet.isConnected)) {
+            if (wallet && !this.isProviderConnected()) {
                 yield (wallet === null || wallet === void 0 ? void 0 : wallet.isPreauthorized());
                 yield this.connect();
             }
@@ -181,7 +188,7 @@ class StarknetWalletConnector extends walletConnectorCore.WalletConnectorBase {
             if (!wallet) {
                 return [];
             }
-            const needsReconnection = !wallet.isConnected && (yield wallet.isPreauthorized());
+            const needsReconnection = !this.isProviderConnected() && (yield wallet.isPreauthorized());
             if (needsReconnection) {
                 /**
                  * this is a hack for braavos

package/src/starknetWalletConnector.d.ts

@@ -30,6 +30,7 @@ declare abstract class StarknetWalletConnector extends WalletConnectorBase {
         walletBook: WalletBookSchema;
     });
     createProviderFromConfig(networks: GenericNetwork[]): StarknetRpcProvider[];
+    isProviderConnected(): boolean;
     getPublicClient(): Promise<RpcProvider | undefined>;
     /**
      * returns starknet wallet network id

package/src/starknetWalletConnector.js

@@ -43,6 +43,13 @@ class StarknetWalletConnector extends WalletConnectorBase {
             };
         });
     }
+    // abstracting this method to a function due to some wallets (bitget)
+    // having non-standard use of the isConnected flag. This allows for us to use other flags to determine connectivity
+    isProviderConnected() {
+        var _a;
+        const wallet = this.getWallet();
+        return (_a = wallet === null || wallet === void 0 ? void 0 : wallet.isConnected) !== null && _a !== void 0 ? _a : false;
+    }
     getPublicClient() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -70,7 +77,7 @@ class StarknetWalletConnector extends WalletConnectorBase {
             if (!wallet) {
                 return Promise.resolve(undefined);
             }
-            if (!wallet.isConnected) {
+            if (!this.isProviderConnected()) {
                 yield wallet.enable({ starknetVersion: this.STARKNET_VERSION });
             }
             return Promise.resolve((_a = wallet.provider) === null || _a === void 0 ? void 0 : _a.getChainId());
@@ -80,7 +87,7 @@ class StarknetWalletConnector extends WalletConnectorBase {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
             try {
-                if (wallet && !wallet.isConnected) {
+                if (wallet && !this.isProviderConnected()) {
                     yield wallet.enable({ starknetVersion: this.STARKNET_VERSION });
                     localStorage.setItem('dynamic_should_have_wallet', 'true');
                 }
@@ -93,7 +100,7 @@ class StarknetWalletConnector extends WalletConnectorBase {
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            if (wallet && !(wallet === null || wallet === void 0 ? void 0 : wallet.isConnected)) {
+            if (wallet && !this.isProviderConnected()) {
                 yield (wallet === null || wallet === void 0 ? void 0 : wallet.isPreauthorized());
                 yield this.connect();
             }
@@ -177,7 +184,7 @@ class StarknetWalletConnector extends WalletConnectorBase {
             if (!wallet) {
                 return [];
             }
-            const needsReconnection = !wallet.isConnected && (yield wallet.isPreauthorized());
+            const needsReconnection = !this.isProviderConnected() && (yield wallet.isPreauthorized());
             if (needsReconnection) {
                 /**
                  * this is a hack for braavos

package/src/types.d.ts

@@ -1,5 +1,5 @@
 import type { StarknetWindowObject } from 'get-starknet-core';
-export type StarknetWalletKey = 'braavos' | 'argentX' | 'argentXMobile' | 'argentWebWallet';
+export type StarknetWalletKey = 'braavos' | 'argentX' | 'argentXMobile' | 'argentWebWallet' | 'okxwallet' | 'bitkeep';
 export type StarknetWindowKey = `starknet_${StarknetWalletKey}` | 'starknet';
 type StarknetWindow = {
     [key in StarknetWindowKey]: StarknetWindowObject;

package/src/wallets/bitget.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var starknetWalletConnector = require('../starknetWalletConnector.cjs');
+
+class Bitget extends starknetWalletConnector["default"] {
+    constructor(opts) {
+        super('Bitget Starknet', 'bitkeep', opts);
+        this.overrideKey = 'bitgetstarknet';
+    }
+    // adding this method due to inconsistencies in isConnected flag on the window object
+    // the window object shows isConnected=true and no provider/account defined
+    isProviderConnected() {
+        var _a;
+        const wallet = this.getWallet();
+        return (_a = (Boolean(wallet === null || wallet === void 0 ? void 0 : wallet.account) && (wallet === null || wallet === void 0 ? void 0 : wallet.isConnected))) !== null && _a !== void 0 ? _a : false;
+    }
+}
+
+exports.Bitget = Bitget;

package/src/wallets/bitget.d.ts

@@ -0,0 +1,7 @@
+import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import StarknetProvider from '../starknetWalletConnector';
+export declare class Bitget extends StarknetProvider implements WalletConnector {
+    overrideKey: string;
+    constructor(opts: any);
+    isProviderConnected(): boolean;
+}

package/src/wallets/bitget.js

@@ -0,0 +1,17 @@
+import StarknetWalletConnector from '../starknetWalletConnector.js';
+
+class Bitget extends StarknetWalletConnector {
+    constructor(opts) {
+        super('Bitget Starknet', 'bitkeep', opts);
+        this.overrideKey = 'bitgetstarknet';
+    }
+    // adding this method due to inconsistencies in isConnected flag on the window object
+    // the window object shows isConnected=true and no provider/account defined
+    isProviderConnected() {
+        var _a;
+        const wallet = this.getWallet();
+        return (_a = (Boolean(wallet === null || wallet === void 0 ? void 0 : wallet.account) && (wallet === null || wallet === void 0 ? void 0 : wallet.isConnected))) !== null && _a !== void 0 ? _a : false;
+    }
+}
+
+export { Bitget };

package/src/wallets/okx.cjs

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var starknetWalletConnector = require('../starknetWalletConnector.cjs');
+
+class Okx extends starknetWalletConnector["default"] {
+    constructor(opts) {
+        super('OKX Starknet', 'okxwallet', opts);
+        this.overrideKey = 'okxstarknet';
+    }
+}
+
+exports.Okx = Okx;

package/src/wallets/okx.d.ts

@@ -0,0 +1,6 @@
+import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import StarknetProvider from '../starknetWalletConnector';
+export declare class Okx extends StarknetProvider implements WalletConnector {
+    overrideKey: string;
+    constructor(opts: any);
+}

package/src/wallets/okx.js

@@ -0,0 +1,10 @@
+import StarknetWalletConnector from '../starknetWalletConnector.js';
+
+class Okx extends StarknetWalletConnector {
+    constructor(opts) {
+        super('OKX Starknet', 'okxwallet', opts);
+        this.overrideKey = 'okxstarknet';
+    }
+}
+
+export { Okx };