Skip to content

Commit 8ff3e78

Browse files
skipjack8skipjack8
authored
Merge pull request #362 from tronprotocol/release_vm_shielded_4.0
Release vm shielded 4.0
2 parents 6dc9812 + 815117b commit 8ff3e78

File tree

79 files changed

+17564
-6862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+17564
-6862
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ jdk: oraclejdk8
55
dist: trusty
66

77
script:
8-
- ./gradlew build
8+
- ./gradlew build

‎README.md‎

Lines changed: 1991 additions & 760 deletions
Large diffs are not rendered by default.

‎build.gradle‎

Lines changed: 131 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,131 @@
1-
group 'Tron'
2-
version '1.0-SNAPSHOT'
3-
4-
apply plugin: 'java'
5-
apply plugin: 'com.google.protobuf'
6-
apply plugin: 'com.github.johnrengelman.shadow'
7-
apply plugin: 'application'
8-
9-
sourceCompatibility = 1.8
10-
targetCompatibility = JavaVersion.VERSION_1_8
11-
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
12-
13-
compileJava.options*.compilerArgs = [
14-
"-Xlint:serial", "-Xlint:varargs", "-Xlint:classfile", "-Xlint:dep-ann",
15-
"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
16-
"-Xlint:path", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough",
17-
"-Xlint:deprecation", "-Xlint:unchecked", "-Xlint:-options"
18-
]
19-
20-
repositories {
21-
mavenLocal()
22-
mavenCentral()
23-
}
24-
25-
sourceSets {
26-
main {
27-
proto {
28-
srcDir 'src/main/protos'
29-
}
30-
java {
31-
srcDir 'src/main/gen'
32-
srcDir 'src/main/java'
33-
}
34-
}
35-
36-
}
37-
buildscript {
38-
repositories {
39-
mavenLocal()
40-
maven {
41-
url "https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public"
42-
}
43-
mavenCentral()
44-
}
45-
ext {
46-
projectVersion = '1.3.0-RELEASE'
47-
grpcVersion = '1.6.1'
48-
protobufVersion = '3.3.0'
49-
protobufGradlePluginVersion = '0.8.0'
50-
springCloudConsulVersion = '1.2.1.RELEASE'
51-
}
52-
53-
dependencies {
54-
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
55-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
56-
classpath "gradle.plugin.com.liferay:gradle-plugins-node:4.3.0"
57-
}
58-
}
59-
60-
task wrapper(type: Wrapper) {
61-
gradleVersion = '3.3'
62-
}
63-
64-
dependencies {
65-
testCompile group: 'junit', name: 'junit', version: '4.12'
66-
compile group: 'com.beust', name: 'jcommander', version: '1.72'
67-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
68-
compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
69-
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
70-
compile 'com.maxmind.geoip2:geoip2:2.10.0'
71-
72-
// google grpc
73-
compile group: 'io.grpc', name: 'grpc-netty', version: '1.9.0'
74-
compile group: 'io.grpc', name: 'grpc-protobuf', version: '1.9.0'
75-
compile group: 'io.grpc', name: 'grpc-stub', version: '1.9.0'
76-
77-
compile group: 'com.googlecode.protobuf-java-format', name: 'protobuf-java-format', version: '1.4'
78-
compile "com.madgag.spongycastle:core:1.53.0.0"
79-
compile "com.madgag.spongycastle:prov:1.53.0.0"
80-
compile group: 'com.typesafe', name: 'config', version: '1.3.2'
81-
compile "com.google.code.findbugs:jsr305:3.0.0"
82-
compile group: 'com.typesafe', name: 'config', version: '1.3.2'
83-
compile "org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}"
84-
compile "org.apache.commons:commons-collections4:4.0"
85-
compile "org.apache.commons:commons-lang3:3.4"
86-
compile group: 'com.google.api.grpc', name: 'googleapis-common-protos', version: '0.0.3'
87-
compile 'com.alibaba:fastjson:1.2.47'
88-
}
89-
90-
protobuf {
91-
generatedFilesBaseDir = "$projectDir/src/"
92-
protoc {
93-
artifact = "com.google.protobuf:protoc:3.5.1-1"
94-
95-
}
96-
plugins {
97-
grpc {
98-
artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0'
99-
}
100-
}
101-
generateProtoTasks {
102-
all().each { task ->
103-
task.builtins {
104-
java {
105-
outputSubDir = "gen"
106-
}
107-
}
108-
}
109-
all()*.plugins {
110-
grpc {
111-
outputSubDir = "gen"
112-
}
113-
}
114-
}
115-
}
116-
117-
run {
118-
standardInput = System.in
119-
mainClassName = 'org.tron.walletcli.Client'
120-
}
121-
122-
123-
shadowJar {
124-
baseName = 'wallet-cli'
125-
classifier = null
126-
version = null
127-
}
1+
group 'Tron'
2+
version '1.0-SNAPSHOT'
3+
4+
apply plugin: 'java'
5+
apply plugin: 'com.google.protobuf'
6+
apply plugin: 'com.github.johnrengelman.shadow'
7+
apply plugin: 'application'
8+
9+
sourceCompatibility = 1.8
10+
targetCompatibility = JavaVersion.VERSION_1_8
11+
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
12+
13+
compileJava.options*.compilerArgs = [
14+
"-Xlint:serial", "-Xlint:varargs", "-Xlint:classfile", "-Xlint:dep-ann",
15+
"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
16+
"-Xlint:path", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough",
17+
"-Xlint:deprecation", "-Xlint:unchecked", "-Xlint:-options"
18+
]
19+
20+
repositories {
21+
mavenLocal()
22+
mavenCentral()
23+
}
24+
25+
sourceSets {
26+
main {
27+
proto {
28+
srcDir 'src/main/protos'
29+
}
30+
java {
31+
srcDir 'src/main/gen'
32+
srcDir 'src/main/java'
33+
}
34+
}
35+
36+
}
37+
buildscript {
38+
repositories {
39+
mavenLocal()
40+
maven {
41+
url "https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public"
42+
}
43+
mavenCentral()
44+
}
45+
ext {
46+
projectVersion = '1.3.0-RELEASE'
47+
grpcVersion = '1.6.1'
48+
protobufVersion = '3.3.0'
49+
protobufGradlePluginVersion = '0.8.0'
50+
springCloudConsulVersion = '1.2.1.RELEASE'
51+
}
52+
53+
dependencies {
54+
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
55+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
56+
classpath "gradle.plugin.com.liferay:gradle-plugins-node:4.3.0"
57+
}
58+
}
59+
60+
task wrapper(type: Wrapper) {
61+
gradleVersion = '3.3'
62+
}
63+
64+
dependencies {
65+
testCompile group: 'junit', name: 'junit', version: '4.12'
66+
compile group: 'com.beust', name: 'jcommander', version: '1.72'
67+
//compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
68+
compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
69+
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
70+
compile 'com.maxmind.geoip2:geoip2:2.10.0'
71+
72+
// google grpc
73+
compile group: 'io.grpc', name: 'grpc-netty', version: '1.9.0'
74+
compile group: 'io.grpc', name: 'grpc-protobuf', version: '1.9.0'
75+
compile group: 'io.grpc', name: 'grpc-stub', version: '1.9.0'
76+
77+
compile group: 'com.googlecode.protobuf-java-format', name: 'protobuf-java-format', version: '1.4'
78+
compile "com.madgag.spongycastle:core:1.58.0.0"
79+
compile "com.madgag.spongycastle:prov:1.58.0.0"
80+
compile group: 'com.typesafe', name: 'config', version: '1.3.2'
81+
compile "com.google.code.findbugs:jsr305:3.0.0"
82+
compile "org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}"
83+
compile "org.apache.commons:commons-collections4:4.0"
84+
compile "org.apache.commons:commons-lang3:3.4"
85+
compile group: 'com.google.api.grpc', name: 'googleapis-common-protos', version: '0.0.3'
86+
compile 'com.alibaba:fastjson:1.2.47'
87+
88+
compile group: 'commons-io', name: 'commons-io', version: '2.6'
89+
compile group: 'org.projectlombok', name: 'lombok', version: '1.18.2'
90+
91+
compile group: 'org.jline', name: 'jline', version: '3.15.0'
92+
}
93+
94+
protobuf {
95+
generatedFilesBaseDir = "$projectDir/src/"
96+
protoc {
97+
artifact = "com.google.protobuf:protoc:3.5.1-1"
98+
99+
}
100+
plugins {
101+
grpc {
102+
artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0'
103+
}
104+
}
105+
generateProtoTasks {
106+
all().each { task ->
107+
task.builtins {
108+
java {
109+
outputSubDir = "gen"
110+
}
111+
}
112+
}
113+
all()*.plugins {
114+
grpc {
115+
outputSubDir = "gen"
116+
}
117+
}
118+
}
119+
}
120+
121+
run {
122+
standardInput = System.in
123+
mainClassName = 'org.tron.walletcli.Client'
124+
}
125+
126+
127+
shadowJar {
128+
baseName = 'wallet-cli'
129+
classifier = null
130+
version = null
131+
}

‎lombok.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lombok.log.fieldName=logger

0 commit comments

Comments
 (0)