Merge pull request #89 from AstarNetwork/update-deps-and-ci

update deps and ci
AstarNetwork · Dec 5, 2024 · 90721d0 · 90721d0
2 parents 52828c3 + c729def
commit 90721d0
Show file tree

Hide file tree

Showing 9 changed files with 521 additions and 519 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -11,10 +11,6 @@ env:
 jobs:
   tests:
     timeout-minutes: 30
-    strategy:
-        fail-fast: false
-        matrix:
-          tests: [xcm-transfer, staking]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -30,7 +26,7 @@ jobs:
 
     - run: yarn update-env
 
-    - run: yarn test tests/${{ matrix.tests }} | tee output.txt ; exit ${PIPESTATUS[0]}
+    - run: yarn test | tee output.txt ; exit ${PIPESTATUS[0]}
 
     - if: ${{ failure() }}
       run: grep -q "Test timed out" output.txt && echo "TIMEOUT=true" >> $GITHUB_ENV || exit 0

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,10 +12,6 @@ env:
 jobs:
   tests:
     timeout-minutes: 30
-    strategy:
-        fail-fast: false
-        matrix:
-          tests: [xcm-transfer, staking]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -29,4 +25,4 @@ jobs:
     - run: yarn --immutable
     - run: yarn lint
     - run: yarn update-env
-    - run: yarn test tests/${{ matrix.tests }}
+    - run: yarn test
diff --git a/networks/astar.ts b/networks/astar.ts
@@ -7,12 +7,12 @@ export type Vars = {
 export default {
   polkadot: {
     name: 'astar' as const,
-    endpoint: 'wss://rpc.astar.network',
+    endpoint: ['wss://rpc.astar.network', 'wss://astar-rpc.dwellir.com'],
     relayToken: '340282366920938463463374607431768211455',
   },
   kusama: {
     name: 'shiden' as const,
-    endpoint: 'wss://rpc.shiden.astar.network',
+    endpoint: ['wss://rpc.shiden.astar.network', 'wss://shiden-rpc.dwellir.com'],
     relayToken: '340282366920938463463374607431768211455',
   },
   config: ({ alice, relayToken }) => ({

diff --git a/networks/polkadot.ts b/networks/polkadot.ts
@@ -3,11 +3,11 @@ import { Config } from './types'
 export default {
   polkadot: {
     name: 'polkadot' as const,
-    endpoint: 'wss://rpc.polkadot.io',
+    endpoint: ['wss://rpc.polkadot.io', 'wss://polkadot-rpc.dwellir.com'],
   },
   kusama: {
     name: 'kusama' as const,
-    endpoint: 'wss://kusama-rpc.polkadot.io',
+    endpoint: ['wss://kusama-rpc.polkadot.io', 'wss://kusama-rpc.dwellir.com'],
   },
   config: ({ alice }) => ({
     storages: {

diff --git a/networks/types.ts b/networks/types.ts
@@ -5,7 +5,7 @@ export type NetworkKind = 'polkadot' | 'kusama'
 
 export type NetworkConfig = {
   name: string
-  endpoint: string
+  endpoint: string | string[]
 }
 
 export type Context = ReturnType<typeof testingPairs>

diff --git a/package.json b/package.json
@@ -14,29 +14,29 @@
 		"update-env": "tsx scripts/update-env.ts"
 	},
 	"dependencies": {
-		"@acala-network/chopsticks": "^1.0.1-1",
-		"@acala-network/chopsticks-testing": "^1.0.1-1",
-		"@polkadot/api": "^14.2.3",
-		"@swc/core": "^1.8.0",
-		"axios": "^1.7.7",
-		"dotenv": "^16.4.5",
+		"@acala-network/chopsticks": "^1.0.1",
+		"@acala-network/chopsticks-testing": "^1.0.1",
+		"@polkadot/api": "^14.0",
+		"@swc/core": "^1.10.0",
+		"axios": "^1.7.9",
+		"dotenv": "^16.4.7",
 		"lodash": "^4.17.21",
-		"typescript": "5.6.3",
+		"typescript": "5.7.2",
 		"unplugin-swc": "^1.5.1",
-		"vitest": "^2.1.4"
+		"vitest": "^2.1.8"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.14.0",
+		"@eslint/js": "^9.16.0",
 		"@types/eslint__js": "^8.42.3",
 		"@types/lodash": "^4.17.13",
-		"@types/node": "^22.9.0",
-		"@vitest/ui": "^2.1.4",
-		"eslint": "^9.14.0",
-		"husky": "^9.1.6",
+		"@types/node": "^22.10.1",
+		"@vitest/ui": "^2.1.8",
+		"eslint": "^9.16.0",
+		"husky": "^9.1.7",
 		"lint-staged": "^15.2.10",
-		"prettier": "^3.3.3",
+		"prettier": "^3.4.2",
 		"tsx": "^4.19.2",
-		"typescript-eslint": "8.4.0"
+		"typescript-eslint": "8.17.0"
 	},
 	"prettier": {
 		"tabWidth": 2,

diff --git a/scripts/update-env.ts b/scripts/update-env.ts
@@ -28,7 +28,7 @@ const main = async () => {
           const blockNumber = header.number.toNumber()
           return `${name.toUpperCase()}_BLOCK_NUMBER=${blockNumber}`
         } catch (e: any) {
-          throw new Error(`${endpoint} ${e.message}`)
+          throw new Error(`${JSON.stringify(endpoint)} ${e.message}`)
         }
       }
       blockNumbers.push(fn())

diff --git a/vitest.config.mts b/vitest.config.mts
@@ -7,6 +7,7 @@ export default defineConfig({
 		hookTimeout: 300_000,
 		testTimeout: 300_000,
 		pool: 'forks',
+		poolOptions: { forks: { singleFork: !!process.env.GITHUB_ACTIONS } },
 		passWithNoTests: true,
 		reporters: process.env.GITHUB_ACTIONS ? ['basic', 'github-actions'] : ['verbose'],
 	},