revert: add sync2 back int

vechain · Nov 7, 2024 · e2e91c5 · e2e91c5
1 parent 4158910
commit e2e91c5
Show file tree

Hide file tree

Showing 28 changed files with 265 additions and 144 deletions.
diff --git a/.github/workflows/lint-build-test.yaml b/.github/workflows/lint-build-test.yaml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: 'yarn'

diff --git a/.github/workflows/test-e2e.yaml b/.github/workflows/test-e2e.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Install Stable Chrome
         run: |
           wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-          sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+          sudo sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
           sudo apt-get update
           sudo apt-get install google-chrome-stable
 
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: 'yarn'

diff --git a/examples/sample-angular-app/src/app/app.component.ts b/examples/sample-angular-app/src/app/app.component.ts
@@ -26,7 +26,6 @@ export class AppComponent implements OnInit {
 
         DAppKitUI.configure({
             nodeUrl: 'https://testnet.vechain.org/',
-            genesis: 'test',
             walletConnectOptions,
             usePersistence: true,
         });

diff --git a/examples/sample-next-app/src/app/layout.tsx b/examples/sample-next-app/src/app/layout.tsx
@@ -46,7 +46,6 @@ export default function RootLayout({
             </head>
             <body className={inter.className}>
                 <DAppKitProvider
-                    genesis="test"
                     logLevel="DEBUG"
                     nodeUrl="https://testnet.vechain.org/"
                     usePersistence

diff --git a/examples/sample-react-app/src/main.tsx b/examples/sample-react-app/src/main.tsx
@@ -22,7 +22,6 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
             nodeUrl={'https://testnet.vechain.org/'}
             usePersistence
             walletConnectOptions={walletConnectOptions}
-            genesis={'test'}
         >
             <App />
         </DAppKitProvider>

diff --git a/examples/sample-react-app/test/welcome.test.tsx b/examples/sample-react-app/test/welcome.test.tsx
@@ -1,6 +1,6 @@
 import renderer from 'react-test-renderer';
 import React from 'react';
-import { test, expect } from 'vitest';
+import { expect, test } from 'vitest';
 import App from '../src/App';
 import { DAppKitProvider } from '@vechain/dapp-kit-react';
 import { WalletConnectOptions } from '@vechain/dapp-kit';
@@ -19,7 +19,6 @@ test('Welcome', async () => {
         <React.StrictMode>
             <DAppKitProvider
                 nodeUrl={'https://testnet.vechain.org/'}
-                genesis={'test'}
                 usePersistence
                 walletConnectOptions={walletConnectOptions}
             >

diff --git a/examples/sample-remix-app/app/.client/app.client.tsx b/examples/sample-remix-app/app/.client/app.client.tsx
@@ -1,9 +1,9 @@
 import {
     DAppKitProvider,
-    WalletButton,
-    WalletConnectOptions,
     useWallet,
     useWalletModal,
+    WalletButton,
+    WalletConnectOptions,
 } from '@vechain/dapp-kit-react';
 import { useEffect, useState } from 'react';
 
@@ -58,7 +58,6 @@ const walletConnectOptions: WalletConnectOptions = {
 export const App = () => {
     return (
         <DAppKitProvider
-            genesis="test"
             logLevel="DEBUG"
             nodeUrl="https://testnet.vechain.org/"
             usePersistence

diff --git a/examples/sample-svelte-app/src/lib/index.ts b/examples/sample-svelte-app/src/lib/index.ts
@@ -12,7 +12,6 @@ const walletConnectOptions = {
 
 DAppKitUI.configure({
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 });

diff --git a/examples/sample-vanilla-app/src/main.ts b/examples/sample-vanilla-app/src/main.ts
@@ -22,7 +22,6 @@ const walletConnectOptions = {
 
 DAppKitUI.configure({
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 });

diff --git a/examples/sample-vue-app/src/App.vue b/examples/sample-vue-app/src/App.vue
@@ -13,7 +13,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { DAppKitUI } from '@vechain/dapp-kit-ui';
-import { Genesis } from '@vechain/dapp-kit';
 
 const walletConnectOptions = {
     projectId: 'a0b855ceaf109dbc8426479a4c3d38d8',
@@ -27,7 +26,6 @@ const walletConnectOptions = {
 
 const vechainDAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test' as Genesis,
     walletConnectOptions,
     usePersistence: true,
 };
@@ -78,9 +76,11 @@ body {
     align-items: center;
     justify-content: center;
 }
+
 h2 {
     margin: 0;
 }
+
 .container {
     display: flex;
     flex-direction: column;
@@ -90,6 +90,7 @@ h2 {
     border-radius: 20px;
     padding: 20px;
 }
+
 .label {
     margin-top: 20px;
     margin-bottom: 10px;

diff --git a/packages/dapp-kit-react/README.md b/packages/dapp-kit-react/README.md
@@ -1,6 +1,9 @@
 # `@vechain/dapp-kit-react`
 
-The Vechain DApp Kit serves as a sophisticated layer built upon @vechain/connex, providing a simplified and efficient avenue for engaging with a multitude of Vechain wallets. This innovative toolkit enhances the ease of interaction, offering developers a seamless bridge to connect with diverse Vechain wallet functionalities. For more information, please refer to the official [Vechain Docs](https://docs.vechain.org/developer-resources/sdks-and-providers/dapp-kit)
+The Vechain DApp Kit serves as a sophisticated layer built upon @vechain/connex, providing a simplified and efficient
+avenue for engaging with a multitude of Vechain wallets. This innovative toolkit enhances the ease of interaction,
+offering developers a seamless bridge to connect with diverse Vechain wallet functionalities. For more information,
+please refer to the official [Vechain Docs](https://docs.vechain.org/developer-resources/sdks-and-providers/dapp-kit)
 
 ## Installation
 
@@ -37,8 +40,6 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         <DAppKitProvider
             // REQUIRED: The URL of the node you want to connect to
             nodeUrl={'https://testnet.vechain.org/'}
-            // OPTIONAL: Required if you're not connecting to the main net
-            genesis={'test'}
             // OPTIONAL: Whether or not to persist state in local storage (account, wallet source)
             usePersistence={true}
             // OPTIONAL: Options to enable wallet connect

diff --git a/packages/dapp-kit-react/src/DAppKitProvider.tsx b/packages/dapp-kit-react/src/DAppKitProvider.tsx
@@ -20,7 +20,6 @@ const Context = createContext<DAppKitContext | undefined>(undefined);
 export const DAppKitProvider: React.FC<DAppKitProviderOptions> = ({
     children,
     nodeUrl,
-    genesis,
     walletConnectOptions,
     usePersistence = false,
     logLevel,
@@ -37,7 +36,6 @@ export const DAppKitProvider: React.FC<DAppKitProviderOptions> = ({
         () =>
             DAppKitUI.configure({
                 nodeUrl,
-                genesis,
                 walletConnectOptions,
                 usePersistence,
                 logLevel,
@@ -52,7 +50,6 @@ export const DAppKitProvider: React.FC<DAppKitProviderOptions> = ({
             }),
         [
             nodeUrl,
-            genesis,
             walletConnectOptions,
             usePersistence,
             logLevel,

diff --git a/packages/dapp-kit-ui/README.md b/packages/dapp-kit-ui/README.md
@@ -1,6 +1,9 @@
 # `@vechain/dapp-kit-ui`
 
-The Vechain DApp Kit serves as a sophisticated layer built upon @vechain/connex, providing a simplified and efficient avenue for engaging with a multitude of Vechain wallets. This innovative toolkit enhances the ease of interaction, offering developers a seamless bridge to connect with diverse Vechain wallet functionalities. For more information, please refer to the official [Vechain Docs](https://docs.vechain.org/developer-resources/sdks-and-providers/dapp-kit)
+The Vechain DApp Kit serves as a sophisticated layer built upon @vechain/connex, providing a simplified and efficient
+avenue for engaging with a multitude of Vechain wallets. This innovative toolkit enhances the ease of interaction,
+offering developers a seamless bridge to connect with diverse Vechain wallet functionalities. For more information,
+please refer to the official [Vechain Docs](https://docs.vechain.org/developer-resources/sdks-and-providers/dapp-kit)
 
 ## Usage
 
@@ -26,7 +29,6 @@ const walletConnectOptions: WalletConnectOptions = {
 
 const options: DAppKitOptions = {
     nodeUrl: 'https://testnet.vechain.org/',
-    genesis: 'test',
     walletConnectOptions,
     usePersistence: true,
 };

diff --git a/packages/dapp-kit-ui/src/constants/sources.ts b/packages/dapp-kit-ui/src/constants/sources.ts
@@ -1,5 +1,5 @@
 import type { WalletSource } from '@vechain/dapp-kit';
-import { VeWorldLogo, WalletConnectLogo } from '../assets/images';
+import { SyncLogo, VeWorldLogo, WalletConnectLogo } from '../assets/images';
 
 export interface SourceInfo {
     id: WalletSource;
@@ -18,4 +18,14 @@ export const WalletSources: Record<WalletSource, SourceInfo> = {
         name: 'VeWorld',
         logo: VeWorldLogo,
     },
+    sync: {
+        id: 'sync',
+        name: 'Sync',
+        logo: SyncLogo,
+    },
+    sync2: {
+        id: 'sync2',
+        name: 'Sync2',
+        logo: SyncLogo,
+    },
 };
diff --git a/packages/dapp-kit/src/classes/certificate-wallet.ts b/packages/dapp-kit/src/classes/certificate-wallet.ts
@@ -1,5 +1,5 @@
 import { Certificate } from '@vechain/sdk-core';
-import type { BaseWallet, ConnectResponse, VechainWallet } from '../types';
+import type { ConnectResponse, VechainWallet } from '../types';
 import { DEFAULT_CONNECT_CERT_MESSAGE } from '../constants';
 import type {
     CertificateMessage,
@@ -9,13 +9,14 @@ import type {
     TransactionOptions,
     TransactionResponse,
 } from '../types/requests';
+import type { WalletSigner } from '../types/types';
 
 /**
  * A `VechainWallet` for wallet's that use a certificate connection
  */
 class CertificateBasedWallet implements VechainWallet {
     constructor(
-        private readonly wallet: BaseWallet,
+        private readonly wallet: Promise<WalletSigner>,
         private readonly connectionCertificateData?: {
             message?: CertificateMessage;
             options?: CertificateOptions;
@@ -60,14 +61,16 @@ class CertificateBasedWallet implements VechainWallet {
     signCert = (
         msg: CertificateMessage,
         options: CertificateOptions,
-    ): Promise<CertificateResponse> => this.wallet.signCert(msg, options);
+    ): Promise<CertificateResponse> =>
+        this.wallet.then((w) => w.signCert(msg, options));
 
     signTx = (
         msg: TransactionMessage[],
         options: TransactionOptions,
-    ): Promise<TransactionResponse> => this.wallet.signTx(msg, options);
+    ): Promise<TransactionResponse> =>
+        this.wallet.then((w) => w.signTx(msg, options));
 
-    disconnect = async (): Promise<void> => this.wallet.disconnect?.();
+    disconnect = () => Promise.resolve();
 }
 
 export { CertificateBasedWallet };
diff --git a/packages/dapp-kit/src/classes/index.ts b/packages/dapp-kit/src/classes/index.ts
@@ -1,4 +1,3 @@
 export * from './wallet-manager';
 export * from './certificate-wallet';
-export * from './wc-wallet';
 export * from './vechain-signer';
diff --git a/packages/dapp-kit/src/classes/wallet-manager.ts b/packages/dapp-kit/src/classes/wallet-manager.ts
@@ -1,6 +1,7 @@
 import { proxy, subscribe } from 'valtio/vanilla';
 import { subscribeKey } from 'valtio/vanilla/utils';
 import { Certificate } from '@vechain/sdk-core';
+import type { ThorClient } from '@vechain/sdk-network';
 import type {
     ConnectResponse,
     DAppKitOptions,
@@ -23,7 +24,10 @@ class WalletManager {
     public readonly state: WalletManagerState;
     private wallets: Record<string, VechainWallet | undefined> = {};
 
-    constructor(private readonly options: DAppKitOptions) {
+    constructor(
+        private readonly options: DAppKitOptions,
+        private readonly thor: ThorClient,
+    ) {
         this.state = this.initState(options.usePersistence ?? false);
         this.initPersistence(options.usePersistence ?? false);
         DAppKitLogger.debug('WalletManager', 'constructor', this.state);
@@ -36,7 +40,7 @@ class WalletManager {
     }
 
     private get wallet(): VechainWallet {
-        let source = this.state.source;
+        const source = this.state.source;
 
         DAppKitLogger.debug(
             'WalletManager',
@@ -46,10 +50,7 @@ class WalletManager {
         );
 
         if (!source) {
-            if (this.state.availableSources.length > 1) {
-                throw new Error('No wallet selected');
-            }
-            source = this.state.availableSources[0];
+            throw new Error('No wallet selected');
         }
 
         let wallet = this.wallets[source];
@@ -70,6 +71,7 @@ class WalletManager {
                 ...this.options,
                 source,
                 onDisconnected: () => this.disconnect(true),
+                thor: this.thor,
             };
             wallet = createWallet(opts);
 
@@ -288,6 +290,12 @@ class WalletManager {
             wallets.push('wallet-connect');
         }
 
+        wallets.push('sync2');
+
+        if (window.connex) {
+            wallets.push('sync');
+        }
+
         return wallets;
     };
 

diff --git a/packages/dapp-kit/src/classes/wc-wallet.ts b/packages/dapp-kit/src/classes/wc-wallet.ts
diff --git a/packages/dapp-kit/src/constants/wallet-settings.ts b/packages/dapp-kit/src/constants/wallet-settings.ts
@@ -13,6 +13,8 @@ const WalletMapping: Record<WalletSource, WalletConfig> = {
         requiresCertificate: false,
     },
     veworld: DEFAULT_CONFIG,
+    sync2: DEFAULT_CONFIG,
+    sync: DEFAULT_CONFIG,
 };
 
 const WalletSources = Object.keys(WalletMapping) as WalletSource[];

diff --git a/packages/dapp-kit/src/dapp-kit.ts b/packages/dapp-kit/src/dapp-kit.ts
@@ -15,12 +15,11 @@ class DAppKit {
         }
 
         const { nodeUrl } = options;
-        const walletManager = new WalletManager(options);
 
         this.thor = ThorClient.fromUrl(nodeUrl);
-        this.wallet = walletManager;
+        this.wallet = new WalletManager(options, this.thor);
         this.signer = new VeChainSignerDAppKit(
-            walletManager,
+            this.wallet,
             new VeChainProvider(this.thor),
         );
     }