Merge pull request #152 from cryptape/release/v1.0.0

Release/v1.0.0

Author: UDLD

.travis.yml

@@ -5,20 +5,30 @@ language: java
 jdk:
   - oraclejdk8
 
-sudo: false  # as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
+env:
+  - TEST_TYPE=UT
+  - CITA_DOCKER_IMAGE_TAG_NAME=sha3          TEST_TYPE=ST TEST_CITA_VERSION=CITA1.0
+  - CITA_DOCKER_IMAGE_TAG_NAME=sha3_88b90bb  TEST_TYPE=ST TEST_CITA_VERSION=CITA0.25
+  - CITA_DOCKER_IMAGE_TAG_NAME=sha3_1f10bc8  TEST_TYPE=ST TEST_CITA_VERSION=CITA0.24
+  - CITA_DOCKER_IMAGE_TAG_NAME=sha3_b1e3048  TEST_TYPE=ST TEST_CITA_VERSION=CITA0.23.1
+
+sudo: true  # as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
 
 # Avoid uploading cache after every build with Gradle - see https://docs.travis-ci.com/user/languages/java/#Caching
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
 cache:
   directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+
+before_script:
+  # upgrade gradle to 5.0
+  - wget http://services.gradle.org/distributions/gradle-5.0-all.zip > debug.log
+  - unzip gradle-5.0-all.zip > debug.log
+  - ./gradle-5.0/bin/gradle -v
 
-# Add --info to view details of test failures
-script: ./gradlew --info check jacocoRootTestReport
+script: bash ./scripts/run.sh
 
-# Upload code coverage metrics
-after_success:
-  - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,5 +1,21 @@
 All notable changes to this project will be documented in this file.
 
+# [v1.0.0](https://github.com/cryptape/cita-sdk-java/compare/v0.25.0...v1.0.0) (2019-08-28)
+
+### Added
+
+* add group manager RPC requests
+* add matrix system test in travis
+
+### Fixed
+* fix test net url
+* fix inPermission method not support function having parameters
+* fix unit test in test module
+
+### Documented
+* add introduction document
+
+
 # [v0.25.0](https://github.com/cryptape/cita-sdk-java/compare/v0.24.1...v0.25.0) (2019-08-27)
 
 ### Feature

README.md

@@ -29,12 +29,12 @@ maven
 <dependency>
   <groupId>com.cryptape.cita</groupId>
   <artifactId>core</artifactId>
-  <version>0.25.0</version>
+  <version>1.0.0</version>
 </dependency>
 ```
 Gradle
 ```
-compile 'com.cryptape.cita:core:0.25.0'
+compile 'com.cryptape.cita:core:1.0.0'
 ```
 
 Install manually
@@ -52,7 +52,7 @@ gradle shadowJar
 ### CITA Test net
 
 Use CITA test net (recommended):
-https://node.cryptape.com is provided as a test net.
+https://testnet.citahub.com is provided as a test net.
 
 Or build your own CITA net:
 Please find more information in [CITA](https://github.com/cryptape/cita).
@@ -147,6 +147,44 @@ public Object callContract(String contractAddress, AbiDefinition functionAbi, St
 While contract file is required when first deploy the contract, cita-sdk-java can get the abi file according to address when call methods in deployed contract.
 Please find complete code in [TokenAccountExample](https://github.com/cryptape/cita-sdk-java/blob/master/tests/src/main/java/com/cryptape/cita/tests/TokenAccountExample.java).
 
+## Contributing
+
+### Creating a Bug Report
+open a new issue: https://github.com/cryptape/cita-sdk-java/issues/new
+
+with your version info
+
+### Tech Stack
+
+#### Back end
+Java
+- Version: 8
+- Building: gradle-v5.0
+
+### Coding style
+coding style guide: Google Shell Style guide:
+- https://google.github.io/styleguide/javaguide.html
+
+#### Installing the coding style settings in Intellij
+1. Download the intellij-java-google-style.xml file from the http://code.google.com/p/google-styleguide/ repo.
+2. go into Preferences -> Editor -> Code Style. Click on Manage and import the downloaded Style Setting file. Select GoogleStyle as new coding style.
+
+#### Installing the coding style settings in Eclipse
+1. Download the eclipse-java-google-style.xml file from the http://code.google.com/p/google-styleguide/ repo.
+2. Under Window/Preferences select Java/Code Style/Formatter. Import the settings file by selecting Import.
+
+### Commit your changes
+
+#### Workflow
+[GitHub Flow](https://help.github.com/en/articles/github-flow), [Understanding the GitHub flow](https://guides.github.com/introduction/flow/)
+
+#### git style guide
+use [git-style-guide](https://github.com/agis/git-style-guide) for Branches, Commits,Messages, Merging 
+
+## Versioning
+vx.y.z
+- x.y Follow the version number of CITA
+- z Defined by SDK itself：changed by fixing or adding features
 
 ## 简介
 cita-sdk-java 是对以太坊 Web3j 进行改写，适配 CITA 的一个 Java 开发包。cita-sdk-java 集成了与 CITA 客户端交互的功能，可以用来对 CITA 发送交易，系统配置，信息查询。
@@ -170,12 +208,12 @@ Gradle 5.0
 <dependency>
   <groupId>com.cryptape.cita</groupId>
   <artifactId>core</artifactId>
-  <version>0.25.0</version>
+  <version>1.0.0</version>
 </dependency>
 ```
 Gradle
 ```
-compile 'com.cryptape.cita:core:0.25.0'
+compile 'com.cryptape.cita:core:1.0.0'
 ```
 
 手动安装  
@@ -192,12 +230,13 @@ gradle shadowJar
 
 ### CITA 测试网络
 使用 CITA 测试网络（推荐）：  
-https://node.cryptape.com
+https://testnet.citahub.com
 
 或者可以部署你自己的 CITA：  
 如果需要了解怎么部署 CITA 网络，请查阅[CITA](https://github.com/cryptape/cita)。
 
 ### 快速教程
+
 #### 部署智能合约
 与以太坊类似，智能合约是通过发送交易来部署的。CITA 交易对象定义在 [Transaction.java](https://github.com/cryptape/cita-sdk-java/blob/master/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Transaction.java)。
 在 CITA 交易中，有三个特殊的参数：
@@ -284,3 +323,42 @@ public Object callContract(String contractAddress, AbiDefinition functionAbi, St
 ```
 虽然在第一次部署合约的时候需要提供合约文件，但是在以后调用合约函数的时候 cita-sdk-java 通过 CITA 提供的 getAbi 接口根据合约地址得到对应的 abi。  
 请在 [TokenAccountExample](https://github.com/cryptape/cita-sdk-java/blob/master/tests/src/main/java/com/cryptape/cita/tests/TokenAccountExample.java) 中查看完整代码。
+
+## 参与贡献
+
+### 报告Bug
+提交 issue: https://github.com/cryptape/cita-sdk-java/issues/new
+记得声明所使用软件的版本信息
+
+### 技术栈
+
+#### Back end
+Java
+- Version: 8
+- Building: gradle-v5.0
+
+### 编码规范
+使用《Google java编程规范》作为我们的编码规范:
+- 英文版: https://google.github.io/styleguide/javaguide.html
+- 中文版: https://jervyshi.gitbooks.io/google-java-styleguide-zh/content/
+
+#### Installing the coding style settings in Intellij
+1. Download the intellij-java-google-style.xml file from the http://code.google.com/p/google-styleguide/ repo.
+2. go into Preferences -> Editor -> Code Style. Click on Manage and import the downloaded Style Setting file. Select GoogleStyle as new coding style.
+
+#### Installing the coding style settings in Eclipse
+1. Download the eclipse-java-google-style.xml file from the http://code.google.com/p/google-styleguide/ repo.
+2. Under Window/Preferences select Java/Code Style/Formatter. Import the settings file by selecting Import.
+
+### 代码提交规范
+
+#### 代码提交流程
+[GitHub Flow](https://help.github.com/en/articles/github-flow), [Understanding the GitHub flow](https://guides.github.com/introduction/flow/)
+
+#### git style guide
+我们要求遵守 [git-style-guide](https://github.com/agis/git-style-guide) 中的规则来进行分支创建、提交以及合并操作。
+
+## 版本规则
+vx.y.z
+- x.y 跟随 CITA 的版本号；
+- z 由 SDK 自己定义：修复或增加feature 则变化

abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java

@@ -88,7 +88,7 @@ static String buildMethodSignature(String methodName, List<Type> parameters) {
         return result.toString();
     }
 
-    static String buildMethodId(String methodSignature) {
+    public static String buildMethodId(String methodSignature) {
         byte[] input = methodSignature.getBytes();
         byte[] hash = Hash.sha3(input);
         return Numeric.toHexString(hash).substring(0, 10);

build.gradle

@@ -49,7 +49,7 @@ allprojects {
     targetCompatibility = 1.8
 
     group 'com.cryptape.cita'
-    version '0.25.0'
+    version '1.0.0'
 
     apply plugin: 'java'
     apply plugin: 'jacoco'
@@ -145,7 +145,7 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) {
         publications {
             mavenJava(MavenPublication) {
                 groupId 'com.cryptape.cita'
-                version '0.25.0'
+                version '1.0.0'
                 from components.java
 
                 artifact sourcesJar {

core/src/main/java/com/cryptape/cita/protocol/system/CITASystemContract.java

@@ -89,6 +89,7 @@ public interface CITASystemContract {
     String Authorization_MANAGER_CHECK_RESOURCE = "checkResource";
 
     //User manager
+    String INTRA_GROUP_USER_MANAGEMENT_ADDR = "0xfFFfFFFFFffFFfffFFFFfffffFffffFFfF020009";
     String USER_MANAGER_ADDR = "0xffffffffffffffffffffffffffffffffff02000a";
     //User manager manipulation
     String USER_MANAGER_NEW_GROUP = "newGroup";
@@ -228,4 +229,4 @@ static AppCall sendCall(String from, String addr,
     }
 
     long getQuotaPrice(String from) throws IOException;
-}
+}