Merge branch 'master' of https://github.com/WisedomChainGroup/java-wisdomcore

Author: 15852288019

.gitignore

@@ -63,7 +63,10 @@ package-lock.json
 
 http-client.env.json
 local
+local-*
 
 # storage for state trie
 state-db
-fast_sync
+fast_sync
+
+.vscode

README.md

@@ -265,4 +265,4 @@ python start.py --env=local.env
 ### shutdown application
  * METHOD: POST
  * URL: http://ip:port/wisdom/shutdown
- * HEADER: token (JWT TOKEN)
+ * HEADER: token (JWT TOKEN)

build.gradle

@@ -10,25 +10,13 @@ allprojects {
     }
 }
 
-def gitCurBranch() {
-    def branchName = System.getenv('TRAVIS_BRANCH')
-
-    if (branchName) return branchName
-    def process = "git rev-parse --abbrev-ref HEAD".execute()
-    return process.text.trim()
-}
-
 subprojects {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    def config = new ConfigSlurper().parse(new File("$projectDir/src/main/resources/version.properties").toURI().toURL())
 
     group = 'org.wisdom'
 
-    version = config.versionNumber + ("master" == gitCurBranch() ? "-RELEASE" : "-SNAPSHOT")
-
-    println("Building version: " + version + " (from branch " + gitCurBranch() + ")")
 
     compileJava.options.encoding = 'UTF-8'
     compileJava.options.compilerArgs << '-XDignore.symbol.file'

gradlew

@@ -5,20 +5,20 @@ SERVER_PORT=19585
 DATA_SOURCE_URL=jdbc:postgresql://localhost:5432/your-data-base
 
 # 数据库用户名
-DB_USERNAME=
+DB_USERNAME=postgres
 
 # 数据库密码
-DB_PASSWORD=
+DB_PASSWORD=wangweilong0
 
 # 矿工收益地址
-WDC_MINER_COINBASE=
+WDC_MINER_COINBASE=WX1DL55mQ6HsfXrnaCak9TdAHxdMYLNxdg3
 
 # 是否开启挖矿
 ENABLE_MINING=true
 
 # 验证者节点配置文件
-VALIDATORS=
+VALIDATORS='local/test-validators.json'
 
 # 是否清除所有区块数据
-CLEAR_DATA=fale
+CLEAR_DATA=false
 

local.env.example

@@ -1,9 +1,8 @@
 {
-   // windows脚本 .\gradlew runTransactionTestTool -PappArgs="-c F:\java-wisdomcore\transaction-test-example.jsonc"
+   // windows脚本 .\gradlew runTransactionTestTool -PappArgs="-c D:\IDEA\IdeaProjects\java-wisdomcore-master\transaction-test-example.jsonc"
    // unix 脚本 ./gradlew runTransactionTestTool -PappArgs="-c ../java-wisdomcore/transaction-test-example.jsonc"
   "host": "192.168.1.36", // 可以通过命令行 -h 参数 覆盖
   "port": "19585", // 可以通过命令行 -p 参数 覆盖
-  "privateKey": "b90a0e49b54e1f52a2234bb5490f15d97f39c40aeabc98dadd9a706ec0c8fddf", // 通过命令行 -k 参数覆盖 传递私钥
   "nonce": 0, // 起始 nonce 可选，如果为 0 自动获取，通过命令行 -n 参数 传递
   "protocol": "http", // 从 http 发事务是批量 http 请求，从 grpc 发是单次 http2 请求速度更快
   "grpc.port": "9585", // 接收者节点的 grpc 监听端口, 如果节点的p2p地址是 wisdom://192.168.1.118:9585， 就填 9585
@@ -13,14 +12,6 @@
     {
       "amount": 100000, // 单位是 WDC，不可省略
       "type": "MORTGAGE", // 事务类型
-      /*
-              事务类型
-              TRANSFER, VOTE,
-              DEPOSIT, TRANSFER_MULTISIG_MULTISIG, TRANSFER_MULTISIG_NORMAL,
-              TRANSFER_NORMAL_MULTISIG, ASSET_DEFINE, ATOMIC_EXCHANGE,
-              INCUBATE, EXTRACT_INTEREST, EXTRACT_SHARING_PROFIT,
-              EXTRACT_COST, EXIT_VOTE, MORTGAGE, EXIT_MORTGAGE
-      */
       "payload": "", // 可选，备注信息
       "to": "151bynoTGVJAaGrZDabDb2aYrTTEqw5vRx", // 接收者的 公钥，公钥哈希或者地址
       "times": 1, // 发送次数
@@ -34,7 +25,7 @@
       "times": 1, // 发送次数
     },
     //孵化
-      {
+      /*{
         "amount":"300",// 单位是 WDC
         "type": "INCUBATE",//事务类型
         "payload": "7d4d105a3fc6db71d35ed654b1b7aab73d8fa50d", // 孵化分享者  公钥，公钥哈希或者地址，非必填
@@ -68,8 +59,22 @@
         }*/
   ]
 }
-
 /*
+          TRANSFER           转账
+          VOTE               投票
+          EXIT_VOTE          撤回投票
+          INCUBATE           孵化
+          EXTRACT_INTEREST   提取收益
+          EXTRACT_SHARING_PROFIT   提取分享收益
+          EXTRACT_COST             提取本金
+          MORTGAGE            抵押
+          EXIT_MORTGAGE       撤回抵押
+          DEPOSIT      存证
+                                                  TRANSFER, VOTE,
+                                                  DEPOSIT, TRANSFER_MULTISIG_MULTISIG, TRANSFER_MULTISIG_NORMAL,
+                                                  TRANSFER_NORMAL_MULTISIG, ASSET_DEFINE, ATOMIC_EXCHANGE,
+                                                  INCUBATE, EXTRACT_INTEREST, EXTRACT_SHARING_PROFIT,
+                                                  EXTRACT_COST, EXIT_VOTE, MORTGAGE, EXIT_MORTGAGE
 存证事务的 payload 可以填文本了
 如果文本内容是合法的十六进制字符串则会被解析为字节数组 例如 "payload": "ff", 提交的是一个字节
 如果要强制提交文本用 `` 包含 例如 "payload": "`ff`", 提交的是两个字节，表示 f 这个字符的 utf8 编码

transaction-test-example.jsonc

@@ -1,4 +1,3 @@
-import java.text.SimpleDateFormat
 
 buildscript {
     repositories {
@@ -17,7 +16,7 @@ buildscript {
                 password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
             }
         }
-        maven { url "http://repo.springsource.org/plugins-release" }
+        maven { url "https://repo.springsource.org/plugins-release" }
         jcenter()
         mavenCentral()
     }
@@ -196,35 +195,6 @@ task buildDockerPgsql(type: Docker) {
     }
 }
 
-/**
- * Runs all tests
- * EthereumJ also runs common Ethereum clients tests
- * See {@link #prepareGithubTests()} if you want to use local repo
- * instead of downloading tests during test execution
- */
-test {
-
-    beforeTest { descriptor ->
-        logger.lifecycle("Running test: ${descriptor}")
-    }
-
-    jvmArgs = ["-Xss8m", "-Xmx3G"]
-
-    prepareGithubTests()
-    // If Github tests directory is provided, it's passed to test runner
-    if (System.getProperty("GitHubTests.testPath") != null) {
-        jvmArgs.add('-DGitHubTests.testPath' + '=' + System.getProperty("GitHubTests.testPath"))
-    }
-
-    testLogging {
-        events "failed"
-        exceptionFormat "short"
-    }
-
-    systemProperties System.properties
-    systemProperty "user.dir", workingDir
-    systemProperty "file.encoding", "UTF-8"
-}
 
 ext {
     slf4jVersion = '1.7.7'
@@ -302,6 +272,7 @@ dependencies {
     compile group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.6.0'
     compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: '6.0.17.Final'
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.8'
+    compile "org.springframework.boot:spring-boot-starter-websocket:${springbootVersion}"
 
     compile group: 'io.netty', name: 'netty-all', version: '4.1.42.Final'
     compile "io.grpc:grpc-netty-shaded:${gRPCVersion}"
@@ -339,19 +310,6 @@ dependencies {
     compile group: 'com.h2database', name: 'h2', version: '1.4.200'
 }
 
-
-javadoc {
-    options.author = true
-    options.header = project.name
-    options.addStringOption('-quiet')
-    options.encoding = "UTF-8"
-    options.links(
-            "http://docs.oracle.com/javase/8/docs/api/",
-            "http://netty.io/4.0/api/"
-    )
-}
-
-
 task copyDependencies(type: Copy) {
     from configurations.runtime
     destinationDir = file('build/libs/lib')
@@ -364,151 +322,5 @@ jar {
     }
 }
 
-// jar.dependsOn += copyDependencies
-
-
-//create a single Jar with all dependencies
-task fatJar(type: Jar) {
-    classifier = 'all'
-    manifest {
-        attributes 'Main-Class': mainClassName
-        attributes 'Class-Path': configurations.compile.collect { 'lib/' + it.getName() }.join(' ')
-    }
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
-}
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar) {
-    classifier = "javadoc"
-    from javadoc
-}
-
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-
-//jacocoTestReport {
-//    reports {
-//        xml.enabled = true
-//        html.enabled = true
-//    }
-//}
-
-def bintrayUsername = project.hasProperty('bintrayUser') ? project.bintrayUser : ''
-def bintrayPassword = project.hasProperty('bintrayKey') ? project.bintrayKey : ''
-def pullRequest = System.getenv('TRAVIS_PULL_REQUEST')
-def branchName = System.getenv('TRAVIS_BRANCH')
-
-artifactory {
-    contextUrl = 'http://oss.jfrog.org/artifactory'
-    publish {
-        repository {
-            repoKey = 'oss-snapshot-local'
-            username = bintrayUsername
-            password = bintrayPassword
-        }
-    }
-    resolve {
-        repository {
-            repoKey = 'libs-release'
-        }
-    }
-
-}
-
-artifactoryPublish.onlyIf {
-    (branchName != null) &&
-            (!pullRequest || pullRequest == 'false') &&
-            project.version.endsWith('-SNAPSHOT') &&
-            (branchName.startsWith('master') ||
-                    branchName.startsWith('develop') ||
-                    branchName.startsWith('stage'))
-}
-
-bintrayUpload.onlyIf {
-    // comment 'false' and uncomment the next line to publish next release
-    (!pullRequest || pullRequest == 'false') && !project.version.endsWith('-SNAPSHOT')
-//     false
-}
-
-tasks.processResources.doLast() {
-    println 'This will be printed after the build task even if something else calls the build task'
-
-    File versionfile = file(new File('build/resources/main/build-info.properties'))
-    versionfile.text = 'build.hash=' + gitCommitHash() + '\n' + 'build.time=' + buildTime() + '\n' + 'build.branch=' + gitCurBranch() + '\n'
-}
-
-task publish {
-
-    println "publishing if master || develop current branch: " + branchName
-    description = "Publishes snapshots to oss.jfrog.org and releases to Bintray/JCenter"
-    dependsOn artifactoryPublish, bintrayUpload
-}
-
-def gitCommitHash() {
-    def process = "git rev-parse --short HEAD".execute()
-    return process.text.trim()
-}
-
-def buildTime() {
-    def df = new SimpleDateFormat("[dd/MMM/yyyy]-[HH:mm]")
-    df.setTimeZone(TimeZone.getTimeZone("GMT"));
-    return '[GMT]-' + df.format(new Date())
-}
-
-def gitCurBranch() {
-    def branchName = System.getenv('TRAVIS_BRANCH')
-    if (branchName) return branchName
-    def process = "git rev-parse --abbrev-ref HEAD".execute()
-    return process.text.trim()
-}
-
-
-import org.ajoberstar.grgit.Grgit
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
-def prepareGithubTests() {
-    String testsPathKey = "GitHubTests.testPath"
-    String testsCommitKey = "GitHubTests.commit"
-    String testUserConf = "wisdom-core/src/test/resources/test-user.conf"
-    String githubTestsProp = "wisdom-core/src/test/resources/github-tests.prop"
-    def repoPath = System.getProperty(testsPathKey)
-    if (repoPath == null) {
-        try {
-            Config userTest = ConfigFactory.parseFile(new File(testUserConf))
-            repoPath = userTest.getString(testsPathKey)
-        } catch (Exception ex) {
-        }
-    }
-    if (repoPath == null) return
-    def commit = System.getProperty(testsCommitKey)
-    if (commit == null) {
-        Properties testProp = new Properties();
-        testProp.load(new File(githubTestsProp).newDataInputStream());
-        commit = testProp.getProperty(testsCommitKey)
-    }
-    if (repoPath != null && commit != null) {
-        println "Tests: Checking out Ethereum Tests repo at " + repoPath + " to commit #" + commit
-        try {
-            def testsRepo = Grgit.open(dir: repoPath)
-            testsRepo.fetch()
-            testsRepo.checkout(branch: commit)
-        } catch (Exception ex) {
-            println "Error occurs while trying to checkout local Ethereum tests repo to specific commit"
-            println "Either remove " + testsPathKey + " property to use remote repo in tests or fix the issue"
-            println "Error: "
-            println ex
-            throw ex
-        }
-    }
-}
 
 run.jvmArgs=['-Xms16g']