Bumped dependencies (#11)

DrBlast · web-flow · commit cb6666100758 · 2026-03-06T13:35:29.000+03:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,42 @@
+name: Publish snapshot package
+on:
+  push:
+    branches: [ 'master' ]
+  release:
+    types: [ published ]
+
+permissions:
+  contents: read
+  id-token: write
+jobs:
+  publish-snapshots:
+    environment:
+      name: NPMJS
+      url: ${{ steps.publish.outputs.url }}
+    name: Publish snapshot packages
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          registry-url: 'https://registry.npmjs.org'
+          node-version: '>=24.7.0' # Trusted publishing requires npm CLI version 11.5.1 or later.
+      - run: npm i
+      - if: ${{ github.event_name == 'push' }}
+        run: |
+          PACKAGE_NAME=$(jq --raw-output .name package.json)
+          npm version prerelease --preid=snapshot --no-git-tag-version
+          PREFIX=$(jq --raw-output .version package.json | sed 's/\.[0-9]\+$//')
+          NEXT=$(npm view $PACKAGE_NAME versions --json \
+            | jq --raw-output --arg prefix $PREFIX '[.[] | select(startswith($prefix))|capture("snapshot\\.(?<n>[0-9]+)").n|tonumber]|max + 1 // 0')
+          npm version $PREFIX.$NEXT --no-git-tag-version
+          echo "TAG=snapshot" >> $GITHUB_ENV
+      - if: ${{ github.event_name == 'release' }}
+        run: |
+          npm version $(echo ${{ github.release.tag_name }} | sed 's/^v//') --no-git-tag-version
+          echo "TAG=latest" >> $GITHUB_ENV
+      - id: publish
+        run: |
+          npm run build
+          npm publish --provenance --access public --tag $TAG
+          echo "url=https://www.npmjs.com/package/@waves/ts-lib-crypto/v/$(jq --raw-output .version package.json)" >> "$GITHUB_OUTPUT"
diff --git a/package.json b/package.json
@@ -1,42 +1,43 @@
 {
   "name": "@waves/node-state",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "main": "dist/index.js",
   "bin": {
     "node-state": "dist/cli.js"
   },
   "scripts": {
-    "prepare": "tsc",
-    "postversion": "npm publish"
+    "prepare": "npx tsc",
+    "build": "npm run prepare"
   },
   "author": {
     "email": "tsddaniil@gmail.com",
     "name": "Tsigel"
   },
   "repository": {
-    "url": "https://github.com/wavesplatform/node-state",
+    "url": "https://github.com/wavesplatform/node-state.git",
     "type": "git"
   },
   "license": "ISC",
   "devDependencies": {
-    "typescript": "^3.9.4"
+    "typescript": "^5.9.2"
   },
   "files": [
     "dist",
     "env",
     "config.json"
   ],
   "dependencies": {
-    "@types/cli-color": "^0.3.29",
+    "@types/cli-color": "^2.0.6",
     "@types/dotenv": "^8.2.0",
-    "@types/fs-extra": "^8.0.1",
-    "@types/yargs": "^16.0.3",
-    "@waves/ts-types": "1.0.2",
-    "@waves/waves-transactions": "^4.1.8",
-    "cli-color": "^2.0.0",
+    "@types/fs-extra": "^11.0.4",
+    "@types/yargs": "^17.0.35",
+    "@waves/node-api-js": "1.3.11-beta.1",
+    "@waves/ts-types": "1.3.1-snapshot.1",
+    "@waves/waves-transactions": "4.3.11",
+    "cli-color": "^2.0.4",
     "dotenv": "^8.2.0",
-    "fs-extra": "^8.1.0",
-    "yargs": "^17.0.1"
+    "fs-extra": "^11.0.4",
+    "yargs": "^17.0.35"
   }
 }
diff --git a/src/args.ts b/src/args.ts
@@ -37,7 +37,7 @@ const data = options({
     verbose: {
         type: 'boolean'
     }
-}).argv;
+}).parseSync();
 
 export const out = data.out;
 export const config = data.config;
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,6 @@
-import { outputFile, readFile } from 'fs-extra';
-import { alias, broadcast, libs } from '@waves/waves-transactions';
+import { outputFile, readJson } from 'fs-extra';
+import { alias, libs } from '@waves/waves-transactions';
+import { broadcast } from '@waves/node-api-js/cjs/api-node/transactions';
 import { ACCOUNT_SCRIPT, CHAIN_ID, DAP_SCRIPT, MASTER_ACCOUNT_SEED, NODE_URL, SMART_ASSET_SCRIPT } from './constants';
 import createAssets from './state/createAssets';
 import createAccounts from './state/createAccounts';
@@ -9,13 +10,13 @@ import setBalances from './state/setBalances';
 
 
 export async function write(options: IOptions) {
-    broadcast(alias({
+    broadcast(NODE_URL, alias({
         alias: 'master',
         chainId: CHAIN_ID
-    }, MASTER_ACCOUNT_SEED), NODE_URL)
+    }, MASTER_ACCOUNT_SEED))
         .catch(() => null);
 
-    const state = JSON.parse(await readFile(options.config, 'utf8'));
+    const state = await readJson(options.config);
     const ACCOUNTS = await createAccounts(state.ACCOUNTS || {});
     const ASSETS = await createAssets(state.ASSETS || {}, ACCOUNTS);
     await setBalances(state.ACCOUNTS || {}, ASSETS, ACCOUNTS);
diff --git a/src/middlewares/apply.ts b/src/middlewares/apply.ts
@@ -14,16 +14,25 @@ export default async (ctx: any, next: any) => {
   
   if (!runTests) {
     return next();
-  } else {
-    // TODO add check test command
-    const child = runCommand('npm', ['run', 'testCommand'], {
-      log: console.warn,
-    });
+  }
+
+  const npmExecPath = process.env.npm_execpath;
+  const command = npmExecPath ? process.execPath : process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  const args = npmExecPath ? [npmExecPath, 'run', 'testCommand'] : ['run', 'testCommand'];
+
+  // TODO add check test command
+  const child = runCommand(command, args, {
+    log: console.warn,
+  });
 
-    child.on('exit', code => {
-      process.exit(code || 0);
-    });
+  const exitCode = await new Promise<number>((resolve, reject) => {
+    child.on('exit', code => resolve(code || 0));
+    child.on('error', reject);
+  });
 
-    next();
+  if (exitCode !== 0) {
+    process.exitCode = exitCode;
   }
+
+  return next();
 };
diff --git a/src/middlewares/checkDockerNetwork.ts b/src/middlewares/checkDockerNetwork.ts
@@ -9,12 +9,12 @@ const checkDockerNetworkCommand = [
 ].join(' ');
 
 export default async (ctx: any, next: any) => {
-  await new Promise(resolve => {
+  await new Promise<void>(resolve => {
     exec(checkDockerNetworkCommand, () => {
       console.log('Docker network created (or reused): ', DOCKER_NETWORK);
       resolve();
     });
   });
 
-  next();
+  await next();
 };
diff --git a/src/middlewares/node.ts b/src/middlewares/node.ts
@@ -24,16 +24,21 @@ export default async (ctx: any, next: any) => {
         NODE_IMAGE
     );
 
-    await new Promise(resolve => {
-        node.stdout.on('data', chunk => {
-            const message = String(chunk);
-            if (message.includes('REST API was bound')) {
-                console.info('REST API was bound');
-                resolve();
-            }
+    try {
+        await new Promise<void>(resolve => {
+            node.stdout.on('data', chunk => {
+                const message = String(chunk);
+                if (message.includes('REST API was bound')) {
+                    console.info('REST API was bound');
+                    resolve();
+                }
+            });
         });
-    });
 
-    next();
+        await next();
+    } finally {
+        await stop(NODE_IMAGE);
+        await remove(NODE_IMAGE);
+    }
 
 };
diff --git a/src/state/createAccounts.ts b/src/state/createAccounts.ts
@@ -1,5 +1,6 @@
-import {IAccount, IAsset, TAccountsResponse, TAssetsResponse, TLong} from '../interface';
-import { alias, data, lease, libs, nodeInteraction, setScript, transfer } from '@waves/waves-transactions';
+import {IAccount, IAsset, TAccountsResponse, TLong} from '../interface';
+import { alias, data, lease, libs, setScript, transfer } from '@waves/waves-transactions';
+import { fetchBalanceDetails } from '@waves/node-api-js/cjs/api-node/addresses';
 import { ACCOUNT_SCRIPT, CHAIN_ID, DAP_SCRIPT, MASTER_ACCOUNT_SEED, NODE_URL } from '../constants';
 import { broadcastAndWait } from '../utils';
 import console from '../utils/console';
@@ -51,7 +52,7 @@ export default function <ASSETS extends Record<string, IAsset>, ACCOUNTS extends
             await setLeasing(randomAddress, amount);
         }
 
-        const { available } = await nodeInteraction.balanceDetails(address, NODE_URL);
+        const { available } = await fetchBalanceDetails(NODE_URL, address);
         const toSend = 100 * Math.pow(10, 8) - (+available);
 
         await setBalance(address, toSend);
diff --git a/src/state/setBalances.ts b/src/state/setBalances.ts
@@ -1,4 +1,4 @@
-import { alias, data, libs, nodeInteraction, setScript, transfer } from '@waves/waves-transactions';
+import { transfer } from '@waves/waves-transactions';
 import { MASTER_ACCOUNT_SEED } from '../constants';
 import { broadcastAndWait } from '../utils';
 import { IAccount, IAsset, TAccountsResponse, TAssetsResponse } from '../interface';
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,16 +1,18 @@
-import { broadcast, waitForTx } from '@waves/waves-transactions';
+
 import { NODE_URL } from './constants';
 import { ChildProcessWithoutNullStreams, spawn, SpawnOptionsWithoutStdio } from 'child_process';
+import { broadcast } from '@waves/node-api-js/cjs/api-node/transactions';
+import waitTx from '@waves/node-api-js/cjs/tools/transactions/wait';
 import console from './utils/console';
-import * as os from "os";
 
 
 export async function broadcastAndWait(tx: any): Promise<any> {
     try {
-        await broadcast(tx, NODE_URL);
-        await waitForTx(tx.id, { apiBase: NODE_URL });
+        const broadcastedTx = await broadcast(NODE_URL, tx);
+        await waitTx(NODE_URL, broadcastedTx);
     } catch (e) {
-        console.error(`Can't send transaction! ${JSON.stringify(tx, null, 4)}` + '\n' + `Error: ${e.message}`);
+        const message = e instanceof Error ? e.message : String(e);
+        console.error(`Can't send transaction! ${JSON.stringify(tx, null, 4)}` + '\n' + `Error: ${message}`);
     }
 }
 
@@ -30,6 +32,10 @@ export const run = (command: string, args: Array<string>, options?: { log?: TFun
         error(data);
     });
 
+    process.on('error', err => {
+        error(err);
+    });
+
     process.on('close', (code) => {
         console.info(`Child process "${command} ${args.join(' ')}" exited with code ${code}`);
     });

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ const data = options({`
`37`	`37`	`verbose: {`
`38`	`38`	`type: 'boolean'`
`39`	`39`	`}`
`40`		`-}).argv;`
	`40`	`+}).parseSync();`
`41`	`41`
`42`	`42`	`export const out = data.out;`
`43`	`43`	`export const config = data.config;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { alias, data, libs, nodeInteraction, setScript, transfer } from '@waves/waves-transactions';`
	`1`	`+import { transfer } from '@waves/waves-transactions';`
`2`	`2`	`import { MASTER_ACCOUNT_SEED } from '../constants';`
`3`	`3`	`import { broadcastAndWait } from '../utils';`
`4`	`4`	`import { IAccount, IAsset, TAccountsResponse, TAssetsResponse } from '../interface';`