Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rc6 #1690

Merged
merged 9 commits into from
Jan 10, 2025
Merged

Rc6 #1690

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/gitleaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Check for leaks in secrets
on:
pull_request:
branches:
- main
- 'main'
- 'main-*'
- 'supported-*'
- 'feature-*'
- '1.0.0'

permissions:
contents: read # This is required for actions/checkout
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/on-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches:
- 'main'
- 'main-*'
- 'supported-*'
- 'feature-*'
- '1.0.0'

jobs:
install-build:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ name: PR Checks
on:
pull_request:
branches:
- main
- 'main'
- 'main-*'
- 'supported-*'
- 'feature-*'
- '1.0.0'

jobs:
doc-examples:
Expand Down
4 changes: 2 additions & 2 deletions apps/sdk-cloudflare-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdk-cloudflare-integration",
"description": "An example app of how to integrate the VeChain SDK with Cloudflare Workers",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"private": true,
"author": "VeChain Foundation",
"license": "MIT",
Expand All @@ -16,6 +16,6 @@
"wrangler": "^3.72.3"
},
"dependencies": {
"@vechain/sdk-core": "1.0.0-rc.4"
"@vechain/sdk-core": "1.0.0-rc.6"
}
}
8 changes: 4 additions & 4 deletions apps/sdk-hardhat-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdk-hardhat-integration",
"description": "An example app of how to use the @vechain/sdk-hardhat-plugin to interact with the VeChainThor blockchain",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"private": true,
"main": "index.js",
"author": "VeChain Foundation",
Expand All @@ -18,9 +18,9 @@
},
"dependencies": {
"@openzeppelin/contracts": "^5.0.2",
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-hardhat-plugin": "1.0.0-rc.4",
"@vechain/sdk-logging": "1.0.0-rc.4"
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-hardhat-plugin": "1.0.0-rc.6",
"@vechain/sdk-logging": "1.0.0-rc.6"
},
"devDependencies": {
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
Expand Down
8 changes: 4 additions & 4 deletions apps/sdk-nextjs-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdk-nextjs-integration",
"description": "An example app of how to integrate the VeChain SDK with Next.js",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"private": true,
"author": "VeChain Foundation",
"license": "MIT",
Expand All @@ -14,8 +14,8 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-network": "1.0.0-rc.4",
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-network": "1.0.0-rc.6",
"install": "^0.13.0",
"nanoid": "3.3.8",
"next": "15.1.4",
Expand Down Expand Up @@ -43,4 +43,4 @@
"resolutions": {
"nanoid": "3.3.8"
}
}
}
4 changes: 2 additions & 2 deletions apps/sdk-node-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdk-node-integration",
"description": "An example app of how to integrate the VeChain SDK with Node.js",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"private": true,
"main": "dist/index.js",
"types": "src/index.ts",
Expand All @@ -13,7 +13,7 @@
"test": "jest"
},
"dependencies": {
"@vechain/sdk-network": "1.0.0-rc.4"
"@vechain/sdk-network": "1.0.0-rc.6"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/sdk-vite-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdk-vite-integration",
"private": true,
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -12,8 +12,8 @@
"test:jsdom": "vitest --config vitest.jsdom.config.js"
},
"dependencies": {
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-network": "1.0.0-rc.4",
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-network": "1.0.0-rc.6",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.27.0"
Expand Down
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docs",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"private": true,
"description": "Official documentation for the VeChain TypeScript SDK with examples",
"author": "VeChain Foundation",
Expand All @@ -17,8 +17,8 @@
"test:examples:solo": "(yarn start-thor-solo && yarn test:examples && yarn stop-thor-solo) || yarn stop-thor-solo"
},
"dependencies": {
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-network": "1.0.0-rc.4"
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-network": "1.0.0-rc.6"
},
"devDependencies": {
"expect": "^29.7.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-kms-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-aws-kms-adapter",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module implements the VeChain abstract signer so it is integrated with AWS KMS",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down Expand Up @@ -40,9 +40,9 @@
"dependencies": {
"@aws-sdk/client-kms": "^3.723.0",
"@noble/curves": "^1.6.0",
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-errors": "1.0.0-rc.4",
"@vechain/sdk-network": "1.0.0-rc.4",
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-errors": "1.0.0-rc.6",
"@vechain/sdk-network": "1.0.0-rc.6",
"asn1js": "^3.0.5",
"ethers": "6.13.4",
"viem": "^2.21.45"
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-core",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module is crafted for dApp development and various blockchain operations that seamlessly unfold offline",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down Expand Up @@ -44,8 +44,8 @@
"@scure/base": "^1.1.9",
"@scure/bip32": "^1.4.0",
"@scure/bip39": "^1.4.0",
"@vechain/sdk-errors": "1.0.0-rc.4",
"@vechain/sdk-logging": "1.0.0-rc.4",
"@vechain/sdk-errors": "1.0.0-rc.6",
"@vechain/sdk-logging": "1.0.0-rc.6",
"abitype": "^1.0.6",
"ethers": "6.13.4",
"fast-json-stable-stringify": "^2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/errors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-errors",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module is dedicated to managing and customizing errors within the VeChain SDK",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down
3 changes: 3 additions & 0 deletions packages/errors/src/helpers/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const stringifyData = (data: unknown): string => {
}
seen.add(value);
}
if (typeof value === 'bigint') {
return value.toString() + 'n';
}
return value;
};
};
Expand Down
55 changes: 4 additions & 51 deletions packages/errors/tests/helpers/helpers.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,65 +73,18 @@ describe('Error package helpers unit tests', () => {
});

/**
* Error message builder function
* An error message is built with big int data
*/
test('Should be able to build an error message', () => {
test('Should be able to build an error message - bigint', () => {
const errorMessage = createErrorMessage(
'simpleMethod',
'Error message',
{
data: 'test'
},
new Error('Internal error')
);
expect(errorMessage).toBeDefined();
});

/**
* An error message is built with inner error undefined
*/
test('Should be able to build an error message - inner error undefined', () => {
const errorMessage = createErrorMessage(
'simpleMethod',
'Error message',
{
data: 'test'
}
);
expect(errorMessage).toBeDefined();
});

/**
* An error message is built with circular dependency on data
*/
test('Should be able to build an error message - circular dependency', () => {
// Simple circular dependency object
const circularDependencyObject: {
prop1: string;
prop2: {
prop3: string;
prop4?: unknown;
};
} = {
prop1: 'value1',
prop2: {
prop3: 'value3'
data: 10n
}
};

// Introduce circular reference
circularDependencyObject.prop2.prop4 = circularDependencyObject;

const errorMessage = createErrorMessage(
'simpleMethod',
'Error message',
{
params: [-1],
data: circularDependencyObject
},
new Error('Internal error')
);
expect(errorMessage).toBeDefined();
expect(errorMessage).toContain('10n');
});
});

Expand Down
8 changes: 4 additions & 4 deletions packages/ethers-adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-ethers-adapter",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module serves as a crucial bridge between the standard Ethereum tooling provided by Hardhat and the unique features of the VeChainThor blockchain",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down Expand Up @@ -33,9 +33,9 @@
"test": "rm -rf ./coverage && jest --coverage --coverageDirectory=coverage --group=integration --group=unit"
},
"dependencies": {
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-errors": "1.0.0-rc.4",
"@vechain/sdk-network": "1.0.0-rc.4",
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-errors": "1.0.0-rc.6",
"@vechain/sdk-network": "1.0.0-rc.6",
"ethers": "6.13.4"
}
}
12 changes: 6 additions & 6 deletions packages/hardhat-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-hardhat-plugin",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module allows to create smart contracts and interact with them using the VeChain SDK and Hardhat",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down Expand Up @@ -38,11 +38,11 @@
},
"dependencies": {
"@nomicfoundation/hardhat-ethers": "^3.0.8",
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-errors": "1.0.0-rc.4",
"@vechain/sdk-ethers-adapter": "1.0.0-rc.4",
"@vechain/sdk-logging": "1.0.0-rc.4",
"@vechain/sdk-network": "1.0.0-rc.4",
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-errors": "1.0.0-rc.6",
"@vechain/sdk-ethers-adapter": "1.0.0-rc.6",
"@vechain/sdk-logging": "1.0.0-rc.6",
"@vechain/sdk-network": "1.0.0-rc.6",
"ethers": "6.13.4",
"hardhat": "^2.22.15"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/logging/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-logging",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module provides functionality to logging data for vechain-sdk",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down Expand Up @@ -34,6 +34,6 @@
"test": "rm -rf ./coverage && jest --coverage --coverageDirectory=coverage --group=integration --group=unit"
},
"dependencies": {
"@vechain/sdk-errors": "1.0.0-rc.4"
"@vechain/sdk-errors": "1.0.0-rc.6"
}
}
8 changes: 4 additions & 4 deletions packages/network/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vechain/sdk-network",
"version": "1.0.0-rc.4",
"version": "1.0.0-rc.6",
"description": "This module serves as the standard interface connecting decentralized applications (dApps) and users to the VeChainThor blockchain",
"author": "VeChain Foundation",
"license": "MIT",
Expand Down Expand Up @@ -42,9 +42,9 @@
},
"dependencies": {
"@noble/curves": "^1.6.0",
"@vechain/sdk-core": "1.0.0-rc.4",
"@vechain/sdk-errors": "1.0.0-rc.4",
"@vechain/sdk-logging": "1.0.0-rc.4",
"@vechain/sdk-core": "1.0.0-rc.6",
"@vechain/sdk-errors": "1.0.0-rc.6",
"@vechain/sdk-logging": "1.0.0-rc.6",
"@vechain/vebetterdao-contracts": "^4.0.0",
"abitype": "^1.0.6",
"ethers": "6.13.4",
Expand Down
8 changes: 0 additions & 8 deletions packages/network/solo-seeding/const.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/network/solo-seeding/index.ts

This file was deleted.

Loading
Loading