cruzo-web3 0.1.1 → 0.1.2

package/README.md

@@ -83,12 +83,14 @@ Without a Project ID, the **Mobile wallet (WalletConnect)** option stays disable
 TON wallets (extension and mobile app) require a public `tonconnect-manifest.json`.
 
 1. Add the manifest file to your site root (must be reachable over HTTPS in production).
-2. Point `web3Service` to it:
+2. Point `web3Service` to the absolute manifest URL at app bootstrap:
 
 ```ts
-web3Service.setTonManifestUrl(
-  new URL("/tonconnect-manifest.json", window.location.href).href
-);
+import { web3Service } from "cruzo-web3";
+
+const tonManifestUrl = new URL("/tonconnect-manifest.json", window.location.href).href;
+
+web3Service.setTonManifestUrl(tonManifestUrl);
 ```
 
 Example manifest:

package/lib/components/web3-signing/web3-signing.component.ts

@@ -85,7 +85,6 @@ export class Web3SigningComponent extends AbstractComponent {
   connectedCallback() {
     componentsRegistryService.connectBucket(this.innerBucket);
     super.connectedCallback();
-    this.ensureTonManifest();
     this.updateWalletHint();
     this.setupUrlSync();
   }
@@ -218,12 +217,6 @@ export class Web3SigningComponent extends AbstractComponent {
     return { pubKey: null, signed: false, wallet: null };
   }
 
-  private ensureTonManifest() {
-    if (web3Service.getTonManifestUrl()) return;
-
-    web3Service.setTonManifestUrl(new URL("/tonconnect-manifest.json", window.location.href).href);
-  }
-
   private updateWalletHint() {
     const extensions = detectInjectedWallets();
     const hints = ["Click Connect wallet to choose a provider (extension or mobile app)."];

package/lib/providers/tonconnect.provider.ts

@@ -80,6 +80,7 @@ export class TonConnectProvider implements Web3Provider {
   }
 
   async signMessage(message: string | Uint8Array) {
+    await this.ui.connectionRestored;
     const account = this.requireAccount();
     const text = new TextDecoder().decode(toMessageBytes(message));
 

package/lib/web3.service.ts

@@ -118,6 +118,7 @@ export class Web3Service extends AbstractService {
   readonly setup$ = this.newRx(0);
 
   private provider: Web3Provider | null = null;
+  private activeProviderKey: string | null = null;
   private tonManifestUrl: string | null = null;
   private walletConnectProjectId: string | null = null;
   private builtinProviders: Web3WalletSlot[] | null = null;
@@ -170,11 +171,20 @@ export class Web3Service extends AbstractService {
     return getWalletModeLabel(wallet.kind, wallet.transport);
   }
 
-  useProvider(provider: Web3Provider) {
+  useProvider(provider: Web3Provider, key: string | null = null) {
     this.provider = provider;
+    this.activeProviderKey = key;
     return this;
   }
 
+  private walletProviderKey(kind: WalletKind, transport: WalletTransport) {
+    return `${kind}:${transport}`;
+  }
+
+  private customProviderKey(providerId: string) {
+    return `custom:${providerId}`;
+  }
+
   getProvider() {
     return this.provider;
   }
@@ -218,6 +228,12 @@ export class Web3Service extends AbstractService {
     kind: InjectedWalletKind = "ethereum",
     options: InjectedProviderOptions = {},
   ) {
+    const key = this.walletProviderKey(kind, "extension");
+
+    if (this.provider && this.activeProviderKey === key) {
+      return this;
+    }
+
     const provider = createInjectedProvider(
       kind,
       (pubKey) => {
@@ -228,7 +244,7 @@ export class Web3Service extends AbstractService {
       },
     );
 
-    return this.useProvider(provider);
+    return this.useProvider(provider, key);
   }
 
   async useWalletProvider(
@@ -236,6 +252,12 @@ export class Web3Service extends AbstractService {
     transport: WalletTransport = "auto",
     options: WalletProviderOptions = {},
   ) {
+    const key = this.walletProviderKey(kind, transport);
+
+    if (this.provider && this.activeProviderKey === key) {
+      return this;
+    }
+
     const provider = await createWalletProvider(
       kind,
       transport,
@@ -245,7 +267,7 @@ export class Web3Service extends AbstractService {
       this.walletOptions(options),
     );
 
-    return this.useProvider(provider);
+    return this.useProvider(provider, key);
   }
 
   ensureInjectedProvider(
@@ -286,6 +308,8 @@ export class Web3Service extends AbstractService {
     }
 
     await this.provider.disconnect();
+    this.provider = null;
+    this.activeProviderKey = null;
     this.userPubKey$.update(null);
   }
 
@@ -314,8 +338,14 @@ export class Web3Service extends AbstractService {
   }
 
   async useCustomProvider(providerId: string) {
+    const key = this.customProviderKey(providerId);
+
+    if (this.provider && this.activeProviderKey === key) {
+      return this;
+    }
+
     const provider = await this.resolveCustomProvider(providerId);
-    return this.useProvider(provider);
+    return this.useProvider(provider, key);
   }
 
   async connectCustom(providerId: string) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cruzo-web3",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Web3 addon for cruzo: wallet providers, sign, verify",
   "license": "MIT",
   "type": "module",