Skip to content

Commit

Permalink
Merge pull request #2137 from iron-fish/staging
Browse files Browse the repository at this point in the history
STAGING -> MASTER
  • Loading branch information
dguenther authored Aug 29, 2022
2 parents f1dcebb + 8e03fdb commit 0725b77
Show file tree
Hide file tree
Showing 139 changed files with 5,622 additions and 3,397 deletions.
4 changes: 2 additions & 2 deletions ironfish-cli/bin/ironfish
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ else
fi

if [ "$IRONFISH_EXPOSE_GC" == "true" ]; then
"$NODE" "--expose-gc" "$DIR/run" "$@"
"$NODE" "--expose-gc" "--enable-source-maps" "$DIR/run" "$@"
else
"$NODE" "$DIR/run" "$@"
"$NODE" "--enable-source-maps" "$DIR/run" "$@"
fi
fi
14 changes: 7 additions & 7 deletions ironfish-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ironfish",
"version": "0.1.44",
"version": "0.1.45",
"description": "CLI for running and interacting with an Iron Fish node",
"author": "Iron Fish <[email protected]> (https://ironfish.network)",
"main": "build/src/index.js",
Expand Down Expand Up @@ -44,18 +44,18 @@
"lint:fix": "tsc -b && eslint --ext .ts,.tsx,.js,.jsx src/ --fix",
"start:dev": "node start",
"start": "yarn build && yarn start:js",
"start:js": "cross-env OCLIF_TS_NODE=0 IRONFISH_DEBUG=1 node --expose-gc bin/run",
"test": "yarn clean && tsc -b && tsc -b tsconfig.test.json && jest",
"test:coverage:html": "tsc -b tsconfig.test.json && jest --coverage --coverage-reporters html --testPathIgnorePatterns",
"start:js": "cross-env OCLIF_TS_NODE=0 IRONFISH_DEBUG=1 node --expose-gc --inspect --inspect-publish-uid=http --enable-source-maps bin/run",
"test": "yarn clean && tsc -b && tsc -b tsconfig.test.json && jest --maxWorkers=1 --passWithNoTests",
"test:coverage:html": "tsc -b tsconfig.test.json && jest --maxWorkers=1 --passWithNoTests --coverage --coverage-reporters html --testPathIgnorePatterns",
"test:watch": "tsc -b tsconfig.test.json && jest --watch --coverage false",
"postpack": "rimraf oclif.manifest.json",
"clean": "rimraf build",
"prepack": "rimraf build && yarn build && oclif manifest && oclif readme",
"oclif:version": "oclif readme && git add README.md"
},
"dependencies": {
"@ironfish/rust-nodejs": "0.1.11",
"@ironfish/sdk": "0.0.21",
"@ironfish/rust-nodejs": "0.1.12",
"@ironfish/sdk": "0.0.22",
"@aws-sdk/client-s3": "3.127.0",
"@oclif/core": "1.6.1",
"@oclif/plugin-help": "5.1.12",
Expand Down Expand Up @@ -111,4 +111,4 @@
"url": "https://github.com/iron-fish/ironfish/issues"
},
"homepage": "https://ironfish.network"
}
}
3 changes: 2 additions & 1 deletion ironfish-cli/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ echo "Copying node_modules"
rsync -L -avrq --exclude 'ironfish' --exclude 'fsevents' ../../../node_modules ./
# Copy node_modules from ironfish-cli folder into the production node_modules folder
# yarn --production seems to split some packages into different folders for some reason
rsync -L -avrq --ignore-missing-args ../../node_modules/* ./node_modules
# if ../../node_modules/ is empty then the cp command will error so skip copying
cp -R ../../node_modules/* ./node_modules || true

echo ""
if ! ./bin/run --version > /dev/null; then
Expand Down
9 changes: 9 additions & 0 deletions ironfish-cli/src/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
RpcConnectionError,
} from '@ironfish/sdk'
import { Command, Config } from '@oclif/core'
import { CLIError, ExitError } from '@oclif/core/lib/errors'
import {
ConfigFlagKey,
DatabaseFlag,
Expand Down Expand Up @@ -76,11 +77,19 @@ export abstract class IronfishCommand extends Command {
} catch (error: unknown) {
if (hasUserResponseError(error)) {
this.log(error.codeMessage)
} else if (error instanceof ExitError) {
throw error
} else if (error instanceof CLIError) {
throw error
} else if (error instanceof RpcConnectionError) {
this.log(`Cannot connect to your node, start your node first.`)
} else if (error instanceof DatabaseVersionError) {
this.log(error.message)
this.exit(1)
} else if (error instanceof Error) {
// eslint-disable-next-line no-console
console.error(ErrorUtils.renderError(error, true))
this.exit(1)
} else {
throw error
}
Expand Down
52 changes: 0 additions & 52 deletions ironfish-cli/src/commands/accounts/address.test.ts

This file was deleted.

57 changes: 0 additions & 57 deletions ironfish-cli/src/commands/accounts/balance.test.ts

This file was deleted.

58 changes: 0 additions & 58 deletions ironfish-cli/src/commands/accounts/create.test.ts

This file was deleted.

80 changes: 0 additions & 80 deletions ironfish-cli/src/commands/accounts/export.test.ts

This file was deleted.

49 changes: 0 additions & 49 deletions ironfish-cli/src/commands/accounts/list.test.ts

This file was deleted.

Loading

0 comments on commit 0725b77

Please sign in to comment.