ALL-3495 - Add getBlockByNumber to possible archive list (#1027)

* ALL-3495 - Add getBlockByNumber to possible archive list * ALL-3495 - Add getBlockByNumber to possible archive list - cleanup * ALL-3495 - Add getBlockByNumber to possible archive list - pipeline * ALL-3495 - Add getBlockByNumber to possible archive list - pipeline 2 * ALL-3495 - Add getBlockByNumber to possible archive list - pipeline 3 * ALL-3495 - Add getBlockByNumber to possible archive list - pipeline 4 * ALL-3495 - Add getBlockByNumber to possible archive list - pipeline 5
tatumio · Nov 22, 2023 · 9f7f71f · 9f7f71f
1 parent 446a1a5
commit 9f7f71f
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -98,6 +98,12 @@ jobs:
         V3_API_KEY_TESTNET: ${{ secrets.V3_API_KEY_TESTNET }}
         NON_TATUM_RPC_ETH_URL: ${{ secrets.NON_TATUM_RPC_ETH_URL }}
         VERBOSE: ${{ secrets.verbose }}
+    - uses: dorny/test-reporter@v1
+      if: success() || failure()
+      with:
+        name: TEST REPORT
+        path: reports/jest-junit.xml
+        reporter: jest-junit
 
   release:
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [4.1.31] - 2023.11.22
+### Changed
+- Adjust logic redirecting for getBlockByNumber to call normal nodes for latest block
+
 ## [4.1.30] - 2023.11.17
 ### Changed
 - Improved `LoadBalancer` stability

diff --git a/README.md b/README.md
@@ -304,7 +304,7 @@ For more details, check out the [NFTs documentation](https://docs.tatum.io/docs/
 Using TatumSDK, it's possible to connect your browser application to MetaMask and perform transactions using it. To achieve this, use the following code:
 
 ```ts
-import { TatumSDK, Network, Ethereum } from '@tatumio/tatum'
+import { TatumSDK, Network, Ethereum, MetaMask } from '@tatumio/tatum'
 
 const tatum = await TatumSDK.init<Ethereum>({ network: Network.ETHEREUM })
 

diff --git a/jest.config.js b/jest.config.js
@@ -8,6 +8,18 @@ module.exports = {
     "^.+\\.(ts|tsx)$": "ts-jest"
   },
   testTimeout: 30000,
-  setupFilesAfterEnv: ['<rootDir>/jest.setup.ts']
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
+  reporters: [
+    "default",
+    ["jest-junit", {
+      outputDirectory: "reports",
+      outputName: "jest-junit.xml",
+      ancestorSeparator: " › ",
+      uniqueOutputName: "false",
+      suiteNameTemplate: "{filepath}",
+      classNameTemplate: "{classname}",
+      titleTemplate: "{title}"
+    }]
+  ]
 }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tatumio/tatum",
-  "version": "4.1.30",
+  "version": "4.1.31",
   "description": "Tatum JS SDK",
   "author": "Tatum",
   "repository": "https://github.com/tatumio/tatum-js",
@@ -42,6 +42,7 @@
     "dotenv": "^16.0.3",
     "eslint": "^8.14.0",
     "jest": "^29.7.0",
+    "jest-junit": "^16.0.0",
     "prettier": "^2.8.4",
     "prettier-plugin-organize-imports": "^3.2.2",
     "ts-jest": "^29.1.1",

diff --git a/src/e2e/tatum.fee.spec.ts b/src/e2e/tatum.fee.spec.ts
@@ -1,5 +1,5 @@
 import { ApiVersion, Network, TatumSDK } from '../service'
-import { Bitcoin, Ethereum } from '../service/tatum'
+import { Bitcoin, Ethereum } from '../service'
 import { Status } from '../util'
 
 describe('Fee', () => {
@@ -11,10 +11,16 @@ describe('Fee', () => {
       version: ApiVersion.V3,
     })
 
-    const { data, status } = await tatum.fee.getCurrentFee()
-    await tatum.destroy()
-    expect(status).toBe(Status.SUCCESS)
-    expect(data.gasPrice.fast).toBeDefined()
+    try{
+      const { data, status } = await tatum.fee.getCurrentFee()
+
+      expect(status).toBe(Status.SUCCESS)
+      expect(data.gasPrice.fast).toBeDefined()
+    }
+    finally {
+      await tatum.destroy()
+    }
+
   })
 
   it('should return fee for btc testnet', async () => {
@@ -25,9 +31,14 @@ describe('Fee', () => {
       version: ApiVersion.V3,
     })
 
-    const { data, status } = await tatum.fee.getCurrentFee()
-    await tatum.destroy()
-    expect(status).toBe(Status.SUCCESS)
-    expect(data.fast).toBeDefined()
+    try{
+      const { data, status } = await tatum.fee.getCurrentFee()
+      await tatum.destroy()
+      expect(status).toBe(Status.SUCCESS)
+      expect(data.fast).toBeDefined()
+    }
+    finally {
+      await tatum.destroy()
+    }
   })
 })
diff --git a/src/service/rpc/evm/EvmUtils.ts b/src/service/rpc/evm/EvmUtils.ts
@@ -21,7 +21,6 @@ export const ARCHIVE_METHODS = [
   'getTransactionReceipt',
   'getUncleCountByBlockHash',
   'getUncleCountByBlockNumber',
-  'getBlockByNumber',
   'getBlockTransactionCountByHash',
   'getBlockTransactionCountByNumber',
   'getBlockReceipts',
@@ -33,10 +32,11 @@ export const ARCHIVE_METHODS = [
 
 export const POSSIBLE_ARCHIVE_METHODS = [
   // Network state
-  { method: 'getStorageAt', index: 2 }, // second param block
-  { method: 'call', index: 1 }, // second param block
-  { method: 'getBalance', index: 1 }, // second param block
-  { method: 'getCode', index: 1 }, // second param block
+  { method: 'getStorageAt', index: 2 },
+  { method: 'call', index: 1 },
+  { method: 'getBalance', index: 1 },
+  { method: 'getCode', index: 1 },
+  { method: 'getBlockByNumber', index: 0 },
 ]
 
 export const EvmUtils = {
@@ -47,7 +47,7 @@ export const EvmUtils = {
     }
 
     const possibleArchiveMethod = POSSIBLE_ARCHIVE_METHODS.find(
-      (possibleArchiveMethod) => possibleArchiveMethod.method === rpc.method,
+      (possibleArchiveMethod) => rpc.method.includes(possibleArchiveMethod.method),
     )
     if (possibleArchiveMethod) {
       const param = rpc?.params?.[possibleArchiveMethod.index]

diff --git a/yarn.lock b/yarn.lock
@@ -1963,6 +1963,16 @@ jest-haste-map@^29.7.0:
   optionalDependencies:
     fsevents "^2.3.2"
 
+jest-junit@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-16.0.0.tgz#d838e8c561cf9fdd7eb54f63020777eee4136785"
+  integrity sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==
+  dependencies:
+    mkdirp "^1.0.4"
+    strip-ansi "^6.0.1"
+    uuid "^8.3.2"
+    xml "^1.0.1"
+
 jest-leak-detector@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz"
@@ -2325,6 +2335,11 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 [email protected]:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
@@ -2876,6 +2891,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache-lib@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"
@@ -2936,6 +2956,11 @@ write-file-atomic@^4.0.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
+xml@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+  integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"