Skip to content

Commit

Permalink
sync master (#481)
Browse files Browse the repository at this point in the history 
* Optimize the method to execute transaction (#418)

* handle Rlp list (#419)

* change func name (#420)

* Add an asynchronous way to call contract and change the type of return value (#421)

* change func name

* add an asynchronous way to call contract and change the type of return value

* Fix gm unusable bugs (#437) (#441)

* fix bug in Jenkins (#440)

* fix bug in Jenkins

* format code

* fix call error status not handle bug. (#442)

* fix bug in test

* add error message

* add CallContract test

* print test message

* suitable for the 2.2.0 version (#447)

* suitable for the 2.2.0 version

* fix PerformanceDTTest bug.

* fix bug in rlp

* add decoder for return value

* Release 2.2.0 fisco (#458)

* fix thead safe bug.

* update transaction receipt status.

update channel version.

* update jackson-databind version

* update Credentials create in test.

* update performance test. (#460)

* update performance test.

* remove one log print.

* change input in merkel

* catch getNodeVersion exception. (#463)

* Release 2.2.0 fisco (#464)

* check int/uint range before abi encode.

* add gm support for parallel test.

* update ci_check_commit.sh

* update netty-tcnative-boringssl-static version. (#465)

* optimize hexToString. (#466)

* merge master and modify change log (#471)

* sync 2.1.2 to master (#449)

* Fix gm unusable bugs (#437)

* update ChangeLog.md (#448)

* fix sdk link error. (#454)

* modify changelog

Co-authored-by: ywy2090 <[email protected]>

* update message service init failed. (#472)

* add generateGroup,startGroup rpc interface (#467)

* Release 2.2.0 bsn (#468)

* update testGenerateGroup testStartGroup

* add status code for generateGroup, startGroup

* update message service init failed.

* Optimize the print (#474)

Co-authored-by: Shareong <[email protected]>
Co-authored-by: chaychen2005 <[email protected]>
  • Loading branch information
@ywy2090 @Shareong @chaychen2005
3 people authored Dec 26, 2019
1 parent 6b9e296 commit 8762269
Show file tree
Hide file tree
Showing 63 changed files with 2,379 additions and 1,434 deletions.
2 changes: 1 addition & 1 deletion .ci/ci_check_commit.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

scan_code_script="cobra/cobra.py -f json -o /tmp/report.json -t "
ignore_files=(PerformanceOkDSync.java SM2Algorithm.java SM2KeyGenerator.java test)
ignore_files=(Constant.java PerformanceOkDSync.java SM2Algorithm.java SM2KeyGenerator.java test)

LOG_ERROR() {
content=${1}
Expand Down
17 changes: 16 additions & 1 deletion Changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
### v2.2.0

(2019-12-24)

* 增加
1. 新增默克尔树的验证接口
2. 压测程序支持国密版本

* 更新
1. 优化toHexString函数为apache commons库的实现
2. 升级netty-tcnative-boringssl-static版本为2.0.27.Final

* 兼容
1. 适配fisco-bcos 2.2.0版本，支持Channel Message v1/V2/V3协议

### v2.1.2

(2019-11-14)
Expand Down Expand Up @@ -138,4 +153,4 @@

* Compatibility

1. 兼容rc1的节点
1. 兼容rc1的节点
173 changes: 87 additions & 86 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ buildscript {
}

plugins {
id 'com.github.sherter.google-java-format' version '0.8'
id 'com.github.sherter.google-java-format' version '0.8'
}

apply plugin: 'maven'
apply plugin: 'idea'
apply plugin: 'java'
Expand All @@ -28,35 +28,35 @@ targetCompatibility = 1.8
// In this section you declare where to find the dependencies of your project
repositories {
maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
maven { url 'https://dl.bintray.com/ethereum/maven/' }
maven { url 'https://dl.bintray.com/ethereum/maven/' }
mavenCentral()
}

googleJavaFormat {
options style: 'AOSP'
source = sourceSets*.allJava
include '**/*.java'
exclude '**/temp/*.java'
options style: 'AOSP'
source = sourceSets*.allJava
include '**/*.java'
exclude '**/temp/*.java'
}

verifyGoogleJavaFormat {
source = sourceSets*.allJava
include '**/*.java'
exclude '**/temp/*.java'
source = sourceSets*.allJava
include '**/*.java'
exclude '**/temp/*.java'
}

def spring_version="4.3.25.RELEASE"
def spring_version = "4.3.25.RELEASE"

List logger = [
'org.slf4j:slf4j-log4j12:1.7.25'
//'org.slf4j:slf4j-api:1.7.25'
'org.slf4j:slf4j-log4j12:1.7.25'
//'org.slf4j:slf4j-api:1.7.25'
]

List spring =[
"org.springframework:spring-core:$spring_version",
"org.springframework:spring-beans:$spring_version",
"org.springframework:spring-context:$spring_version",
"org.springframework:spring-tx:$spring_version",
List spring = [
"org.springframework:spring-core:$spring_version",
"org.springframework:spring-beans:$spring_version",
"org.springframework:spring-context:$spring_version",
"org.springframework:spring-tx:$spring_version",
]

List alibaba = [
Expand All @@ -66,19 +66,19 @@ List alibaba = [

// In this section you declare the dependencies for your production and test code
dependencies {
// compile files('lib/solcJ-all-0.4.25-gm.jar')
// compile 'org.ethereum:solcJ-all:0.5.2'
compile 'org.ethereum:solcJ-all:0.4.25'
compile logger,spring,alibaba
compile 'org.apache.commons:commons-lang3:3.1'
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
compile 'io.netty:netty-all:4.1.32.Final'
compile 'io.netty:netty-tcnative:2.0.25.Final'
compile 'io.netty:netty-tcnative-boringssl-static:2.0.20.Final'
compile 'com.google.guava:guava:28.1-jre'
compile 'commons-configuration:commons-configuration:1.10'
// web3j
compile 'org.apache.httpcomponents:httpclient:4.5.5',
// compile files('lib/solcJ-all-0.4.25-gm.jar')
// compile 'org.ethereum:solcJ-all:0.5.2'
compile 'org.ethereum:solcJ-all:0.4.25'
compile logger, spring, alibaba
compile 'org.apache.commons:commons-lang3:3.1'
compile 'com.fasterxml.jackson.core:jackson-databind:2.10.0'
compile 'io.netty:netty-all:4.1.32.Final'
compile 'io.netty:netty-tcnative:2.0.25.Final'
compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
compile 'com.google.guava:guava:28.1-jre'
compile 'commons-configuration:commons-configuration:1.10'
// web3j
compile 'org.apache.httpcomponents:httpclient:4.5.5',
'org.bouncycastle:bcprov-jdk15on:1.60',
'com.lambdaworks:scrypt:1.4.0',
'com.squareup:javapoet:1.7.0',
Expand All @@ -92,8 +92,8 @@ dependencies {
'com.github.stefanbirkner:system-rules:1.18.0',
'junit:junit:4.12',
'org.mockito:mockito-core:2.23.0'
compile 'de.vandermeer:asciitable:0.3.2'
compile 'org.projectlombok:lombok:1.18.2'
compile 'de.vandermeer:asciitable:0.3.2'
compile 'org.projectlombok:lombok:1.18.2'
}

//archivesBaseName = 'web3sdk'
Expand All @@ -104,19 +104,19 @@ configurations {
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
}

// for old sdk
sourceSets {
main {
java {
srcDir 'src/main/java'
srcDir 'src/test/java'
}
resources {
srcDir 'src/test/resources'
}
}
integrationTest {
main {
java {
srcDir 'src/main/java'
srcDir 'src/test/java'
}
resources {
srcDir 'src/test/resources'
}
}
integrationTest {
java {
compileClasspath += main.output + test.output
runtimeClasspath += main.output + test.output
Expand All @@ -139,57 +139,58 @@ check.dependsOn.remove(test)
check.dependsOn.remove(integrationTest)
check.dependsOn.remove(verifyGoogleJavaFormat)

import org.ajoberstar.grgit.*

import org.ajoberstar.grgit.Grgit

def repo = null;
try {
repo = Grgit.open('.')
} catch(Exception e) {
println(" .git directory not exist.");
try {
repo = Grgit.open('.')
} catch (Exception e) {
println(" .git directory not exist.");
}

// 1 dist jar
jar {
destinationDir file('dist/apps')
archiveName project.name + '.jar'
exclude '**/*.xml'
exclude '**/*.properties'
exclude '**/*.crt'
exclude '**/*.key'

manifest {
if(repo != null) {
attributes(["Built-By": System.getProperty("user.name"),
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"Git-Branch": repo.branch.getCurrent().getName(),
"Git-Commit": repo.head().getAbbreviatedId(40),
])
}
} from sourceSets.main.output
destinationDir file('dist/apps')
archiveName project.name + '.jar'
exclude '**/*.xml'
exclude '**/*.properties'
exclude '**/*.crt'
exclude '**/*.key'

doLast {

copy {
from file('tools/sol2java.sh')
into 'dist/tools/'
}
copy {
from configurations.runtime
into 'dist/lib'
}
copy {
from file('src/test/resources/')
into 'dist/conf'
}
copy {
from file('src/test/resources/contract/Table.sol')
into 'dist/tools/contracts'
}
}
manifest {
if (repo != null) {
attributes(["Built-By" : System.getProperty("user.name"),
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"Git-Branch" : repo.branch.getCurrent().getName(),
"Git-Commit" : repo.head().getAbbreviatedId(40),
])
}
} from sourceSets.main.output

doLast {

copy {
from file('tools/sol2java.sh')
into 'dist/tools/'
}
copy {
from configurations.runtime
into 'dist/lib'
}
copy {
from file('src/test/resources/')
into 'dist/conf'
}
copy {
from file('src/test/resources/contract/Table.sol')
into 'dist/tools/contracts'
}
}
}

test {
testLogging.showStandardStreams = true
testLogging.showStandardStreams = true
}
// for upload to maven
//task sourcesJar(type: Jar) {
Expand Down Expand Up @@ -254,4 +255,4 @@ test {
// }
// }
//}
mainClassName = System.getProperty("exec.mainClass") ?: "org.fisco.bcos.channel.test.amop.Channel2Client"
mainClassName = System.getProperty("exec.mainClass") ?: "org.fisco.bcos.channel.test.amop.Channel2Client"
Empty file modified lib/solcJ-all-0.4.25-gm.jar
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion release_note.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.1.2
v2.2.0
Loading

0 comments on commit 8762269

Please sign in to comment.