feat: upgrade to sdk v2 (#382)

Author: HiiiiD

examples/sample-react-app/package.json

@@ -18,8 +18,8 @@
         "@vechain/dapp-kit": "workspace:^",
         "@vechain/dapp-kit-react": "workspace:*",
         "@vechain/dapp-kit-ui": "workspace:^",
-        "@vechain/sdk-core": "1.2.0",
-        "@vechain/sdk-network": "1.2.0",
+        "@vechain/sdk-core": "2.0.5",
+        "@vechain/sdk-network": "2.0.5",
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
         "vite": "^6.2.5"

packages/dapp-kit-react/package.json

@@ -27,7 +27,7 @@
         "@lit/react": "^1.0.7",
         "@vechain/dapp-kit": "workspace:*",
         "@vechain/dapp-kit-ui": "workspace:*",
-        "@vechain/sdk-core": "1.2.0",
+        "@vechain/sdk-core": "^2.0.0",
         "valtio": "1.13.2"
     },
     "devDependencies": {

packages/dapp-kit-ui/package.json

@@ -35,8 +35,8 @@
     "dependencies": {
         "@vechain/dapp-kit": "workspace:*",
         "@vechain/picasso": "2.1.1",
-        "@vechain/sdk-core": "1.2.0",
-        "@vechain/sdk-network": "1.2.0",
+        "@vechain/sdk-core": "^2.0.0",
+        "@vechain/sdk-network": "^2.0.0",
         "@wagmi/core": "^2.16.7",
         "@web3modal/ethereum": "^2.7.1",
         "@web3modal/html": "^2.7.1",

packages/dapp-kit/package.json

@@ -24,9 +24,9 @@
     },
     "dependencies": {
         "@vechain/connex-wallet-buddy": "^0.1.11",
-        "@vechain/sdk-core": "1.2.0",
-        "@vechain/sdk-errors": "1.2.0",
-        "@vechain/sdk-network": "1.2.0",
+        "@vechain/sdk-core": "^2.0.0",
+        "@vechain/sdk-errors": "^2.0.0",
+        "@vechain/sdk-network": "^2.0.0",
         "@walletconnect/modal": "2.7.0",
         "@walletconnect/sign-client": "2.19.2",
         "@walletconnect/utils": "2.19.2",

packages/dapp-kit/src/classes/certificate-wallet.ts

@@ -23,7 +23,11 @@ import type {
     TransactionOptions,
     TransactionResponse,
 } from '../types/requests';
-import { getPrimaryType } from '../utils/typed-data';
+import {
+    getPrimaryType,
+    parseChainId,
+    stringifyChainId,
+} from '../utils/typed-data';
 
 /**
  * A `VechainWallet` for wallet's that use a certificate connection
@@ -79,7 +83,10 @@ class CertificateBasedWallet implements VeChainWallet {
             const signer = await recoverTypedDataAddress({
                 signature: res as `0x${string}`,
                 message: value.value,
-                domain: value.domain,
+                domain: {
+                    ...value.domain,
+                    chainId: parseChainId(value.domain.chainId),
+                },
                 types: value.types,
                 primaryType: getPrimaryType(value.types),
             });
@@ -192,7 +199,12 @@ class CertificateBasedWallet implements VeChainWallet {
         if (!this.wallet.signTypedData) {
             throw new Error('signTypedData is not implemented');
         }
-        return this.wallet?.signTypedData(domain, types, message, options);
+        return this.wallet?.signTypedData(
+            { ...domain, chainId: stringifyChainId(domain.chainId) },
+            types,
+            message,
+            options,
+        );
     };
 
     disconnect = async () => {

packages/dapp-kit/src/classes/wallet-manager.ts

@@ -27,7 +27,7 @@ import type {
 import type { TypedDataMessage } from '../types/types';
 import { createWallet, DAppKitLogger, Storage } from '../utils';
 import { getAccountDomain } from '../utils/get-account-domain';
-import { getPrimaryType } from '../utils/typed-data';
+import { getPrimaryType, parseChainId } from '../utils/typed-data';
 
 class WalletManager {
     public state: WalletManagerState;
@@ -273,7 +273,10 @@ class WalletManager {
         const signer = await recoverTypedDataAddress({
             signature: res as `0x${string}`,
             message: typedMessage.value,
-            domain: typedMessage.domain,
+            domain: {
+                ...value.domain,
+                chainId: parseChainId(value.domain.chainId),
+            },
             types: typedMessage.types,
             primaryType: getPrimaryType(typedMessage.types),
         });

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

@@ -29,7 +29,7 @@ declare global {
 type WalletSource = 'wallet-connect' | 'veworld' | 'sync' | 'sync2';
 
 type TypedDataDomain = {
-    chainId?: number | bigint | undefined;
+    chainId?: number | bigint | string | undefined;
     name?: string | undefined;
     salt?: `0x${string}` | undefined;
     verifyingContract?: string | undefined;

packages/dapp-kit/src/utils/typed-data.ts

@@ -1,3 +1,4 @@
+import type { TypedDataDomain } from 'viem';
 import type { TypedDataMessage } from '../types';
 
 /**
@@ -109,3 +110,19 @@ const hasBaseEncoder = (type: string) => {
 
     return false;
 };
+
+export const parseChainId = (
+    chainId: TypedDataMessage['domain']['chainId'],
+): TypedDataDomain['chainId'] => {
+    if (chainId === undefined) return undefined;
+    if (typeof chainId === 'string') return BigInt(chainId);
+    return chainId;
+};
+
+export const stringifyChainId = (
+    chainId: TypedDataMessage['domain']['chainId'],
+): string | undefined => {
+    if (chainId === undefined) return undefined;
+    if (typeof chainId === 'string') return chainId;
+    return chainId.toString();
+};