Merge conflicts main v2

packages/dapp-kit-react/src/DAppKitProvider/DAppKitProvider.tsx

@@ -79,7 +79,6 @@ export const DAppKitProviderData = ({
     const closeModal = useCallback(() => {
         DAppKitUI.modal.close();
     }, []);
-
     const onModalConnected = useCallback(
         (callback: (address: string | null) => void) =>
             DAppKitUI.modal.onConnectionStatusChange(callback),
@@ -181,4 +180,4 @@ export const DAppKitProvider = ({
     return (
         <DAppKitProviderData dAppKit={dAppKit}>{children}</DAppKitProviderData>
     );
-};
+};

packages/dapp-kit-react/src/DAppKitProvider/hooks/useThor.test.tsx

@@ -0,0 +1,22 @@
+import { describe, it, expect } from 'vitest';
+import { renderHook } from '@testing-library/react';
+import { useThor } from '../..';
+import { wrapper } from '../../../test';
+
+describe('useThor', () => {
+    it('Thor should get initialised', async () => {
+        const { result } = renderHook(() => useThor(), { wrapper });
+
+        expect(result.current).toBeDefined();
+        const genesisBlock = await result.current.blocks.getGenesisBlock();
+        expect(genesisBlock?.id).toBe(
+            '0x000000000b2bce3c70bc649a02749e8687721b09ed2e15997f466536b20bb127',
+        );
+    });
+
+    it('should throw an error when used outside of DAppKitProvider', () => {
+        expect(() => renderHook(() => useThor())).toThrow(
+            '"useThor" must be used within a DAppKitProvider',
+        );
+    });
+});

packages/dapp-kit-react/src/types.ts

@@ -9,7 +9,6 @@ import type { CertificateData } from '@vechain/sdk-core';
 import type { ThorClient } from '@vechain/sdk-network';
 
 export type { WalletConnectOptions, DAppKitOptions } from '@vechain/dapp-kit';
-export type { DAppKitUIOptions } from '@vechain/dapp-kit-ui';
 
 export interface AccountState {
     address: string | null;

packages/dapp-kit/src/types/index.ts

@@ -4,6 +4,7 @@ export type {
     WalletSource,
     ConnectResponse,
     WalletConfig,
+    BaseWallet,
     WalletManagerState,
     Genesis,
 } from './types';

packages/dapp-kit/src/types/types.d.ts

@@ -63,6 +63,10 @@ interface DAppKitOptions {
     allowedWallets?: WalletSource[];
 }
 
+type BaseWallet = ExpandedConnexSigner & {
+    disconnect?: () => Promise<void> | void;
+};
+
 interface WalletSigner {
     signTx: (
         msg: TransactionMessage[],
@@ -98,6 +102,7 @@ interface WalletManagerState {
 }
 
 export type {
+    BaseWallet,
     DAppKitOptions,
     VeChainWallet,
     WalletConfig,

packages/dapp-kit/src/utils/create-wallet.ts

@@ -1,5 +1,6 @@
 import type { ThorClient } from '@vechain/sdk-network';
 import type {
+    BaseWallet,
     DAppKitOptions,
     VeChainWallet,
     WalletSource,
@@ -70,7 +71,10 @@ export const createWallet = ({
                     throw e;
                 });
 
-            return new CertificateBasedWallet(signer, connectionCertificate);
+            return new CertificateBasedWallet(
+                signer as BaseWallet,
+                connectionCertificate,
+            );
         }
         case 'wallet-connect': {
             if (!walletConnectOptions) {

scripts/prepare-packages.ts

@@ -50,8 +50,8 @@ const preparePackages = async () => {
     console.log('       - ✅  Removed!');
 
     console.log(' Build:');
-    console.log('       - 📦 Building packages...');
-    await exec('yarn install && yarn install:all');
+    console.log('       - 📦 Install dependencies and build packages...');
+    await exec('yarn install:all');
     console.log('       - ✅  Built!');
 
     console.log(' Test:');