Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion api/pluginAPI-V0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,4 +54,3 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
)

8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand All @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions int/config/plugin_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}

Expand Down
12 changes: 6 additions & 6 deletions int/config/plugin_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"description": "Massa blockchain official node manager",
"logo": "favicon.svg",
"home": "",
"version": "0.4.3",
"version": "0.4.4",
"apispec": ""
}
4 changes: 2 additions & 2 deletions scripts/ci-setup-node-from-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
# Downloads zip archives and extracts massa-node and massa-client from the massa/ folder
#
# Usage: ./ci-setup-node-from-linux.sh <MAINNET_VERSION> <BUILDNET_VERSION> <NODE_MASSA_DIR>
# 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

# Check if correct number of parameters provided
if [ $# -ne 3 ]; then
echo "Error: This script requires exactly 3 parameters"
echo "Usage: $0 <MAINNET_VERSION> <BUILDNET_VERSION> <NODE_MASSA_DIR>"
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

Expand Down
4 changes: 2 additions & 2 deletions scripts/setup-node-unix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# Should be called by taskfile.
#
# Usage: ./setup-node-unix.sh <MAINNET_VERSION> <BUILDNET_VERSION> <MAINNET_NODEBIN> <BUILDNET_NODEBIN> <NODE_MASSA_DIR>
# 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

# Check if correct number of parameters provided
if [ $# -ne 5 ]; then
echo "Error: This script requires exactly 5 parameters"
echo "Usage: $0 <MAINNET_VERSION> <BUILDNET_VERSION> <MAINNET_NODEBIN> <BUILDNET_NODEBIN> <NODE_MASSA_DIR>"
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

Expand Down
83 changes: 36 additions & 47 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down
Loading