Skip to content

Commit

Permalink
chore: update SDK version
Browse files Browse the repository at this point in the history
  • Loading branch information
darrenvechain committed Mar 10, 2025
1 parent 1dbfe06 commit d9a6ae4
Show file tree
Hide file tree
Showing 27 changed files with 333 additions and 202 deletions.
Binary file modified .yarn/install-state.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/sample-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@vechain/dapp-kit": "workspace:^",
"@vechain/dapp-kit-react": "workspace:^",
"@vechain/dapp-kit-ui": "workspace:^",
"@vechain/sdk-core": "2.0.0-beta.1",
"@vechain/sdk-network": "2.0.0-beta.1",
"@vechain/sdk-core": "1.0.0",
"@vechain/sdk-network": "1.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"vite": "^5.3.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp-kit-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@lit/react": "^1.0.1",
"@vechain/dapp-kit": "*",
"@vechain/dapp-kit-ui": "*",
"@vechain/sdk-core": "2.0.0-beta.1",
"@vechain/sdk-core": "1.0.0",
"valtio": "1.11.2"
},
"devDependencies": {
Expand Down
32 changes: 16 additions & 16 deletions packages/dapp-kit-react/src/DAppKitProvider/DAppKitProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Context } from './context';

export const DAppKitProviderData = ({
children,
dAppKit
dAppKit,
}: {
children: React.ReactNode;
dAppKit: DAppKit;
Expand Down Expand Up @@ -122,21 +122,21 @@ export const DAppKitProviderData = ({
};

export const DAppKitProvider = ({
children,
nodeUrl,
genesis,
walletConnectOptions,
usePersistence = false,
logLevel,
requireCertificate,
themeVariables,
themeMode,
i18n,
language,
modalParent,
onSourceClick,
connectionCertificate: connectionCertificateData,
allowedWallets,
children,
nodeUrl,
genesis,
walletConnectOptions,
usePersistence = false,
logLevel,
requireCertificate,
themeVariables,
themeMode,
i18n,
language,
modalParent,
onSourceClick,
connectionCertificate: connectionCertificateData,
allowedWallets,
}: DAppKitProviderOptions): React.ReactElement | null => {
const [dAppKit, setDAppKit] = useState<DAppKit | null>(null);
useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ export const getAddress = async ({
? VNS_RESOLVER.test
: VNS_RESOLVER.main;

const res = await thor.contracts.executeCall(resolver, ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getAddresses'), [domain]);
const res = await thor.contracts.executeCall(
resolver,
ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getAddresses'),
[domain],
);
const resArray = res.result.array as string[];

return (resArray[0] as string) || undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ export const getDomain = async ({
? VNS_RESOLVER.test
: VNS_RESOLVER.main;

const res = await thor.contracts.executeCall(resolver, ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getNames'), [address]);
const res = await thor.contracts.executeCall(
resolver,
ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getNames'),
[address],
);
const resArray = res.result.array as string[];

return (resArray[0] as string) || undefined;
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp-kit-react/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type React from 'react';
import type {
ConnectResponse,
VeChainSignerDAppKit,
WalletSource
WalletSource,
} from '@vechain/dapp-kit';
import { type DAppKitUIOptions } from '@vechain/dapp-kit-ui';
import type { CertificateData } from '@vechain/sdk-core';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest';
import { renderHook } from '@testing-library/react';
import { useThor } from '../..';
import { wrapper } from '../../../test';
import { useThor } from '../../../src';
import { wrapper } from '../../index';

describe('useThor', () => {
it('Thor should get initialised', async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, expect, it } from 'vitest';
import { renderHook, waitFor } from '@testing-library/react';
import { mockedConnexSigner, wrapper } from '../../../test';
import { useWallet } from './useWallet';
import { mockedConnexSigner, wrapper } from '../../index';
import { useWallet } from '../../../src/DAppKitProvider/hooks/useWallet';

window.vechain = {} as any;
window.vechain = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { describe, expect, it } from 'vitest';
import { renderHook, waitFor } from '@testing-library/react';
import { useWalletModal } from '../..';
import { wrapper } from '../../../test/helpers/react-test-helpers';
import { useWalletModal } from '../../../src';
import { wrapper } from '../../helpers';
import { act } from 'react';

describe('useWalletModal', () => {
it('should be able to open the modal', async () => {
const { result } = renderHook(() => useWalletModal(), { wrapper });
const { result } = await act(async () => {
return renderHook(() => useWalletModal(), { wrapper });
});

expect(result.current).toBeDefined();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { WalletButton, DAppKitProvider } from '../../src';

export const wrapper = ({ children }: { children?: React.ReactNode }) => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, it, expect, vi } from 'vitest';
import { getAddress } from './getAddress';
import { getAddress } from '../../../../src/hooks/useVechainDomain/api/getAddress';
import { genesisBlocks, VNS_RESOLVER } from '@vechain/dapp-kit';
import { ABIContract } from '@vechain/sdk-core';

Expand All @@ -21,31 +21,49 @@ describe('getAddress', () => {
});

it('should use main resolver for mainnet', async () => {
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({ id: genesisBlocks.main.id });
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({
id: genesisBlocks.main.id,
});
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: ['0x1234567890123456789012345678901234567890']
array: ['0x1234567890123456789012345678901234567890'],
},
});

const result = await getAddress({ domain: 'example.vet', thor: mockThorClient.thor });
const result = await getAddress({
domain: 'example.vet',
thor: mockThorClient.thor,
});

expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(VNS_RESOLVER.main, ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getAddresses'), ['example.vet']);
expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(
VNS_RESOLVER.main,
ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getAddresses'),
['example.vet'],
);

expect(result).toBe('0x1234567890123456789012345678901234567890');
});

it('should use test resolver for testnet', async () => {
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({ id: genesisBlocks.test.id });
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({
id: genesisBlocks.test.id,
});
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: ['0x1234567890123456789012345678901234567890']
array: ['0x1234567890123456789012345678901234567890'],
},
});

const result = await getAddress({ domain: 'example.vet', thor: mockThorClient.thor });
const result = await getAddress({
domain: 'example.vet',
thor: mockThorClient.thor,
});

expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(VNS_RESOLVER.test, ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getAddresses'), ['example.vet']);
expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(
VNS_RESOLVER.test,
ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getAddresses'),
['example.vet'],
);

expect(result).toBe('0x1234567890123456789012345678901234567890');
});
Expand All @@ -54,7 +72,7 @@ describe('getAddress', () => {
const expectedAddress = '0x1234567890123456789012345678901234567890';
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: [expectedAddress]
array: [expectedAddress],
},
});

Expand All @@ -69,7 +87,7 @@ describe('getAddress', () => {
it('should return null if no addresses are resolved', async () => {
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: []
array: [],
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, it, expect, vi } from 'vitest';
import { getDomain } from './getDomain';
import { getDomain } from '../../../../src/hooks/useVechainDomain/api/getDomain';
import { genesisBlocks, VNS_RESOLVER } from '@vechain/dapp-kit';
import { ABIContract } from '@vechain/sdk-core';

Expand All @@ -21,10 +21,12 @@ describe('getDomain', () => {
});

it('should use main resolver for mainnet', async () => {
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({ id: genesisBlocks.main.id });
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({
id: genesisBlocks.main.id,
});
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: ['example.vet']
array: ['example.vet'],
},
});

Expand All @@ -33,25 +35,35 @@ describe('getDomain', () => {
thor: mockThorClient.thor,
});

expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(VNS_RESOLVER.main, ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getNames'), ["0x1234567890123456789012345678901234567890"]);
expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(
VNS_RESOLVER.main,
ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getNames'),
['0x1234567890123456789012345678901234567890'],
);

expect(result).toBe('example.vet');
});

it('should use test resolver for testnet', async () => {
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({ id: genesisBlocks.test.id });
mockThorClient.thor.blocks.getGenesisBlock.mockResolvedValue({
id: genesisBlocks.test.id,
});
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: ['example.vet']
array: ['example.vet'],
},
});

const result = await getDomain({
address: '0x1234567890123456789012345678901234567890',
thor: mockThorClient.thor,
});

expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(VNS_RESOLVER.test, ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getNames'), ["0x1234567890123456789012345678901234567890"]);
expect(mockThorClient.thor.contracts.executeCall).toHaveBeenCalledWith(
VNS_RESOLVER.test,
ABIContract.ofAbi(VNS_RESOLVER.abi).getFunction('getNames'),
['0x1234567890123456789012345678901234567890'],
);

expect(result).toBe('example.vet');
});
Expand All @@ -60,7 +72,7 @@ describe('getDomain', () => {
const expectedDomain = 'example.vet';
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: [expectedDomain]
array: [expectedDomain],
},
});

Expand All @@ -75,7 +87,7 @@ describe('getDomain', () => {
it('should return null if no names are resolved', async () => {
mockThorClient.thor.contracts.executeCall.mockResolvedValue({
result: {
array: []
array: [],
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { renderHook, waitFor } from '@testing-library/react';
import { describe, it, expect, vi } from 'vitest';
import { useVechainDomain } from './useVechainDomain';
import { wrapper } from '../../../test';
import { useVechainDomain } from '../../../src';
import { wrapper } from '../../helpers';

vi.mock('./api/fetchVechainDomain', () => ({
...vi.importActual('./api/fetchVechainDomain'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { renderHook, waitFor } from '@testing-library/react';
import { describe, it, expect, vi } from 'vitest';
import { useVechainDomain } from './useVechainDomain';
import { wrapper } from '../../../test';
import { useVechainDomain } from '../../../src';
import { wrapper } from '../../helpers';

vi.mock('./api/getDomain', () => ({
vi.mock('../../../src/hooks/useVechainDomain/api/getDomain', () => ({
getDomain: vi.fn().mockImplementation(({ address }) => {
if (address === '0x1234567890123456789012345678901234567890') {
return Promise.resolve('test.vet');
Expand All @@ -18,7 +18,7 @@ vi.mock('./api/getDomain', () => ({
}),
}));

vi.mock('./api/getAddress', () => ({
vi.mock('../../../src/hooks/useVechainDomain/api/getAddress', () => ({
getAddress: vi.fn().mockImplementation(({ domain }) => {
if (domain === 'test.vet') {
return Promise.resolve(
Expand Down
8 changes: 6 additions & 2 deletions packages/dapp-kit-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@
"preserveWatchOutput": true,
"skipLibCheck": true,
"strict": true,
// React
"jsx": "react-jsx"
},
"include": ["src/**/*.ts", "test/**/*.test.ts", "eslint.config.mjs"]
"include": [
"src/**/*.ts",
"test/**/*.ts",
"test/**/*.tsx",
"eslint.config.mjs"
]
}
4 changes: 2 additions & 2 deletions packages/dapp-kit-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"dependencies": {
"@vechain/dapp-kit": "workspace:^",
"@vechain/picasso": "2.1.1",
"@vechain/sdk-core": "2.0.0-beta.1",
"@vechain/sdk-network": "2.0.0-beta.1",
"@vechain/sdk-core": "1.0.0",
"@vechain/sdk-network": "1.0.0",
"@wagmi/core": "^1.4.5",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/html": "^2.7.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/dapp-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"watch": "yarn build --watch"
},
"dependencies": {
"@vechain/sdk-core": "2.0.0-beta.1",
"@vechain/sdk-errors": "2.0.0-beta.1",
"@vechain/sdk-network": "2.0.0-beta.1",
"@vechain/sdk-core": "1.0.0",
"@vechain/sdk-errors": "1.0.0",
"@vechain/sdk-network": "1.0.0",
"@walletconnect/modal": "2.6.2",
"@walletconnect/sign-client": "2.11.3",
"@walletconnect/utils": "2.11.3",
Expand Down
Loading

0 comments on commit d9a6ae4

Please sign in to comment.