Sml

.github/workflows/jekyll-gh-pages.yml

@@ -0,0 +1,51 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["develop"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.vscode/extensions.json

@@ -0,0 +1,13 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": [
+
+	]
+}

build.gradle

@@ -1,131 +1,133 @@
-group 'Tron'
-version '1.0-SNAPSHOT'
-
-apply plugin: 'java'
-apply plugin: 'com.google.protobuf'
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'application'
-
-sourceCompatibility = 1.8
-targetCompatibility = JavaVersion.VERSION_1_8
-[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
-compileJava.options*.compilerArgs = [
-        "-Xlint:serial", "-Xlint:varargs", "-Xlint:classfile", "-Xlint:dep-ann",
-        "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
-        "-Xlint:path", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough",
-        "-Xlint:deprecation", "-Xlint:unchecked", "-Xlint:-options"
-]
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-sourceSets {
-    main {
-        proto {
-            srcDir 'src/main/protos'
-        }
-        java {
-            srcDir 'src/main/gen'
-            srcDir 'src/main/java'
-        }
-    }
-
-}
-buildscript {
-    repositories {
-        mavenLocal()
-        maven {
-            url "https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public"
-        }
-        mavenCentral()
-    }
-    ext {
-        projectVersion = '1.3.0-RELEASE'
-        grpcVersion = '1.6.1'
-        protobufVersion = '3.3.0'
-        protobufGradlePluginVersion = '0.8.0'
-        springCloudConsulVersion = '1.2.1.RELEASE'
-    }
-
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
-        classpath "gradle.plugin.com.liferay:gradle-plugins-node:4.3.0"
-    }
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
-}
-
-dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile group: 'com.beust', name: 'jcommander', version: '1.72'
-    //compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
-    compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
-    compile 'com.maxmind.geoip2:geoip2:2.10.0'
-
-    // google grpc
-    compile group: 'io.grpc', name: 'grpc-netty', version: '1.9.0'
-    compile group: 'io.grpc', name: 'grpc-protobuf', version: '1.9.0'
-    compile group: 'io.grpc', name: 'grpc-stub', version: '1.9.0'
-
-    compile group: 'com.googlecode.protobuf-java-format', name: 'protobuf-java-format', version: '1.4'
-    compile "com.madgag.spongycastle:core:1.53.0.0"
-    compile "com.madgag.spongycastle:prov:1.53.0.0"
-    compile group: 'com.typesafe', name: 'config', version: '1.3.2'
-    compile "com.google.code.findbugs:jsr305:3.0.0"
-    compile "org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}"
-    compile "org.apache.commons:commons-collections4:4.0"
-    compile "org.apache.commons:commons-lang3:3.4"
-    compile group: 'com.google.api.grpc', name: 'googleapis-common-protos', version: '0.0.3'
-    compile 'com.alibaba:fastjson:1.2.47'
-
-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
-    compile group: 'org.projectlombok', name: 'lombok', version: '1.18.2'
-
-    compile group: 'org.jline', name: 'jline', version: '3.1.3'
-}
-
-protobuf {
-    generatedFilesBaseDir = "$projectDir/src/"
-    protoc {
-        artifact = "com.google.protobuf:protoc:3.5.1-1"
-
-    }
-    plugins {
-        grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0'
-        }
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java {
-                    outputSubDir = "gen"
-                }
-            }
-        }
-        all()*.plugins {
-            grpc {
-                outputSubDir = "gen"
-            }
-        }
-    }
-}
-
-run {
-    standardInput = System.in
-    mainClassName = 'org.tron.walletcli.Client'
-}
-
-
-shadowJar {
-    baseName = 'wallet-cli'
-    classifier = null
-    version = null
-}
+group 'Tron'
+version '1.0-SNAPSHOT'
+
+apply plugin: 'java'
+apply plugin: 'com.google.protobuf'
+apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'application'
+
+sourceCompatibility = 1.8
+targetCompatibility = JavaVersion.VERSION_1_8
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
+//compileJava.options*.compilerArgs = [
+//        "-Xlint:serial", "-Xlint:varargs", "-Xlint:classfile", "-Xlint:dep-ann",
+//        "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
+//        "-Xlint:path", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough",
+//        "-Xlint:deprecation", "-Xlint:unchecked", "-Xlint:-options"
+//]
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
+}
+
+def protobufVersion = "3.25.5"
+def grpcVersion = "1.60.0"
+
+sourceSets {
+    main {
+        proto {
+            srcDir 'src/main/protos'
+        }
+        java {
+            srcDir 'src/main/gen'
+            srcDir 'src/main/java'
+        }
+    }
+}
+
+buildscript {
+    repositories {
+        mavenLocal()
+        maven {
+            url "https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
+        classpath "gradle.plugin.com.liferay:gradle-plugins-node:7.0.2"
+    }
+}
+
+
+dependencies {
+    implementation group: 'junit', name: 'junit', version: '4.13.2'
+    implementation group: 'com.beust', name: 'jcommander', version: '1.82'
+    //compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
+
+    // grpc
+    implementation group: 'io.grpc', name: 'grpc-netty', version: grpcVersion
+    implementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion
+    implementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
+
+    // google protobuf
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion
+    implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: protobufVersion
+
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
+
+    implementation group: 'com.googlecode.protobuf-java-format', name: 'protobuf-java-format', version: '1.4'
+    implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78.1'
+    implementation group: 'com.typesafe', name: 'config', version: '1.3.2'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
+    implementation group: 'com.alibaba', name: 'fastjson', version: '1.2.83'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.1'
+
+    compileOnly 'org.projectlombok:lombok:1.18.24'
+    annotationProcessor 'org.projectlombok:lombok:1.18.24'
+    testCompileOnly 'org.projectlombok:lombok:1.18.24'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
+
+    implementation group: 'org.jline', name: 'jline', version: '3.25.0'
+    implementation group: 'io.github.tronprotocol', name: 'zksnark-java-sdk', version: '1.0.0'
+}
+
+protobuf {
+    generatedFilesBaseDir = "$projectDir/src"
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
+    }
+    plugins {
+        grpc {
+            artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion"
+        }
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    outputSubDir = "gen"
+                }
+            }
+        }
+        all()*.plugins {
+            grpc {
+                outputSubDir = "gen"
+            }
+        }
+    }
+}
+
+clean.doFirst {
+    delete "src/main/gen"
+}
+
+run {
+    standardInput = System.in
+    mainClassName = 'org.tron.walletcli.Client'
+}
+
+
+shadowJar {
+    baseName = 'wallet-cli'
+    classifier = null
+    version = null
+    mergeServiceFiles() //  https://github.com/grpc/grpc-java/issues/10853
+}