Merge branch 'main' into arm64-aarch64

# Conflicts: # .github/workflows/release.yml
neodix42 · Aug 5, 2024 · 0367735 · 0367735
2 parents cb60a71 + c47826a
commit 0367735
Show file tree

Hide file tree

Showing 8 changed files with 253 additions and 39 deletions.
diff --git a/.github/workflows/commit.yml → .github/workflows/commit-macos-arm64.yml b/.github/workflows/commit.yml → .github/workflows/commit-macos-arm64.yml
@@ -1,13 +1,10 @@
-name: Test changes
+name: Test on macOS 14 arm64
 
-on:
-  workflow_dispatch:
-  push:
-    branches:
+on: [ push,workflow_dispatch,workflow_call ]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: macos-14
 
     steps:
       - uses: actions/checkout@v3
@@ -17,28 +14,22 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
 
-      - name: Build x86-64 mainnet
-        run: |
-          mkdir artifacts
-          git fetch -a          
-          mvn clean compile package -DskipTests
-          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64.jar
-
-      - name: Build x86-64 testnet
-        run: |
-          mvn clean compile package -DskipTests -Dton_branch=testnet
-          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64-testnet.jar
-
-      - name: Build arm64-aarch64 mainnet
+      - name: Build & Test arm64-aarch64 mainnet
+        timeout-minutes: 10
         run: |
+          git fetch -a
           git checkout arm64-aarch64
+          mkdir artifacts
           mvn clean compile package -DskipTests
           cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64.jar
+          java -jar artifacts/MyLocalTon-arm64.jar nogui debug test-binaries
 
-      - name: Build arm64-aarch64 testnet
+      - name: Build & Test arm64-aarch64 testnet
+        timeout-minutes: 10
         run: |
           mvn clean compile package -DskipTests -Dton_branch=testnet
           cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64-testnet.jar
+          java -jar artifacts/MyLocalTon-arm64-testnet.jar nogui debug test-binaries
 
       - name: Upload artifacts
         uses: actions/upload-artifact@master

diff --git a/.github/workflows/commit-macos-x86-64.yml b/.github/workflows/commit-macos-x86-64.yml
@@ -0,0 +1,38 @@
+name: Test on macOS 12 x86-64
+
+on: [ push,workflow_dispatch,workflow_call ]
+
+jobs:
+  build:
+    runs-on: macos-12
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build & Test x86-64 mainnet
+        timeout-minutes: 10
+        run: |
+          git fetch -a
+          git checkout main
+          mkdir artifacts       
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64.jar
+          java -jar artifacts/MyLocalTon-x86-64.jar nogui debug test-binaries
+
+      - name: Build & Test x86-64 testnet
+        timeout-minutes: 10
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64-testnet.jar
+          java -jar artifacts/MyLocalTon-x86-64-testnet.jar nogui debug test-binaries
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: All-MyLocalTon-Jars
+          path: artifacts
diff --git a/.github/workflows/commit-ubuntu-x86-64.yml b/.github/workflows/commit-ubuntu-x86-64.yml
@@ -0,0 +1,38 @@
+name: Test on Ubuntu 22.04 x86-64
+
+on: [ push,workflow_dispatch,workflow_call ]
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build & Test x86-64 mainnet
+        timeout-minutes: 10
+        run: |
+          git fetch -a
+          git checkout main
+          mkdir artifacts                 
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64.jar
+          java -jar artifacts/MyLocalTon-x86-64.jar nogui debug test-binaries
+
+      - name: Build & Test x86-64 testnet
+        timeout-minutes: 10
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64-testnet.jar
+          java -jar artifacts/MyLocalTon-x86-64-testnet.jar nogui debug test-binaries
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: All-MyLocalTon-Jars
+          path: artifacts
diff --git a/.github/workflows/commit-windows-x86-64.yml b/.github/workflows/commit-windows-x86-64.yml
@@ -0,0 +1,38 @@
+name: Test on Windows x86-64
+
+on: [ push,workflow_dispatch,workflow_call ]
+
+jobs:
+  build:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build & Test x86-64 mainnet
+        timeout-minutes: 10
+        run: |
+          git fetch -a
+          git checkout main
+          mkdir artifacts                    
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64.jar
+          java -jar artifacts/MyLocalTon-x86-64.jar nogui debug test-binaries
+
+      - name: Build & Test x86-64 testnet
+        timeout-minutes: 10
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64-testnet.jar
+          java -jar artifacts/MyLocalTon-x86-64-testnet.jar nogui debug test-binaries
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: All-MyLocalTon-Jars
+          path: artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,75 @@
+name: Create release
+
+on: [ workflow_dispatch ]
+
+jobs:
+  build:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build x86-64 mainnet
+        run: |
+          mkdir artifacts
+          git fetch -a
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64.jar
+
+      - name: Build x86-64 testnet
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-x86-64-testnet.jar
+
+      - name: Build arm64-aarch64 mainnet
+        run: |
+          git checkout arm64-aarch64
+          mvn clean compile package -DskipTests
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64.jar
+
+      - name: Build arm64-aarch64 testnet
+        run: |
+          mvn clean compile package -DskipTests -Dton_branch=testnet
+          cp target/MyLocalTon.jar artifacts/MyLocalTon-arm64-testnet.jar
+
+      - name: Checkout main branch
+        run: |
+          git checkout main
+          ls artifacts
+
+      - name: Read CHANGELOG.md and use it as a body of new release
+        id: read_release
+        shell: bash
+        run: |
+          r=$(cat CHANGELOG.md)
+          r="${r//'%'/'%25'}"
+          r="${r//$'\n'/'%0A'}"
+          r="${r//$'\r'/'%0D'}"
+          echo "::set-output name=CHANGELOG_BODY::$r"
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ github.run_number }}
+          release_name: MyLocalTon v${{ github.run_number }}
+          body: |
+            ${{ steps.read_release.outputs.CHANGELOG_BODY }}
+          draft: false
+          prerelease: true
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: artifacts/*.jar
+          tag: v${{ github.run_number }}
+          overwrite: true
+          file_glob: true
diff --git a/README.md b/README.md
@@ -39,31 +39,28 @@ In case you are using MacPorts instead of Homebrew on Mac please execute the fol
 
 ## Java installation
 
-If you are new to Java, please follow this guide on how to install OpenJDK 17:
-
-- On Ubuntu
-  https://techviewleo.com/install-java-openjdk-on-ubuntu-linux/
-- On Windows
-  https://java.tutorials24x7.com/blog/how-to-install-openjdk-17-on-windows
-- On MacOS
-  https://knasmueller.net/how-to-install-java-openjdk-17-on-macos-big-sur
-
-In case you have several versions of Java use the following command in order to select the default Java version:
-
-`sudo update-alternatives --config java`
+| Linux                                 | MacOS                         | Windows                                      |
+|---------------------------------------|-------------------------------|----------------------------------------------|
+| ```sudo apt install openjdk-17-jdk``` | ```brew install openjdk@17``` | ```choco install openjdk --version=17.0.2``` |
 
 ## Microsoft Visual C++ Redistributable installation (for Windows only)
 
 Please install Microsoft Visual C++ Redistributable 2015 (and above) x64.
 https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170
 
-## Installation and usage
+## MyLocalTon installation
+
+| Archicture | Linux / MacOS                                                                                    | Windows                                                                                           |
+|------------|--------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| x86-64     | ```wget https://github.com/neodix42/MyLocalTon/releases/latest/download/MyLocalTon-x86-64.jar``` | [download](https://github.com/neodix42/MyLocalTon/releases/latest/download/MyLocalTon-x86-64.jar) |
+| arm64      | ```wget https://github.com/neodix42/MyLocalTon/releases/latest/download/MyLocalTon-arm64.jar```  | [download](https://github.com/neodix42/MyLocalTon/releases/latest/download/MyLocalTon-arm64.jar)  |
 
-Go to https://github.com/neodiX42/MyLocalTon/releases. Open Assets section and download MyLocalTon for your architecture
+## MyLocalTon usage
 
-Open console and execute the following command:
+`java -jar MyLocalTon-x86-64.jar [nogui] [ton-http-api] [explorer] [ip.addr.xxx.xxx] [test-binaries] [debug]`
+
+for ARM64 architecture use:
 
-`java -jar MyLocalTon-x86-64.jar` or
 `java -jar MyLocalTon-arm64.jar`
 
 ## Upgrade
@@ -113,4 +110,8 @@ pip3 install --user ton-http-api
 wget https://www.python.org/ftp/python/3.12.0/python-3.12.0-amd64.exe
 python -m ensurepip --upgrade
 start pip3 install -U ton-http-api
-```
+```
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=neodix42/MyLocalTon&type=Date)](https://star-history.com/#neodix42/mylocalton&Date)
diff --git a/src/main/java/org/ton/main/App.java b/src/main/java/org/ton/main/App.java
@@ -9,10 +9,12 @@
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 import org.ton.actions.MyLocalTon;
 import org.ton.db.DbPool;
 import org.ton.executors.dhtserver.DhtServer;
 import org.ton.executors.validatorengine.ValidatorEngine;
+import org.ton.executors.validatorengine.ValidatorEngineExecutor;
 import org.ton.settings.MyLocalTonSettings;
 import org.ton.settings.Node;
 import org.ton.ui.controllers.MainController;
@@ -22,9 +24,11 @@
 
 import java.awt.*;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
@@ -95,7 +99,7 @@ public static void setRoot(String fxml) throws IOException {
         scene.setRoot(fxmlLoader.load());
     }
 
-    public static void main(MyLocalTonSettings settings, MyLocalTon myLocalTon) throws Throwable {
+    public static void main(MyLocalTonSettings settings, MyLocalTon myLocalTon, String[] args) throws Throwable {
 
         // start GUI
         if (!GraphicsEnvironment.isHeadless()) {
@@ -106,6 +110,25 @@ public static void main(MyLocalTonSettings settings, MyLocalTon myLocalTon) thro
         Node genesisNode = settings.getGenesisNode();
         genesisNode.extractBinaries();
 
+        if (!Arrays.asList(args).isEmpty()) {
+            for (String arg : args) {
+
+                if (arg.equalsIgnoreCase("test-binaries")) {
+                    Pair<Process, Future<String>> validator = new ValidatorEngineExecutor().execute(genesisNode, "-V");
+//                    Future<String> f = validator.getRight();
+                    log.info("test feature code {}", validator.getRight().get());
+                    log.info("test exit code {}", validator.getLeft().exitValue());
+                    if (validator.getLeft().exitValue() != 0) {
+                        System.out.println("Simple binary test failed.");
+                        System.exit(10);
+                    } else {
+                        System.out.println("Simple binary test passed.");
+                        System.exit(0);
+                    }
+                }
+            }
+        }
+
         // initialize DB
         dbPool = new DbPool(settings);
 

diff --git a/src/main/java/org/ton/main/Main.java b/src/main/java/org/ton/main/Main.java
@@ -63,6 +63,16 @@ public static void main(String[] args) throws Throwable {
                     System.setProperty("java.awt.headless", "true");
                 }
 
+                if (arg.equalsIgnoreCase("ton-http-api")) {
+                    log.info("enabling ton-http-api on start (default port 8081)");
+                    settings.getUiSettings().setEnableTonHttpApi(true);
+                }
+
+                if (arg.equalsIgnoreCase("explorer")) {
+                    log.info("enabling ton-blockchain explorer on start (default port 8000)");
+                    settings.getUiSettings().setEnableBlockchainExplorer(true);
+                }
+
                 if (InetAddresses.isInetAddress(arg)) {
                     log.info("listening on public IP " + arg);
                     settings.getGenesisNode().setPublicIp(arg);
@@ -88,7 +98,7 @@ public static void main(String[] args) throws Throwable {
 
             log.info("Starting application at path {}", MyLocalTonUtils.getMyPath());
 
-            App.main(settings, myLocalTon);
+            App.main(settings, myLocalTon, args);
 
         } else {
             log.error("Instance already running.");