Fix first time connecting dapp

Author: SamWilsn

client/src/glue.ts

@@ -1,4 +1,4 @@
-import { Chain } from "./index";
+import { AnyChain } from "./index";
 import { delay } from "./util";
 import {
     ActivateChain,
@@ -73,9 +73,9 @@ export class ManualGlue extends Glue {
     private readonly eventsElement: HTMLElement;
     private readonly instructionsElement: HTMLElement;
 
-    private readonly wallet: Chain;
+    private readonly wallet: AnyChain;
 
-    constructor(element: HTMLElement, wallet: Chain) {
+    constructor(element: HTMLElement, wallet: AnyChain) {
         super();
 
         this.wallet = wallet;

client/src/index.ts

@@ -7,12 +7,15 @@ import * as viem from "viem";
 
 type Eip1193Provider = Parameters<typeof viem.custom>[0];
 
-export interface Chain {
+export interface AccountChain<A extends undefined | viem.Account> {
     provider: Eip1193Provider;
     public: viem.PublicClient<viem.Transport, viem.Chain>;
-    wallet: viem.WalletClient<viem.Transport, viem.Chain, viem.Account>;
+    wallet: viem.WalletClient<viem.Transport, viem.Chain, A>;
 }
 
+export type Chain = AccountChain<viem.Account>;
+export type AnyChain = AccountChain<undefined | viem.Account>;
+
 export interface TestChain extends Chain {
     test: viem.TestClient<"ganache", viem.Transport, viem.Chain>;
 }
@@ -140,15 +143,11 @@ function main() {
 
             await blockchain.test.setAutomine(false);
 
-            const wallet: Chain = {
+            const unboundWallet: AccountChain<undefined> = {
                 provider: window.ethereum,
                 wallet: viem.createWalletClient({
                     chain,
                     transport: viem.custom(window.ethereum),
-                    account: {
-                        address: await getAccount(window.ethereum),
-                        type: "json-rpc",
-                    } as viem.Account,
                     pollingInterval: 0,
                 }),
                 public: viem.createPublicClient({
@@ -170,7 +169,7 @@ function main() {
                     throw "no #container element";
                 }
 
-                glue = new ManualGlue(glueElem, wallet);
+                glue = new ManualGlue(glueElem, unboundWallet);
             }
 
             const uuid = crypto.randomUUID();
@@ -272,12 +271,30 @@ function main() {
                     });
                 });
 
-                await wallet.wallet.requestAddresses();
+                await unboundWallet.wallet.requestAddresses();
                 unsubscribe();
                 if (requestAccountsPromise instanceof Promise) {
                     await requestAccountsPromise;
                 }
 
+                const wallet: Chain = {
+                    provider: window.ethereum,
+                    wallet: viem.createWalletClient({
+                        chain,
+                        transport: viem.custom(window.ethereum),
+                        account: {
+                            address: await getAccount(window.ethereum),
+                            type: "json-rpc",
+                        } as viem.Account,
+                        pollingInterval: 0,
+                    }),
+                    public: viem.createPublicClient({
+                        chain,
+                        transport: viem.custom(window.ethereum),
+                        pollingInterval: 0,
+                    }),
+                };
+
                 await tests.run(blockchain, wallet);
             });