@dynamic-labs/flow 0.17.0-RC.13 → 0.17.0-RC.14

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+## [0.17.0-RC.14](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.0-RC.13...v0.17.0-RC.14) (2023-05-12)
+
+
+### Features
+
+* add local flowNetwork prop to toggle between mainnet and testnet ([#2094](https://github.com/dynamic-labs/DynamicAuth/issues/2094)) ([43c3f20](https://github.com/dynamic-labs/DynamicAuth/commit/43c3f20abf2d6c83e88e48f885749b978cec078a))
+* deprecate multiWallet sdk setting and fetch it from projectSettings ([#2079](https://github.com/dynamic-labs/DynamicAuth/issues/2079)) ([8b7f11d](https://github.com/dynamic-labs/DynamicAuth/commit/8b7f11d9eb71a17056be05cc8006d15dc149e3ff))
+
+
+### Bug Fixes
+
+* **balance:** correctly compare AVAX address when fetching balance ([#2064](https://github.com/dynamic-labs/DynamicAuth/issues/2064)) ([c5942d1](https://github.com/dynamic-labs/DynamicAuth/commit/c5942d112804f3a935bca396221fb33a3c7cc42a))
+* **DYN-2231:** restore User Profile display when social is the only enabled flag in information capture ([#2070](https://github.com/dynamic-labs/DynamicAuth/issues/2070)) ([6790bc7](https://github.com/dynamic-labs/DynamicAuth/commit/6790bc7e54afb1807be9996dc47129932441bbae))
+
 ## [0.17.0-RC.13](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.0-RC.12...v0.17.0-RC.13) (2023-05-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/flow",
-  "version": "0.17.0-RC.13",
+  "version": "0.17.0-RC.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@onflow/fcl": "^1.3.2",
-    "@dynamic-labs/utils": "0.17.0-RC.13",
-    "@dynamic-labs/wallet-connector-core": "0.17.0-RC.13"
+    "@dynamic-labs/utils": "0.17.0-RC.14",
+    "@dynamic-labs/wallet-connector-core": "0.17.0-RC.14"
   },
   "peerDependencies": {}
 }

package/src/FlowWalletConnector.cjs

@@ -33,17 +33,18 @@ const LOCAL_STORAGE = {
     put: (key, value) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return set(key, value); }),
 };
 class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
-    constructor({ appName, appLogoUrl, }) {
+    constructor({ appName, appLogoUrl, flowNetwork, }) {
         super();
         this.connectedChain = 'FLOW';
         this.supportedChains = ['FLOW'];
         this.appName = appName;
         this.appLogoUrl = appLogoUrl;
+        this.network = flowNetwork !== null && flowNetwork !== void 0 ? flowNetwork : 'mainnet';
     }
     connect() {
         var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            this.setupConfig();
+            yield this.setupConfig();
             const { addr } = yield fcl.currentUser().authenticate();
             if (addr) {
                 yield ((_a = this.onAccountChange) === null || _a === void 0 ? void 0 : _a.call(this, [addr]));
@@ -53,16 +54,22 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
     setupEventListeners(listeners) {
         this.onAccountChange = listeners.onAccountChange;
     }
-    setupConfig() {
-        this.baseConfig();
+    getNetwork() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return this.network;
+        });
     }
-    baseConfig() {
-        fcl.config()
-            .put('app.detail.title', this.appName)
-            .put('app.detail.icon', this.appLogoUrl)
-            .put('accessNode.api', 'https://rest-mainnet.onflow.org')
-            .put('flow.network', 'mainnet')
-            .put('fcl.storage', LOCAL_STORAGE);
+    setupConfig() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield fcl.config()
+                .put('app.detail.title', this.appName)
+                .put('app.detail.icon', this.appLogoUrl)
+                .put('fcl.storage', LOCAL_STORAGE)
+                .put('accessNode.api', this.network === 'testnet'
+                ? 'https://rest-testnet.onflow.org'
+                : 'https://rest-mainnet.onflow.org')
+                .put('flow.network', this.network);
+        });
     }
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -110,7 +117,7 @@ class FlowWalletConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getBalance() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            this.baseConfig();
+            yield this.setupConfig();
             const address = yield this.fetchPublicAddress();
             if (address) {
                 const code = `

package/src/FlowWalletConnector.d.ts

@@ -10,14 +10,16 @@ export declare abstract class FlowWalletConnector extends WalletConnectorBase {
     protected onAccountChange?: (address: string[]) => Promise<void>;
     connectedChain: Chain;
     supportedChains: Chain[];
-    constructor({ appName, appLogoUrl, }: {
+    protected network: 'mainnet' | 'testnet';
+    constructor({ appName, appLogoUrl, flowNetwork, }: {
         appLogoUrl?: string;
         appName?: string;
+        flowNetwork?: 'mainnet' | 'testnet';
     });
     connect(): Promise<void>;
     setupEventListeners(listeners: WalletEventListeners): void;
-    setupConfig(): void;
-    baseConfig(): void;
+    getNetwork(): Promise<string>;
+    setupConfig(): Promise<void>;
     fetchPublicAddress(): Promise<string | undefined>;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/FlowWalletConnector.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { config, currentUser, send, script, decode } from '@onflow/fcl';
+import { currentUser, config, send, script, decode } from '@onflow/fcl';
 import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
 
@@ -29,17 +29,18 @@ const LOCAL_STORAGE = {
     put: (key, value) => __awaiter(void 0, void 0, void 0, function* () { return set(key, value); }),
 };
 class FlowWalletConnector extends WalletConnectorBase {
-    constructor({ appName, appLogoUrl, }) {
+    constructor({ appName, appLogoUrl, flowNetwork, }) {
         super();
         this.connectedChain = 'FLOW';
         this.supportedChains = ['FLOW'];
         this.appName = appName;
         this.appLogoUrl = appLogoUrl;
+        this.network = flowNetwork !== null && flowNetwork !== void 0 ? flowNetwork : 'mainnet';
     }
     connect() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.setupConfig();
+            yield this.setupConfig();
             const { addr } = yield currentUser().authenticate();
             if (addr) {
                 yield ((_a = this.onAccountChange) === null || _a === void 0 ? void 0 : _a.call(this, [addr]));
@@ -49,16 +50,22 @@ class FlowWalletConnector extends WalletConnectorBase {
     setupEventListeners(listeners) {
         this.onAccountChange = listeners.onAccountChange;
     }
-    setupConfig() {
-        this.baseConfig();
+    getNetwork() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.network;
+        });
     }
-    baseConfig() {
-        config()
-            .put('app.detail.title', this.appName)
-            .put('app.detail.icon', this.appLogoUrl)
-            .put('accessNode.api', 'https://rest-mainnet.onflow.org')
-            .put('flow.network', 'mainnet')
-            .put('fcl.storage', LOCAL_STORAGE);
+    setupConfig() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield config()
+                .put('app.detail.title', this.appName)
+                .put('app.detail.icon', this.appLogoUrl)
+                .put('fcl.storage', LOCAL_STORAGE)
+                .put('accessNode.api', this.network === 'testnet'
+                ? 'https://rest-testnet.onflow.org'
+                : 'https://rest-mainnet.onflow.org')
+                .put('flow.network', this.network);
+        });
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -106,7 +113,7 @@ class FlowWalletConnector extends WalletConnectorBase {
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.baseConfig();
+            yield this.setupConfig();
             const address = yield this.fetchPublicAddress();
             if (address) {
                 const code = `

package/src/blocto.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var _tslib = require('../_virtual/_tslib.cjs');
 var fcl = require('@onflow/fcl');
 var FlowWalletConnector = require('./FlowWalletConnector.cjs');
 
@@ -10,12 +11,19 @@ class Blocto extends FlowWalletConnector.FlowWalletConnector {
         this.canConnectViaCustodialService = true;
     }
     setupConfig() {
-        super.setupConfig();
-        fcl.config()
-            .put('challenge.scope', 'email')
-            .put('discovery.wallet', 'https://flow-wallet.blocto.app/authn')
-            .put('service.OpenID.scopes', 'email!')
-            .put('discovery.wallet.method', undefined);
+        const _super = Object.create(null, {
+            setupConfig: { get: () => super.setupConfig }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield _super.setupConfig.call(this);
+            yield fcl.config()
+                .put('challenge.scope', 'email')
+                .put('discovery.wallet', this.network === 'testnet'
+                ? 'https://flow-wallet-testnet.blocto.app/authn'
+                : 'https://flow-wallet.blocto.app/authn')
+                .put('service.OpenID.scopes', 'email!')
+                .put('discovery.wallet.method', undefined);
+        });
     }
 }
 

package/src/blocto.d.ts

@@ -2,6 +2,6 @@ import { FlowWalletConnector } from './FlowWalletConnector';
 declare class Blocto extends FlowWalletConnector {
     name: string;
     canConnectViaCustodialService: boolean;
-    setupConfig(): void;
+    setupConfig(): Promise<void>;
 }
 export default Blocto;

package/src/blocto.js

@@ -1,3 +1,4 @@
+import { __awaiter } from '../_virtual/_tslib.js';
 import { config } from '@onflow/fcl';
 import { FlowWalletConnector } from './FlowWalletConnector.js';
 
@@ -8,12 +9,19 @@ class Blocto extends FlowWalletConnector {
         this.canConnectViaCustodialService = true;
     }
     setupConfig() {
-        super.setupConfig();
-        config()
-            .put('challenge.scope', 'email')
-            .put('discovery.wallet', 'https://flow-wallet.blocto.app/authn')
-            .put('service.OpenID.scopes', 'email!')
-            .put('discovery.wallet.method', undefined);
+        const _super = Object.create(null, {
+            setupConfig: { get: () => super.setupConfig }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.setupConfig.call(this);
+            yield config()
+                .put('challenge.scope', 'email')
+                .put('discovery.wallet', this.network === 'testnet'
+                ? 'https://flow-wallet-testnet.blocto.app/authn'
+                : 'https://flow-wallet.blocto.app/authn')
+                .put('service.OpenID.scopes', 'email!')
+                .put('discovery.wallet.method', undefined);
+        });
     }
 }
 

package/src/dapper.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var _tslib = require('../_virtual/_tslib.cjs');
 var fcl = require('@onflow/fcl');
 var FlowWalletConnector = require('./FlowWalletConnector.cjs');
 
@@ -10,12 +11,19 @@ class Dapper extends FlowWalletConnector.FlowWalletConnector {
         this.canConnectViaCustodialService = true;
     }
     setupConfig() {
-        super.setupConfig();
-        fcl.config()
-            .put('challenge.scope', undefined)
-            .put('discovery.wallet', 'https://accounts.meetdapper.com/fcl/authn-restricted')
-            .put('service.OpenID.scopes', undefined)
-            .put('discovery.wallet.method', 'POP/RPC');
+        const _super = Object.create(null, {
+            setupConfig: { get: () => super.setupConfig }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield _super.setupConfig.call(this);
+            yield fcl.config()
+                .put('challenge.scope', undefined)
+                .put('discovery.wallet', this.network === 'testnet'
+                ? 'https://staging.accounts.meetdapper.com/fcl/authn-restricted'
+                : 'https://accounts.meetdapper.com/fcl/authn-restricted')
+                .put('service.OpenID.scopes', undefined)
+                .put('discovery.wallet.method', 'POP/RPC');
+        });
     }
 }
 

package/src/dapper.d.ts

@@ -2,6 +2,6 @@ import { FlowWalletConnector } from './FlowWalletConnector';
 declare class Dapper extends FlowWalletConnector {
     name: string;
     canConnectViaCustodialService: boolean;
-    setupConfig(): void;
+    setupConfig(): Promise<void>;
 }
 export default Dapper;

package/src/dapper.js

@@ -1,3 +1,4 @@
+import { __awaiter } from '../_virtual/_tslib.js';
 import { config } from '@onflow/fcl';
 import { FlowWalletConnector } from './FlowWalletConnector.js';
 
@@ -8,12 +9,19 @@ class Dapper extends FlowWalletConnector {
         this.canConnectViaCustodialService = true;
     }
     setupConfig() {
-        super.setupConfig();
-        config()
-            .put('challenge.scope', undefined)
-            .put('discovery.wallet', 'https://accounts.meetdapper.com/fcl/authn-restricted')
-            .put('service.OpenID.scopes', undefined)
-            .put('discovery.wallet.method', 'POP/RPC');
+        const _super = Object.create(null, {
+            setupConfig: { get: () => super.setupConfig }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.setupConfig.call(this);
+            yield config()
+                .put('challenge.scope', undefined)
+                .put('discovery.wallet', this.network === 'testnet'
+                ? 'https://staging.accounts.meetdapper.com/fcl/authn-restricted'
+                : 'https://accounts.meetdapper.com/fcl/authn-restricted')
+                .put('service.OpenID.scopes', undefined)
+                .put('discovery.wallet.method', 'POP/RPC');
+        });
     }
 }
 

package/src/lilico.cjs

@@ -11,12 +11,17 @@ class Lilico extends FlowWalletConnector.FlowWalletConnector {
         this.name = 'Lilico';
     }
     setupConfig() {
-        super.setupConfig();
-        fcl.config()
-            .put('challenge.scope', undefined)
-            .put('discovery.wallet', 'chrome-extension://hpclkefagolihohboafpheddmmgdffjm/popup.html')
-            .put('service.OpenID.scopes', undefined)
-            .put('discovery.wallet.method', 'EXT/RPC');
+        const _super = Object.create(null, {
+            setupConfig: { get: () => super.setupConfig }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield _super.setupConfig.call(this);
+            fcl.config()
+                .put('challenge.scope', undefined)
+                .put('discovery.wallet', 'chrome-extension://hpclkefagolihohboafpheddmmgdffjm/popup.html')
+                .put('service.OpenID.scopes', undefined)
+                .put('discovery.wallet.method', 'EXT/RPC');
+        });
     }
     isInstalledOnBrowser() {
         var _a;

package/src/lilico.d.ts

@@ -2,7 +2,7 @@ import { FlowWalletConnector } from './FlowWalletConnector';
 import './types';
 declare class Lilico extends FlowWalletConnector {
     name: string;
-    setupConfig(): void;
+    setupConfig(): Promise<void>;
     isInstalledOnBrowser(): boolean;
     signDelay(): Promise<void>;
 }

package/src/lilico.js

@@ -9,12 +9,17 @@ class Lilico extends FlowWalletConnector {
         this.name = 'Lilico';
     }
     setupConfig() {
-        super.setupConfig();
-        config()
-            .put('challenge.scope', undefined)
-            .put('discovery.wallet', 'chrome-extension://hpclkefagolihohboafpheddmmgdffjm/popup.html')
-            .put('service.OpenID.scopes', undefined)
-            .put('discovery.wallet.method', 'EXT/RPC');
+        const _super = Object.create(null, {
+            setupConfig: { get: () => super.setupConfig }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.setupConfig.call(this);
+            config()
+                .put('challenge.scope', undefined)
+                .put('discovery.wallet', 'chrome-extension://hpclkefagolihohboafpheddmmgdffjm/popup.html')
+                .put('service.OpenID.scopes', undefined)
+                .put('discovery.wallet.method', 'EXT/RPC');
+        });
     }
     isInstalledOnBrowser() {
         var _a;