Merge branch 'master' into fix/liquid-bits-calc

backend/.gitignore

@@ -45,3 +45,6 @@ testem.log
 #System Files
 .DS_Store
 Thumbs.db
+
+# package folder (npm run package output)
+/package

backend/npm_package.sh

@@ -1,14 +1,17 @@
 #/bin/sh
 set -e
 
+# Remove previous dist folder
+rm -rf dist
+# Build new dist folder
 npm run build
 # Remove previous package folder
 rm -rf package
 # Move JS and deps
 mv dist package
-mv node_modules package
+cp -R node_modules package
 # Remove symlink for rust-gbt and insert real folder
 rm package/node_modules/rust-gbt
-mv rust-gbt package/node_modules
+cp -R rust-gbt package/node_modules
 # Clean up deps
 npm run package-rm-build-deps

backend/package.json

@@ -22,7 +22,7 @@
   "main": "index.ts",
   "scripts": {
     "tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json",
-    "build": "npm run tsc && npm run create-resources",
+    "build": "npm run rust-build && npm run tsc && npm run create-resources",
     "create-resources": "cp ./src/tasks/price-feeds/mtgox-weekly.json ./dist/tasks && node dist/api/fetch-version.js",
     "package": "./npm_package.sh",
     "package-rm-build-deps": "./npm_package_rm_build_deps.sh",
@@ -33,7 +33,8 @@
     "test": "./node_modules/.bin/jest --coverage",
     "lint": "./node_modules/.bin/eslint . --ext .ts",
     "lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix",
-    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
+    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\"",
+    "rust-build": "cd rust-gbt && npm run build-release"
   },
   "dependencies": {
     "@babel/core": "^7.21.3",