Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.6.0 #884

Merged
merged 39 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
02cb4b3
Merge pull request #835 from kyonRay/dev
kyonRay Oct 23, 2023
d43977d
update openjdk version to 8.0.382 (#837)
LucasLi1024 Nov 1, 2023
5f7c8a2
Add setSystemConfigByKey feature check (#839)
morebtcg Nov 3, 2023
bb91f71
<feat>(version): Update version and feature (#843)
JimmyShi22 Nov 15, 2023
a6344b8
<fix>(codec,crypto): deprecated Codec unnecessarily depends CryptoSui…
kyonRay Nov 21, 2023
fc2b3fb
<feat>(transaction): add interfaces of new transaction manager. (#841)
kyonRay Nov 21, 2023
be9c323
<perf>(style): add pre-commit hook before git commit. (#846)
kyonRay Nov 23, 2023
d79ce90
<feat>(transaction): impl transaction manager, add gas provider. (#847)
kyonRay Nov 30, 2023
4d9bb0f
Merge pull request #848 from FISCO-BCOS/feature-3.6.0
kyonRay Nov 30, 2023
534aae7
<fix>(transaction): fix transaction manager bug. (#849)
kyonRay Dec 1, 2023
154f566
<fix>(transaction): fix transaction manager gas price hex bug. (#850)
kyonRay Dec 5, 2023
0c928f0
<fix>(build): fix build in arm. (#853)
kyonRay Dec 6, 2023
e804be8
<feat>(transaction): impl AssembleTransactionService, add integration…
kyonRay Dec 11, 2023
392f60e
add balance service (#854)
wenlinlee Dec 18, 2023
b42ab83
<fix>(transaction): add event subscribe logic in Contract.class (#855)
kyonRay Dec 25, 2023
c85c29b
add listCaller and transferV2 interface (#856)
wenlinlee Dec 26, 2023
985e86b
<fix>(model,precompiled): add tx, receipt and block java native calcu…
kyonRay Dec 28, 2023
718787d
<rec&fix>(transaction): refator transaction request, fix v2 assemble …
kyonRay Dec 28, 2023
720c381
<feat>(features): Support new feature: bugfix_event_log_order, bugfix…
JimmyShi22 Jan 3, 2024
7dde8c6
<fix>(transaction): fix transaction manager use hex input data. (#861)
kyonRay Jan 4, 2024
9b36d22
support new feature_dmc2serial (#862)
JimmyShi22 Jan 4, 2024
8ad4dd3
<feat&fix>(transaction): add nonceProvider feature, fix transaction m…
kyonRay Jan 5, 2024
50ed1ac
<fix>(transaction,client): fix transaction manager async method not c…
kyonRay Jan 12, 2024
55f651f
<fix>(integration): fix integration client not exit bug. (#866)
kyonRay Jan 12, 2024
afeb12b
<fix>(transaction): fix transfer transaction manager constructor bug.…
kyonRay Jan 17, 2024
f99fb4e
update BalanceService support unit and add async interface (#864)
wenlinlee Jan 19, 2024
3a9346f
<fix,feat>(transaction): rename nonce provider to NonceAndBlockLimitP…
kyonRay Jan 24, 2024
46b2437
<fix>(transaction,CI): add v0 JsonTransactionResponse decode, fix Tra…
kyonRay Jan 26, 2024
dd8a41a
<fix>(integration): fix TransactionManagerPayableTest bug. (#872)
kyonRay Jan 26, 2024
c0d4b2f
<fix>(transaction): fix JsonTransactionResponse decode bug. (#873)
kyonRay Jan 31, 2024
2cab838
<fix>(transaction,config): fix config error message, add transaction …
kyonRay Jan 31, 2024
19f423e
<feat>(contract): add payable contract wrapper feature. (#876)
kyonRay Feb 1, 2024
8e8de21
add tx_gar_price systemConfig to java sdk (#877)
wenlinlee Feb 2, 2024
e874d32
support bugfix_dmc_revert flag (#878)
JimmyShi22 Feb 2, 2024
3198724
delete feature_balance_precompiled version check (#879)
JimmyShi22 Feb 2, 2024
f874ddd
<fix>(transaction): mv transaction v2 to v1 package, add decode hex t…
kyonRay Feb 5, 2024
56aac84
<fix&feat>(transaction,build): update jni version, add transaction ma…
kyonRay Feb 5, 2024
56504d8
tx gasprice for auth mode (#883)
wenlinlee Feb 6, 2024
c921d23
fix getSystemConfigByKey tx_gas_price bug (#885)
wenlinlee Feb 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions .ci/ci_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ check_standard_node()
prepare_environment "${2}"
## run integration test
bash gradlew clean integrationTest --info
# if $? is not 0, then exit
if [ ${?} -ne 0 ]; then
cat log/*.log
fi
## clean
clean_node "${1}"
}
Expand Down Expand Up @@ -170,28 +174,39 @@ LOG_INFO "------ download_binary: v3.1.0---------"
download_build_chain "v3.1.0"
download_binary "v3.1.0"
LOG_INFO "------ check_standard_node---------"
check_standard_node
check_standard_node "true" "normal" "-A"
rm -rf ./bin

LOG_INFO "------ download_binary: v3.2.0---------"
download_build_chain "v3.2.0"
download_binary "v3.2.0"
LOG_INFO "------ download_binary: v3.2.3---------"
download_build_chain "v3.2.3"
download_binary "v3.2.3"
LOG_INFO "------ check_standard_node---------"
check_standard_node "false" "normal" "-A"
LOG_INFO "------ check_sm_node---------"
check_standard_node "true" "sm" "-s -A"
rm -rf ./bin

LOG_INFO "------ download_build_chain: v3.3.0---------"
download_binary "v3.3.0"
download_build_chain "v3.3.0"
LOG_INFO "------ check_standard_node---------"
check_standard_node "true" "sm" "-s"
check_standard_node "true"
rm -rf ./bin

LOG_INFO "------ download_build_chain: v3.4.0---------"
download_binary "v3.4.0"
download_build_chain "v3.4.0"
LOG_INFO "------ check_standard_node---------"
check_standard_node "true"
rm -rf ./bin

LOG_INFO "------ download_build_chain: v3.5.0---------"
download_binary "v3.5.0"
download_build_chain "v3.5.0"
LOG_INFO "------ check_wasm_node---------"
check_wasm_node "false"
LOG_INFO "------ check_standard_node---------"
check_standard_node "false" "normal"
LOG_INFO "------ check_standard_node---------"
check_standard_node "true" "sm" "-s"
rm -rf ./bin
6 changes: 3 additions & 3 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ jobs:
if: runner.os == 'macOS'
run: |
brew install openssl@1.1 ccache
- name: Set up JDK 1.8.0.345
- name: Set up JDK 1.8.0.382
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '8.0.345'
java-version: '8.0.382'
- name: run build test
if: runner.os == 'Windows'
run: ./gradlew.bat build
- name: run integration testing
# FIXME: macOS WASM integration testing failed
if: runner.os != 'Windows' && runner.os != 'macOS'
if: runner.os != 'Windows'
run: /bin/bash .ci/ci_check.sh

build-centos:
Expand Down
40 changes: 25 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ ext {
commonsIOVersion = '2.11.0'
commonsLang3Version = '3.12.0'
toml4jVersion = "0.7.2"
bcprovJDK15onVersion = '1.69'
bcprovJDK18onVersion = '1.75'
webankJavaCryptoVersion = "1.0.3"
junitVersion = '4.13.2'
commonsCollections4Version = "4.4"
bcosSdkJniVersion = "3.5.0"
bcosSdkJniVersion = "3.6.0-SNAPSHOT"
slf4jApiVerison = '1.7.36'
mockitoVersion = '4.8.0'
gsonVersion = '2.10.1'
Expand All @@ -35,12 +35,12 @@ ext {
// integrationTest.mustRunAfter test
allprojects {
group = 'org.fisco-bcos.java-sdk'
version = '3.5.0'
version = '3.6.0-SNAPSHOT'

apply plugin: 'maven-publish'
apply plugin: 'idea'
apply plugin: 'eclipse'

apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'jacoco'
Expand Down Expand Up @@ -125,13 +125,13 @@ googleJavaFormat {
}

dependencies {
api("org.fisco-bcos:fisco-bcos-tars-sdk" + ":${tarsSDKVersion}")
api("org.fisco-bcos:bcos-sdk-jni:${bcosSdkJniVersion}") {
exclude group : "org.slf4j"
exclude group : "com.fasterxml.jackson.core"
api("org.fisco-bcos:fisco-bcos-tars-sdk" + ":${tarsSDKVersion}")
api("org.fisco-bcos:bcos-sdk-jni:${bcosSdkJniVersion}") {
exclude group: "org.slf4j"
exclude group: "com.fasterxml.jackson.core"
}

api("org.bouncycastle:bcprov-jdk15on:${bcprovJDK15onVersion}")
api("org.bouncycastle:bcprov-jdk18on:${bcprovJDK18onVersion}")
api("com.google.code.gson:gson:${gsonVersion}")
api("org.apache.commons:commons-lang3:${commonsLang3Version}")
api("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
Expand Down Expand Up @@ -159,13 +159,13 @@ configurations {
}

task integrationTest(type: Test) {
dependsOn test
// dependsOn test
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
}

task integrationWasmTest(type: Test) {
dependsOn test
// dependsOn test
testClassesDirs = sourceSets.integrationWasmTest.output.classesDirs
classpath = sourceSets.integrationWasmTest.runtimeClasspath
}
Expand All @@ -176,6 +176,15 @@ javadoc {
options.addStringOption('charSet', 'UTF-8')
}

task copyHooks(type: Copy) {
if (!file(".git/hooks/pre-commit").exists()) {
from("hooks") {
include "**"
}
into ".git/hooks"
}
}

task sourcesJar(type: Jar) {
from sourceSets.main.allJava
archiveClassifier = 'sources'
Expand All @@ -199,9 +208,9 @@ jacocoTestReport {
}
}

tasks.withType(Test) {
finalizedBy jacocoTestReport
}
//tasks.withType(Test) {
// finalizedBy jacocoTestReport
//}

publishing {
publications {
Expand Down Expand Up @@ -258,7 +267,7 @@ publishing {

jar {
// destinationDir file('dist/apps')
archiveFileName="fisco-bcos-" + project.name + '-' + project.version + '.jar'
archiveFileName = "fisco-bcos-" + project.name + '-' + project.version + '.jar'
exclude '**/*.xml'
exclude '**/*.properties'

Expand Down Expand Up @@ -304,3 +313,4 @@ jar {
}
}
check.dependsOn jacocoTestReport
verifyGoogleJavaFormat.dependsOn(copyHooks)
33 changes: 33 additions & 0 deletions hooks/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".

bash gradlew verifyGoogleJavaFormat
result=$?
printf "the verifyGoogleJavaFormat result code is $result"
if [[ "$result" = 0 ]] ; then
echo "\033[32m
....
....
verifyGoogleJavaFormat Pass!!
....
....
\033[0m"
exit 0
else
bash gradlew goJF
echo "\033[31m
....
....
verifyGoogleJavaFormat Failed!!
Code format has been automatically adjusted, please review the code and then git add. && git commit;
....
....
\033[0m"
exit 1
fi
Loading
Loading