diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd9eb36..765c1df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,12 +31,12 @@ jobs: target: linux # The third combination is macOS running on an AMD64 processor, building for Darwin (macOS). - - os: macos-13 + - os: macos-15 arch: amd64 target: darwin # The fourth combination is macOS running on an ARM64 processor, building for Darwin (macOS). - - os: macos-13 + - os: macos-15 arch: arm64 target: darwin diff --git a/Taskfile.yml b/Taskfile.yml index 6091150..de67764 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -3,8 +3,8 @@ version: "3" vars: APP_NAME: node-manager-plugin BIN_DIR: build - MAINNET_VERSION: "MAIN.4.0" - BUILDNET_VERSION: "DEVN.29.0" + MAINNET_VERSION: "MAIN.4.1" + BUILDNET_VERSION: "DEVN.29.1" NODE_MASSA_DIR: "build/node-massa" tasks: diff --git a/api/pluginAPI-V0.yml b/api/pluginAPI-V0.yml index 3c2eda5..4607d0c 100644 --- a/api/pluginAPI-V0.yml +++ b/api/pluginAPI-V0.yml @@ -313,7 +313,7 @@ definitions: Network: type: object properties: - version: # network value is contained in the version name. Ex: MAIN.4.0 + version: # network value is contained in the version name. Ex: MAIN.4.1 type: string description: The version of the node network hasPwd: diff --git a/go.mod b/go.mod index 1667c45..52c2bf0 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/massalabs/station-massa-wallet v0.5.1 github.com/massalabs/station/plugin-kit v0.1.1 github.com/ncruces/go-sqlite3 v0.27.1 - github.com/stretchr/testify v1.10.0 + github.com/stretchr/testify v1.11.1 golang.org/x/net v0.41.0 golang.org/x/sys v0.34.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -54,4 +54,3 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect ) - diff --git a/go.sum b/go.sum index 8394aa5..91e918c 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= -github.com/massalabs/station v0.8.2 h1:hmGejQvr7FJBjxH1ot/iQRY+MKAjayaCQBOeePvvtwM= -github.com/massalabs/station v0.8.2/go.mod h1:fvIMuIS8v1/tu5e4FPvvqEJEcLsZN+wUD5OMSHD/rO8= +github.com/massalabs/station v0.8.2 h1:4ILvRjcnjb32bgWh6udTskfKs2oMhZTNxp+gXDq9ul0= +github.com/massalabs/station v0.8.2/go.mod h1:skBhCxU+An9l05EGmQbk3RqIDT2xNRMTRqs3v5jR3Us= github.com/massalabs/station-massa-wallet v0.5.1 h1:tF4sX7Qt3mcFyLqlqbBj6uUqQgDMYa+3/uQkHF3j/1I= github.com/massalabs/station-massa-wallet v0.5.1/go.mod h1:36O0NV1arEDy8NXPGj+vtlTftAgJ/QgG+keIOatZOnw= github.com/massalabs/station/plugin-kit v0.1.1 h1:KIzEjQX1ukgSSmmnD3EVADN9N7h3kTbFzHI3lal9+Po= @@ -92,8 +92,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I= github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM= github.com/ybbus/jsonrpc/v3 v3.1.4 h1:pPmgfWXnqR2GdIlealyCzmV6LV3nxm3w9gwA1B3cP3Y= diff --git a/int/config/plugin_info.go b/int/config/plugin_info.go index d244c66..5fac4d1 100644 --- a/int/config/plugin_info.go +++ b/int/config/plugin_info.go @@ -30,8 +30,8 @@ func init() { PwdBuildnet: "", AutoRestart: false, IsMainnet: true, - MainnetVersion: "MAIN.4.0", - BuildnetVersion: "DEVN.29.0", + MainnetVersion: "MAIN.4.1", + BuildnetVersion: "DEVN.29.1", } } diff --git a/int/config/plugin_info_test.go b/int/config/plugin_info_test.go index f31ce5f..964d253 100644 --- a/int/config/plugin_info_test.go +++ b/int/config/plugin_info_test.go @@ -12,13 +12,13 @@ func TestRemoveOldNodeVersionsArtifacts(t *testing.T) { // Prepare plugin info with current versions pi := &PluginInfo{ - MainnetVersion: "MAIN.4.0", - BuildnetVersion: "DEVN.29.0", + MainnetVersion: "MAIN.4.1", + BuildnetVersion: "DEVN.29.1", } // Create directories representing versions - mustMkdir(t, filepath.Join(root, "MAIN.4.0")) // should stay - mustMkdir(t, filepath.Join(root, "DEVN.29.0")) // should stay + mustMkdir(t, filepath.Join(root, "MAIN.4.1")) // should stay + mustMkdir(t, filepath.Join(root, "DEVN.29.1")) // should stay mustMkdir(t, filepath.Join(root, "MAIN.3.0")) // should be removed mustMkdir(t, filepath.Join(root, "DEVN.28.16")) // should be removed mustMkdir(t, filepath.Join(root, "random-other")) // should be removed @@ -34,8 +34,8 @@ func TestRemoveOldNodeVersionsArtifacts(t *testing.T) { } // Assert expected directories - assertExists(t, filepath.Join(root, "MAIN.4.0"), true) - assertExists(t, filepath.Join(root, "DEVN.29.0"), true) + assertExists(t, filepath.Join(root, "MAIN.4.1"), true) + assertExists(t, filepath.Join(root, "DEVN.29.1"), true) assertExists(t, filepath.Join(root, "MAIN.3.0"), false) assertExists(t, filepath.Join(root, "DEVN.28.16"), false) assertExists(t, filepath.Join(root, "random-other"), false) diff --git a/manifest.json b/manifest.json index 373b3a5..0f49d14 100644 --- a/manifest.json +++ b/manifest.json @@ -4,6 +4,6 @@ "description": "Massa blockchain official node manager", "logo": "favicon.svg", "home": "", - "version": "0.4.3", + "version": "0.4.4", "apispec": "" } \ No newline at end of file diff --git a/scripts/ci-setup-node-from-linux.sh b/scripts/ci-setup-node-from-linux.sh index af94909..ac33d11 100755 --- a/scripts/ci-setup-node-from-linux.sh +++ b/scripts/ci-setup-node-from-linux.sh @@ -6,7 +6,7 @@ # Downloads zip archives and extracts massa-node and massa-client from the massa/ folder # # Usage: ./ci-setup-node-from-linux.sh -# Example: ./ci-setup-node-from-linux.sh "MAIN.4.0" "DEVN.29.0" "build/node-massa" +# Example: ./ci-setup-node-from-linux.sh "MAIN.4.1" "DEVN.29.1" "build/node-massa" set -e # Exit on any error @@ -14,7 +14,7 @@ set -e # Exit on any error if [ $# -ne 3 ]; then echo "Error: This script requires exactly 3 parameters" echo "Usage: $0 " - echo "Example: $0 \"MAIN.4.0\" \"DEVN.29.0\" \"build/node-massa\"" + echo "Example: $0 \"MAIN.4.1\" \"DEVN.29.1\" \"build/node-massa\"" exit 1 fi diff --git a/scripts/setup-node-unix.sh b/scripts/setup-node-unix.sh index 0963349..77c5843 100755 --- a/scripts/setup-node-unix.sh +++ b/scripts/setup-node-unix.sh @@ -5,7 +5,7 @@ # Should be called by taskfile. # # Usage: ./setup-node-unix.sh -# Example: ./setup-node-unix.sh "MAIN.4.0" "DEVN.29.0" "massa_MAIN.4.0_release_linux.tar.gz" "massa_DEVN.29.0_release_linux.tar.gz" "build/node-massa" +# Example: ./setup-node-unix.sh "MAIN.4.1" "DEVN.29.1" "massa_MAIN.4.1_release_linux.tar.gz" "massa_DEVN.29.1_release_linux.tar.gz" "build/node-massa" set -e # Exit on any error @@ -13,7 +13,7 @@ set -e # Exit on any error if [ $# -ne 5 ]; then echo "Error: This script requires exactly 5 parameters" echo "Usage: $0 " - echo "Example: $0 \"MAIN.4.0\" \"DEVN.29.0\" \"massa_MAIN.4.0_release_linux.tar.gz\" \"massa_DEVN.29.0_release_linux.tar.gz\" \"build/node-massa\"" + echo "Example: $0 \"MAIN.4.1\" \"DEVN.29.1\" \"massa_MAIN.4.1_release_linux.tar.gz\" \"massa_DEVN.29.1_release_linux.tar.gz\" \"build/node-massa\"" exit 1 fi diff --git a/web/package-lock.json b/web/package-lock.json index f0fadc4..e39637d 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -15,7 +15,7 @@ "esbuild": "0.17.19", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "^6.10.0", + "react-router-dom": "^6.30.3", "recharts": "^3.1.0", "zustand": "^4.3.8" }, @@ -51,6 +51,7 @@ "react-test-renderer": "^18.2.0", "tailwindcss": "^3.3.1", "ts-jest": "^29.4.0", + "ts-node": "^10.9.2", "typescript": "^5.0.2", "vite": "^4.5.2" } @@ -1838,9 +1839,8 @@ "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "devOptional": true, "license": "MIT", - "optional": true, - "peer": true, "dependencies": { "@jridgewell/trace-mapping": "0.3.9" }, @@ -1852,9 +1852,8 @@ "version": "0.3.9", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "devOptional": true, "license": "MIT", - "optional": true, - "peer": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -3624,9 +3623,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.22.0.tgz", - "integrity": "sha512-MBOl8MeOzpK0HQQQshKB7pABXbmyHizdTpqnrIseTbsv0nAepwC2ENZa1aaBExNQcpLoXmWthhak8SABLzvGPw==", + "version": "1.23.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.2.tgz", + "integrity": "sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==", "license": "MIT", "engines": { "node": ">=14.0.0" @@ -4104,36 +4103,32 @@ } }, "node_modules/@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "license": "MIT", - "optional": true, - "peer": true + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz", + "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==", + "devOptional": true, + "license": "MIT" }, "node_modules/@tsconfig/node12": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "license": "MIT", - "optional": true, - "peer": true + "devOptional": true, + "license": "MIT" }, "node_modules/@tsconfig/node14": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "license": "MIT", - "optional": true, - "peer": true + "devOptional": true, + "license": "MIT" }, "node_modules/@tsconfig/node16": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "license": "MIT", - "optional": true, - "peer": true + "devOptional": true, + "license": "MIT" }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -5316,9 +5311,8 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "license": "MIT", - "optional": true, - "peer": true + "devOptional": true, + "license": "MIT" }, "node_modules/argparse": { "version": "1.0.10", @@ -6395,9 +6389,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "license": "MIT", - "optional": true, - "peer": true + "devOptional": true, + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -6789,9 +6782,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "devOptional": true, "license": "BSD-3-Clause", - "optional": true, - "peer": true, "engines": { "node": ">=0.3.1" } @@ -12273,12 +12265,12 @@ } }, "node_modules/react-router": { - "version": "6.29.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.29.0.tgz", - "integrity": "sha512-DXZJoE0q+KyeVw75Ck6GkPxFak63C4fGqZGNijnWgzB/HzSP1ZfTlBj5COaGWwhrMQ/R8bXiq5Ooy4KG+ReyjQ==", + "version": "6.30.3", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.3.tgz", + "integrity": "sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.22.0" + "@remix-run/router": "1.23.2" }, "engines": { "node": ">=14.0.0" @@ -12288,13 +12280,13 @@ } }, "node_modules/react-router-dom": { - "version": "6.29.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.29.0.tgz", - "integrity": "sha512-pkEbJPATRJ2iotK+wUwHfy0xs2T59YPEN8BQxVCPeBZvK7kfPESRc/nyxzdcxR17hXgUPYx2whMwl+eo9cUdnQ==", + "version": "6.30.3", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.3.tgz", + "integrity": "sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.22.0", - "react-router": "6.29.0" + "@remix-run/router": "1.23.2", + "react-router": "6.30.3" }, "engines": { "node": ">=14.0.0" @@ -13849,9 +13841,8 @@ "version": "10.9.2", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "devOptional": true, "license": "MIT", - "optional": true, - "peer": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -14264,9 +14255,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "license": "MIT", - "optional": true, - "peer": true + "devOptional": true, + "license": "MIT" }, "node_modules/v8-to-istanbul": { "version": "9.3.0", @@ -15332,9 +15322,8 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "devOptional": true, "license": "MIT", - "optional": true, - "peer": true, "engines": { "node": ">=6" } diff --git a/web/package.json b/web/package.json index 69279ad..f796b38 100644 --- a/web/package.json +++ b/web/package.json @@ -25,7 +25,7 @@ "esbuild": "0.17.19", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router-dom": "^6.10.0", + "react-router-dom": "^6.30.3", "recharts": "^3.1.0", "zustand": "^4.3.8" }, @@ -61,6 +61,7 @@ "react-test-renderer": "^18.2.0", "tailwindcss": "^3.3.1", "ts-jest": "^29.4.0", + "ts-node": "^10.9.2", "typescript": "^5.0.2", "vite": "^4.5.2" },