Merge branch 'fix/1424-ensuring-string' of https://github.com/vechain…

…/vechain-sdk-js into fix/1424-ensuring-string
vechain · Nov 21, 2024 · e18f275 · e18f275
2 parents 39f6203 + 158d055
commit e18f275
Show file tree

Hide file tree

Showing 11 changed files with 666 additions and 604 deletions.
diff --git a/apps/sdk-hardhat-integration/package.json b/apps/sdk-hardhat-integration/package.json
@@ -27,11 +27,11 @@
     "@nomicfoundation/hardhat-ethers": "^3.0.8",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
-    "@nomicfoundation/hardhat-verify": "^2.0.10",
+    "@nomicfoundation/hardhat-verify": "^2.0.12",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
-    "@types/mocha": ">=9.1.0",
+    "@types/mocha": ">=10.0.9",
     "chai": "^4.2.0",
     "hardhat": "^2.22.15",
     "hardhat-gas-reporter": "^1.0.8",

diff --git a/apps/sdk-vite-integration/package.json b/apps/sdk-vite-integration/package.json
@@ -22,7 +22,7 @@
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-react": "^4.3.3",
-    "@vitest/browser": "^2.1.4",
+    "@vitest/browser": "^2.1.5",
     "eslint": "^9.13.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.14",

diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
         "prettier": "^3.3.3",
         "ts-jest": "^29.2.5",
         "tsup": "^8.3.0",
-        "turbo": "^2.2.3",
+        "turbo": "^2.3.0",
         "typedoc": "^0.26.8",
         "typedoc-plugin-missing-exports": "^3.0.0",
         "typescript": "^5.6.3",

diff --git a/packages/aws-kms-adapter/package.json b/packages/aws-kms-adapter/package.json
@@ -38,7 +38,7 @@
     "test:unit": "rm -rf ./coverageUnit && UNIT=true jest --coverage --coverageDirectory=coverageUnit --group=unit"
   },
   "dependencies": {
-    "@aws-sdk/client-kms": "^3.682.0",
+    "@aws-sdk/client-kms": "^3.696.0",
     "@noble/curves": "^1.6.0",
     "@vechain/sdk-core": "1.0.0-rc.3",
     "@vechain/sdk-errors": "1.0.0-rc.3",

diff --git a/...ils/rpc-mapper/methods/eth_getUncleByBlockHashAndIndex/eth_getUncleByBlockHashAndIndex.ts b/...ils/rpc-mapper/methods/eth_getUncleByBlockHashAndIndex/eth_getUncleByBlockHashAndIndex.ts
@@ -19,7 +19,7 @@ import { ThorId } from '@vechain/sdk-core';
  */
 const ethGetUncleByBlockHashAndIndex = async (
     params: unknown[]
-): Promise<object> => {
+): Promise<object | null> => {
     // Input validation
     if (
         params.length !== 2 ||
@@ -33,7 +33,7 @@ const ethGetUncleByBlockHashAndIndex = async (
             { params }
         );
 
-    return await Promise.resolve({});
+    return await Promise.resolve(null);
 };
 
 export { ethGetUncleByBlockHashAndIndex };
diff --git a/...rpc-mapper/methods/eth_getUncleByBlockNumberAndIndex/eth_getUncleByBlockNumberAndIndex.ts b/...rpc-mapper/methods/eth_getUncleByBlockNumberAndIndex/eth_getUncleByBlockNumberAndIndex.ts
@@ -19,7 +19,7 @@ import { JSONRPCInvalidParams } from '@vechain/sdk-errors';
  */
 const ethGetUncleByBlockNumberAndIndex = async (
     params: unknown[]
-): Promise<object> => {
+): Promise<object | null> => {
     // Input validation
     if (
         params.length !== 2 ||
@@ -32,7 +32,7 @@ const ethGetUncleByBlockNumberAndIndex = async (
             { params }
         );
 
-    return await Promise.resolve({});
+    return await Promise.resolve(null);
 };
 
 export { ethGetUncleByBlockNumberAndIndex };
diff --git a/packages/network/src/provider/utils/rpc-mapper/rpc-mapper.ts b/packages/network/src/provider/utils/rpc-mapper/rpc-mapper.ts
@@ -281,13 +281,13 @@ const RPCMethodsMap = (
 
         [RPC_METHODS.eth_getUncleByBlockHashAndIndex]: async (
             params
-        ): Promise<object> => {
+        ): Promise<object | null> => {
             return await ethGetUncleByBlockHashAndIndex(params);
         },
 
         [RPC_METHODS.eth_getUncleByBlockNumberAndIndex]: async (
             params
-        ): Promise<object> => {
+        ): Promise<object | null> => {
             return await ethGetUncleByBlockNumberAndIndex(params);
         },
 

diff --git a/...r/methods/eth_getUncleByBlockHashAndIndex/eth_getUncleByBlockHashAndIndex.testnet.test.ts b/...r/methods/eth_getUncleByBlockHashAndIndex/eth_getUncleByBlockHashAndIndex.testnet.test.ts
@@ -41,7 +41,7 @@ describe('RPC Mapper - eth_getUncleByBlockHashAndIndex method tests', () => {
                 '0x0'
             ]);
 
-            expect(uncleBlock).toStrictEqual({});
+            expect(uncleBlock).toStrictEqual(null);
         });
     });
 

diff --git a/...thods/eth_getUncleByBlockNumberAndIndex/eth_getUncleByBlockNumberAndIndex.testnet.test.ts b/...thods/eth_getUncleByBlockNumberAndIndex/eth_getUncleByBlockNumberAndIndex.testnet.test.ts
@@ -38,7 +38,7 @@ describe('RPC Mapper - eth_getUncleByBlockNumberAndIndex method tests', () => {
                 RPC_METHODS.eth_getUncleByBlockNumberAndIndex
             ](['latest', '0x0']);
 
-            expect(uncleBlock).toStrictEqual({});
+            expect(uncleBlock).toStrictEqual(null);
         });
     });
 

diff --git a/packages/rpc-proxy/tests/e2e_rpc_proxy.solo.test.ts b/packages/rpc-proxy/tests/e2e_rpc_proxy.solo.test.ts
@@ -516,7 +516,7 @@ describe('RPC Proxy endpoints', () => {
             console.log(response.data);
             expect(response.data).toHaveProperty('result');
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            expect(response.data.result).toStrictEqual({});
+            expect(response.data.result).toBeNull();
         });
 
         it('eth_getUncleByBlockNumberAndIndex method call', async () => {
@@ -532,7 +532,7 @@ describe('RPC Proxy endpoints', () => {
             console.log(response.data);
             expect(response.data).toHaveProperty('result');
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            expect(response.data.result).toStrictEqual({});
+            expect(response.data.result).toBeNull();
         });
 
         it('eth_requestAccounts method call', async () => {
-Original file line number
+Diff line change
@@ Expand Up @@
                     '0x0'
                 ]);
-                expect(uncleBlock).toStrictEqual({});
+                expect(uncleBlock).toStrictEqual(null);
             });
         });
@@ Expand Down @@