From 1aae4c49266f86530e6d166104df9648fa2a4dc2 Mon Sep 17 00:00:00 2001 From: yangzhenlong Date: Wed, 28 Aug 2019 18:52:38 +0800 Subject: [PATCH 01/20] add introduction document --- README.md | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/README.md b/README.md index 200ecc56..7b4b99e1 100644 --- a/README.md +++ b/README.md @@ -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 发送交易，系统配置，信息查询。 @@ -198,6 +236,7 @@ https://node.cryptape.com 如果需要了解怎么部署 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 则变化 \ No newline at end of file From a619ab4cedf4f7d3616fa2a4c09655e8e3c00810 Mon Sep 17 00:00:00 2001 From: qiaorong Date: Wed, 28 Aug 2019 09:53:23 +0800 Subject: [PATCH 02/20] Add some new functions for group management, modify queryGroups and newGroup for more rubust. --- .../protocol/system/CITASystemContract.java | 3 +- .../protocol/system/CITAjSystemContract.java | 144 +++++++++++++----- .../java/com/cryptape/cita/tests/Config.java | 3 + .../cita/tests/GroupManagerExample.java | 83 ++++++++-- .../main/resources/config.properties.example | 2 + 5 files changed, 177 insertions(+), 58 deletions(-) diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/CITASystemContract.java b/core/src/main/java/com/cryptape/cita/protocol/system/CITASystemContract.java index 0b724b38..02c08af7 100644 --- a/core/src/main/java/com/cryptape/cita/protocol/system/CITASystemContract.java +++ b/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; -} \ No newline at end of file +} diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java b/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java index 1da4586b..d6e267b7 100644 --- a/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java +++ b/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java @@ -116,72 +116,72 @@ public long getQuotaPrice(String from) throws IOException { } public boolean approveNode( - String nodeAddr, String adminPrivatekey, int version, BigInteger chainId) + String nodeAddr, String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { List inputParameters = Collections.singletonList(new Address(nodeAddr)); String funcData = CITASystemContract.encodeFunction( NODE_MANAGER_APPROVE_NODE, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - NODE_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + NODE_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log != null && log.getTopics().contains(Util.addUpTo64Hex(nodeAddr)); } public boolean deleteNode( - String nodeAddr, String adminPrivatekey, int version, BigInteger chainId) + String nodeAddr, String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { List inputParameters = Collections.singletonList(new Address(nodeAddr)); String funcData = CITASystemContract.encodeFunction( NODE_MANAGER_DELETE_NODE, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - NODE_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + NODE_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log != null && log.getTopics().contains(Util.addUpTo64Hex(nodeAddr)); } public boolean setStake( - String nodeAddr, int stake, String adminPrivatekey, int version, BigInteger chainId) + String nodeAddr, int stake, String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { List inputParameters = Arrays.asList(new Address(nodeAddr), new Uint64(stake)); String funcData = CITASystemContract.encodeFunction(NODE_MANAGER_SET_STAKE, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - NODE_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + NODE_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log != null && log.getTopics().contains(Util.addUpTo64Hex(nodeAddr)); } public boolean setBql( - BigInteger bqlToSet, String adminPrivatekey, int version, BigInteger chainId) + BigInteger bqlToSet, String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { List inputParameters = Collections.singletonList(new Uint(bqlToSet)); String funcData = CITASystemContract.encodeFunction(QUOTA_MANAGER_SET_BQL, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - QUOTA_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + QUOTA_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log != null && log.getTopics().contains(Util.addUpTo64Hex(bqlToSet.toString(16))); } public boolean setDefaultAql( - BigInteger defaultAqlToSet, String adminPrivatekey, int version, BigInteger chainId) + BigInteger defaultAqlToSet, String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { List inputParameters = Collections.singletonList(new Uint(defaultAqlToSet)); String funcData = CITASystemContract.encodeFunction(QUOTA_MANAGER_SET_DEFAULT_AQL, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - QUOTA_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + QUOTA_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log != null && log.getTopics().contains(Util.addUpTo64Hex(defaultAqlToSet.toString(16))); } public boolean setAql( - String addrToSet, BigInteger aqlToSet, String adminPrivatekey, int version, BigInteger chainId) + String addrToSet, BigInteger aqlToSet, String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { List inputParameters = Arrays.asList(new Address(addrToSet), new Uint(aqlToSet)); String funcData = CITASystemContract.encodeFunction(QUOTA_MANAGER_SET_AQL, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - QUOTA_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + QUOTA_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log != null && log.getTopics().contains(Util.addUpTo64Hex(addrToSet)); } @@ -257,7 +257,7 @@ public String newPermission( String name, List addrs, List funcs, - String adminPrivatekey, + String adminPrivateKey, int version, BigInteger chainId) throws IOException, InterruptedException { @@ -283,7 +283,7 @@ public String newPermission( String funcData = CITASystemContract.encodeFunction( PERMISSION_MANAGER_NEW_PERMISSION, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( - PERMISSION_MANAGER_ADDR, service, adminPrivatekey, funcData, version, chainId); + PERMISSION_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); Log log = CITASystemContract.getReceiptLog(service, txHash, 0); return log == null ? "" : log.getAddress(); @@ -580,6 +580,76 @@ public QueryResourceResult queryResource(String fromAddr, String permissionAddr) return new QueryResourceResult(contracts, functions); } + public boolean deleteGroup(String groupAddr, String adminPrivateKey, int version, BigInteger chainId) throws Exception { + List inputParameter = Arrays.asList(new Address(INTRA_GROUP_USER_MANAGEMENT_ADDR), + new Address(groupAddr)); + String funcData = CITASystemContract.encodeFunction( + USER_MANAGER_DELETE_GROUP, inputParameter); + String txHash = CITASystemContract.sendTxAndGetHash( + USER_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); + return CITASystemContract.checkReceipt(service, txHash); + } + + public boolean updateGroupName(String groupAddr, String newGroupName, String adminPrivateKey, int version, BigInteger chainId) throws Exception { + String nameHex = Util.addUpTo64Hex(ConvertStrByte.stringToHexString(newGroupName)); + byte[] nameBytes = ConvertStrByte.hexStringToBytes(Numeric.cleanHexPrefix(nameHex)); + + List inputParameters = Arrays.asList(new Address(INTRA_GROUP_USER_MANAGEMENT_ADDR), + new Address(groupAddr), new Bytes32(nameBytes)); + String funcData = CITASystemContract.encodeFunction( + USER_MANAGER_UPDATE_GROUP_NAME, inputParameters); + String txHash = CITASystemContract.sendTxAndGetHash( + USER_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); + return CITASystemContract.checkReceipt(service, txHash); + } + + public boolean addAccounts(String groupAddr, List accounts, String adminPrivateKey, int version, BigInteger chainId) throws Exception { + List
addrsToAdd = new ArrayList<>(); + for (String str : accounts) { + addrsToAdd.add(new Address(str)); + } + List inputParameters = Arrays.asList( + new Address(INTRA_GROUP_USER_MANAGEMENT_ADDR), + new Address(groupAddr), + new DynamicArray
(addrsToAdd)); + + String funcData = CITASystemContract.encodeFunction( + USER_MANAGER_ADD_ACCOUNTS, inputParameters); + String txHash = CITASystemContract.sendTxAndGetHash( + USER_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); + return CITASystemContract.checkReceipt(service, txHash); + } + + public boolean deleteAccounts(String groupAddr, List accounts, String adminPrivateKey, int version, BigInteger chainId) throws Exception { + List
addrsToAdd = new ArrayList<>(); + for (String str : accounts) { + addrsToAdd.add(new Address(str)); + } + List inputParameters = Arrays.asList( + new Address(INTRA_GROUP_USER_MANAGEMENT_ADDR), + new Address(groupAddr), + new DynamicArray
(addrsToAdd)); + + String funcData = CITASystemContract.encodeFunction( + USER_MANAGER_DELETE_ACCOUNTS, inputParameters); + String txHash = CITASystemContract.sendTxAndGetHash( + USER_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); + return CITASystemContract.checkReceipt(service, txHash); + } + + public boolean checkScope(String groupAddr, String adminPrivateKey, int version, BigInteger chainId) throws Exception { + List inputParameters = Arrays.asList( + new Address(INTRA_GROUP_USER_MANAGEMENT_ADDR), + new Address(groupAddr)); + + String funcData = CITASystemContract.encodeFunction( + USER_MANAGER_CHECK_SCOPE, inputParameters); + String txHash = CITASystemContract.sendTxAndGetHash( + USER_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); + return CITASystemContract.checkReceipt(service, txHash); + } + + /** * query all groups * @param senderAddress sender address @@ -593,9 +663,13 @@ public List queryGroups(String senderAddress) throws IOException { List> outputParamters = Collections.singletonList(new TypeReference>() {}); List resultTypes = CITASystemContract.decodeCallResult(callResult, outputParamters); + if (resultTypes.isEmpty()) + return null; + List list = new ArrayList<>(); ArrayList
results = (ArrayList
) resultTypes.get(0).getValue(); - List list = new ArrayList<>(results.size()); for (Address address : results) { + if (INTRA_GROUP_USER_MANAGEMENT_ADDR.equalsIgnoreCase(address.getValue())) + continue; list.add(address.getValue()); } return list; @@ -604,7 +678,6 @@ public List queryGroups(String senderAddress) throws IOException { /** * new group * @see newGroup - * @param superAdminAddress the address of super_admin * @param groupName the name of group to be created * @param accounts accounts added to the group * @param adminPrivateKey the private key of super_admin @@ -613,36 +686,25 @@ public List queryGroups(String senderAddress) throws IOException { * @return the transaction hash for creating group * @throws IOException */ - public String newGroup(String superAdminAddress, - String groupName, - List accounts, - String adminPrivateKey, - int version, - BigInteger chainId) throws IOException { - // account addresses convert to Address object list - List
addresses = new ArrayList<>(accounts.size()); - for(String acc : accounts){ - addresses.add(new Address(acc)); - } - - // groupName string convert to bytes32 + public String newGroup(String groupName, List accounts, String adminPrivateKey, int version, BigInteger chainId) throws Exception { String nameHex = Util.addUpTo64Hex(ConvertStrByte.stringToHexString(groupName)); byte[] nameBytes = ConvertStrByte.hexStringToBytes(Numeric.cleanHexPrefix(nameHex)); - - // build input parameters + List
addrsToAdd = new ArrayList<>(); + for (String str : accounts) { + addrsToAdd.add(new Address(str)); + } List inputParameters = Arrays.asList( - new Address(superAdminAddress),//origin - new Bytes32(nameBytes),//name - new DynamicArray
(addresses)//account - ); - - // encode input parameters - String funcData = CITASystemContract.encodeFunction(USER_MANAGER_NEW_GROUP, inputParameters); + new Address(INTRA_GROUP_USER_MANAGEMENT_ADDR), + new Bytes32(nameBytes), + new DynamicArray
(addrsToAdd)); - // send request to create group and return transaction hash + String funcData = CITASystemContract.encodeFunction( + USER_MANAGER_NEW_GROUP, inputParameters); String txHash = CITASystemContract.sendTxAndGetHash( USER_MANAGER_ADDR, service, adminPrivateKey, funcData, version, chainId); - return txHash; + + Log log = CITASystemContract.getReceiptLog(service, txHash, 0); + return log == null ? "" : log.getAddress(); } public Transaction constructStoreTransaction(String data, int version, BigInteger chainId) { @@ -651,4 +713,4 @@ public Transaction constructStoreTransaction(String data, int version, BigIntege Util.getValidUtilBlock(service).longValue(), version, chainId, "0", data); } -} \ No newline at end of file +} diff --git a/tests/src/main/java/com/cryptape/cita/tests/Config.java b/tests/src/main/java/com/cryptape/cita/tests/Config.java index 31e8a0d3..59b135c9 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/Config.java +++ b/tests/src/main/java/com/cryptape/cita/tests/Config.java @@ -25,6 +25,7 @@ public class Config { private static final String DEFAULT_QUOTA_Transfer = "QuotaForTransfer"; private static final String DEFAULT_QUOTA_Deployment = "QuotaForDeployment"; private static final String ADMIN_PRIVATE_KEY = "AdminPrivateKey"; + private static final String ADMIN_ADDRESS = "AdminAddress"; private static final String CRYPTO_TYPE = "CryptoType"; private Properties props; @@ -46,6 +47,7 @@ public class Config { public CITAj service; public String adminPrivateKey; public String cryptoTx; + public String adminAddress; public Config() { @@ -105,6 +107,7 @@ private void loadPropsToAttr(Properties props) { defaultQuotaDeployment = props.getProperty(DEFAULT_QUOTA_Deployment); adminPrivateKey = props.getProperty(ADMIN_PRIVATE_KEY); cryptoTx = props.getProperty(CRYPTO_TYPE); + adminAddress = props.getProperty(ADMIN_ADDRESS); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java b/tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java index 08dac5f4..b5c07f67 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java +++ b/tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java @@ -3,10 +3,14 @@ import com.cryptape.cita.protocol.core.methods.response.Log; import com.cryptape.cita.protocol.system.CITASystemContract; +import com.cryptape.cita.protocol.system.CITAjSystemContract; import java.io.IOException; +import java.math.BigInteger; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.concurrent.TimeUnit; /** * Group and Account Management @@ -14,21 +18,68 @@ * https://docs.citahub.com/zh-CN/cita/account-permission/account */ public class GroupManagerExample extends SystemContractExample { - public static void main(String[] args) throws IOException, InterruptedException { - // query groups - List groupAddress = sysContract.queryGroups("0xfFFfFFFFFffFFfffFFFFfffffFffffFFfF020009"); - System.out.println("groupAddress: " + groupAddress); - - // create a group - String transcationHash = sysContract.newGroup("0xfFFfFFFFFffFFfffFFFFfffffFffffFFfF020009", - "newGroup", - Arrays.asList("e1c4021742730ded647590a1686d5c4bfcbae0b0", "45a50f45cb81c8aedeab917ea0cd3c9178ebdcae"), - adminPriavteKey, - version, - chainId); - System.out.println("transcationHash: " + transcationHash); - // get receipt by hash - Log log = CITASystemContract.getReceiptLog(service, transcationHash, 0); - System.out.println("groupAddress: " + (log == null ? "null" : log.getAddress())); + static String senderAddr; + static String adminPrivateKey; + static int version; + static BigInteger chainId; + + static { + Config conf = new Config(); + conf.buildService(false); + service = conf.service; + senderAddr = conf.primaryAddr; + adminPrivateKey = conf.adminPrivateKey; + version = TestUtil.getVersion(service); + chainId = TestUtil.getChainId(service); + } + public static void main(String[] args) throws Exception { + CITAjSystemContract sysContract = new CITAjSystemContract(service); + + // New group + List addresses = new ArrayList<>(); + addresses.add("0x1c6eebf136ee234caff3a95e0d9d22e40c9ac4ca"); + String newGroupAddr = sysContract.newGroup("vlk1", addresses, adminPrivateKey, version, chainId); + if ("".equals(newGroupAddr)) { + System.out.println("New group failed！"); + return; + } + System.out.println("Address for new group: " + newGroupAddr); + TimeUnit.SECONDS.sleep(10); + + // Update group name + boolean updated = sysContract.updateGroupName(newGroupAddr, "TokenNew", adminPrivateKey, version, chainId); + System.out.println("Group updated: " + updated); + TimeUnit.SECONDS.sleep(10); + + // Add accounts + List addressNeedBeAdded = new ArrayList<>(); + addressNeedBeAdded.add("0xbac68e5cb986ead0253e0632da1131a0a96efa18"); + updated = sysContract.addAccounts(newGroupAddr, addressNeedBeAdded, adminPrivateKey, version, chainId); + System.out.println("Account is added: " + updated); + TimeUnit.SECONDS.sleep(10); + + // Delete accounts + updated = sysContract.deleteAccounts(newGroupAddr, addressNeedBeAdded, adminPrivateKey, version, chainId); + System.out.println("Account is deleted: " + updated); + TimeUnit.SECONDS.sleep(10); + + // Check scope + updated = sysContract.checkScope(newGroupAddr, adminPrivateKey, version, chainId); + System.out.println("Check scope: " + updated); + TimeUnit.SECONDS.sleep(10); + + // Query groups + List res = sysContract.queryGroups(senderAddr); + if (res != null) { + for (String s : res) { + System.out.println("Group address: " + s); + } + } + TimeUnit.SECONDS.sleep(10); + + // Delete group + updated = sysContract.deleteGroup(newGroupAddr, adminPrivateKey, version, chainId); + System.out.println("Group deleted: " + updated); + TimeUnit.SECONDS.sleep(10); } } diff --git a/tests/src/main/resources/config.properties.example b/tests/src/main/resources/config.properties.example index 1dea9796..443106e2 100644 --- a/tests/src/main/resources/config.properties.example +++ b/tests/src/main/resources/config.properties.example @@ -14,4 +14,6 @@ SimpleDataBin=tests/src/main/resources/SimpleData.bin QuotaForTransfer=21000 QuotaForDeployment=10000000 AdminPrivateKey=0x5a0257a4778057a8a7d97809bd209055b2fbafa654ce7d31ec7191066b9225e6 +# if use cita test net, you can recharge for this address +AdminAddress=0x827b05e4b070167a360e123fd06566eeb1a79fa5 CryptoType=SECP256K1 From d8bebb3d27f75594ae58e2ddeab0aa2501f5de84 Mon Sep 17 00:00:00 2001 From: chenhao Date: Thu, 19 Sep 2019 19:48:35 +0800 Subject: [PATCH 03/20] support matrix system test in travis --- .travis.yml | 29 +++++++--- scripts/run-system-test.sh | 44 +++++++++++++++ scripts/run-unit-test.sh | 4 ++ scripts/run.sh | 12 +++++ .../travis-upload-test-report-to-gh-pages.sh | 53 +++++++++++++++++++ 5 files changed, 134 insertions(+), 8 deletions(-) create mode 100644 scripts/run-system-test.sh create mode 100644 scripts/run-unit-test.sh create mode 100644 scripts/run.sh create mode 100755 scripts/travis-upload-test-report-to-gh-pages.sh diff --git a/.travis.yml b/.travis.yml index a65b5654..4dc2bf75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,20 +5,33 @@ 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 > /dev/null + - unzip gradle-5.0-all.zip + - ./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) +## Upload code coverage metrics +#after_success: +# - bash <(curl -s https://codecov.io/bash) diff --git a/scripts/run-system-test.sh b/scripts/run-system-test.sh new file mode 100644 index 00000000..ce67a282 --- /dev/null +++ b/scripts/run-system-test.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +DEBUG_LOG_PATH=./debug_log.txt +# generate sdk and update docker image +rm -r console/build/libs/* | true +./gradle-5.0/bin/gradle shadowJar > ${DEBUG_LOG_PATH} +test -e console/build/libs/console-*-all.jar || echo "build sdk failed !!!" +test -e console/build/libs/console-*-all.jar || exit 1 +docker pull ${DOCKER_IMAGE_URL}:${CITA_DOCKER_IMAGE_TAG_NAME} > ${DEBUG_LOG_PATH} + +# get cita_quality code +cd .. +test -e cita_quality | git clone ${SYSTEM_TEST_CODE_URL} +cp cita-sdk-java/console/build/libs/console-*-all.jar ./cita_quality/systemTest/console.jar +cd ./cita_quality/systemTest +system_test_dir=$(pwd) +git checkout master | git pull + +# use local sdk change the maven sdk +CITA_SDk_VERSION=$( cat pom.xml | grep -A 1 ">core<" | grep version | awk -F "[<>]" '{print $3}') +CITA_SDK_LOCAL_FILE_PATH=${system_test_dir}/console-${CITA_SDk_VERSION}-all.jar +rm -r ${CITA_SDK_LOCAL_FILE_PATH} | true +cp -r ./console.jar ${CITA_SDK_LOCAL_FILE_PATH} + +echo ${CITA_SDK_LOCAL_FILE_PATH} +TARGET_TEXT_LINE=$(($( cat pom.xml | grep -n ">core<" | awk -F ":" '{print $1}')+2)) +echo ${TARGET_TEXT_LINE} +CITA_SDK_LOCAL_FILE_PATH=${CITA_SDK_LOCAL_FILE_PATH//\//\\/} +echo ${CITA_SDK_LOCAL_FILE_PATH} +sed -i "${TARGET_TEXT_LINE} s/^/${CITA_SDK_LOCAL_FILE_PATH}<\/systemPath>\n/" pom.xml +sed -i "${TARGET_TEXT_LINE} s/^/system<\/scope>\n/" pom.xml +cat pom.xml | grep -A 3 ">core<" + +# install cita-cli and run test +rm -r target/* +make install-cita-cli +mvn test -Dtest=com.cryptape.function.sdkcase.** +MAVEN_TEST_RESULT=$? + +# collect result +test -e $HOME/tmp || mkdir $HOME/tmp +test -e $HOME/tmp/${TRAVIS_JOB_ID} || mkdir $HOME/tmp/${TRAVIS_JOB_ID} +cp -R ${system_test_dir}/target/surefire-reports/html/* $HOME/tmp/${TRAVIS_JOB_ID}/ +exit ${MAVEN_TEST_RESULT} diff --git a/scripts/run-unit-test.sh b/scripts/run-unit-test.sh new file mode 100644 index 00000000..8e1119f9 --- /dev/null +++ b/scripts/run-unit-test.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +../gradlew --info check jacocoRootTestReport +bash <(curl -s https://codecov.io/bash) \ No newline at end of file diff --git a/scripts/run.sh b/scripts/run.sh new file mode 100644 index 00000000..689b6557 --- /dev/null +++ b/scripts/run.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +if [ ${TEST_TYPE} == UT ]; then + echo "run unit test" + bash scripts/run-unit-test.sh +fi + +if [ ${TEST_TYPE} == ST ]; then + echo "run system test" + bash scripts/run-system-test.sh + bash scripts/travis-upload-test-report-to-gh-pages.sh $? +fi diff --git a/scripts/travis-upload-test-report-to-gh-pages.sh b/scripts/travis-upload-test-report-to-gh-pages.sh new file mode 100755 index 00000000..b5994664 --- /dev/null +++ b/scripts/travis-upload-test-report-to-gh-pages.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +# This script is used to run on Travis CI to publish generated files to GitHub pages +# 1. Create a orphan branch named gh-pages: https://help.github.com/en/articles/creating-project-pages-using-the-command-line#create-a-master-branch +# 2. Enabling GitHub Pages to publish your site from gh-pages: https://help.github.com/en/articles/configuring-a-publishing-source-for-github-pages#enabling-github-pages-to-publish-your-site-from-master-or-gh-pages + +# NOTES: all UPPER-CASE variables are ENV variables, lower-case variables are local defined variables + +echo "Maven test result code :"$1 +MAVEN_TEST_RESULT=$1 + +echo "Starting to update gh-pages" +# gh page info +owner_name=`echo $TRAVIS_REPO_SLUG|cut -d / -f 1` +repo_name=`echo $TRAVIS_REPO_SLUG|cut -d / -f 2` +gh_pages_url="https://cryptape.github.io/cita-sdk-java/" +test_report_url="$gh_pages_url/reports/${TRAVIS_JOB_ID}/" + +test_result_mark="×" +if [ ${MAVEN_TEST_RESULT} -eq 0 ]; then + test_result_mark="✔" +fi + +# go to home +cd $HOME + +# using token clone gh-pages branch +git clone --quiet --branch=gh-pages ${TEST_REPORT_CODE_URL} gh-pages > /dev/null + +#go into diractory and copy data we're interested in to that directory +cd gh-pages +mkdir -p reports + +# TODO: delete outdated reports +# add new report +mv $HOME/tmp/${TRAVIS_JOB_ID} reports/ +ls -l reports/${TRAVIS_JOB_ID} + +# update index.html +echo "" >> index.html +# setup git user +git config user.email "travis@travis-ci.org" +git config user.name "Travis CI" + +# add, commit and push files +commit_message="Test report $test_report_url for CI build $travis_build_url" +git add -f . +git commit -m "$commit_message" +git push -fq origin gh-pages > /dev/null +echo "Test report uploaded to $test_report_url" + +# return maven test result +exit ${MAVEN_TEST_RESULT} + From 2b91f0f6c6c3b9ac3eff9bf8866b3b5f891febc8 Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 23 Sep 2019 15:50:56 +0800 Subject: [PATCH 04/20] fix unit test cases --- .travis.yml | 3 - scripts/run-unit-test.sh | 33 +- tests/build.gradle | 3 + .../java/com/cryptape/cita/tests/RpcTest.java | 331 ------------------ .../cita/tests/AdvanceTransactionTest.java | 38 +- .../cita/tests/BlockFilterFlowableTest.java} | 8 +- .../tests/BlockFilterTransactionTest.java} | 20 +- .../java/com/cryptape/cita/tests/Config.java | 11 +- .../cryptape/cita/tests/DecodeTxTest.java} | 23 +- .../cita/tests/GroupManagerTest.java} | 22 +- .../cita/tests/PermissionManagerTest.java} | 35 +- .../cita/tests/QuotaManagerTest.java} | 25 +- .../java/com/cryptape/cita/tests/RpcTest.java | 286 +++++++++++++++ .../cita/tests/SM2ValidationTest.java | 6 +- .../cita/tests/SendTransactionSyncTest.java} | 70 ++-- .../cita/tests/SendTransactionTest.java} | 50 ++- .../cryptape/cita/tests/SimpleDataTest.java} | 47 ++- .../cryptape/cita/tests/StoreRecordTest.java} | 25 +- .../cita/tests/SystemContractTest.java} | 29 +- .../com/cryptape/cita/tests/TestUtil.java | 15 +- .../java/com/cryptape/cita/tests/Token.java | 0 .../cita/tests/TokenAccountTest.java} | 32 +- .../cita/tests/TokenCodegenTest.java} | 42 +-- .../cita/tests/TokenFilterCodeGenTest.java} | 69 ++-- .../cita/tests/TokenFilterFlowableTest.java} | 44 +-- .../tests/TokenFilterTransactionTest.java} | 34 +- .../cita/tests/TokenTransactionTest.java} | 32 +- .../cita/tests/VerifySignatureTest.java} | 18 +- .../src/{main => test}/resources/Advance.abi | 0 .../src/{main => test}/resources/Advance.bin | 0 .../src/{main => test}/resources/Advance.sol | 0 .../src/{main => test}/resources/SafeMath.sol | 0 .../{main => test}/resources/SimpleData.abi | 0 .../{main => test}/resources/SimpleData.bin | 0 .../{main => test}/resources/SimpleData.sol | 0 tests/src/{main => test}/resources/Token.abi | 0 tests/src/{main => test}/resources/Token.bin | 0 tests/src/{main => test}/resources/Token.sol | 0 .../src/{main => test}/resources/config.json | 0 .../resources/config.properties.example | 8 +- 40 files changed, 715 insertions(+), 644 deletions(-) delete mode 100644 tests/src/main/java/com/cryptape/cita/tests/RpcTest.java rename tests/src/{main => test}/java/com/cryptape/cita/tests/AdvanceTransactionTest.java (95%) rename tests/src/{main/java/com/cryptape/cita/tests/BlockFilterFlowableExample.java => test/java/com/cryptape/cita/tests/BlockFilterFlowableTest.java} (73%) rename tests/src/{main/java/com/cryptape/cita/tests/BlockFilterTransactionExample.java => test/java/com/cryptape/cita/tests/BlockFilterTransactionTest.java} (72%) rename tests/src/{main => test}/java/com/cryptape/cita/tests/Config.java (96%) rename tests/src/{main/java/com/cryptape/cita/tests/DecodeTxExample.java => test/java/com/cryptape/cita/tests/DecodeTxTest.java} (83%) rename tests/src/{main/java/com/cryptape/cita/tests/GroupManagerExample.java => test/java/com/cryptape/cita/tests/GroupManagerTest.java} (85%) rename tests/src/{main/java/com/cryptape/cita/tests/PermissionManagerExample.java => test/java/com/cryptape/cita/tests/PermissionManagerTest.java} (76%) rename tests/src/{main/java/com/cryptape/cita/tests/QuotaManagerExample.java => test/java/com/cryptape/cita/tests/QuotaManagerTest.java} (80%) create mode 100644 tests/src/test/java/com/cryptape/cita/tests/RpcTest.java rename tests/src/{main => test}/java/com/cryptape/cita/tests/SM2ValidationTest.java (98%) rename tests/src/{main/java/com/cryptape/cita/tests/SendTransactionSyncExample.java => test/java/com/cryptape/cita/tests/SendTransactionSyncTest.java} (52%) rename tests/src/{main/java/com/cryptape/cita/tests/SendTransactionAsyncExample.java => test/java/com/cryptape/cita/tests/SendTransactionTest.java} (72%) rename tests/src/{main/java/com/cryptape/cita/tests/SimpleDataExample.java => test/java/com/cryptape/cita/tests/SimpleDataTest.java} (92%) rename tests/src/{main/java/com/cryptape/cita/tests/StoreRecordExample.java => test/java/com/cryptape/cita/tests/StoreRecordTest.java} (85%) rename tests/src/{main/java/com/cryptape/cita/tests/SystemContractExample.java => test/java/com/cryptape/cita/tests/SystemContractTest.java} (72%) rename tests/src/{main => test}/java/com/cryptape/cita/tests/TestUtil.java (95%) rename tests/src/{main => test}/java/com/cryptape/cita/tests/Token.java (100%) rename tests/src/{main/java/com/cryptape/cita/tests/TokenAccountExample.java => test/java/com/cryptape/cita/tests/TokenAccountTest.java} (93%) rename tests/src/{main/java/com/cryptape/cita/tests/TokenCodegenExample.java => test/java/com/cryptape/cita/tests/TokenCodegenTest.java} (94%) rename tests/src/{main/java/com/cryptape/cita/tests/TokenFilterCodeGenExample.java => test/java/com/cryptape/cita/tests/TokenFilterCodeGenTest.java} (78%) rename tests/src/{main/java/com/cryptape/cita/tests/TokenFilterFlowableExample.java => test/java/com/cryptape/cita/tests/TokenFilterFlowableTest.java} (96%) rename tests/src/{main/java/com/cryptape/cita/tests/TokenFilterTransactionExample.java => test/java/com/cryptape/cita/tests/TokenFilterTransactionTest.java} (97%) rename tests/src/{main/java/com/cryptape/cita/tests/TokenTransactionExample.java => test/java/com/cryptape/cita/tests/TokenTransactionTest.java} (93%) rename tests/src/{main/java/com/cryptape/cita/tests/VerifySignatureExample.java => test/java/com/cryptape/cita/tests/VerifySignatureTest.java} (91%) rename tests/src/{main => test}/resources/Advance.abi (100%) rename tests/src/{main => test}/resources/Advance.bin (100%) rename tests/src/{main => test}/resources/Advance.sol (100%) rename tests/src/{main => test}/resources/SafeMath.sol (100%) rename tests/src/{main => test}/resources/SimpleData.abi (100%) rename tests/src/{main => test}/resources/SimpleData.bin (100%) rename tests/src/{main => test}/resources/SimpleData.sol (100%) rename tests/src/{main => test}/resources/Token.abi (100%) rename tests/src/{main => test}/resources/Token.bin (100%) rename tests/src/{main => test}/resources/Token.sol (100%) rename tests/src/{main => test}/resources/config.json (100%) rename tests/src/{main => test}/resources/config.properties.example (79%) diff --git a/.travis.yml b/.travis.yml index 4dc2bf75..c70c2666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,3 @@ before_script: script: bash ./scripts/run.sh -## Upload code coverage metrics -#after_success: -# - bash <(curl -s https://codecov.io/bash) diff --git a/scripts/run-unit-test.sh b/scripts/run-unit-test.sh index 8e1119f9..b7601ded 100644 --- a/scripts/run-unit-test.sh +++ b/scripts/run-unit-test.sh @@ -1,4 +1,33 @@ #!/usr/bin/env bash -../gradlew --info check jacocoRootTestReport -bash <(curl -s https://codecov.io/bash) \ No newline at end of file +# start a CITA chain for running tests， and init config +OLD_ADMIN_PRIVATE_KEY=0x5a0257a4778057a8a7d97809bd209055b2fbafa654ce7d31ec7191066b9225e6 +OLD_ADMIN_ADDRESS=0x827b05e4b070167a360e123fd06566eeb1a79fa5 +TEST_ADMIN_PRIVATE_KEY=0x5f0258a4778057a8a7d97809bd209055b2fbafa654ce7d31ec7191066b9225e6 +TEST_ADMIN_ADDRESS=0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523 +docker pull ${DOCKER_IMAGE_URL}:sha3 +docker run --rm -d -p 60702:1337 --name=test_sdk_cita ${DOCKER_IMAGE_URL}:sha3 +sleep 2m +docker ps +sed -i "s/:1337/:60702/" ./tests/src/test/resources/config.properties.example +sed -i "s/${OLD_ADMIN_ADDRESS}/${TEST_ADMIN_ADDRESS}/" ./tests/src/test/resources/config.properties.example +sed -i "s/${OLD_ADMIN_PRIVATE_KEY}/${TEST_ADMIN_PRIVATE_KEY}/" ./tests/src/test/resources/config.properties.example +cp -r ./tests/src/test/resources/config.properties.example ./tests/src/test/resources/config.properties +cat ./tests/src/test/resources/config.properties + +# run unit and integration tests +./gradlew --info check jacocoRootTestReport +UNIT_TEST_RESULT=$? +echo "UNIT_TEST_RESULT：${UNIT_TEST_RESULT}" + +# if success, upload code coverage metrics +if [ ${UNIT_TEST_RESULT} -eq 0 ]; then + echo "Upload code coverage metrics" + bash <(curl -s https://codecov.io/bash) +fi + +# remove docker container +docker rm -f test_sdk_cita + +# exit UNIT TEST CODE +exit ${UNIT_TEST_RESULT} \ No newline at end of file diff --git a/tests/build.gradle b/tests/build.gradle index b2f884a7..9211b986 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -1,6 +1,9 @@ description 'Several examples to use cita-sdk-java to interact with CITA' dependencies { + + testCompile group: 'com.alibaba', name: 'fastjson', version: '1.2.60' + testCompile group: 'org.hamcrest', name: 'hamcrest-core', version: '2.1' compile group: 'commons-codec', name: 'commons-codec', version: '1.11' compile project(':core'), "com.google.code.gson:gson:$gsonVersion" diff --git a/tests/src/main/java/com/cryptape/cita/tests/RpcTest.java b/tests/src/main/java/com/cryptape/cita/tests/RpcTest.java deleted file mode 100644 index 011df252..00000000 --- a/tests/src/main/java/com/cryptape/cita/tests/RpcTest.java +++ /dev/null @@ -1,331 +0,0 @@ -package com.cryptape.cita.tests; - -import java.io.IOException; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; - -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.*; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; - -public class RpcTest { - - private static int version; - private static BigInteger chainId; - private static CITAj service; - private static String value; - private static String privateKey; - private static long quotaToDeploy; - private static Transaction.CryptoTx cryptoTx; - - - static { - Config conf = new Config(); - conf.buildService(true); - service = conf.service; - privateKey = conf.primaryPrivKey; - quotaToDeploy = Long.parseLong(conf.defaultQuotaDeployment); - value = "0"; - version = TestUtil.getVersion(service); - chainId = TestUtil.getChainId(service); - cryptoTx = Transaction.CryptoTx.valueOf(conf.cryptoTx); - } - - public static void main(String[] args) throws Exception { - - testNetPeerCount(); - - testNetPeersInfo(); - - testGetVersion(); - - testGetBlockByNumber(BigInteger.valueOf(47)); - - testGetBalance(); - - testMetaData(); - - BigInteger validBlockNumber = testBlockNumber(); - - System.out.println(validBlockNumber.toString(10)); - - String blockByNumberHash = testAppGetBlockByNumber( - validBlockNumber, true); - - testAppGetBlockByHash(blockByNumberHash, true); - - //because unsigned transaction is not supported in cita, there is no method sendTransaction. - String code = "6060604052341561000f57600080fd5b600160a060020" - + "a033316600090815260208190526040902061271090556101" - + "df8061003b6000396000f3006060604052600436106100565" - + "763ffffffff7c010000000000000000000000000000000000" - + "000000000000000000000060003504166327e235e38114610" - + "05b578063a9059cbb1461008c578063f8b2cb4f146100c257" - + "5b600080fd5b341561006657600080fd5b61007a600160a06" - + "0020a03600435166100e1565b604051908152602001604051" - + "80910390f35b341561009757600080fd5b6100ae600160a06" - + "0020a03600435166024356100f3565b604051901515815260" - + "200160405180910390f35b34156100cd57600080fd5b61007" - + "a600160a060020a0360043516610198565b60006020819052" - + "908152604090205481565b600160a060020a0333166000908" - + "1526020819052604081205482901080159061011c57506000" - + "82115b1561018e57600160a060020a0333811660008181526" - + "0208190526040808220805487900390559286168082529083" - + "9020805486019055917fddf252ad1be2c89b69c2b068fc378" - + "daa952ba7f163c4a11628f55a4df523b3ef90859051908152" - + "60200160405180910390a3506001610192565b5060005b929" - + "15050565b600160a060020a03166000908152602081905260" - + "40902054905600a165627a7a72305820f59b7130870eee8f0" - + "44b129f4a20345ffaff662707fc0758133cd16684bc3b160029"; - - String nonce = TestUtil.getNonce(); - BigInteger validUtil = TestUtil.getValidUtilBlock(service); - - Transaction rtx = Transaction.createContractTransaction( - nonce, quotaToDeploy, validUtil.longValue(), - version, chainId, value, code); - String signedTransaction = rtx.sign(privateKey, cryptoTx, false); - String transactionHash = testAppSendRawTransaction(signedTransaction); - - System.out.println("waiting for tx into chain ..."); - Thread.sleep(8000); - - testAppGetTransactionByHash(transactionHash); - - Credentials credentials = Credentials.create(privateKey); - String validAccount = credentials.getAddress(); - testAppGetTransactionCount(validAccount, DefaultBlockParameterName.PENDING); - - String validContractAddress = ""; - String contractAddr = testAppGetTransactionReceipt(transactionHash); - if (contractAddr != null) { - validContractAddress = contractAddr; - } else { - System.out.println("Failed to get address from tx receipt"); - System.exit(1); - } - - testAppGetCode(validContractAddress, DefaultBlockParameterName.PENDING); - - String fromAddress = Credentials.create(privateKey).getAddress(); - Function getBalanceFunc = new Function( - "getBalance", - Arrays.asList(new Address(fromAddress)), - Arrays.asList(new TypeReference() { - }) - ); - String funcCallData = FunctionEncoder.encode(getBalanceFunc); - - testAppCall(fromAddress, validContractAddress, funcCallData, DefaultBlockParameterName.PENDING); - } - - - private static void testGetBlockByNumber(BigInteger number) throws IOException { - AppBlock.Block block = service.appGetBlockByNumber(DefaultBlockParameter.valueOf(number), false).send().getBlock(); - System.out.println("block " + number.toString() + " is: " + new Gson().toJson(block)); - } - - private static void testGetBalance() throws Exception { - Credentials c = Credentials.create(privateKey); - String addr = c.getAddress(); - AppGetBalance appGetbalance = service.appGetBalance( - addr, DefaultBlockParameterName.PENDING).send(); - if (appGetbalance == null) { - System.out.println("the result is null"); - } else { - BigInteger balance = appGetbalance.getBalance(); - System.out.println("Balance for address " + addr + "is " + balance); - } - } - - private static void testMetaData() throws Exception { - AppMetaData appMetaData = service.appMetaData(DefaultBlockParameterName.PENDING).send(); - System.out.println("AppMetaData: " + new Gson().toJson(appMetaData)); - } - - private static void testNetPeerCount() throws Exception { - NetPeerCount netPeerCount = service.netPeerCount().send(); - System.out.println("net_peerCount:" + netPeerCount.getQuantity()); - } - - private static void testNetPeersInfo() throws Exception { - NetPeersInfo netPeersInfo = service.netPeersInfo().send(); - Map peers = netPeersInfo.getPeersInfo().peers; - System.out.println("net_peersInfo amount:" + netPeersInfo.getPeersInfo().amount); - for (Map.Entry entry : peers.entrySet()) { - System.out.println("Address : " + entry.getKey() + " Node : " + entry.getValue()); - } - } - - private static void testGetVersion() throws Exception { - AppVersion appVersion = service.getVersion().send(); - System.out.println("version:" + appVersion.getVersion().softwareVersion); - } - - private static BigInteger testBlockNumber() throws Exception { - - AppBlockNumber appBlockNumber = service.appBlockNumber().send(); - - BigInteger validBlockNumber = BigInteger.valueOf(Long.MAX_VALUE); - - if (appBlockNumber.isEmpty()) { - System.out.println("the result is null"); - } else { - validBlockNumber = appBlockNumber.getBlockNumber(); - System.out.println("blockNumber:" + validBlockNumber); - } - return validBlockNumber; - } - - private static String testAppGetBlockByNumber( - BigInteger validBlockNumber, boolean isfullTranobj) - throws Exception { - AppBlock appBlock = service.appGetBlockByNumber( - DefaultBlockParameter.valueOf(validBlockNumber), isfullTranobj).send(); - - if (appBlock.isEmpty()) { - System.out.println("the result is null"); - return null; - } else { - AppBlock.Block block = appBlock.getBlock(); - System.out.println("Block: " + new Gson().toJson(block)); - return block.getHash(); - } - } - - private static void testAppGetBlockByHash( - String validBlockHash, boolean isfullTran) - throws Exception { - AppBlock appBlock = service - .appGetBlockByHash(validBlockHash, isfullTran).send(); - - if (appBlock.isEmpty()) { - System.out.println("the result is null"); - } else { - AppBlock.Block block = appBlock.getBlock(); - System.out.println("Block: " + new Gson().toJson(block)); - } - } - - - private static String testAppSendRawTransaction( - String rawData) throws Exception { - AppSendTransaction appSendTx = service - .appSendRawTransaction(rawData).send(); - - if (appSendTx.isEmpty()) { - System.out.println("the result is null"); - return null; - } else { - String hash = appSendTx.getSendTransactionResult().getHash(); - System.out.println("hash(Transaction):" + hash); - System.out.println("status:" - + appSendTx.getSendTransactionResult().getStatus()); - return hash; - } - } - - - private static void testAppGetTransactionByHash( - String validTransactionHash) throws Exception { - AppTransaction appTransaction = service.appGetTransactionByHash( - validTransactionHash).send(); - - if (appTransaction.getTransaction() == null) { - System.out.println("the result is null"); - } else { - com.cryptape.cita.protocol.core.methods.response.Transaction transaction - = appTransaction.getTransaction(); - System.out.println("Transaction: " + new Gson().toJson(transaction)); - } - } - - - private static void testAppGetTransactionCount( - String validAccount, DefaultBlockParameter param) throws Exception { - AppGetTransactionCount appGetTransactionCount = service.appGetTransactionCount( - validAccount, param).send(); - - if (appGetTransactionCount.isEmpty()) { - System.out.println("the result is null"); - } else { - System.out.println("TransactionCount:" - + appGetTransactionCount.getTransactionCount()); - } - } - - private static String testAppGetTransactionReceipt( - String validTransactionHash) throws Exception { - AppGetTransactionReceipt appGetTransactionReceipt = service.appGetTransactionReceipt( - validTransactionHash).send(); - - if (appGetTransactionReceipt.getTransactionReceipt() == null) { - System.out.println("the result is null"); - return null; - } else { - //is option_value is null return NoSuchElementException, else return option_value - TransactionReceipt transactionReceipt = - appGetTransactionReceipt.getTransactionReceipt(); - printTransactionReceiptInfo(transactionReceipt); - if (transactionReceipt.getErrorMessage() != null) { - System.out.println("Transaction failed."); - System.out.println("Error Message: " + transactionReceipt.getErrorMessage()); - System.exit(1); - } - return transactionReceipt.getContractAddress(); - } - - } - - private static void printTransactionReceiptInfo( - TransactionReceipt transactionReceipt) { - try { - ObjectMapper mapper = new ObjectMapper(); - String result = mapper.writeValueAsString(transactionReceipt); - System.out.println(result); - } catch (JsonProcessingException e) { - System.out.println("Failed to process object to json. Exception: " + e); - e.printStackTrace(); - System.exit(1); - } - } - - private static void testAppGetCode( - String validContractAddress, DefaultBlockParameter param) - throws Exception { - AppGetCode appGetCode = service - .appGetCode(validContractAddress, param).send(); - - if (appGetCode.isEmpty()) { - System.out.println("the result is null"); - } else { - System.out.println("contract code:" + appGetCode.getCode()); - } - } - - - private static void testAppCall( - String fromAddress, String contractAddress, String encodedFunction, - DefaultBlockParameter param) throws Exception { - AppCall appCall = service.appCall( - new Call(fromAddress, contractAddress, encodedFunction), - param).send(); - - System.out.println("call result:" + appCall.getValue()); - } - -} diff --git a/tests/src/main/java/com/cryptape/cita/tests/AdvanceTransactionTest.java b/tests/src/test/java/com/cryptape/cita/tests/AdvanceTransactionTest.java similarity index 95% rename from tests/src/main/java/com/cryptape/cita/tests/AdvanceTransactionTest.java rename to tests/src/test/java/com/cryptape/cita/tests/AdvanceTransactionTest.java index 4d2c6e71..d6024429 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/AdvanceTransactionTest.java +++ b/tests/src/test/java/com/cryptape/cita/tests/AdvanceTransactionTest.java @@ -1,11 +1,5 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.text.DecimalFormat; -import java.util.Arrays; -import java.util.Collections; -import java.util.Random; - import com.cryptape.cita.abi.FunctionEncoder; import com.cryptape.cita.abi.FunctionReturnDecoder; import com.cryptape.cita.abi.TypeReference; @@ -16,6 +10,12 @@ import com.cryptape.cita.protocol.core.methods.request.Call; import com.cryptape.cita.protocol.core.methods.request.Transaction; import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import java.math.BigInteger; +import java.text.DecimalFormat; +import java.util.Arrays; +import java.util.Collections; +import java.util.Random; +import org.junit.Test; public class AdvanceTransactionTest { @@ -31,7 +31,7 @@ public class AdvanceTransactionTest { Config conf = new Config(); conf.buildService(false); service = conf.service; - senderPrivateKey = conf.primaryPrivKey; + senderPrivateKey = conf.adminPrivateKey; version = TestUtil.getVersion(service); chainId = TestUtil.getChainId(service); quota = Long.parseLong(conf.defaultQuotaDeployment); @@ -46,7 +46,7 @@ public class AdvanceTransactionTest { private String contractAddress; - public AdvanceTransactionTest(int sdCount, int thdCount, boolean isEd25519AndBlake2b) { + public void initAdvanceTransactionTest(int sdCount, int thdCount, boolean isEd25519AndBlake2b) { try { random = new Random(System.currentTimeMillis()); this.validUntilBlock = TestUtil.getValidUtilBlock(service, 100).longValue(); @@ -56,7 +56,7 @@ public AdvanceTransactionTest(int sdCount, int thdCount, boolean isEd25519AndBla System.out.println("Initial block height: " + TestUtil.getCurrentHeight(service)); } catch (Exception e) { e.printStackTrace(); - System.exit(1); + //System.exit(1); } } @@ -191,14 +191,14 @@ public void runContract() throws Exception { } else { System.out.println("Failed to deploy smart contract. Error: " + receipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } } else { System.out.println("Waiting for contract deployment...."); Thread.sleep(3000); if (countForContractDeployment++ > 3) { System.out.println("Timeout, failed to deploy contract."); - System.exit(1); + //System.exit(1); } } } @@ -217,14 +217,14 @@ public void runContract() throws Exception { break; } else { System.out.println("Failed to reset count."); - System.exit(1); + //System.exit(1); } } else { System.out.println("Waiting to reset count...."); Thread.sleep(3000); if (countForResetFunctionCall++ > 3) { System.out.println("Timeout, failed to reset count."); - System.exit(1); + //System.exit(1); } } } @@ -247,7 +247,7 @@ public void runContract() throws Exception { } catch (Exception e) { System.out.println("Failed to call contract function."); e.printStackTrace(); - System.exit(1); + //System.exit(1); } }); t.start(); @@ -308,7 +308,9 @@ public void runContract() throws Exception { System.out.println(outStr); } - public static void main(String[] args) throws Exception { + @Test + public void testAdvanceTransaction() throws Exception { + int sendcount = 20; int threadcount = 1; boolean isEd25519AndBlake2b = false; @@ -316,9 +318,9 @@ public static void main(String[] args) throws Exception { System.out.println( "sendCount: " + sendcount + " threadCount: " + threadcount + " isEd25519AndBlake2b: " + isEd25519AndBlake2b); - AdvanceTransactionTest advanceTxTest = new AdvanceTransactionTest( - sendcount, threadcount, isEd25519AndBlake2b); - advanceTxTest.runContract(); + initAdvanceTransactionTest(sendcount, threadcount, isEd25519AndBlake2b); + runContract(); System.out.println("Performance - test case complete"); } + } diff --git a/tests/src/main/java/com/cryptape/cita/tests/BlockFilterFlowableExample.java b/tests/src/test/java/com/cryptape/cita/tests/BlockFilterFlowableTest.java similarity index 73% rename from tests/src/main/java/com/cryptape/cita/tests/BlockFilterFlowableExample.java rename to tests/src/test/java/com/cryptape/cita/tests/BlockFilterFlowableTest.java index ed4afbb0..70121ecc 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/BlockFilterFlowableExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/BlockFilterFlowableTest.java @@ -2,9 +2,10 @@ import com.cryptape.cita.protocol.CITAj; import io.reactivex.Flowable; +import org.junit.Test; -public class BlockFilterFlowableExample { - private static CITAj service; +public class BlockFilterFlowableTest { + public static CITAj service; static { Config conf = new Config(); @@ -12,7 +13,8 @@ public class BlockFilterFlowableExample { service = conf.service; } - public static void main(String[] args) { + @Test + public void testBlockFilterFlowable( ) { Flowable blockFitlerFlowable = service.appBlockHashFlowable(); blockFitlerFlowable.subscribe(block -> System.out.println(block.toString()) diff --git a/tests/src/main/java/com/cryptape/cita/tests/BlockFilterTransactionExample.java b/tests/src/test/java/com/cryptape/cita/tests/BlockFilterTransactionTest.java similarity index 72% rename from tests/src/main/java/com/cryptape/cita/tests/BlockFilterTransactionExample.java rename to tests/src/test/java/com/cryptape/cita/tests/BlockFilterTransactionTest.java index e2fa933e..9b98ecd4 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/BlockFilterTransactionExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/BlockFilterTransactionTest.java @@ -1,17 +1,21 @@ package com.cryptape.cita.tests; -import java.io.IOException; -import java.math.BigInteger; -import java.util.List; -import java.util.concurrent.TimeUnit; +import static junit.framework.TestCase.assertNotNull; +import static junit.framework.TestCase.assertNull; +import static junit.framework.TestCase.assertTrue; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.Request; import com.cryptape.cita.protocol.core.methods.response.AppBlock; import com.cryptape.cita.protocol.core.methods.response.AppFilter; import com.cryptape.cita.protocol.core.methods.response.AppLog; +import java.io.IOException; +import java.math.BigInteger; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class BlockFilterTransactionExample { +public class BlockFilterTransactionTest { private static CITAj service; static { @@ -20,7 +24,8 @@ public class BlockFilterTransactionExample { service = conf.service; } - public static void main(String[] args) throws IOException, InterruptedException { + @Test + public void testBlockFilterTransaction( ) throws IOException, InterruptedException { Request request = service.appNewBlockFilter(); AppFilter appFilter = request.send(); BigInteger filterId = appFilter.getFilterId(); @@ -38,6 +43,9 @@ public static void main(String[] args) throws IOException, InterruptedException Object s = logResult.get(); System.out.println("Block Hash" + s.toString()); AppBlock block = service.appGetBlockByHash(s.toString(), true).send(); + assertNull(block.getError()); + assertNotNull(block.getBlock().getHeader().getNumber()); + assertTrue(block.getBlock().getHash().equals(s.toString())); System.out.println("Block number: " + block.getBlock().getHeader().getNumber() + "\n"); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/Config.java b/tests/src/test/java/com/cryptape/cita/tests/Config.java similarity index 96% rename from tests/src/main/java/com/cryptape/cita/tests/Config.java rename to tests/src/test/java/com/cryptape/cita/tests/Config.java index 59b135c9..781a6a09 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/Config.java +++ b/tests/src/test/java/com/cryptape/cita/tests/Config.java @@ -1,14 +1,13 @@ package com.cryptape.cita.tests; -import java.io.FileInputStream; -import java.util.Properties; - import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.http.HttpService; +import java.io.FileInputStream; +import java.util.Properties; public class Config { - private static final String configPath = "tests/src/main/resources/config.properties"; + private static final String configPath = "src/test/resources/config.properties"; private static final String CHAIN_ID = "ChainId"; private static final String VERSION = "Version"; private static final String TEST_NET_ADDR = "TestNetIpAddr"; @@ -72,7 +71,7 @@ public static Properties load(String path) { props.load(new FileInputStream(path)); } catch (Exception e) { System.out.println("Failed to read config at path " + path); - System.exit(1); + //System.exit(1); } return props; } @@ -84,7 +83,7 @@ public static Properties load() { } catch (Exception e) { System.out.println("Failed to read config file. Error: " + e); e.printStackTrace(); - System.exit(1); + //System.exit(1); } return props; } diff --git a/tests/src/main/java/com/cryptape/cita/tests/DecodeTxExample.java b/tests/src/test/java/com/cryptape/cita/tests/DecodeTxTest.java similarity index 83% rename from tests/src/main/java/com/cryptape/cita/tests/DecodeTxExample.java rename to tests/src/test/java/com/cryptape/cita/tests/DecodeTxTest.java index 95958024..ea910d8d 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/DecodeTxExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/DecodeTxTest.java @@ -1,22 +1,25 @@ package com.cryptape.cita.tests; import static com.cryptape.cita.utils.Numeric.decodeQuantity; +import static junit.framework.TestCase.assertTrue; +import static org.hamcrest.MatcherAssert.assertThat; -import java.io.IOException; -import java.math.BigInteger; -import java.util.concurrent.TimeUnit; - +import com.alibaba.fastjson.JSONObject; import com.cryptape.cita.protobuf.ConvertStrByte; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.methods.request.Transaction; import com.cryptape.cita.protocol.core.methods.response.AppTransaction; import com.google.gson.Gson; +import java.io.IOException; +import java.math.BigInteger; +import java.util.concurrent.TimeUnit; +import org.junit.Test; /* * This example shows how to decode transaction info from response. * */ -public class DecodeTxExample { +public class DecodeTxTest { private static int version; private static BigInteger chainId; private static CITAj service; @@ -29,7 +32,7 @@ public class DecodeTxExample { Config conf = new Config(); conf.buildService(false); service = conf.service; - privateKey = conf.primaryPrivKey; + privateKey = conf.adminPrivateKey; chainId = new BigInteger(conf.chainId); payeeAddr = conf.auxAddr1; quotaToDeploy = Long.parseLong(conf.defaultQuotaDeployment); @@ -51,7 +54,8 @@ private static String createSampleTransaction() throws IOException { return service.appSendRawTransaction(rawTx).send().getSendTransactionResult().getHash(); } - public static void main(String[] args) throws Exception { + @Test + public void testDecodeTx( ) throws Exception { //create a sample transaction String hash = createSampleTransaction(); System.out.println("Hash of the transaction: " + hash); @@ -62,8 +66,9 @@ public static void main(String[] args) throws Exception { //get response transaction AppTransaction appTx = service.appGetTransactionByHash(hash).send(); - com.cryptape.cita.protocol.core.methods.response.Transaction tx - = appTx.getTransaction(); + com.cryptape.cita.protocol.core.methods.response.Transaction tx = appTx.getTransaction(); + JSONObject contendJson = JSONObject.parseObject(new Gson().toJson(tx.decodeContent())); + assertTrue(payeeAddr.equals("0x"+contendJson.getString("to"))); System.out.println(new Gson().toJson(tx.decodeContent())); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java b/tests/src/test/java/com/cryptape/cita/tests/GroupManagerTest.java similarity index 85% rename from tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java rename to tests/src/test/java/com/cryptape/cita/tests/GroupManagerTest.java index b5c07f67..3afdc8b1 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/GroupManagerExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/GroupManagerTest.java @@ -1,23 +1,22 @@ package com.cryptape.cita.tests; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.system.CITASystemContract; -import com.cryptape.cita.protocol.system.CITAjSystemContract; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertFalse; -import java.io.IOException; +import com.cryptape.cita.protocol.system.CITAjSystemContract; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; +import org.junit.Test; /** * Group and Account Management * If you want to know more about the documentation, please click on the link below. * https://docs.citahub.com/zh-CN/cita/account-permission/account */ -public class GroupManagerExample extends SystemContractExample { +public class GroupManagerTest extends SystemContractTest { static String senderAddr; static String adminPrivateKey; static int version; @@ -32,13 +31,16 @@ public class GroupManagerExample extends SystemContractExample { version = TestUtil.getVersion(service); chainId = TestUtil.getChainId(service); } - public static void main(String[] args) throws Exception { + + @Test + public void testGroupManager( ) throws Exception { CITAjSystemContract sysContract = new CITAjSystemContract(service); // New group List addresses = new ArrayList<>(); addresses.add("0x1c6eebf136ee234caff3a95e0d9d22e40c9ac4ca"); String newGroupAddr = sysContract.newGroup("vlk1", addresses, adminPrivateKey, version, chainId); + assertFalse("".equals(newGroupAddr)); if ("".equals(newGroupAddr)) { System.out.println("New group failed！"); return; @@ -48,6 +50,7 @@ public static void main(String[] args) throws Exception { // Update group name boolean updated = sysContract.updateGroupName(newGroupAddr, "TokenNew", adminPrivateKey, version, chainId); + assertTrue(updated); System.out.println("Group updated: " + updated); TimeUnit.SECONDS.sleep(10); @@ -55,16 +58,19 @@ public static void main(String[] args) throws Exception { List addressNeedBeAdded = new ArrayList<>(); addressNeedBeAdded.add("0xbac68e5cb986ead0253e0632da1131a0a96efa18"); updated = sysContract.addAccounts(newGroupAddr, addressNeedBeAdded, adminPrivateKey, version, chainId); + assertTrue(updated); System.out.println("Account is added: " + updated); TimeUnit.SECONDS.sleep(10); // Delete accounts updated = sysContract.deleteAccounts(newGroupAddr, addressNeedBeAdded, adminPrivateKey, version, chainId); + assertTrue(updated); System.out.println("Account is deleted: " + updated); TimeUnit.SECONDS.sleep(10); // Check scope updated = sysContract.checkScope(newGroupAddr, adminPrivateKey, version, chainId); + assertTrue(updated); System.out.println("Check scope: " + updated); TimeUnit.SECONDS.sleep(10); @@ -75,10 +81,12 @@ public static void main(String[] args) throws Exception { System.out.println("Group address: " + s); } } + assertTrue(res.contains(newGroupAddr)); TimeUnit.SECONDS.sleep(10); // Delete group updated = sysContract.deleteGroup(newGroupAddr, adminPrivateKey, version, chainId); + assertTrue(updated); System.out.println("Group deleted: " + updated); TimeUnit.SECONDS.sleep(10); } diff --git a/tests/src/main/java/com/cryptape/cita/tests/PermissionManagerExample.java b/tests/src/test/java/com/cryptape/cita/tests/PermissionManagerTest.java similarity index 76% rename from tests/src/main/java/com/cryptape/cita/tests/PermissionManagerExample.java rename to tests/src/test/java/com/cryptape/cita/tests/PermissionManagerTest.java index 46ebf168..19663da6 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/PermissionManagerExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/PermissionManagerTest.java @@ -1,15 +1,20 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collections; -import java.util.concurrent.TimeUnit; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertFalse; +import com.cryptape.cita.abi.FunctionEncoder; +import com.cryptape.cita.abi.datatypes.Function; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.system.CITAjSystemContract; import com.cryptape.cita.protocol.system.entities.QueryInfoResult; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class PermissionManagerExample { +public class PermissionManagerTest { static CITAj service; static String senderAddr; static String adminPrivateKey; @@ -34,7 +39,13 @@ private static void printQueryInfo(QueryInfoResult result) { result.funcs.forEach(System.out::println); } - public static void main(String[] args) throws Exception { + public String getEncodeOfFunc(String funcName){ + Function func = new Function(funcName, Collections.emptyList(), Collections.emptyList()); + return FunctionEncoder.encode(func).substring(2); + } + + @Test + public void testPermissionManager( ) throws Exception { CITAjSystemContract sysContract = new CITAjSystemContract(service); @@ -43,29 +54,38 @@ public static void main(String[] args) throws Exception { ArrayList funcs = new ArrayList<>(Collections.singletonList("Token")); String newPermissionAddr = sysContract.newPermission( "somePermission1", addrs, funcs, adminPrivateKey, version, chainId); + assertTrue(newPermissionAddr.contains("0x")); + assertTrue(newPermissionAddr.length()==42); System.out.println("Address for new permission: " + newPermissionAddr); TimeUnit.SECONDS.sleep(10); boolean updated = sysContract.updatePermissionName(newPermissionAddr, "TokenNew", adminPrivateKey, version, chainId); + assertTrue(updated); System.out.println("Permission updated: " + updated); TimeUnit.SECONDS.sleep(10); //check if the permission updated QueryInfoResult queryInforesult = sysContract.queryInfo(senderAddr, newPermissionAddr); + String name = queryInforesult.name; + assertTrue(queryInforesult.name.contains("TokenNew")); printQueryInfo(queryInforesult); //add a new resource addrs = new ArrayList<>(Collections.singletonList(senderAddr)); funcs = new ArrayList<>(Collections.singletonList("Token1")); + String funcEncode = getEncodeOfFunc(funcs.get(0)); boolean addResource = sysContract.addResources(addrs, funcs, newPermissionAddr, adminPrivateKey, version, chainId); + assertTrue(addResource); System.out.println("Resource is added: " + addResource); TimeUnit.SECONDS.sleep(10); //check if the resources added queryInforesult = sysContract.queryInfo(senderAddr, newPermissionAddr); + assertTrue(queryInforesult.funcs.contains(funcEncode)); printQueryInfo(queryInforesult); boolean inPermission = sysContract.inPermission(senderAddr, newPermissionAddr, senderAddr, "Token1"); + assertTrue(inPermission); System.out.println("The resource is in permission: " + inPermission); @@ -73,15 +93,18 @@ public static void main(String[] args) throws Exception { addrs = new ArrayList<>(Collections.singletonList(senderAddr)); funcs = new ArrayList<>(Collections.singletonList("Token1")); boolean deleteResource = sysContract.deleteResources(addrs, funcs, newPermissionAddr, adminPrivateKey, version, chainId); + assertTrue(deleteResource); System.out.println("Resource is deleted: " + deleteResource); TimeUnit.SECONDS.sleep(10); //check if the resources deleted queryInforesult = sysContract.queryInfo(senderAddr, newPermissionAddr); + assertFalse(queryInforesult.funcs.contains(funcEncode)); printQueryInfo(queryInforesult); //delete permission boolean deleted = sysContract.deletePermission(newPermissionAddr, adminPrivateKey, version, chainId); + assertTrue(deleted); System.out.println("Permission deleted: " + deleted); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/QuotaManagerExample.java b/tests/src/test/java/com/cryptape/cita/tests/QuotaManagerTest.java similarity index 80% rename from tests/src/main/java/com/cryptape/cita/tests/QuotaManagerExample.java rename to tests/src/test/java/com/cryptape/cita/tests/QuotaManagerTest.java index 60c1fb36..d2f02fc1 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/QuotaManagerExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/QuotaManagerTest.java @@ -1,13 +1,15 @@ package com.cryptape.cita.tests; +import com.cryptape.cita.protocol.CITAj; +import com.cryptape.cita.protocol.system.CITAjSystemContract; import java.math.BigInteger; import java.util.List; import java.util.concurrent.TimeUnit; +import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.system.CITAjSystemContract; - -public class QuotaManagerExample { +public class QuotaManagerTest { static CITAj service; static String senderAddr; static String adminPriavteKey; @@ -24,19 +26,22 @@ public class QuotaManagerExample { chainId = TestUtil.getChainId(service); } - public static void main(String[] args) throws Exception { + @Test + public void testQuotaManager() throws Exception { CITAjSystemContract sysContract = new CITAjSystemContract(service); int bql = sysContract.getBql(senderAddr); System.out.println("BQL(Block quota limit): " + bql + ". default one should be 1073741824"); + int setBql = bql+1; boolean bqlSuccess = sysContract.setBql( - new BigInteger("1073741825"), adminPriavteKey, version, chainId); + new BigInteger(""+setBql), adminPriavteKey, version, chainId); System.out.println("Is Bql set: " + bqlSuccess); System.out.println("Wait 3 seconds for transaction from pending to latest"); TimeUnit.SECONDS.sleep(3); bql = sysContract.getBql(senderAddr); + assertThat(bql,equalTo(setBql)); System.out.println("BQL(Block quota limit): " + bql + ". default one should be 1073741824"); int defaultAql = sysContract.getDefaultAql(senderAddr); @@ -44,8 +49,9 @@ public static void main(String[] args) throws Exception { "Default AQL(Account quota limit): " + defaultAql + ". Default one should be 268435456"); + int setAql = defaultAql+1; boolean setDefaultAqlSucces = sysContract.setDefaultAql( - new BigInteger("268435456"), adminPriavteKey, version, chainId); + new BigInteger(""+setAql), adminPriavteKey, version, chainId); System.out.println("Is default Aql set: " + setDefaultAqlSucces); @@ -53,6 +59,7 @@ public static void main(String[] args) throws Exception { TimeUnit.SECONDS.sleep(5); defaultAql = sysContract.getDefaultAql(senderAddr); + assertThat(defaultAql,equalTo(setAql)); System.out.println( "Default AQL(Account quota limit): " + defaultAql + ". Default one should be 268435456"); @@ -60,14 +67,16 @@ public static void main(String[] args) throws Exception { int aql = sysContract.getAql(senderAddr, senderAddr); System.out.println("AQL(Account quota limit) for addr " + senderAddr + " is: " + aql); + setAql = aql+1; boolean setAqlSuccess = sysContract.setAql( - senderAddr, new BigInteger("1073741824"), adminPriavteKey, version, chainId); + senderAddr, new BigInteger(""+setAql), adminPriavteKey, version, chainId); System.out.println("Is aql set: " + setAqlSuccess); System.out.println("wait 5 seconds for status from pending to latest"); TimeUnit.SECONDS.sleep(5); aql = sysContract.getAql(senderAddr, senderAddr); + assertThat(aql,equalTo(setAql)); System.out.println("AQL(Account quota limit) for addr " + senderAddr + " is: " + aql); List accounts = sysContract.getAccounts(senderAddr); diff --git a/tests/src/test/java/com/cryptape/cita/tests/RpcTest.java b/tests/src/test/java/com/cryptape/cita/tests/RpcTest.java new file mode 100644 index 00000000..e693c729 --- /dev/null +++ b/tests/src/test/java/com/cryptape/cita/tests/RpcTest.java @@ -0,0 +1,286 @@ +package com.cryptape.cita.tests; + +import static junit.framework.TestCase.assertTrue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import com.cryptape.cita.abi.FunctionEncoder; +import com.cryptape.cita.abi.TypeReference; +import com.cryptape.cita.abi.datatypes.Address; +import com.cryptape.cita.abi.datatypes.Function; +import com.cryptape.cita.abi.datatypes.Uint; +import com.cryptape.cita.crypto.Credentials; +import com.cryptape.cita.protocol.CITAj; +import com.cryptape.cita.protocol.core.DefaultBlockParameter; +import com.cryptape.cita.protocol.core.DefaultBlockParameterName; +import com.cryptape.cita.protocol.core.methods.request.Call; +import com.cryptape.cita.protocol.core.methods.request.Transaction; +import com.cryptape.cita.protocol.core.methods.response.AppBlock; +import com.cryptape.cita.protocol.core.methods.response.AppBlockNumber; +import com.cryptape.cita.protocol.core.methods.response.AppCall; +import com.cryptape.cita.protocol.core.methods.response.AppGetBalance; +import com.cryptape.cita.protocol.core.methods.response.AppGetCode; +import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionCount; +import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.cryptape.cita.protocol.core.methods.response.AppMetaData; +import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import com.cryptape.cita.protocol.core.methods.response.AppTransaction; +import com.cryptape.cita.protocol.core.methods.response.AppVersion; +import com.cryptape.cita.protocol.core.methods.response.NetPeerCount; +import com.cryptape.cita.protocol.core.methods.response.NetPeersInfo; +import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.cryptape.cita.utils.Convert; +import com.google.gson.Gson; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Map; +import org.junit.BeforeClass; +import org.junit.Test; + +public class RpcTest { + + private static int version; + private static BigInteger chainId; + private static CITAj service; + private static String value; + private static String privateKey; + private static String adminPrivateKey; + private static long quotaToDeploy; + private static Transaction.CryptoTx cryptoTx; + + + //because unsigned transaction is not supported in cita, there is no method sendTransaction. + String code = "6060604052341561000f57600080fd5b600160a060020" + + "a033316600090815260208190526040902061271090556101" + + "df8061003b6000396000f3006060604052600436106100565" + + "763ffffffff7c010000000000000000000000000000000000" + + "000000000000000000000060003504166327e235e38114610" + + "05b578063a9059cbb1461008c578063f8b2cb4f146100c257" + + "5b600080fd5b341561006657600080fd5b61007a600160a06" + + "0020a03600435166100e1565b604051908152602001604051" + + "80910390f35b341561009757600080fd5b6100ae600160a06" + + "0020a03600435166024356100f3565b604051901515815260" + + "200160405180910390f35b34156100cd57600080fd5b61007" + + "a600160a060020a0360043516610198565b60006020819052" + + "908152604090205481565b600160a060020a0333166000908" + + "1526020819052604081205482901080159061011c57506000" + + "82115b1561018e57600160a060020a0333811660008181526" + + "0208190526040808220805487900390559286168082529083" + + "9020805486019055917fddf252ad1be2c89b69c2b068fc378" + + "daa952ba7f163c4a11628f55a4df523b3ef90859051908152" + + "60200160405180910390a3506001610192565b5060005b929" + + "15050565b600160a060020a03166000908152602081905260" + + "40902054905600a165627a7a72305820f59b7130870eee8f0" + + "44b129f4a20345ffaff662707fc0758133cd16684bc3b160029"; + + static { + Config conf = new Config(); + conf.buildService(true); + service = conf.service; + privateKey = conf.primaryPrivKey; + adminPrivateKey = conf.adminPrivateKey; + quotaToDeploy = Long.parseLong(conf.defaultQuotaDeployment); + value = "0"; + version = TestUtil.getVersion(service); + chainId = TestUtil.getChainId(service); + cryptoTx = Transaction.CryptoTx.valueOf(conf.cryptoTx); + } + + @Test + public void testGetBlockByNumber() throws IOException { + BigInteger number = BigInteger.valueOf(4L); + AppBlock.Block block = service.appGetBlockByNumber(DefaultBlockParameter.valueOf(number), false).send().getBlock(); + assertNotNull(block.getHash()); + assertNotNull(block.getBody()); + System.out.println("block " + number.toString() + " is: " + new Gson().toJson(block)); + } + + @Test + public void testGetBalance() throws Exception { + Credentials c = Credentials.create(privateKey); + String addr = c.getAddress(); + AppGetBalance appGetbalance = service.appGetBalance( + addr, DefaultBlockParameterName.PENDING).send(); + assertNotNull(appGetbalance.getBalance()); + } + + @Test + public void testMetaData() throws Exception { + AppMetaData appMetaData = service.appMetaData(DefaultBlockParameterName.PENDING).send(); + assertNotNull(appMetaData.getAppMetaDataResult()); + System.out.println("AppMetaData: " + new Gson().toJson(appMetaData)); + } + + @Test + public void testNetPeerCount() throws Exception { + NetPeerCount netPeerCount = service.netPeerCount().send(); + assertNotNull(netPeerCount); + System.out.println("net_peerCount:" + netPeerCount.getQuantity()); + } + + @Test + public void testNetPeersInfo() throws Exception { + NetPeersInfo netPeersInfo = service.netPeersInfo().send(); + Map peers = netPeersInfo.getPeersInfo().peers; + System.out.println("net_peersInfo amount:" + netPeersInfo.getPeersInfo().amount); + for (Map.Entry entry : peers.entrySet()) { + assertNotNull(entry.getKey()); + assertNotNull(entry.getValue()); + System.out.println("Address : " + entry.getKey() + " Node : " + entry.getValue()); + } + } + + @Test + public void testGetVersion() throws Exception { + AppVersion appVersion = service.getVersion().send(); + + if(appVersion.getError().equals(null)){ + assertNotNull(appVersion.getVersion()); + }else { + assertTrue(appVersion.getError().getCode() == -32601); + } + } + + @Test + public void testBlockNumber() throws Exception { + AppBlockNumber appBlockNumber = service.appBlockNumber().send(); + BigInteger validBlockNumber = appBlockNumber.getBlockNumber(); + assertTrue(validBlockNumber.longValue()>0); + } + + @Test + public void testAppGetBlockByNumber() + throws Exception { + BigInteger validBlockNumber = BigInteger.valueOf(4L); + boolean isfullTranobj = true; + AppBlock appBlock = service.appGetBlockByNumber( + DefaultBlockParameter.valueOf(validBlockNumber), isfullTranobj).send(); + AppBlock.Block block = appBlock.getBlock(); + assertNotNull(block.getBody()); + } + + @Test + public void testAppGetBlockByHash() + throws Exception { + BigInteger validBlockNumber = BigInteger.valueOf(4L); + AppBlock appBlock = service.appGetBlockByNumber( + DefaultBlockParameter.valueOf(validBlockNumber), true).send(); + String validBlockHash = appBlock.getBlock().getHash(); + AppBlock appFindBlock = service + .appGetBlockByHash(validBlockHash, true).send(); + String appBlockResult = new Gson().toJson(appBlock.getResult().getBody()); + String appBlockFindResult = new Gson().toJson(appFindBlock.getResult().getBody()); + assertThat(appBlockFindResult, equalTo(appBlockResult)); + } + + public AppSendTransaction appSendRawTransaction() throws IOException { + String nonce = TestUtil.getNonce(); + BigInteger validUtil = TestUtil.getValidUtilBlock(service); + Transaction rtx = Transaction.createContractTransaction( + nonce, quotaToDeploy, validUtil.longValue(), + version, chainId, value, code); + String signedTransaction = rtx.sign(adminPrivateKey, cryptoTx, false); + AppSendTransaction appSendTx = service + .appSendRawTransaction(signedTransaction).send(); + return appSendTx; + } + + @Test + public void testAppSendRawTransaction( ) throws Exception { + AppSendTransaction appSendTx = appSendRawTransaction(); + String hash = appSendTx.getSendTransactionResult().getHash(); + String status = appSendTx.getSendTransactionResult().getStatus(); + assertNotNull(hash); + assertNotNull(status); + } + + @Test + public void testAppGetTransactionByHash( ) throws Exception { + AppSendTransaction appSendTx = appSendRawTransaction(); + String hash = appSendTx.getSendTransactionResult().getHash(); + Thread.sleep(8000); + AppTransaction appTransaction = service.appGetTransactionByHash( + hash).send(); + assertNotNull(appTransaction.getTransaction()); + assertNull(appTransaction.getError()); + } + + @Test + public void testAppGetTransactionCount() throws Exception { + Credentials credentials = Credentials.create(privateKey); + String validAccount = credentials.getAddress(); + DefaultBlockParameter param = DefaultBlockParameterName.PENDING; + AppGetTransactionCount appGetTransactionCount = service.appGetTransactionCount( + validAccount, param).send(); + assertTrue(appGetTransactionCount.getTransactionCount().longValue()>=0); + } + + @Test + public void testAppGetTransactionReceipt() throws Exception { + AppSendTransaction appSendTx = appSendRawTransaction(); + String validTransactionHash = appSendTx.getSendTransactionResult().getHash(); + Thread.sleep(8000); + AppGetTransactionReceipt appGetTransactionReceipt = service.appGetTransactionReceipt( + validTransactionHash).send(); + TransactionReceipt transactionReceipt = + appGetTransactionReceipt.getTransactionReceipt(); + assertNotNull(transactionReceipt.getContractAddress()); + assertNull(transactionReceipt.getErrorMessage()); + } + + @Test + public void testAppGetCode() throws Exception { + + AppSendTransaction appSendTx = appSendRawTransaction(); + String validTransactionHash = appSendTx.getSendTransactionResult().getHash(); + Thread.sleep(8000); + AppGetTransactionReceipt appGetTransactionReceipt = service.appGetTransactionReceipt( + validTransactionHash).send(); + TransactionReceipt transactionReceipt = + appGetTransactionReceipt.getTransactionReceipt(); + String validContractAddress = transactionReceipt.getContractAddress(); + AppGetCode appGetCode = service + .appGetCode(validContractAddress, DefaultBlockParameterName.PENDING).send(); + assertThat(code,containsString(appGetCode.getCode().substring(2))); + } + + @Test + public void testAppCall() throws Exception { + // init from address + String fromAddress = Credentials.create(adminPrivateKey).getAddress(); + + // init contract address + AppSendTransaction appSendTx = appSendRawTransaction(); + String validTransactionHash = appSendTx.getSendTransactionResult().getHash(); + Thread.sleep(8000); + AppGetTransactionReceipt appGetTransactionReceipt = service.appGetTransactionReceipt( + validTransactionHash).send(); + TransactionReceipt transactionReceipt = + appGetTransactionReceipt.getTransactionReceipt(); + String contractAddress = transactionReceipt.getContractAddress(); + + // init funcCallData + Function getBalanceFunc = new Function( + "getBalance", + Arrays.asList(new Address(fromAddress)), + Arrays.asList(new TypeReference() { + }) + ); + String funcCallData = FunctionEncoder.encode(getBalanceFunc); + + // send call and check + AppCall appCall = service.appCall( + new Call(fromAddress, contractAddress, funcCallData), + DefaultBlockParameterName.PENDING).send(); + assertNotNull(appCall.getValue()); + } + + @BeforeClass + public static void initSenderBalanceBeforeClass() throws Exception { + //initSenderBalance(); + } +} diff --git a/tests/src/main/java/com/cryptape/cita/tests/SM2ValidationTest.java b/tests/src/test/java/com/cryptape/cita/tests/SM2ValidationTest.java similarity index 98% rename from tests/src/main/java/com/cryptape/cita/tests/SM2ValidationTest.java rename to tests/src/test/java/com/cryptape/cita/tests/SM2ValidationTest.java index 8becc119..cc525ee2 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/SM2ValidationTest.java +++ b/tests/src/test/java/com/cryptape/cita/tests/SM2ValidationTest.java @@ -1,12 +1,11 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; - import com.cryptape.cita.crypto.sm2.SM2; import com.cryptape.cita.crypto.sm2.SM2KeyPair; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.methods.request.Transaction; import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import java.math.BigInteger; /** * This example is to use SM2 to generate 100 pairs of keys @@ -48,11 +47,12 @@ private static String verifyTx(String contractCode, String privateKey) { return testTx.getSendTransactionResult().getHash(); } catch (Exception e) { e.printStackTrace(); - System.exit(1); + //System.exit(1); } return null; } + // need sm2 chain public static void main(String[] args) { // CHECKSTYLE:OFF String contractCode = "6060604052341561000f57600080fd5b600160a060020a033316600090815260208190526040902061271090556101df8061003b6000396000f3006060604052600436106100565763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166327e235e3811461005b578063a9059cbb1461008c578063f8b2cb4f146100c2575b600080fd5b341561006657600080fd5b61007a600160a060020a03600435166100e1565b60405190815260200160405180910390f35b341561009757600080fd5b6100ae600160a060020a03600435166024356100f3565b604051901515815260200160405180910390f35b34156100cd57600080fd5b61007a600160a060020a0360043516610198565b60006020819052908152604090205481565b600160a060020a03331660009081526020819052604081205482901080159061011c5750600082115b1561018e57600160a060020a033381166000818152602081905260408082208054879003905592861680825290839020805486019055917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a3506001610192565b5060005b92915050565b600160a060020a0316600090815260208190526040902054905600a165627a7a72305820f59b7130870eee8f044b129f4a20345ffaff662707fc0758133cd16684bc3b160029"; diff --git a/tests/src/main/java/com/cryptape/cita/tests/SendTransactionSyncExample.java b/tests/src/test/java/com/cryptape/cita/tests/SendTransactionSyncTest.java similarity index 52% rename from tests/src/main/java/com/cryptape/cita/tests/SendTransactionSyncExample.java rename to tests/src/test/java/com/cryptape/cita/tests/SendTransactionSyncTest.java index dc3fbc79..9554c688 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/SendTransactionSyncExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/SendTransactionSyncTest.java @@ -1,6 +1,8 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; +import static junit.framework.TestCase.assertNull; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.DefaultBlockParameterName; @@ -10,9 +12,14 @@ import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; import com.cryptape.cita.tx.response.PollingTransactionReceiptProcessor; import com.cryptape.cita.utils.Convert; +import java.math.BigDecimal; +import java.math.BigInteger; +import org.junit.Test; -public class SendTransactionSyncExample { +public class SendTransactionSyncTest { + private static String adminKey; + private static String adminKeyAddr; private static String payerKey; private static String payerAddr; private static String payeeAddr1; @@ -28,6 +35,8 @@ public class SendTransactionSyncExample { Config conf = new Config(); conf.buildService(false); + adminKey = conf.adminPrivateKey; + adminKeyAddr = conf.adminAddress; payerKey = conf.primaryPrivKey; payerAddr = conf.primaryAddr; payeeAddr1 = conf.auxAddr1; @@ -48,7 +57,7 @@ private static BigInteger getBalance(String address) { balance = response.getBalance(); } catch (Exception e) { System.out.println("failed to get balance."); - System.exit(1); + //System.exit(1); } return balance; } @@ -79,34 +88,47 @@ private static TransactionReceipt transferSync( return txReceipt; } - public static void main(String[] args) throws Exception { + @Test + public void testSendTransactionSync() throws Exception { - System.out.println(payerAddr + ": " - + Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER)); - System.out.println(payeeAddr1 + ": " - + Convert.fromWei(getBalance(payeeAddr1).toString(), Convert.Unit.ETHER)); - System.out.println(payeeAddr2 + ": " - + Convert.fromWei(getBalance(payeeAddr2).toString(), Convert.Unit.ETHER)); + BigDecimal payeeBalanceEther1 = Convert.fromWei(getBalance(payeeAddr1).toString(), Convert.Unit.ETHER); + BigDecimal payeeBalanceEther2 = Convert.fromWei(getBalance(payeeAddr2).toString(), Convert.Unit.ETHER); + System.out.println(payeeAddr1 + ": " + payeeBalanceEther1); + System.out.println(payeeAddr2 + ": " + payeeBalanceEther2); String value = "1"; String valueWei = Convert.toWei(value, Convert.Unit.ETHER).toString(); + TransactionReceipt transactionReceipt1 = transferSync(adminKey, payeeAddr1, valueWei); + TransactionReceipt transactionReceipt2 = transferSync(adminKey, payeeAddr2, valueWei); + assertNull(transactionReceipt1.getErrorMessage()); + assertNull(transactionReceipt2.getErrorMessage()); + BigDecimal payeeBalanceEtherNow1 = Convert.fromWei(getBalance(payeeAddr1).toString(), Convert.Unit.ETHER); + BigDecimal payeeBalanceEtherNow2 = Convert.fromWei(getBalance(payeeAddr2).toString(), Convert.Unit.ETHER); + + System.out.println(payeeAddr1 + ": " + payeeBalanceEtherNow1); + System.out.println(payeeAddr2 + ": " + payeeBalanceEtherNow2); + assertThat(payeeBalanceEtherNow1.subtract(payeeBalanceEther1).intValue()+"", equalTo(value)); + assertThat(payeeBalanceEtherNow2.subtract(payeeBalanceEther2).intValue()+"", equalTo((value))); + } - TransactionReceipt txReceipt = transferSync(payerKey, payeeAddr1, valueWei); - if (txReceipt.getErrorMessage() == null) { - System.out.println(payerAddr + ": " - + Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER)); - System.out.println(payeeAddr1 + ": " - + Convert.fromWei(getBalance(payeeAddr1).toString(), Convert.Unit.ETHER)); - } + public static void initSenderBalance () throws Exception { - TransactionReceipt txReceipt1 = transferSync(payerKey, payeeAddr2, valueWei); + BigDecimal adminBalanceEther = Convert.fromWei(getBalance(adminKeyAddr).toString(), Convert.Unit.ETHER); + BigDecimal payerBalanceEther = Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER); + System.out.println(adminKeyAddr + ": " + adminBalanceEther); + System.out.println(payerAddr + ": " + payerBalanceEther); - if (txReceipt1.getErrorMessage() == null) { - System.out.println(payerAddr + ": " - + Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER)); - System.out.println(payeeAddr2 + ": " - + Convert.fromWei(getBalance(payeeAddr2).toString(), Convert.Unit.ETHER)); - } + String value = "40"; + String valueWei = Convert.toWei(value, Convert.Unit.ETHER).toString(); + TransactionReceipt transactionReceipt1 = transferSync(adminKey, payerAddr, valueWei); + assertNull(transactionReceipt1.getErrorMessage()); + + BigDecimal payerBalanceEtherNow = Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER); + System.out.println(payerAddr + ": " + payerBalanceEtherNow); + + String addEther = payerBalanceEtherNow.subtract(payerBalanceEther)+""; + assertThat(addEther, equalTo(value)); } + } diff --git a/tests/src/main/java/com/cryptape/cita/tests/SendTransactionAsyncExample.java b/tests/src/test/java/com/cryptape/cita/tests/SendTransactionTest.java similarity index 72% rename from tests/src/main/java/com/cryptape/cita/tests/SendTransactionAsyncExample.java rename to tests/src/test/java/com/cryptape/cita/tests/SendTransactionTest.java index 8e0471e7..41c632aa 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/SendTransactionAsyncExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/SendTransactionTest.java @@ -1,8 +1,8 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; +import static junit.framework.TestCase.assertNull; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.DefaultBlockParameterName; @@ -13,8 +13,13 @@ import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; import com.cryptape.cita.tx.response.PollingTransactionReceiptProcessor; import com.cryptape.cita.utils.Convert; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import org.junit.Test; -public class SendTransactionAsyncExample { +public class SendTransactionTest { private static String payerKey; private static String payerAddr; private static String payeeAddr; @@ -28,8 +33,8 @@ public class SendTransactionAsyncExample { static { Config conf = new Config(); conf.buildService(false); - payerKey = conf.primaryPrivKey; - payerAddr = conf.primaryAddr; + payerKey = conf.adminPrivateKey; + payerAddr = conf.adminAddress; payeeAddr = conf.auxAddr1; quotaToTransfer = Long.parseLong(conf.defaultQuotaTransfer); service = conf.service; @@ -38,7 +43,7 @@ public class SendTransactionAsyncExample { cryptoTx = Transaction.CryptoTx.valueOf(conf.cryptoTx); } - private static BigInteger getBalance(String address) { + public static BigInteger getBalance(String address) { BigInteger balance = null; try { AppGetBalance response = service.appGetBalance( @@ -46,7 +51,7 @@ private static BigInteger getBalance(String address) { balance = response.getBalance(); } catch (Exception e) { System.out.println("failed to get balance."); - System.exit(1); + //System.exit(1); } return balance; } @@ -79,33 +84,22 @@ private static TransactionReceipt transferSync( return txReceipt; } - private static Future transferAsync( + public static Future transferAsync( String payerKey, String payeeAddr, String value) { return new RemoteCall<>( () -> transferSync(payerKey, payeeAddr, value)).sendAsync(); } - public static void main(String[] args) { - System.out.println(Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER)); - System.out.println(Convert.fromWei(getBalance(payeeAddr).toString(), Convert.Unit.ETHER)); - + @Test + public void testSendTransaction( ) throws ExecutionException, InterruptedException { + BigDecimal payeeBalance = Convert.fromWei(getBalance(payeeAddr).toString(), Convert.Unit.ETHER); String value = "1"; String valueWei = Convert.toWei(value, Convert.Unit.ETHER).toString(); - Future receiptFuture = - transferAsync(payerKey, payeeAddr, valueWei); - try { - TransactionReceipt receipt = receiptFuture.get(); - if (receipt.getErrorMessage() == null) { - System.out.println( - Convert.fromWei(getBalance(payerAddr).toString(), Convert.Unit.ETHER)); - System.out.println( - Convert.fromWei(getBalance(payeeAddr).toString(), Convert.Unit.ETHER)); - } else { - System.out.println("Error get receipt: " + receipt.getErrorMessage()); - } - } catch (ExecutionException | InterruptedException e) { - e.printStackTrace(); - } + transferAsync(payerKey, payeeAddr, valueWei); + TransactionReceipt receipt = receiptFuture.get(); + assertNull(receipt.getErrorMessage()); + BigDecimal payeeBalanceNow = Convert.fromWei(getBalance(payeeAddr).toString(), Convert.Unit.ETHER); + assertThat(payeeBalanceNow.subtract(payeeBalance).intValue(), equalTo(Integer.parseInt(value))); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/SimpleDataExample.java b/tests/src/test/java/com/cryptape/cita/tests/SimpleDataTest.java similarity index 92% rename from tests/src/main/java/com/cryptape/cita/tests/SimpleDataExample.java rename to tests/src/test/java/com/cryptape/cita/tests/SimpleDataTest.java index 4894b405..edf7c1b9 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/SimpleDataExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/SimpleDataTest.java @@ -1,37 +1,40 @@ package com.cryptape.cita.tests; -import java.io.IOException; -import java.math.BigInteger; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import com.cryptape.cita.abi.FunctionEncoder; import com.cryptape.cita.abi.FunctionReturnDecoder; import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; import com.cryptape.cita.abi.datatypes.Address; import com.cryptape.cita.abi.datatypes.DynamicBytes; import com.cryptape.cita.abi.datatypes.Function; import com.cryptape.cita.abi.datatypes.Type; import com.cryptape.cita.abi.datatypes.Uint; import com.cryptape.cita.abi.datatypes.Utf8String; +import com.cryptape.cita.abi.datatypes.generated.Uint256; +import com.cryptape.cita.protobuf.ConvertStrByte; +import com.cryptape.cita.protocol.CITAj; +import com.cryptape.cita.protocol.core.DefaultBlockParameterName; +import com.cryptape.cita.protocol.core.methods.request.Call; +import com.cryptape.cita.protocol.core.methods.request.Transaction; import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import java.io.IOException; +import java.math.BigInteger; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.junit.Test; /* * The example shows how to deploy a contract with constructor parameters * */ -public class SimpleDataExample { +public class SimpleDataTest { private static BigInteger chainId; private static int version; private static String privateKey; @@ -48,8 +51,8 @@ public class SimpleDataExample { Config conf = new Config(); conf.buildService(false); - privateKey = conf.primaryPrivKey; - fromAddress = conf.primaryAddr; + privateKey = conf.adminPrivateKey; + fromAddress = conf.adminAddress; toAddress = conf.auxAddr1; binPath = conf.simpleBin; @@ -154,7 +157,8 @@ private static String loadContractCode(String binPath) throws Exception { return new String(Files.readAllBytes(Paths.get(binPath))); } - public static void main(String[] args) throws Exception { + @Test + public void testSimpleData() throws Exception { //deploy the contract with sample parameters String deploymentHash = deploySampleContract(1, "userName", "userDesc", toAddress); System.out.println("Hash of contract deployment: " + deploymentHash); @@ -169,5 +173,10 @@ public static void main(String[] args) throws Exception { System.out.println("user name: " + getName()); System.out.println("user desc: " + getUserDesc()); System.out.println("user addr: " + getUserAddr()); + assertThat(getUserId(),equalTo(BigInteger.valueOf(1L))); + assertThat(getName(),equalTo("userName")); + assertThat(getUserDesc(),equalTo("userDesc")); + assertThat(getUserAddr(),equalTo(toAddress)); + } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/StoreRecordExample.java b/tests/src/test/java/com/cryptape/cita/tests/StoreRecordTest.java similarity index 85% rename from tests/src/main/java/com/cryptape/cita/tests/StoreRecordExample.java rename to tests/src/test/java/com/cryptape/cita/tests/StoreRecordTest.java index 459adc29..a0d71d5f 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/StoreRecordExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/StoreRecordTest.java @@ -1,8 +1,7 @@ package com.cryptape.cita.tests; -import java.io.IOException; -import java.math.BigInteger; -import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import com.cryptape.cita.protobuf.Blockchain; import com.cryptape.cita.protobuf.ConvertStrByte; @@ -11,8 +10,12 @@ import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; import com.cryptape.cita.protocol.system.CITAjSystemContract; import com.cryptape.cita.utils.Numeric; +import java.io.IOException; +import java.math.BigInteger; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class StoreRecordExample { +public class StoreRecordTest { private static String payerKey; private static BigInteger chainId; @@ -26,13 +29,14 @@ public class StoreRecordExample { conf.buildService(false); service = conf.service; - payerKey = conf.primaryPrivKey; + payerKey = conf.adminPrivateKey; chainId = TestUtil.getChainId(service); version = TestUtil.getVersion(service); cryptoTx = Transaction.CryptoTx.valueOf(conf.cryptoTx); } - public static void main(String[] args) + @Test + public void testStoreRecord() throws IOException, InterruptedException { String sampleDataToStore = ConvertStrByte @@ -48,13 +52,6 @@ public static void main(String[] args) AppSendTransaction appSendTransaction = service.appSendRawTransaction(signedTx).send(); - if (appSendTransaction.getError() != null) { - System.out.println( - "Failed to get hash of transaction. Error message: " - + appSendTransaction.getError().getMessage()); - System.exit(1); - } - String hash = appSendTransaction.getSendTransactionResult().getHash(); System.out.println("Wait 6s for transaction written into block."); @@ -76,5 +73,7 @@ public static void main(String[] args) .parseFrom(byteSerializedTx); System.out.println(unverifiedTransaction); + String dataStored = unverifiedTransaction.getTransaction().getData().toStringUtf8(); + assertThat(dataStored,equalTo("SampleDataToStore")); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/SystemContractExample.java b/tests/src/test/java/com/cryptape/cita/tests/SystemContractTest.java similarity index 72% rename from tests/src/main/java/com/cryptape/cita/tests/SystemContractExample.java rename to tests/src/test/java/com/cryptape/cita/tests/SystemContractTest.java index ac95be7a..d82e56a8 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/SystemContractExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/SystemContractTest.java @@ -1,12 +1,14 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.util.List; +import static org.junit.Assert.assertTrue; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.system.CITAjSystemContract; +import java.math.BigInteger; +import java.util.List; +import org.junit.Test; -public class SystemContractExample { +public class SystemContractTest { static CITAj service; static String senderAddr; @@ -26,7 +28,8 @@ public class SystemContractExample { sysContract = new CITAjSystemContract(service); } - public static void main(String[] args) throws Exception { + @Test + public void testSystemContract() throws Exception { long quotaPrice = sysContract.getQuotaPrice(senderAddr); System.out.println("Quota price is: " + quotaPrice); @@ -49,25 +52,13 @@ public static void main(String[] args) throws Exception { //test approve node boolean approved = sysContract.approveNode( "0xe2066149012e6c1505e3549d103068bd0f2f0577", adminPriavteKey, version, chainId); - if (approved) { - System.out.println( - "Node(0xe2066149012e6c1505e3549d103068bd0f2f0577) " - + "is added as a consensus node successfully"); - } + List nodesNow = sysContract.listNode(senderAddr); + assertTrue(nodesNow.contains("0xe2066149012e6c1505e3549d103068bd0f2f0577")); //test for delete node boolean deleted = sysContract.deleteNode( "0xe2066149012e6c1505e3549d103068bd0f2f0577", adminPriavteKey, version, chainId); - if (deleted) { - System.out.println( - "Node(0xe2066149012e6c1505e3549d103068bd0f2f0577) " - + "is deleted from consensus nodes successfully."); - } + assertTrue(deleted); - /**Don't try this**/ - //boolean setStake = sysContract.setStake(senderAddr, 2, adminPrivateKey); - //if (setStake) { - // System.out.println("success"); - //} } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/TestUtil.java b/tests/src/test/java/com/cryptape/cita/tests/TestUtil.java similarity index 95% rename from tests/src/main/java/com/cryptape/cita/tests/TestUtil.java rename to tests/src/test/java/com/cryptape/cita/tests/TestUtil.java index 854b96d0..4a0786d3 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TestUtil.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TestUtil.java @@ -1,13 +1,12 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.util.Random; - import com.cryptape.cita.protobuf.ConvertStrByte; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.utils.Numeric; import com.cryptape.cita.protocol.core.methods.response.AppMetaData; +import com.cryptape.cita.utils.Numeric; +import java.math.BigInteger; +import java.util.Random; public class TestUtil { @@ -22,7 +21,7 @@ static int getVersion(CITAj service) { appMetaData = service.appMetaData(DefaultBlockParameterName.PENDING).send(); } catch (Exception e) { e.printStackTrace(); - System.exit(1); + //System.exit(1); } return appMetaData.getAppMetaDataResult().getVersion(); } @@ -33,7 +32,7 @@ static BigInteger getChainId(CITAj service) { appMetaData = service.appMetaData(DefaultBlockParameterName.PENDING).send(); } catch (Exception e) { e.printStackTrace(); - System.exit(1); + //System.exit(1); } return appMetaData.getAppMetaDataResult().getChainId(); } @@ -60,14 +59,14 @@ private static BigInteger getCurrentHeight(CITAj service, int retry) { Thread.sleep(2000); } catch (Exception e1) { System.out.println("failed to get block number, Exception: " + e1); - System.exit(1); + //System.exit(1); } } count++; } if (height == -1) { System.out.println("Failed to get block number after " + count + " times."); - System.exit(1); + //System.exit(1); } return BigInteger.valueOf(height); } diff --git a/tests/src/main/java/com/cryptape/cita/tests/Token.java b/tests/src/test/java/com/cryptape/cita/tests/Token.java similarity index 100% rename from tests/src/main/java/com/cryptape/cita/tests/Token.java rename to tests/src/test/java/com/cryptape/cita/tests/Token.java diff --git a/tests/src/main/java/com/cryptape/cita/tests/TokenAccountExample.java b/tests/src/test/java/com/cryptape/cita/tests/TokenAccountTest.java similarity index 93% rename from tests/src/main/java/com/cryptape/cita/tests/TokenAccountExample.java rename to tests/src/test/java/com/cryptape/cita/tests/TokenAccountTest.java index 29263329..fe18d909 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TokenAccountExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TokenAccountTest.java @@ -1,16 +1,17 @@ package com.cryptape.cita.tests; -import java.io.File; -import java.math.BigInteger; - import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.account.Account; import com.cryptape.cita.protocol.account.CompiledContract; +import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; +import java.io.File; +import java.math.BigInteger; +import org.junit.Ignore; +import org.junit.Test; -public class TokenAccountExample { +public class TokenAccountTest { private static BigInteger chainId; private static int version; @@ -49,7 +50,7 @@ private static TransactionReceipt waitToGetReceipt( .send().getTransactionReceipt(); } - public TokenAccountExample() throws Exception { + public TokenAccountTest() throws Exception { account = new Account(privateKey, service); tokenContract = new CompiledContract(new File(solPath)); @@ -63,7 +64,7 @@ public String deployContract(String path) throws Exception { if (receipt.getErrorMessage() != null) { System.out.println("deploy contract failed because of " + receipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } contractAddress = receipt.getContractAddress(); System.out.println("deploy contract success and contract address is " @@ -83,7 +84,7 @@ public void transfer(String toAddress, BigInteger amount) if (receipt.getErrorMessage() != null) { System.out.println("call transfer method failed because of " + receipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } System.out.println("call transfer method success and receipt is " + receipt.getTransactionHash()); @@ -107,7 +108,7 @@ public void transferRemote(String toAddress, BigInteger amount) throws Exception if (receipt.getErrorMessage() != null) { System.out.println("call transfer method failed because of " + receipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } System.out.println("call transfer method success and receipt is " + receipt.getTransactionHash()); @@ -130,7 +131,7 @@ public void storeAbiToBlockchain() throws Exception { if (receipt.getErrorMessage() != null) { System.out.println("call upload abi method failed because of " + receipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } else { System.out.println("call upload abi method success. Receipt " + receipt); } @@ -144,7 +145,10 @@ public void getAbi() throws Exception { System.out.println("abi: " + abi); } - public static void main(String[] args) throws Exception { + // need solc environment + @Ignore + @Test + public void testTokenAccount() throws Exception { // deploy contract with smart contract solidity file // and call method "transfer" with generated Abi String contractAddr = deployContractAndCallMethodFromSolidity(); @@ -153,14 +157,14 @@ public static void main(String[] args) throws Exception { // and call method "transfer" callContractMethodFromRemoteAbi(contractAddr); - System.exit(0); + //System.exit(0); } //CHECKSTYLE:OFF private static String deployContractAndCallMethodFromSolidity() throws Exception { - TokenAccountExample tokenAccountExample = new TokenAccountExample(); + TokenAccountTest tokenAccountExample = new TokenAccountTest(); String contractAddr = tokenAccountExample.deployContract(solPath); tokenAccountExample.getBalance(fromAddress); tokenAccountExample.getBalance(toAddress); @@ -175,7 +179,7 @@ private static String deployContractAndCallMethodFromSolidity() private static void callContractMethodFromRemoteAbi(String contractAddress) throws Exception { - TokenAccountExample tokenAccountExample = new TokenAccountExample(); + TokenAccountTest tokenAccountExample = new TokenAccountTest(); tokenAccountExample.contractAddress = contractAddress; tokenAccountExample.transferRemote(toAddress, BigInteger.valueOf(500)); tokenAccountExample.getBalanceRemote(fromAddress); diff --git a/tests/src/main/java/com/cryptape/cita/tests/TokenCodegenExample.java b/tests/src/test/java/com/cryptape/cita/tests/TokenCodegenTest.java similarity index 94% rename from tests/src/main/java/com/cryptape/cita/tests/TokenCodegenExample.java rename to tests/src/test/java/com/cryptape/cita/tests/TokenCodegenTest.java index acfcba1c..2f0c20c4 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TokenCodegenExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TokenCodegenTest.java @@ -1,7 +1,11 @@ package com.cryptape.cita.tests; +import com.cryptape.cita.crypto.Credentials; +import com.cryptape.cita.protocol.CITAj; +import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.cryptape.cita.tx.RawTransactionManager; +import com.cryptape.cita.tx.TransactionManager; import java.math.BigInteger; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -12,14 +16,10 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.junit.Ignore; +import org.junit.Test; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.RawTransactionManager; -import com.cryptape.cita.tx.TransactionManager; - -public class TokenCodegenExample { +public class TokenCodegenTest { private static Config conf; private static BigInteger chainId; private static int version; @@ -70,7 +70,7 @@ private static long getBalance(Credentials credentials) { System.out.println("Failed to get balance of account: " + credentials.getAddress()); e.printStackTrace(); - System.exit(1); + //System.exit(1); } return accountBalance; } @@ -94,7 +94,7 @@ private static void waitToGetToken() { } } catch (InterruptedException e) { System.out.println("thread is interrupted accidently"); - System.exit(1); + //System.exit(1); } } @@ -109,7 +109,7 @@ private static void waitToGetToken() { private static boolean isTokenTransferComplete() { Map accountTokens = new HashMap<>(); for (Credentials credentials : testAccounts) { - accountTokens.put(credentials, TokenCodegenExample.getBalance(credentials)); + accountTokens.put(credentials, TokenCodegenTest.getBalance(credentials)); } long totalToken = 0; for (Long token : accountTokens.values()) { @@ -137,10 +137,10 @@ private void shuffle(Credentials credentials) { | TimeoutException e) { System.out.println( "Failed to get receipt from receiptFuture. Failed to shuffle."); - System.exit(1); + //System.exit(1); } catch (Exception e) { System.out.println("Event execute failed. Failed to Shuffle"); - System.exit(1); + //System.exit(1); } } }); @@ -199,7 +199,7 @@ private void randomTransferToken() { long accountBalance = getBalance(account); System.out.println(account.getAddress() + ": " + accountBalance); }); - System.exit(1); + //System.exit(1); } if (event.tokens < shuffleThreshold) { @@ -209,7 +209,9 @@ private void randomTransferToken() { } - public static void main(String[] args) throws Exception { + @Ignore + @Test + public void testTokenCodegen() throws Exception { TransactionManager citaTxManager = new RawTransactionManager( service, creator, 5, 3000); @@ -219,7 +221,7 @@ public static void main(String[] args) throws Exception { service, citaTxManager, quotaDeployment, nonce, TestUtil.getValidUtilBlock(service).longValue(), version, value, chainId).sendAsync(); - TokenCodegenExample tokenCodegenExample = new TokenCodegenExample(); + TokenCodegenTest tokenCodegenExample = new TokenCodegenTest(); System.out.println("Wait 10s for contract to be deployed..."); Thread.sleep(10000); @@ -229,7 +231,7 @@ public static void main(String[] args) throws Exception { + token.getContractAddress()); } else { System.out.println("Failed to deploy the contract."); - System.exit(1); + //System.exit(1); } try { @@ -237,7 +239,7 @@ public static void main(String[] args) throws Exception { } catch (Exception e) { e.printStackTrace(); System.out.println("Interrupted when waiting blocks written in."); - System.exit(1); + //System.exit(1); } try { @@ -247,9 +249,9 @@ public static void main(String[] args) throws Exception { } catch (Exception e) { System.out.println("Failed to get accounts balances"); e.printStackTrace(); - System.exit(1); + //System.exit(1); } - System.exit(0); + //System.exit(0); } private class TransferEvent { diff --git a/tests/src/main/java/com/cryptape/cita/tests/TokenFilterCodeGenExample.java b/tests/src/test/java/com/cryptape/cita/tests/TokenFilterCodeGenTest.java similarity index 78% rename from tests/src/main/java/com/cryptape/cita/tests/TokenFilterCodeGenExample.java rename to tests/src/test/java/com/cryptape/cita/tests/TokenFilterCodeGenTest.java index 97b16cb7..c382403c 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TokenFilterCodeGenExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TokenFilterCodeGenTest.java @@ -1,9 +1,8 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertNotNull; import com.cryptape.cita.crypto.Credentials; import com.cryptape.cita.crypto.sm2.SM2; @@ -15,8 +14,13 @@ import com.cryptape.cita.tx.TransactionManager; import io.reactivex.Flowable; import io.reactivex.functions.Consumer; +import java.math.BigInteger; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class TokenFilterCodeGenExample { +public class TokenFilterCodeGenTest { private static BigInteger chainId; private static int version; private static String payerPrivateKey; @@ -34,9 +38,9 @@ public class TokenFilterCodeGenExample { Config conf = new Config(); conf.buildService(false); - payerPrivateKey = conf.primaryPrivKey; + payerPrivateKey = conf.adminPrivateKey; payeePrivateKey = conf.auxPrivKey1; - payerAddr = conf.primaryAddr; + payerAddr = conf.adminAddress; payeeAddr = conf.auxAddr1; service = conf.service; quota = Long.parseLong(conf.defaultQuotaDeployment); @@ -55,7 +59,7 @@ private static long getBalance(String addr) { } catch (Exception e) { System.out.println("Failed to get balance of account: " + addr); e.printStackTrace(); - System.exit(1); + //System.exit(1); } return accountBalance; } @@ -81,7 +85,7 @@ private void randomTransferToken() { Credentials fromCredential = Credentials.create(payerPrivateKey); Credentials toCredential = Credentials.create(payeePrivateKey); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 6; i++) { System.out.println("Transfer " + i); long fromBalance = getBalance(payerAddr); long transferAmount = ThreadLocalRandom @@ -94,11 +98,14 @@ private void randomTransferToken() { } catch (Exception e) { System.out.println("Thread interrupted."); } + long fromBalanceNow = getBalance(payerAddr); + assertThat(fromBalance-fromBalanceNow,equalTo(transferAmount)); } } - public static void main(String[] args) throws Exception { + @Test + public void TokenFilterCodeGenTest() throws Exception { TransactionManager rawTransactionManager = new RawTransactionManager( service, Credentials.create(payerPrivateKey), 5, 3000); //Instantiate SM2 style rawTransactionManager @@ -115,39 +122,25 @@ public static void main(String[] args) throws Exception { service, rawTransactionManager, 1000000L, nonce, validUtilBlock, version, value, chainId).sendAsync(); - TokenFilterCodeGenExample tokenFilterCodeGenExample = new TokenFilterCodeGenExample(); + TokenFilterCodeGenTest tokenFilterCodeGenExample = new TokenFilterCodeGenTest(); System.out.println("Wait 10s for contract to be deployed..."); Thread.sleep(10000); token = tokenFuture.get(); - if (token != null) { - System.out.println("contract deployment success. Contract address: " - + token.getContractAddress()); - } else { - System.out.println("Failed to deploy the contract."); - System.exit(1); - } + assertNotNull(token.getContractAddress()); + System.out.println("contract deployment success. Contract address: " + + token.getContractAddress()); //in cita 0.20, it seems that contract is not ready even if address is returned. - try { - System.out.println("waiting for transaction in the block"); - TimeUnit.SECONDS.sleep(4); - } catch (Exception e) { - System.out.println("interrupted when waiting for transactions written into block"); - e.printStackTrace(); - System.exit(1); - } - try { - System.out.println("Contract initial state: "); - tokenFilterCodeGenExample.randomTransferToken(); - } catch (Exception e) { - System.out.println("Failed to get accounts balances" + e); - e.printStackTrace(); - System.exit(1); - } - System.exit(0); + System.out.println("waiting for transaction in the block"); + TimeUnit.SECONDS.sleep(4); + System.out.println("interrupted when waiting for transactions written into block"); + + System.out.println("Contract initial state: "); + tokenFilterCodeGenExample.randomTransferToken(); + } private class TransferEvent { @@ -162,14 +155,14 @@ private class TransferEvent { } void execute() { - Token tokenContract = TokenFilterCodeGenExample.this.token; + Token tokenContract = TokenFilterCodeGenTest.this.token; long validUtilBlock = TestUtil.getValidUtilBlock( - TokenFilterCodeGenExample.this.service).longValue(); + TokenFilterCodeGenTest.this.service).longValue(); String nonce = TestUtil.getNonce(); tokenContract.transfer( this.to, BigInteger.valueOf(tokens), - TokenFilterCodeGenExample.quota, + TokenFilterCodeGenTest.quota, nonce, validUtilBlock, version, chainId, value).sendAsync(); } diff --git a/tests/src/main/java/com/cryptape/cita/tests/TokenFilterFlowableExample.java b/tests/src/test/java/com/cryptape/cita/tests/TokenFilterFlowableTest.java similarity index 96% rename from tests/src/main/java/com/cryptape/cita/tests/TokenFilterFlowableExample.java rename to tests/src/test/java/com/cryptape/cita/tests/TokenFilterFlowableTest.java index 30616165..6f858232 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TokenFilterFlowableExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TokenFilterFlowableTest.java @@ -1,32 +1,33 @@ package com.cryptape.cita.tests; -import java.io.IOException; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Collections; -import java.util.concurrent.TimeUnit; +import static com.cryptape.cita.tx.Contract.staticExtractEventParameters; +import static org.junit.Assert.assertTrue; +import com.cryptape.cita.abi.EventEncoder; +import com.cryptape.cita.abi.EventValues; +import com.cryptape.cita.abi.FunctionEncoder; +import com.cryptape.cita.abi.TypeReference; +import com.cryptape.cita.abi.datatypes.Address; +import com.cryptape.cita.abi.datatypes.Event; +import com.cryptape.cita.abi.datatypes.Function; import com.cryptape.cita.abi.datatypes.generated.Uint256; import com.cryptape.cita.protocol.CITAj; import com.cryptape.cita.protocol.core.DefaultBlockParameterName; import com.cryptape.cita.protocol.core.methods.request.AppFilter; import com.cryptape.cita.protocol.core.methods.request.Transaction; +import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; import com.cryptape.cita.protocol.core.methods.response.Log; import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; import io.reactivex.Flowable; -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; - -import static com.cryptape.cita.tx.Contract.staticExtractEventParameters; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Collections; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class TokenFilterFlowableExample { +public class TokenFilterFlowableTest { private static BigInteger chainId; private static int version; private static String privateKey; @@ -40,7 +41,7 @@ public class TokenFilterFlowableExample { Config conf = new Config(); conf.buildService(false); - privateKey = conf.primaryPrivKey; + privateKey = conf.adminPrivateKey; toAddress = conf.auxAddr1; service = conf.service; quota = Long.parseLong(conf.defaultQuotaDeployment); @@ -133,7 +134,8 @@ private static String contractFunctionCall( .send().getSendTransactionResult().getHash(); } - public static void main(String[] args) { + @Test + public void testTokenFilterFlowable() { String contractCode = "6060604052341561000f57600080fd5" + "b600160a060020a03331660009081526020819052604090206127109055610" + "1df8061003b6000396000f3006060604052600436106100565763ffffffff7" @@ -152,6 +154,7 @@ public static void main(String[] args) { + "3506001610192565b5060005b92915050565b600160a060020a03166000908" + "15260208190526040902054905600a165627a7a72305820f59b7130870eee8" + "f044b129f4a20345ffaff662707fc0758133cd16684bc3b160029"; + boolean noException = true; try { String txHash = deployContract(contractCode); System.out.println("wait for 8 secs for contract deployment"); @@ -195,13 +198,14 @@ public static void main(String[] args) { transfer(contractAddr, toAddress, new BigInteger("3")); } catch (IOException e) { + noException = false; e.printStackTrace(); System.out.println("IO Exception: maybe tx is not deployed successfully"); - System.exit(1); } catch (Exception e) { + noException = false; e.printStackTrace(); - System.exit(1); } + assertTrue(noException); } public static class TransferObj { diff --git a/tests/src/main/java/com/cryptape/cita/tests/TokenFilterTransactionExample.java b/tests/src/test/java/com/cryptape/cita/tests/TokenFilterTransactionTest.java similarity index 97% rename from tests/src/main/java/com/cryptape/cita/tests/TokenFilterTransactionExample.java rename to tests/src/test/java/com/cryptape/cita/tests/TokenFilterTransactionTest.java index e281b883..3d10afab 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TokenFilterTransactionExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TokenFilterTransactionTest.java @@ -1,13 +1,6 @@ package com.cryptape.cita.tests; -import java.io.IOException; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.concurrent.TimeUnit; +import static org.junit.Assert.assertTrue; import com.cryptape.cita.abi.EventEncoder; import com.cryptape.cita.abi.EventValues; @@ -22,14 +15,23 @@ import com.cryptape.cita.protocol.core.Request; import com.cryptape.cita.protocol.core.methods.request.AppFilter; import com.cryptape.cita.protocol.core.methods.request.Transaction; +import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; import com.cryptape.cita.protocol.core.methods.response.AppLog; import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; import com.cryptape.cita.protocol.core.methods.response.Log; import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; import com.cryptape.cita.tx.Contract; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import java.io.IOException; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class TokenFilterTransactionExample { +public class TokenFilterTransactionTest { private static BigInteger chainId; private static int version; private static String privateKey; @@ -44,7 +46,7 @@ public class TokenFilterTransactionExample { Config config = new Config(); config.buildService(true); - privateKey = config.primaryPrivKey; + privateKey = config.adminPrivateKey; toAddress = config.auxAddr1; service = config.service; random = new Random(System.currentTimeMillis()); @@ -184,7 +186,8 @@ private static void contractFunctionCall( service.appSendRawTransaction(rawTx).send(); } - public static void main(String[] args) { + @Test + public void TokenFilterTransactionTest() { String contractCode = "6060604052341561000f57600080fd5" + "b600160a060020a03331660009081526020819052604090206127109055610" + "1df8061003b6000396000f3006060604052600436106100565763ffffffff7" @@ -204,6 +207,7 @@ public static void main(String[] args) { + "15260208190526040902054905600a165627a7a72305820f59b7130870eee8" + "f044b129f4a20345ffaff662707fc0758133cd16684bc3b160029"; + boolean noException = true; try { String txHash = deployContract(contractCode); System.out.println("wait for 8 secs for contract deployment"); @@ -251,14 +255,14 @@ public static void main(String[] args) { } System.out.println("Filter Id " + filterId); } catch (IOException e) { + noException = false; e.printStackTrace(); System.out.println("IO Exception: maybe tx is not deployed successfully"); - System.exit(1); } catch (Exception e) { + noException = false; e.printStackTrace(); - System.exit(1); } - + assertTrue(noException); } public static class TransferEventResponse { diff --git a/tests/src/main/java/com/cryptape/cita/tests/TokenTransactionExample.java b/tests/src/test/java/com/cryptape/cita/tests/TokenTransactionTest.java similarity index 93% rename from tests/src/main/java/com/cryptape/cita/tests/TokenTransactionExample.java rename to tests/src/test/java/com/cryptape/cita/tests/TokenTransactionTest.java index 93a8c507..311d3bb1 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/TokenTransactionExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/TokenTransactionTest.java @@ -1,11 +1,8 @@ package com.cryptape.cita.tests; -import java.math.BigInteger; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertNull; import com.cryptape.cita.abi.FunctionEncoder; import com.cryptape.cita.abi.FunctionReturnDecoder; @@ -20,9 +17,16 @@ import com.cryptape.cita.protocol.core.methods.request.Call; import com.cryptape.cita.protocol.core.methods.request.Transaction; import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import java.math.BigInteger; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.junit.Test; -public class TokenTransactionExample { +public class TokenTransactionTest { private static BigInteger chainId; private static int version; private static String privateKey; @@ -38,8 +42,8 @@ public class TokenTransactionExample { Config conf = new Config(); conf.buildService(false); - privateKey = conf.primaryPrivKey; - fromAddress = conf.primaryAddr; + privateKey = conf.adminPrivateKey; + fromAddress = conf.adminAddress; toAddress = conf.auxAddr1; binPath = conf.tokenBin; @@ -124,7 +128,8 @@ private static String getBalance(String fromAddr, String contractAddress) throws return resultTypes.get(0).getValue().toString(); } - public static void main(String[] args) throws Exception { + @Test + public void testTokenTransaction() throws Exception { // deploy contract String contractCode = loadContractCode(binPath); System.out.println(contractCode); @@ -138,7 +143,7 @@ public static void main(String[] args) throws Exception { if (txReceipt.getErrorMessage() != null) { System.out.println("There is something wrong in deployContractTxHash. Error: " + txReceipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } String contractAddress = txReceipt.getContractAddress(); System.out.println("Contract deployed successfully. Contract address: " @@ -156,10 +161,11 @@ public static void main(String[] args) throws Exception { Thread.sleep(10000); TransactionReceipt transferTxReceipt = getTransactionReceipt(transferTxHash); + assertNull(transferTxReceipt.getErrorMessage()); if (transferTxReceipt.getErrorMessage() != null) { System.out.println("Failed to call transfer method in contract. Error: " + transferTxReceipt.getErrorMessage()); - System.exit(1); + //System.exit(1); } System.out.println("call transfer method success and receipt is " + transferTxHash); @@ -169,6 +175,6 @@ public static void main(String[] args) throws Exception { System.out.println(toAddress + " has " + balanceTo + " tokens."); System.out.println("Complete"); - System.exit(0); + assertThat(balaneFrom,equalTo("9000")); } } diff --git a/tests/src/main/java/com/cryptape/cita/tests/VerifySignatureExample.java b/tests/src/test/java/com/cryptape/cita/tests/VerifySignatureTest.java similarity index 91% rename from tests/src/main/java/com/cryptape/cita/tests/VerifySignatureExample.java rename to tests/src/test/java/com/cryptape/cita/tests/VerifySignatureTest.java index e5bed23a..d8b2fbbc 100644 --- a/tests/src/main/java/com/cryptape/cita/tests/VerifySignatureExample.java +++ b/tests/src/test/java/com/cryptape/cita/tests/VerifySignatureTest.java @@ -1,8 +1,6 @@ package com.cryptape.cita.tests; -import java.io.IOException; -import java.math.BigInteger; -import java.util.concurrent.TimeUnit; +import static org.junit.Assert.assertTrue; import com.cryptape.cita.protobuf.ConvertStrByte; import com.cryptape.cita.protocol.CITAj; @@ -10,8 +8,12 @@ import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; import com.cryptape.cita.protocol.core.methods.response.AppTransaction; import com.cryptape.cita.utils.Numeric; +import java.io.IOException; +import java.math.BigInteger; +import java.util.concurrent.TimeUnit; +import org.junit.Test; -public class VerifySignatureExample { +public class VerifySignatureTest { private static String privateKey; private static String primaryAddr; private static BigInteger chainId; @@ -24,8 +26,8 @@ public class VerifySignatureExample { Config conf = new Config(); conf.buildService(false); - privateKey = conf.primaryPrivKey; - primaryAddr = conf.primaryAddr; + privateKey = conf.adminPrivateKey; + primaryAddr = conf.adminAddress; service = conf.service; chainId = TestUtil.getChainId(service); version = TestUtil.getVersion(service); @@ -64,7 +66,8 @@ private static String sendSampleTransaction(String signedTx) } } - public static void main(String[] args) throws Exception { + @Test + public void testVerifySignatureTest() throws Exception { //create a sample transaction Transaction tx = createSampleTransaction(); @@ -86,5 +89,6 @@ public static void main(String[] args) throws Exception { //verify signature in response transaction boolean valid = respTx.verifySignature(primaryAddr); System.out.println("Verification: " + valid); + assertTrue(valid); } } diff --git a/tests/src/main/resources/Advance.abi b/tests/src/test/resources/Advance.abi similarity index 100% rename from tests/src/main/resources/Advance.abi rename to tests/src/test/resources/Advance.abi diff --git a/tests/src/main/resources/Advance.bin b/tests/src/test/resources/Advance.bin similarity index 100% rename from tests/src/main/resources/Advance.bin rename to tests/src/test/resources/Advance.bin diff --git a/tests/src/main/resources/Advance.sol b/tests/src/test/resources/Advance.sol similarity index 100% rename from tests/src/main/resources/Advance.sol rename to tests/src/test/resources/Advance.sol diff --git a/tests/src/main/resources/SafeMath.sol b/tests/src/test/resources/SafeMath.sol similarity index 100% rename from tests/src/main/resources/SafeMath.sol rename to tests/src/test/resources/SafeMath.sol diff --git a/tests/src/main/resources/SimpleData.abi b/tests/src/test/resources/SimpleData.abi similarity index 100% rename from tests/src/main/resources/SimpleData.abi rename to tests/src/test/resources/SimpleData.abi diff --git a/tests/src/main/resources/SimpleData.bin b/tests/src/test/resources/SimpleData.bin similarity index 100% rename from tests/src/main/resources/SimpleData.bin rename to tests/src/test/resources/SimpleData.bin diff --git a/tests/src/main/resources/SimpleData.sol b/tests/src/test/resources/SimpleData.sol similarity index 100% rename from tests/src/main/resources/SimpleData.sol rename to tests/src/test/resources/SimpleData.sol diff --git a/tests/src/main/resources/Token.abi b/tests/src/test/resources/Token.abi similarity index 100% rename from tests/src/main/resources/Token.abi rename to tests/src/test/resources/Token.abi diff --git a/tests/src/main/resources/Token.bin b/tests/src/test/resources/Token.bin similarity index 100% rename from tests/src/main/resources/Token.bin rename to tests/src/test/resources/Token.bin diff --git a/tests/src/main/resources/Token.sol b/tests/src/test/resources/Token.sol similarity index 100% rename from tests/src/main/resources/Token.sol rename to tests/src/test/resources/Token.sol diff --git a/tests/src/main/resources/config.json b/tests/src/test/resources/config.json similarity index 100% rename from tests/src/main/resources/config.json rename to tests/src/test/resources/config.json diff --git a/tests/src/main/resources/config.properties.example b/tests/src/test/resources/config.properties.example similarity index 79% rename from tests/src/main/resources/config.properties.example rename to tests/src/test/resources/config.properties.example index 443106e2..0ae71868 100644 --- a/tests/src/main/resources/config.properties.example +++ b/tests/src/test/resources/config.properties.example @@ -7,10 +7,10 @@ TestPrivateKey1=0x02b8f18d92354b055bd02cd51449b05b7b97104931f10485d1df905e4e70fb TestAddress1=0xbac68e5cb986ead0253e0632da1131a0a96efa18 TestPrivateKey2=0xefa5668cd759045918ee7ef88d43c1beed32622f98ea76711e1a8f59ddeb0fe9 TestAddress2=0x1c6eebf136ee234caff3a95e0d9d22e40c9ac4ca -TokenSolidity=tests/src/main/resources/Token.sol -TokenBin=tests/src/main/resources/Token.bin -TokenAbi=tests/src/main/resources/Token.abi -SimpleDataBin=tests/src/main/resources/SimpleData.bin +TokenSolidity=src/test/resources/Token.sol +TokenBin=src/test/resources/Token.bin +TokenAbi=src/test/resources/Token.abi +SimpleDataBin=src/test/resources/SimpleData.bin QuotaForTransfer=21000 QuotaForDeployment=10000000 AdminPrivateKey=0x5a0257a4778057a8a7d97809bd209055b2fbafa654ce7d31ec7191066b9225e6 From c761d38ec7871f7d6da5497a55129b99e799541a Mon Sep 17 00:00:00 2001 From: chenhao Date: Wed, 9 Oct 2019 10:18:16 +0800 Subject: [PATCH 05/20] fix test-result error and fix log-max errpr in travis --- .travis.yml | 4 ++-- scripts/run-system-test.sh | 2 +- scripts/run.sh | 1 + scripts/travis-upload-test-report-to-gh-pages.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c70c2666..de975037 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ cache: before_script: # upgrade gradle to 5.0 - - wget http://services.gradle.org/distributions/gradle-5.0-all.zip > /dev/null - - unzip gradle-5.0-all.zip + - 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 script: bash ./scripts/run.sh diff --git a/scripts/run-system-test.sh b/scripts/run-system-test.sh index ce67a282..ad2d1f04 100644 --- a/scripts/run-system-test.sh +++ b/scripts/run-system-test.sh @@ -33,7 +33,7 @@ cat pom.xml | grep -A 3 ">core<" # install cita-cli and run test rm -r target/* -make install-cita-cli +make install-cita-cli > ${DEBUG_LOG_PATH} mvn test -Dtest=com.cryptape.function.sdkcase.** MAVEN_TEST_RESULT=$? diff --git a/scripts/run.sh b/scripts/run.sh index 689b6557..532cdb83 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -3,6 +3,7 @@ if [ ${TEST_TYPE} == UT ]; then echo "run unit test" bash scripts/run-unit-test.sh + exit $? fi if [ ${TEST_TYPE} == ST ]; then diff --git a/scripts/travis-upload-test-report-to-gh-pages.sh b/scripts/travis-upload-test-report-to-gh-pages.sh index b5994664..52c64696 100755 --- a/scripts/travis-upload-test-report-to-gh-pages.sh +++ b/scripts/travis-upload-test-report-to-gh-pages.sh @@ -12,7 +12,7 @@ echo "Starting to update gh-pages" # gh page info owner_name=`echo $TRAVIS_REPO_SLUG|cut -d / -f 1` repo_name=`echo $TRAVIS_REPO_SLUG|cut -d / -f 2` -gh_pages_url="https://cryptape.github.io/cita-sdk-java/" +gh_pages_url="https://cryptape.github.io/cita-sdk-java" test_report_url="$gh_pages_url/reports/${TRAVIS_JOB_ID}/" test_result_mark="×" From 44d530b4df010d4af2d5eca7283f8790ac53431c Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 14 Oct 2019 11:34:44 +0800 Subject: [PATCH 06/20] to support param-having func in permission manager --- .../java/com/cryptape/cita/abi/FunctionEncoder.java | 2 +- .../java/com/cryptape/cita/protocol/system/Util.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java b/abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java index 363757b5..340a86f2 100644 --- a/abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java +++ b/abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java @@ -88,7 +88,7 @@ static String buildMethodSignature(String methodName, List 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); diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/Util.java b/core/src/main/java/com/cryptape/cita/protocol/system/Util.java index aaa686c2..707981dd 100644 --- a/core/src/main/java/com/cryptape/cita/protocol/system/Util.java +++ b/core/src/main/java/com/cryptape/cita/protocol/system/Util.java @@ -1,5 +1,7 @@ package com.cryptape.cita.protocol.system; +import static com.cryptape.cita.abi.FunctionEncoder.buildMethodId; + import java.math.BigInteger; import java.util.Collections; import java.util.Random; @@ -68,9 +70,13 @@ static String addUpTo64Hex(String hexStr) { } - static String generateFunSig(String funcName) { - Function func = new Function(funcName, Collections.emptyList(), Collections.emptyList()); - return FunctionEncoder.encode(func); + static String generateFunSig(String funcSignature) { + if(funcSignature.contains("(") && funcSignature.contains(")")){ + return buildMethodId(funcSignature); + } else { + // compatible with old ways of using, only the func name + return buildMethodId(funcSignature+"()"); + } } static String hexToASCII(String hexValue) { From 224b617dacf29087e88a7814345155b8f06ac301 Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 14 Oct 2019 12:53:19 +0800 Subject: [PATCH 07/20] add notes for permission name param length --- .../com/cryptape/cita/protocol/system/CITAjSystemContract.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java b/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java index d6e267b7..442d887f 100644 --- a/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java +++ b/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java @@ -253,6 +253,7 @@ public List getQuotas(String from) throws IOException { return resultList; } + // the name param length, Chinese should not exceed 16 and English should not exceed 32 public String newPermission( String name, List addrs, From dcea5ee77bd673c279f72b7959fb4f0d799a8059 Mon Sep 17 00:00:00 2001 From: chenhao Date: Wed, 16 Oct 2019 15:31:09 +0800 Subject: [PATCH 08/20] update version and changelog and readme --- CHANGELOG.md | 7 +++++++ README.md | 8 ++++---- build.gradle | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1212d7..aadabd51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ All notable changes to this project will be documented in this file. +# [v0.25.0](https://github.com/cryptape/cita-sdk-java/compare/v0.24.1...v0.25.0) (2019-08-27) + +### Feature + +* add queryGroups RPC request +* add newGroup RPC request + # [v0.24.1](https://github.com/cryptape/cita-sdk-java/compare/v0.24.0...v0.24.1) (2019-08-16) ### Feature diff --git a/README.md b/README.md index 7b4b99e1..87898020 100644 --- a/README.md +++ b/README.md @@ -29,12 +29,12 @@ maven com.cryptape.cita core - 0.24.1 + 0.25.0 ``` Gradle ``` -compile 'com.cryptape.cita:core:0.24.1' +compile 'com.cryptape.cita:core:0.25.0' ``` Install manually @@ -208,12 +208,12 @@ Gradle 5.0 com.cryptape.cita core - 0.24.1 + 0.25.0 ``` Gradle ``` -compile 'com.cryptape.cita:core:0.24.1' +compile 'com.cryptape.cita:core:0.25.0' ``` 手动安装 diff --git a/build.gradle b/build.gradle index 1b246717..89617197 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ allprojects { targetCompatibility = 1.8 group 'com.cryptape.cita' - version '0.24.1' + version '0.25.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.24.1' + version '0.25.0' from components.java artifact sourcesJar { From 4a1154a4bd2e48f7a0333e7641e46c09ad7ee2fa Mon Sep 17 00:00:00 2001 From: chenhao Date: Wed, 16 Oct 2019 18:49:46 +0800 Subject: [PATCH 09/20] fix testnet url --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87898020..1db57727 100644 --- a/README.md +++ b/README.md @@ -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). @@ -230,7 +230,7 @@ gradle shadowJar ### CITA 测试网络 使用 CITA 测试网络（推荐）： -https://node.cryptape.com +https://testnet.citahub.com 或者可以部署你自己的 CITA： 如果需要了解怎么部署 CITA 网络，请查阅[CITA](https://github.com/cryptape/cita)。 From 9fc39230b3bf307e10bd381a07b1fb3db8ebe80a Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 25 Oct 2019 11:58:46 +0800 Subject: [PATCH 10/20] update version and changelog and readme for v1.0.0 --- CHANGELOG.md | 16 ++++++++++++++++ README.md | 8 ++++---- build.gradle | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aadabd51..5ebc8483 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 1db57727..b21a28a7 100644 --- a/README.md +++ b/README.md @@ -29,12 +29,12 @@ maven com.cryptape.cita core - 0.25.0 + 1.0.0 ``` Gradle ``` -compile 'com.cryptape.cita:core:0.25.0' +compile 'com.cryptape.cita:core:1.0.0' ``` Install manually @@ -208,12 +208,12 @@ Gradle 5.0 com.cryptape.cita core - 0.25.0 + 1.0.0 ``` Gradle ``` -compile 'com.cryptape.cita:core:0.25.0' +compile 'com.cryptape.cita:core:1.0.0' ``` 手动安装 diff --git a/build.gradle b/build.gradle index 89617197..c52b3959 100644 --- a/build.gradle +++ b/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 { From 3feca348bd15e395fdbf2c94952fbbe41af1ca6d Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 15 Nov 2019 21:47:56 +0800 Subject: [PATCH 11/20] fix gradle url --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index de975037..46e82d62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - 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/ +sudo: required # 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: @@ -26,8 +26,8 @@ cache: 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 + - test -e $HOME/.gradle/caches/gradle-5.0.zip || sudo wget https://services.gradle.org/distributions/gradle-5.0-all.zip -O $HOME/.gradle/caches/gradle-5.0.zip > debug.log + - sudo unzip $HOME/.gradle/caches/gradle-5.0.zip > debug.log - ./gradle-5.0/bin/gradle -v script: bash ./scripts/run.sh From 286be97d0c92ce6e5cdcd87a76f2a64d75369272 Mon Sep 17 00:00:00 2001 From: RainChen Date: Fri, 15 Nov 2019 11:13:35 +0800 Subject: [PATCH 12/20] show license and tag badges in README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b21a28a7..1cc8f473 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # cita-sdk-java [![Build Status](https://travis-ci.org/cryptape/cita-sdk-java.svg?branch=master)](https://travis-ci.org/cryptape/cita-sdk-java) +[![License: Apache-2.0](https://img.shields.io/github/license/cryptape/cita-sdk-java.svg)](https://github.com/cryptape/cita-sdk-java/blob/master/LICENSE) +![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/cryptape/cita-sdk-java.svg) + [English](https://github.com/cryptape/cita-sdk-java#introduction) [中文](https://github.com/cryptape/cita-sdk-java#简介) From 2e07b611e4ac5cb214d5c338b70afb3c3d6f5336 Mon Sep 17 00:00:00 2001 From: UDLD Date: Tue, 3 Dec 2019 20:20:45 +0800 Subject: [PATCH 13/20] rename cryptape to citahub --- .../java/com/{cryptape => citahub}/cita/abi/EventEncoder.java | 0 .../main/java/com/{cryptape => citahub}/cita/abi/EventValues.java | 0 .../java/com/{cryptape => citahub}/cita/abi/FunctionEncoder.java | 0 .../com/{cryptape => citahub}/cita/abi/FunctionReturnDecoder.java | 0 .../main/java/com/{cryptape => citahub}/cita/abi/TypeDecoder.java | 0 .../main/java/com/{cryptape => citahub}/cita/abi/TypeEncoder.java | 0 .../com/{cryptape => citahub}/cita/abi/TypeMappingException.java | 0 .../java/com/{cryptape => citahub}/cita/abi/TypeReference.java | 0 abi/src/main/java/com/{cryptape => citahub}/cita/abi/Utils.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/Address.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Array.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Bool.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Bytes.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/BytesType.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/DynamicArray.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/DynamicBytes.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Event.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Fixed.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/FixedPointType.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/Function.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Int.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/IntType.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/NumericType.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/StaticArray.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Type.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Ufixed.java | 0 .../java/com/{cryptape => citahub}/cita/abi/datatypes/Uint.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/UnorderedEvent.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/Utf8String.java | 0 .../cita/abi/datatypes/generated/AbiTypes.java | 0 .../cita/abi/datatypes/generated/Bytes1.java | 0 .../cita/abi/datatypes/generated/Bytes10.java | 0 .../cita/abi/datatypes/generated/Bytes11.java | 0 .../cita/abi/datatypes/generated/Bytes12.java | 0 .../cita/abi/datatypes/generated/Bytes13.java | 0 .../cita/abi/datatypes/generated/Bytes14.java | 0 .../cita/abi/datatypes/generated/Bytes15.java | 0 .../cita/abi/datatypes/generated/Bytes16.java | 0 .../cita/abi/datatypes/generated/Bytes17.java | 0 .../cita/abi/datatypes/generated/Bytes18.java | 0 .../cita/abi/datatypes/generated/Bytes19.java | 0 .../cita/abi/datatypes/generated/Bytes2.java | 0 .../cita/abi/datatypes/generated/Bytes20.java | 0 .../cita/abi/datatypes/generated/Bytes21.java | 0 .../cita/abi/datatypes/generated/Bytes22.java | 0 .../cita/abi/datatypes/generated/Bytes23.java | 0 .../cita/abi/datatypes/generated/Bytes24.java | 0 .../cita/abi/datatypes/generated/Bytes25.java | 0 .../cita/abi/datatypes/generated/Bytes26.java | 0 .../cita/abi/datatypes/generated/Bytes27.java | 0 .../cita/abi/datatypes/generated/Bytes28.java | 0 .../cita/abi/datatypes/generated/Bytes29.java | 0 .../cita/abi/datatypes/generated/Bytes3.java | 0 .../cita/abi/datatypes/generated/Bytes30.java | 0 .../cita/abi/datatypes/generated/Bytes31.java | 0 .../cita/abi/datatypes/generated/Bytes32.java | 0 .../cita/abi/datatypes/generated/Bytes4.java | 0 .../cita/abi/datatypes/generated/Bytes5.java | 0 .../cita/abi/datatypes/generated/Bytes6.java | 0 .../cita/abi/datatypes/generated/Bytes7.java | 0 .../cita/abi/datatypes/generated/Bytes8.java | 0 .../cita/abi/datatypes/generated/Bytes9.java | 0 .../cita/abi/datatypes/generated/Int104.java | 0 .../cita/abi/datatypes/generated/Int112.java | 0 .../cita/abi/datatypes/generated/Int120.java | 0 .../cita/abi/datatypes/generated/Int128.java | 0 .../cita/abi/datatypes/generated/Int136.java | 0 .../cita/abi/datatypes/generated/Int144.java | 0 .../cita/abi/datatypes/generated/Int152.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int16.java | 0 .../cita/abi/datatypes/generated/Int160.java | 0 .../cita/abi/datatypes/generated/Int168.java | 0 .../cita/abi/datatypes/generated/Int176.java | 0 .../cita/abi/datatypes/generated/Int184.java | 0 .../cita/abi/datatypes/generated/Int192.java | 0 .../cita/abi/datatypes/generated/Int200.java | 0 .../cita/abi/datatypes/generated/Int208.java | 0 .../cita/abi/datatypes/generated/Int216.java | 0 .../cita/abi/datatypes/generated/Int224.java | 0 .../cita/abi/datatypes/generated/Int232.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int24.java | 0 .../cita/abi/datatypes/generated/Int240.java | 0 .../cita/abi/datatypes/generated/Int248.java | 0 .../cita/abi/datatypes/generated/Int256.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int32.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int40.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int48.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int56.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int64.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int72.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int8.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int80.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int88.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Int96.java | 0 .../cita/abi/datatypes/generated/StaticArray1.java | 0 .../cita/abi/datatypes/generated/StaticArray10.java | 0 .../cita/abi/datatypes/generated/StaticArray11.java | 0 .../cita/abi/datatypes/generated/StaticArray12.java | 0 .../cita/abi/datatypes/generated/StaticArray13.java | 0 .../cita/abi/datatypes/generated/StaticArray14.java | 0 .../cita/abi/datatypes/generated/StaticArray15.java | 0 .../cita/abi/datatypes/generated/StaticArray16.java | 0 .../cita/abi/datatypes/generated/StaticArray17.java | 0 .../cita/abi/datatypes/generated/StaticArray18.java | 0 .../cita/abi/datatypes/generated/StaticArray19.java | 0 .../cita/abi/datatypes/generated/StaticArray2.java | 0 .../cita/abi/datatypes/generated/StaticArray20.java | 0 .../cita/abi/datatypes/generated/StaticArray21.java | 0 .../cita/abi/datatypes/generated/StaticArray22.java | 0 .../cita/abi/datatypes/generated/StaticArray23.java | 0 .../cita/abi/datatypes/generated/StaticArray24.java | 0 .../cita/abi/datatypes/generated/StaticArray25.java | 0 .../cita/abi/datatypes/generated/StaticArray26.java | 0 .../cita/abi/datatypes/generated/StaticArray27.java | 0 .../cita/abi/datatypes/generated/StaticArray28.java | 0 .../cita/abi/datatypes/generated/StaticArray29.java | 0 .../cita/abi/datatypes/generated/StaticArray3.java | 0 .../cita/abi/datatypes/generated/StaticArray30.java | 0 .../cita/abi/datatypes/generated/StaticArray31.java | 0 .../cita/abi/datatypes/generated/StaticArray32.java | 0 .../cita/abi/datatypes/generated/StaticArray4.java | 0 .../cita/abi/datatypes/generated/StaticArray5.java | 0 .../cita/abi/datatypes/generated/StaticArray6.java | 0 .../cita/abi/datatypes/generated/StaticArray7.java | 0 .../cita/abi/datatypes/generated/StaticArray8.java | 0 .../cita/abi/datatypes/generated/StaticArray9.java | 0 .../cita/abi/datatypes/generated/Uint104.java | 0 .../cita/abi/datatypes/generated/Uint112.java | 0 .../cita/abi/datatypes/generated/Uint120.java | 0 .../cita/abi/datatypes/generated/Uint128.java | 0 .../cita/abi/datatypes/generated/Uint136.java | 0 .../cita/abi/datatypes/generated/Uint144.java | 0 .../cita/abi/datatypes/generated/Uint152.java | 0 .../cita/abi/datatypes/generated/Uint16.java | 0 .../cita/abi/datatypes/generated/Uint160.java | 0 .../cita/abi/datatypes/generated/Uint168.java | 0 .../cita/abi/datatypes/generated/Uint176.java | 0 .../cita/abi/datatypes/generated/Uint184.java | 0 .../cita/abi/datatypes/generated/Uint192.java | 0 .../cita/abi/datatypes/generated/Uint200.java | 0 .../cita/abi/datatypes/generated/Uint208.java | 0 .../cita/abi/datatypes/generated/Uint216.java | 0 .../cita/abi/datatypes/generated/Uint224.java | 0 .../cita/abi/datatypes/generated/Uint232.java | 0 .../cita/abi/datatypes/generated/Uint24.java | 0 .../cita/abi/datatypes/generated/Uint240.java | 0 .../cita/abi/datatypes/generated/Uint248.java | 0 .../cita/abi/datatypes/generated/Uint256.java | 0 .../cita/abi/datatypes/generated/Uint32.java | 0 .../cita/abi/datatypes/generated/Uint40.java | 0 .../cita/abi/datatypes/generated/Uint48.java | 0 .../cita/abi/datatypes/generated/Uint56.java | 0 .../cita/abi/datatypes/generated/Uint64.java | 0 .../cita/abi/datatypes/generated/Uint72.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/generated/Uint8.java | 0 .../cita/abi/datatypes/generated/Uint80.java | 0 .../cita/abi/datatypes/generated/Uint88.java | 0 .../cita/abi/datatypes/generated/Uint96.java | 0 .../java/com/{cryptape => citahub}/cita/abi/EventEncoderTest.java | 0 .../com/{cryptape => citahub}/cita/abi/FunctionEncoderTest.java | 0 .../{cryptape => citahub}/cita/abi/FunctionReturnDecoderTest.java | 0 .../java/com/{cryptape => citahub}/cita/abi/TypeDecoderTest.java | 0 .../java/com/{cryptape => citahub}/cita/abi/TypeEncoderTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/abi/UtilsTest.java | 0 .../com/{cryptape => citahub}/cita/abi/datatypes/AddressTest.java | 0 .../cita/abi/datatypes/FixedPointTypeTest.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/StaticArrayTest.java | 0 .../{cryptape => citahub}/cita/abi/datatypes/Utf8StringTest.java | 0 .../com/{cryptape => citahub}/cita/codegen/AbiTypesGenerator.java | 0 .../cita/codegen/AbiTypesMapperGenerator.java | 0 .../main/java/com/{cryptape => citahub}/cita/codegen/Console.java | 0 .../cita/codegen/FunctionWrapperGenerator.java | 0 .../java/com/{cryptape => citahub}/cita/codegen/Generator.java | 0 .../cita/codegen/SolidityFunctionWrapper.java | 0 .../cita/codegen/SolidityFunctionWrapperGenerator.java | 0 .../cita/codegen/TruffleJsonFunctionWrapperGenerator.java | 0 .../com/{cryptape => citahub}/cita/codegen/TupleGenerator.java | 0 .../java/com/{cryptape => citahub}/cita/TempFileProvider.java | 0 .../{cryptape => citahub}/cita/codegen/AbiTypesGeneratorTest.java | 0 .../cita/codegen/AbiTypesMapperGeneratorTest.java | 0 .../{cryptape => citahub}/cita/codegen/ContractJsonParseTest.java | 0 .../cita/codegen/SolidityFunctionWrapperGeneratorTest.java | 0 .../cita/codegen/SolidityFunctionWrapperTest.java | 0 .../cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java | 0 .../{cryptape => citahub}/cita/codegen/TupleGeneratorTest.java | 0 .../com/{cryptape => citahub}/cita/console/ConsoleDevice.java | 0 .../java/com/{cryptape => citahub}/cita/console/IODevice.java | 0 .../java/com/{cryptape => citahub}/cita/console/KeyImporter.java | 0 .../main/java/com/{cryptape => citahub}/cita/console/Runner.java | 0 .../com/{cryptape => citahub}/cita/console/WalletCreator.java | 0 .../com/{cryptape => citahub}/cita/console/WalletManager.java | 0 .../com/{cryptape => citahub}/cita/console/WalletUpdater.java | 0 .../com/{cryptape => citahub}/cita/console/KeyImporterTest.java | 0 .../com/{cryptape => citahub}/cita/console/WalletCreatorTest.java | 0 .../java/com/{cryptape => citahub}/cita/console/WalletTester.java | 0 .../com/{cryptape => citahub}/cita/console/WalletUpdaterTest.java | 0 .../main/java/com/{cryptape => citahub}/cita/protocol/CITAj.java | 0 .../com/{cryptape => citahub}/cita/protocol/CITAjService.java | 0 .../{cryptape => citahub}/cita/protocol/ObjectMapperFactory.java | 0 .../java/com/{cryptape => citahub}/cita/protocol/Service.java | 0 .../com/{cryptape => citahub}/cita/protocol/account/Account.java | 0 .../cita/protocol/account/CompiledContract.java | 0 .../java/com/{cryptape => citahub}/cita/protocol/admin/Admin.java | 0 .../cita/protocol/admin/JsonRpc2_0Admin.java | 0 .../cita/protocol/admin/methods/response/BooleanResponse.java | 0 .../protocol/admin/methods/response/NewAccountIdentifier.java | 0 .../protocol/admin/methods/response/PersonalListAccounts.java | 0 .../cita/protocol/admin/methods/response/PersonalSign.java | 0 .../protocol/admin/methods/response/PersonalUnlockAccount.java | 0 .../java/com/{cryptape => citahub}/cita/protocol/core/CITA.java | 0 .../cita/protocol/core/DefaultBlockParameter.java | 0 .../cita/protocol/core/DefaultBlockParameterName.java | 0 .../cita/protocol/core/DefaultBlockParameterNumber.java | 0 .../{cryptape => citahub}/cita/protocol/core/JsonRpc2_0CITAj.java | 0 .../com/{cryptape => citahub}/cita/protocol/core/RemoteCall.java | 0 .../com/{cryptape => citahub}/cita/protocol/core/Request.java | 0 .../com/{cryptape => citahub}/cita/protocol/core/Response.java | 0 .../cita/protocol/core/filters/BlockFilter.java | 0 .../cita/protocol/core/filters/Callback.java | 0 .../{cryptape => citahub}/cita/protocol/core/filters/Filter.java | 0 .../cita/protocol/core/filters/FilterException.java | 0 .../cita/protocol/core/filters/LogFilter.java | 0 .../cita/protocol/core/filters/PendingTransactionFilter.java | 0 .../cita/protocol/core/methods/request/AppFilter.java | 0 .../cita/protocol/core/methods/request/Call.java | 0 .../cita/protocol/core/methods/request/Filter.java | 0 .../cita/protocol/core/methods/request/ShhFilter.java | 0 .../cita/protocol/core/methods/request/ShhPost.java | 0 .../cita/protocol/core/methods/request/Transaction.java | 0 .../cita/protocol/core/methods/response/AbiDefinition.java | 0 .../cita/protocol/core/methods/response/AppAccounts.java | 0 .../cita/protocol/core/methods/response/AppBlock.java | 0 .../cita/protocol/core/methods/response/AppBlockNumber.java | 0 .../cita/protocol/core/methods/response/AppCall.java | 0 .../cita/protocol/core/methods/response/AppCoinbase.java | 0 .../cita/protocol/core/methods/response/AppFilter.java | 0 .../cita/protocol/core/methods/response/AppGasPrice.java | 0 .../cita/protocol/core/methods/response/AppGetAbi.java | 0 .../cita/protocol/core/methods/response/AppGetBalance.java | 0 .../cita/protocol/core/methods/response/AppGetCode.java | 0 .../protocol/core/methods/response/AppGetTransactionCount.java | 0 .../protocol/core/methods/response/AppGetTransactionReceipt.java | 0 .../cita/protocol/core/methods/response/AppLog.java | 0 .../cita/protocol/core/methods/response/AppMetaData.java | 0 .../cita/protocol/core/methods/response/AppProtocolVersion.java | 0 .../protocol/core/methods/response/AppSendRawTransaction.java | 0 .../cita/protocol/core/methods/response/AppSendTransaction.java | 0 .../cita/protocol/core/methods/response/AppSign.java | 0 .../cita/protocol/core/methods/response/AppTransaction.java | 0 .../cita/protocol/core/methods/response/AppUninstallFilter.java | 0 .../cita/protocol/core/methods/response/AppVersion.java | 0 .../cita/protocol/core/methods/response/CITAClientVersion.java | 0 .../cita/protocol/core/methods/response/CITASha3.java | 0 .../cita/protocol/core/methods/response/Log.java | 0 .../cita/protocol/core/methods/response/NetPeerCount.java | 0 .../cita/protocol/core/methods/response/NetPeersInfo.java | 0 .../cita/protocol/core/methods/response/Transaction.java | 0 .../cita/protocol/core/methods/response/TransactionReceipt.java | 0 .../cita/protocol/core/methods/response/VoidResponse.java | 0 .../cita/protocol/deserializer/RawResponseDeserializer.java | 0 .../cita/protocol/exceptions/ClientConnectionException.java | 0 .../cita/protocol/exceptions/TransactionException.java | 0 .../com/{cryptape => citahub}/cita/protocol/http/HttpService.java | 0 .../com/{cryptape => citahub}/cita/protocol/ipc/IOFacade.java | 0 .../com/{cryptape => citahub}/cita/protocol/ipc/IpcService.java | 0 .../{cryptape => citahub}/cita/protocol/ipc/UnixDomainSocket.java | 0 .../{cryptape => citahub}/cita/protocol/ipc/UnixIpcService.java | 0 .../cita/protocol/ipc/WindowsIpcService.java | 0 .../{cryptape => citahub}/cita/protocol/ipc/WindowsNamedPipe.java | 0 .../java/com/{cryptape => citahub}/cita/protocol/rx/CITAjRx.java | 0 .../com/{cryptape => citahub}/cita/protocol/rx/JsonRpc2_0Rx.java | 0 .../cita/protocol/system/CITASystemAddress.java | 0 .../cita/protocol/system/CITASystemContract.java | 0 .../cita/protocol/system/CITAjSystemContract.java | 0 .../java/com/{cryptape => citahub}/cita/protocol/system/Util.java | 0 .../cita/protocol/system/entities/QueryInfoResult.java | 0 .../cita/protocol/system/entities/QueryResourceResult.java | 0 core/src/main/java/com/{cryptape => citahub}/cita/tx/ChainId.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/tx/Contract.java | 0 .../com/{cryptape => citahub}/cita/tx/ManagedTransaction.java | 0 .../com/{cryptape => citahub}/cita/tx/RawTransactionManager.java | 0 .../com/{cryptape => citahub}/cita/tx/TransactionManager.java | 0 .../cita/tx/exceptions/ContractCallException.java | 0 .../java/com/{cryptape => citahub}/cita/tx/response/Callback.java | 0 .../cita/tx/response/EmptyTransactionReceipt.java | 0 .../com/{cryptape => citahub}/cita/tx/response/NoOpProcessor.java | 0 .../cita/tx/response/PollingTransactionReceiptProcessor.java | 0 .../cita/tx/response/QueuingTransactionReceiptProcessor.java | 0 .../cita/tx/response/TransactionReceiptProcessor.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/utils/Async.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/CallCmd.java | 0 .../java/com/{cryptape => citahub}/cita/utils/Collection.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/utils/Files.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/Flowables.java | 0 .../com/{cryptape => citahub}/cita/utils/TransactionUtil.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/TypedAbi.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/Version.java | 0 .../java/com/{cryptape => citahub}/cita/TempFileProvider.java | 0 .../cita/contracts/token/ERC20BasicInterface.java | 0 .../cita/contracts/token/ERC20Interface.java | 0 .../com/{cryptape => citahub}/cita/protocol/RequestTester.java | 0 .../com/{cryptape => citahub}/cita/protocol/ResponseTester.java | 0 .../{cryptape => citahub}/cita/protocol/admin/RequestTest.java | 0 .../{cryptape => citahub}/cita/protocol/admin/ResponseTest.java | 0 .../{cryptape => citahub}/cita/protocol/core/RawResponseTest.java | 0 .../com/{cryptape => citahub}/cita/protocol/core/RequestTest.java | 0 .../{cryptape => citahub}/cita/protocol/core/ResponseTest.java | 0 .../cita/protocol/core/filters/BlockFilterTest.java | 0 .../cita/protocol/core/filters/FilterTester.java | 0 .../cita/protocol/core/filters/LogFilterTest.java | 0 .../cita/protocol/core/filters/PendingTransactionFilterTest.java | 0 .../{cryptape => citahub}/cita/protocol/http/HttpServiceTest.java | 0 .../{cryptape => citahub}/cita/protocol/ipc/IpcServiceTest.java | 0 .../cita/protocol/ipc/UnixDomainSocketTest.java | 0 .../{cryptape => citahub}/cita/protocol/rx/JsonRpc2_0RxTest.java | 0 .../{cryptape => citahub}/cita/tx/ManagedTransactionTester.java | 0 .../test/java/com/{cryptape => citahub}/cita/utils/AsyncTest.java | 0 .../java/com/{cryptape => citahub}/cita/utils/CollectionTest.java | 0 .../java/com/{cryptape => citahub}/cita/utils/FlowablesTests.java | 0 .../com/{cryptape => citahub}/cita/utils/TransactionUtilTest.java | 0 .../com/{cryptape => citahub}/cita/crypto/CipherException.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/ContractUtils.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/Credentials.java | 0 .../com/{cryptape => citahub}/cita/crypto/ECDSASignature.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/ECKeyPair.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/crypto/Keys.java | 0 .../com/{cryptape => citahub}/cita/crypto/LinuxSecureRandom.java | 0 .../com/{cryptape => citahub}/cita/crypto/RawTransaction.java | 0 .../com/{cryptape => citahub}/cita/crypto/SecureRandomUtils.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/crypto/Sign.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/Signature.java | 0 .../com/{cryptape => citahub}/cita/crypto/TransactionEncoder.java | 0 .../com/{cryptape => citahub}/cita/crypto/TransactionUtils.java | 0 .../main/java/com/{cryptape => citahub}/cita/crypto/Wallet.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/WalletFile.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/WalletUtils.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/sm2/Params.java | 0 .../main/java/com/{cryptape => citahub}/cita/crypto/sm2/SM2.java | 0 .../com/{cryptape => citahub}/cita/crypto/sm2/SM2KeyPair.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/sm2/SM2Keys.java | 0 .../main/java/com/{cryptape => citahub}/cita/crypto/sm2/SM3.java | 0 .../com/{cryptape => citahub}/cita/crypto/ContractUtilsTest.java | 0 .../com/{cryptape => citahub}/cita/crypto/CredentialsTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/crypto/KeysTest.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/SampleKeys.java | 0 .../{cryptape => citahub}/cita/crypto/SecureRandomUtilsTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/crypto/SignTest.java | 0 .../{cryptape => citahub}/cita/crypto/TransactionEncoderTest.java | 0 .../{cryptape => citahub}/cita/crypto/TransactionUtilsTest.java | 0 .../java/com/{cryptape => citahub}/cita/crypto/WalletTest.java | 0 .../com/{cryptape => citahub}/cita/crypto/WalletUtilsTest.java | 0 .../java/com/{cryptape => citahub}/cita/protobuf/Blockchain.java | 0 .../com/{cryptape => citahub}/cita/protobuf/ConvertStrByte.java | 0 .../java/com/{cryptape => citahub}/cita/protobuf/blockchain.proto | 0 .../main/java/com/{cryptape => citahub}/cita/rlp/RlpEncoder.java | 0 rlp/src/main/java/com/{cryptape => citahub}/cita/rlp/RlpList.java | 0 .../main/java/com/{cryptape => citahub}/cita/rlp/RlpString.java | 0 rlp/src/main/java/com/{cryptape => citahub}/cita/rlp/RlpType.java | 0 .../java/com/{cryptape => citahub}/cita/rlp/RlpEncoderTest.java | 0 .../{cryptape => citahub}/cita/tests/AdvanceTransactionTest.java | 0 .../{cryptape => citahub}/cita/tests/BlockFilterFlowableTest.java | 0 .../cita/tests/BlockFilterTransactionTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/tests/Config.java | 0 .../java/com/{cryptape => citahub}/cita/tests/DecodeTxTest.java | 0 .../com/{cryptape => citahub}/cita/tests/GroupManagerTest.java | 0 .../{cryptape => citahub}/cita/tests/PermissionManagerTest.java | 0 .../com/{cryptape => citahub}/cita/tests/QuotaManagerTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/tests/RpcTest.java | 0 .../com/{cryptape => citahub}/cita/tests/SM2ValidationTest.java | 0 .../{cryptape => citahub}/cita/tests/SendTransactionSyncTest.java | 0 .../com/{cryptape => citahub}/cita/tests/SendTransactionTest.java | 0 .../java/com/{cryptape => citahub}/cita/tests/SimpleDataTest.java | 0 .../com/{cryptape => citahub}/cita/tests/StoreRecordTest.java | 0 .../com/{cryptape => citahub}/cita/tests/SystemContractTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/tests/TestUtil.java | 0 .../src/test/java/com/{cryptape => citahub}/cita/tests/Token.java | 0 .../com/{cryptape => citahub}/cita/tests/TokenAccountTest.java | 0 .../com/{cryptape => citahub}/cita/tests/TokenCodegenTest.java | 0 .../{cryptape => citahub}/cita/tests/TokenFilterCodeGenTest.java | 0 .../{cryptape => citahub}/cita/tests/TokenFilterFlowableTest.java | 0 .../cita/tests/TokenFilterTransactionTest.java | 0 .../{cryptape => citahub}/cita/tests/TokenTransactionTest.java | 0 .../com/{cryptape => citahub}/cita/tests/VerifySignatureTest.java | 0 .../java/com/{cryptape => citahub}/cita/tuples/EmptyTuple.java | 0 .../main/java/com/{cryptape => citahub}/cita/tuples/Tuple.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple1.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple10.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple11.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple12.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple13.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple14.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple15.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple16.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple17.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple18.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple19.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple2.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple20.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple3.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple4.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple5.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple6.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple7.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple8.java | 0 .../com/{cryptape => citahub}/cita/tuples/generated/Tuple9.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/crypto/Hash.java | 0 .../cita/exceptions/MessageDecodingException.java | 0 .../cita/exceptions/MessageEncodingException.java | 0 .../java/com/{cryptape => citahub}/cita/utils/Assertions.java | 0 .../src/main/java/com/{cryptape => citahub}/cita/utils/Bytes.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/Convert.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/HexUtil.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/Numeric.java | 0 .../main/java/com/{cryptape => citahub}/cita/utils/Strings.java | 0 .../test/java/com/{cryptape => citahub}/cita/crypto/HashTest.java | 0 .../java/com/{cryptape => citahub}/cita/utils/AssertionsTest.java | 0 .../test/java/com/{cryptape => citahub}/cita/utils/BytesTest.java | 0 .../java/com/{cryptape => citahub}/cita/utils/ConvertTest.java | 0 .../java/com/{cryptape => citahub}/cita/utils/NumericTest.java | 0 .../java/com/{cryptape => citahub}/cita/utils/StringsTest.java | 0 420 files changed, 0 insertions(+), 0 deletions(-) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/EventEncoder.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/EventValues.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/FunctionEncoder.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/FunctionReturnDecoder.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/TypeDecoder.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/TypeEncoder.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/TypeMappingException.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/TypeReference.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/Utils.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Address.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Array.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Bool.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Bytes.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/BytesType.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/DynamicArray.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/DynamicBytes.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Event.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Fixed.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/FixedPointType.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Function.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Int.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/IntType.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/NumericType.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/StaticArray.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Type.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Ufixed.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Uint.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/UnorderedEvent.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/Utf8String.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/AbiTypes.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes1.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes10.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes11.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes12.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes13.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes14.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes15.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes16.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes17.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes18.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes19.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes2.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes20.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes21.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes22.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes23.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes24.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes25.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes26.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes27.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes28.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes29.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes3.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes30.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes31.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes32.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes4.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes5.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes6.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes7.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes8.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Bytes9.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int104.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int112.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int120.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int128.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int136.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int144.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int152.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int16.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int160.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int168.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int176.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int184.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int192.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int200.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int208.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int216.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int224.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int232.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int24.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int240.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int248.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int256.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int32.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int40.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int48.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int56.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int64.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int72.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int8.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int80.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int88.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Int96.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray1.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray10.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray11.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray12.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray13.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray14.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray15.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray16.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray17.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray18.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray19.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray2.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray20.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray21.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray22.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray23.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray24.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray25.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray26.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray27.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray28.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray29.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray3.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray30.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray31.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray32.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray4.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray5.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray6.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray7.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray8.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/StaticArray9.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint104.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint112.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint120.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint128.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint136.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint144.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint152.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint16.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint160.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint168.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint176.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint184.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint192.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint200.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint208.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint216.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint224.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint232.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint24.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint240.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint248.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint256.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint32.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint40.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint48.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint56.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint64.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint72.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint8.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint80.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint88.java (100%) rename abi/src/main/java/com/{cryptape => citahub}/cita/abi/datatypes/generated/Uint96.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/EventEncoderTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/FunctionEncoderTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/FunctionReturnDecoderTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/TypeDecoderTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/TypeEncoderTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/UtilsTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/datatypes/AddressTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/datatypes/FixedPointTypeTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/datatypes/StaticArrayTest.java (100%) rename abi/src/test/java/com/{cryptape => citahub}/cita/abi/datatypes/Utf8StringTest.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/AbiTypesGenerator.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/AbiTypesMapperGenerator.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/Console.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/FunctionWrapperGenerator.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/Generator.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/SolidityFunctionWrapper.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/SolidityFunctionWrapperGenerator.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/TruffleJsonFunctionWrapperGenerator.java (100%) rename codegen/src/main/java/com/{cryptape => citahub}/cita/codegen/TupleGenerator.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/TempFileProvider.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/AbiTypesGeneratorTest.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/AbiTypesMapperGeneratorTest.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/ContractJsonParseTest.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/SolidityFunctionWrapperGeneratorTest.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/SolidityFunctionWrapperTest.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java (100%) rename codegen/src/test/java/com/{cryptape => citahub}/cita/codegen/TupleGeneratorTest.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/ConsoleDevice.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/IODevice.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/KeyImporter.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/Runner.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/WalletCreator.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/WalletManager.java (100%) rename console/src/main/java/com/{cryptape => citahub}/cita/console/WalletUpdater.java (100%) rename console/src/test/java/com/{cryptape => citahub}/cita/console/KeyImporterTest.java (100%) rename console/src/test/java/com/{cryptape => citahub}/cita/console/WalletCreatorTest.java (100%) rename console/src/test/java/com/{cryptape => citahub}/cita/console/WalletTester.java (100%) rename console/src/test/java/com/{cryptape => citahub}/cita/console/WalletUpdaterTest.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/CITAj.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/CITAjService.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ObjectMapperFactory.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/Service.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/account/Account.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/account/CompiledContract.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/Admin.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/JsonRpc2_0Admin.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/methods/response/BooleanResponse.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/methods/response/NewAccountIdentifier.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/methods/response/PersonalListAccounts.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/methods/response/PersonalSign.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/admin/methods/response/PersonalUnlockAccount.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/CITA.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/DefaultBlockParameter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/DefaultBlockParameterName.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/DefaultBlockParameterNumber.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/JsonRpc2_0CITAj.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/RemoteCall.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/Request.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/Response.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/filters/BlockFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/filters/Callback.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/filters/Filter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/filters/FilterException.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/filters/LogFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/filters/PendingTransactionFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/request/AppFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/request/Call.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/request/Filter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/request/ShhFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/request/ShhPost.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/request/Transaction.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AbiDefinition.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppAccounts.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppBlock.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppBlockNumber.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppCall.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppCoinbase.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppGasPrice.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppGetAbi.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppGetBalance.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppGetCode.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppGetTransactionCount.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppGetTransactionReceipt.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppLog.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppMetaData.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppProtocolVersion.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppSendRawTransaction.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppSendTransaction.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppSign.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppTransaction.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppUninstallFilter.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/AppVersion.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/CITAClientVersion.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/CITASha3.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/Log.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/NetPeerCount.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/NetPeersInfo.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/Transaction.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/TransactionReceipt.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/core/methods/response/VoidResponse.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/deserializer/RawResponseDeserializer.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/exceptions/ClientConnectionException.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/exceptions/TransactionException.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/http/HttpService.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ipc/IOFacade.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ipc/IpcService.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ipc/UnixDomainSocket.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ipc/UnixIpcService.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ipc/WindowsIpcService.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/ipc/WindowsNamedPipe.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/rx/CITAjRx.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/rx/JsonRpc2_0Rx.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/system/CITASystemAddress.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/system/CITASystemContract.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/system/CITAjSystemContract.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/system/Util.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/system/entities/QueryInfoResult.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/protocol/system/entities/QueryResourceResult.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/ChainId.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/Contract.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/ManagedTransaction.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/RawTransactionManager.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/TransactionManager.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/exceptions/ContractCallException.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/response/Callback.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/response/EmptyTransactionReceipt.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/response/NoOpProcessor.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/response/PollingTransactionReceiptProcessor.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/response/QueuingTransactionReceiptProcessor.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/tx/response/TransactionReceiptProcessor.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/Async.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/CallCmd.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/Collection.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/Files.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/Flowables.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/TransactionUtil.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/TypedAbi.java (100%) rename core/src/main/java/com/{cryptape => citahub}/cita/utils/Version.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/TempFileProvider.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/contracts/token/ERC20BasicInterface.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/contracts/token/ERC20Interface.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/RequestTester.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/ResponseTester.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/admin/RequestTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/admin/ResponseTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/RawResponseTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/RequestTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/ResponseTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/filters/BlockFilterTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/filters/FilterTester.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/filters/LogFilterTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/core/filters/PendingTransactionFilterTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/http/HttpServiceTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/ipc/IpcServiceTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/ipc/UnixDomainSocketTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/protocol/rx/JsonRpc2_0RxTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/tx/ManagedTransactionTester.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/utils/AsyncTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/utils/CollectionTest.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/utils/FlowablesTests.java (100%) rename core/src/test/java/com/{cryptape => citahub}/cita/utils/TransactionUtilTest.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/CipherException.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/ContractUtils.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/Credentials.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/ECDSASignature.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/ECKeyPair.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/Keys.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/LinuxSecureRandom.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/RawTransaction.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/SecureRandomUtils.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/Sign.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/Signature.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/TransactionEncoder.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/TransactionUtils.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/Wallet.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/WalletFile.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/WalletUtils.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/sm2/Params.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/sm2/SM2.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/sm2/SM2KeyPair.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/sm2/SM2Keys.java (100%) rename crypto/src/main/java/com/{cryptape => citahub}/cita/crypto/sm2/SM3.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/ContractUtilsTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/CredentialsTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/KeysTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/SampleKeys.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/SecureRandomUtilsTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/SignTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/TransactionEncoderTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/TransactionUtilsTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/WalletTest.java (100%) rename crypto/src/test/java/com/{cryptape => citahub}/cita/crypto/WalletUtilsTest.java (100%) rename protobuf/src/main/java/com/{cryptape => citahub}/cita/protobuf/Blockchain.java (100%) rename protobuf/src/main/java/com/{cryptape => citahub}/cita/protobuf/ConvertStrByte.java (100%) rename protobuf/src/main/java/com/{cryptape => citahub}/cita/protobuf/blockchain.proto (100%) rename rlp/src/main/java/com/{cryptape => citahub}/cita/rlp/RlpEncoder.java (100%) rename rlp/src/main/java/com/{cryptape => citahub}/cita/rlp/RlpList.java (100%) rename rlp/src/main/java/com/{cryptape => citahub}/cita/rlp/RlpString.java (100%) rename rlp/src/main/java/com/{cryptape => citahub}/cita/rlp/RlpType.java (100%) rename rlp/src/test/java/com/{cryptape => citahub}/cita/rlp/RlpEncoderTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/AdvanceTransactionTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/BlockFilterFlowableTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/BlockFilterTransactionTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/Config.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/DecodeTxTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/GroupManagerTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/PermissionManagerTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/QuotaManagerTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/RpcTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/SM2ValidationTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/SendTransactionSyncTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/SendTransactionTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/SimpleDataTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/StoreRecordTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/SystemContractTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TestUtil.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/Token.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TokenAccountTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TokenCodegenTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TokenFilterCodeGenTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TokenFilterFlowableTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TokenFilterTransactionTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/TokenTransactionTest.java (100%) rename tests/src/test/java/com/{cryptape => citahub}/cita/tests/VerifySignatureTest.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/EmptyTuple.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/Tuple.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple1.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple10.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple11.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple12.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple13.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple14.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple15.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple16.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple17.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple18.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple19.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple2.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple20.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple3.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple4.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple5.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple6.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple7.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple8.java (100%) rename tuples/src/main/java/com/{cryptape => citahub}/cita/tuples/generated/Tuple9.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/crypto/Hash.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/exceptions/MessageDecodingException.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/exceptions/MessageEncodingException.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/utils/Assertions.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/utils/Bytes.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/utils/Convert.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/utils/HexUtil.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/utils/Numeric.java (100%) rename utils/src/main/java/com/{cryptape => citahub}/cita/utils/Strings.java (100%) rename utils/src/test/java/com/{cryptape => citahub}/cita/crypto/HashTest.java (100%) rename utils/src/test/java/com/{cryptape => citahub}/cita/utils/AssertionsTest.java (100%) rename utils/src/test/java/com/{cryptape => citahub}/cita/utils/BytesTest.java (100%) rename utils/src/test/java/com/{cryptape => citahub}/cita/utils/ConvertTest.java (100%) rename utils/src/test/java/com/{cryptape => citahub}/cita/utils/NumericTest.java (100%) rename utils/src/test/java/com/{cryptape => citahub}/cita/utils/StringsTest.java (100%) diff --git a/abi/src/main/java/com/cryptape/cita/abi/EventEncoder.java b/abi/src/main/java/com/citahub/cita/abi/EventEncoder.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/EventEncoder.java rename to abi/src/main/java/com/citahub/cita/abi/EventEncoder.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/EventValues.java b/abi/src/main/java/com/citahub/cita/abi/EventValues.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/EventValues.java rename to abi/src/main/java/com/citahub/cita/abi/EventValues.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java b/abi/src/main/java/com/citahub/cita/abi/FunctionEncoder.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/FunctionEncoder.java rename to abi/src/main/java/com/citahub/cita/abi/FunctionEncoder.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/FunctionReturnDecoder.java b/abi/src/main/java/com/citahub/cita/abi/FunctionReturnDecoder.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/FunctionReturnDecoder.java rename to abi/src/main/java/com/citahub/cita/abi/FunctionReturnDecoder.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/TypeDecoder.java b/abi/src/main/java/com/citahub/cita/abi/TypeDecoder.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/TypeDecoder.java rename to abi/src/main/java/com/citahub/cita/abi/TypeDecoder.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/TypeEncoder.java b/abi/src/main/java/com/citahub/cita/abi/TypeEncoder.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/TypeEncoder.java rename to abi/src/main/java/com/citahub/cita/abi/TypeEncoder.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/TypeMappingException.java b/abi/src/main/java/com/citahub/cita/abi/TypeMappingException.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/TypeMappingException.java rename to abi/src/main/java/com/citahub/cita/abi/TypeMappingException.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/TypeReference.java b/abi/src/main/java/com/citahub/cita/abi/TypeReference.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/TypeReference.java rename to abi/src/main/java/com/citahub/cita/abi/TypeReference.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/Utils.java b/abi/src/main/java/com/citahub/cita/abi/Utils.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/Utils.java rename to abi/src/main/java/com/citahub/cita/abi/Utils.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Address.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Address.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Address.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Address.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Array.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Array.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Array.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Array.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Bool.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Bool.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Bool.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Bool.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Bytes.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Bytes.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Bytes.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Bytes.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/BytesType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/BytesType.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/BytesType.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/BytesType.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/DynamicArray.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicArray.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/DynamicArray.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicArray.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/DynamicBytes.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicBytes.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/DynamicBytes.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicBytes.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Event.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Event.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Event.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Event.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Fixed.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Fixed.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Fixed.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Fixed.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/FixedPointType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/FixedPointType.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/FixedPointType.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/FixedPointType.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Function.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Function.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Function.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Function.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Int.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Int.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Int.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Int.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/IntType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/IntType.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/IntType.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/IntType.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/NumericType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/NumericType.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/NumericType.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/NumericType.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/StaticArray.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/StaticArray.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/StaticArray.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/StaticArray.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Type.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Type.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Type.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Type.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Ufixed.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Ufixed.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Ufixed.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Ufixed.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Uint.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Uint.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Uint.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Uint.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/UnorderedEvent.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/UnorderedEvent.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/UnorderedEvent.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/UnorderedEvent.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/Utf8String.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Utf8String.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/Utf8String.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/Utf8String.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/AbiTypes.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/AbiTypes.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/AbiTypes.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/AbiTypes.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes1.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes1.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes1.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes1.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes10.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes10.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes10.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes10.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes11.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes11.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes11.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes11.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes12.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes12.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes12.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes12.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes13.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes13.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes13.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes13.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes14.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes14.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes14.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes14.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes15.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes15.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes15.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes15.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes16.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes16.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes16.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes17.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes17.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes17.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes17.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes18.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes18.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes18.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes18.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes19.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes19.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes19.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes19.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes2.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes2.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes2.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes2.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes20.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes20.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes20.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes20.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes21.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes21.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes21.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes21.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes22.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes22.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes22.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes22.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes23.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes23.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes23.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes23.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes24.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes24.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes24.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes25.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes25.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes25.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes25.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes26.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes26.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes26.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes26.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes27.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes27.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes27.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes27.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes28.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes28.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes28.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes28.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes29.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes29.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes29.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes29.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes3.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes3.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes3.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes3.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes30.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes30.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes30.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes30.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes31.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes31.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes31.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes31.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes32.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes32.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes32.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes4.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes4.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes4.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes4.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes5.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes5.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes5.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes5.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes6.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes6.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes6.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes6.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes7.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes7.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes7.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes7.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes8.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes8.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes8.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes9.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes9.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Bytes9.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes9.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int104.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int104.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int104.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int104.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int112.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int112.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int112.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int112.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int120.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int120.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int120.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int120.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int128.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int128.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int128.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int128.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int136.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int136.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int136.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int136.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int144.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int144.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int144.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int144.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int152.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int152.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int152.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int152.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int16.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int16.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int16.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int160.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int160.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int160.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int160.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int168.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int168.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int168.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int168.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int176.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int176.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int176.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int176.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int184.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int184.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int184.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int184.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int192.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int192.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int192.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int192.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int200.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int200.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int200.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int200.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int208.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int208.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int208.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int208.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int216.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int216.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int216.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int216.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int224.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int224.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int224.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int224.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int232.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int232.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int232.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int232.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int24.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int24.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int24.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int240.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int240.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int240.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int240.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int248.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int248.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int248.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int248.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int256.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int256.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int256.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int256.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int32.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int32.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int32.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int40.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int40.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int40.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int40.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int48.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int48.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int48.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int48.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int56.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int56.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int56.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int56.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int64.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int64.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int64.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int64.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int72.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int72.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int72.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int72.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int8.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int8.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int8.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int80.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int80.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int80.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int80.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int88.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int88.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int88.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int88.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int96.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int96.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Int96.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int96.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray1.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray1.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray1.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray1.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray10.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray10.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray10.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray10.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray11.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray11.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray11.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray11.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray12.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray12.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray12.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray12.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray13.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray13.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray13.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray13.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray14.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray14.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray14.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray14.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray15.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray15.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray15.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray15.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray16.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray16.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray16.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray17.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray17.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray17.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray17.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray18.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray18.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray18.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray18.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray19.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray19.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray19.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray19.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray2.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray2.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray2.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray2.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray20.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray20.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray20.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray20.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray21.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray21.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray21.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray21.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray22.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray22.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray22.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray22.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray23.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray23.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray23.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray23.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray24.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray24.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray24.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray25.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray25.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray25.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray25.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray26.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray26.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray26.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray26.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray27.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray27.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray27.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray27.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray28.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray28.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray28.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray28.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray29.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray29.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray29.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray29.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray3.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray3.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray3.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray3.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray30.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray30.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray30.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray30.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray31.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray31.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray31.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray31.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray32.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray32.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray32.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray4.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray4.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray4.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray4.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray5.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray5.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray5.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray5.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray6.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray6.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray6.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray6.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray7.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray7.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray7.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray7.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray8.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray8.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray8.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray9.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray9.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/StaticArray9.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray9.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint104.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint104.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint104.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint104.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint112.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint112.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint112.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint112.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint120.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint120.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint120.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint120.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint128.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint128.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint128.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint128.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint136.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint136.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint136.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint136.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint144.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint144.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint144.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint144.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint152.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint152.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint152.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint152.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint16.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint16.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint16.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint160.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint160.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint160.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint160.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint168.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint168.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint168.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint168.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint176.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint176.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint176.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint176.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint184.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint184.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint184.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint184.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint192.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint192.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint192.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint192.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint200.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint200.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint200.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint200.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint208.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint208.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint208.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint208.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint216.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint216.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint216.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint216.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint224.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint224.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint224.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint224.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint232.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint232.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint232.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint232.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint24.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint24.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint24.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint240.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint240.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint240.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint240.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint248.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint248.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint248.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint248.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint256.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint256.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint256.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint256.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint32.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint32.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint32.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint40.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint40.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint40.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint40.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint48.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint48.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint48.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint48.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint56.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint56.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint56.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint56.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint64.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint64.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint64.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint64.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint72.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint72.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint72.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint72.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint8.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint8.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint8.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint80.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint80.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint80.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint80.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint88.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint88.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint88.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint88.java diff --git a/abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint96.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint96.java similarity index 100% rename from abi/src/main/java/com/cryptape/cita/abi/datatypes/generated/Uint96.java rename to abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint96.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/EventEncoderTest.java b/abi/src/test/java/com/citahub/cita/abi/EventEncoderTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/EventEncoderTest.java rename to abi/src/test/java/com/citahub/cita/abi/EventEncoderTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/FunctionEncoderTest.java b/abi/src/test/java/com/citahub/cita/abi/FunctionEncoderTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/FunctionEncoderTest.java rename to abi/src/test/java/com/citahub/cita/abi/FunctionEncoderTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/FunctionReturnDecoderTest.java b/abi/src/test/java/com/citahub/cita/abi/FunctionReturnDecoderTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/FunctionReturnDecoderTest.java rename to abi/src/test/java/com/citahub/cita/abi/FunctionReturnDecoderTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/TypeDecoderTest.java b/abi/src/test/java/com/citahub/cita/abi/TypeDecoderTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/TypeDecoderTest.java rename to abi/src/test/java/com/citahub/cita/abi/TypeDecoderTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/TypeEncoderTest.java b/abi/src/test/java/com/citahub/cita/abi/TypeEncoderTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/TypeEncoderTest.java rename to abi/src/test/java/com/citahub/cita/abi/TypeEncoderTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/UtilsTest.java b/abi/src/test/java/com/citahub/cita/abi/UtilsTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/UtilsTest.java rename to abi/src/test/java/com/citahub/cita/abi/UtilsTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/datatypes/AddressTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/AddressTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/datatypes/AddressTest.java rename to abi/src/test/java/com/citahub/cita/abi/datatypes/AddressTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/datatypes/FixedPointTypeTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/FixedPointTypeTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/datatypes/FixedPointTypeTest.java rename to abi/src/test/java/com/citahub/cita/abi/datatypes/FixedPointTypeTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/datatypes/StaticArrayTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/StaticArrayTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/datatypes/StaticArrayTest.java rename to abi/src/test/java/com/citahub/cita/abi/datatypes/StaticArrayTest.java diff --git a/abi/src/test/java/com/cryptape/cita/abi/datatypes/Utf8StringTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/Utf8StringTest.java similarity index 100% rename from abi/src/test/java/com/cryptape/cita/abi/datatypes/Utf8StringTest.java rename to abi/src/test/java/com/citahub/cita/abi/datatypes/Utf8StringTest.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/AbiTypesGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesGenerator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/AbiTypesGenerator.java rename to codegen/src/main/java/com/citahub/cita/codegen/AbiTypesGenerator.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/AbiTypesMapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesMapperGenerator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/AbiTypesMapperGenerator.java rename to codegen/src/main/java/com/citahub/cita/codegen/AbiTypesMapperGenerator.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/Console.java b/codegen/src/main/java/com/citahub/cita/codegen/Console.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/Console.java rename to codegen/src/main/java/com/citahub/cita/codegen/Console.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/FunctionWrapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/FunctionWrapperGenerator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/FunctionWrapperGenerator.java rename to codegen/src/main/java/com/citahub/cita/codegen/FunctionWrapperGenerator.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/Generator.java b/codegen/src/main/java/com/citahub/cita/codegen/Generator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/Generator.java rename to codegen/src/main/java/com/citahub/cita/codegen/Generator.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/SolidityFunctionWrapper.java b/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapper.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/SolidityFunctionWrapper.java rename to codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapper.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/SolidityFunctionWrapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapperGenerator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/SolidityFunctionWrapperGenerator.java rename to codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapperGenerator.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/TruffleJsonFunctionWrapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGenerator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/TruffleJsonFunctionWrapperGenerator.java rename to codegen/src/main/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGenerator.java diff --git a/codegen/src/main/java/com/cryptape/cita/codegen/TupleGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/TupleGenerator.java similarity index 100% rename from codegen/src/main/java/com/cryptape/cita/codegen/TupleGenerator.java rename to codegen/src/main/java/com/citahub/cita/codegen/TupleGenerator.java diff --git a/codegen/src/test/java/com/cryptape/cita/TempFileProvider.java b/codegen/src/test/java/com/citahub/cita/TempFileProvider.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/TempFileProvider.java rename to codegen/src/test/java/com/citahub/cita/TempFileProvider.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/AbiTypesGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesGeneratorTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/AbiTypesGeneratorTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/AbiTypesGeneratorTest.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/AbiTypesMapperGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesMapperGeneratorTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/AbiTypesMapperGeneratorTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/AbiTypesMapperGeneratorTest.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/ContractJsonParseTest.java b/codegen/src/test/java/com/citahub/cita/codegen/ContractJsonParseTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/ContractJsonParseTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/ContractJsonParseTest.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/SolidityFunctionWrapperGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperGeneratorTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/SolidityFunctionWrapperGeneratorTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperGeneratorTest.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/SolidityFunctionWrapperTest.java b/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/SolidityFunctionWrapperTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperTest.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java diff --git a/codegen/src/test/java/com/cryptape/cita/codegen/TupleGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/TupleGeneratorTest.java similarity index 100% rename from codegen/src/test/java/com/cryptape/cita/codegen/TupleGeneratorTest.java rename to codegen/src/test/java/com/citahub/cita/codegen/TupleGeneratorTest.java diff --git a/console/src/main/java/com/cryptape/cita/console/ConsoleDevice.java b/console/src/main/java/com/citahub/cita/console/ConsoleDevice.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/ConsoleDevice.java rename to console/src/main/java/com/citahub/cita/console/ConsoleDevice.java diff --git a/console/src/main/java/com/cryptape/cita/console/IODevice.java b/console/src/main/java/com/citahub/cita/console/IODevice.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/IODevice.java rename to console/src/main/java/com/citahub/cita/console/IODevice.java diff --git a/console/src/main/java/com/cryptape/cita/console/KeyImporter.java b/console/src/main/java/com/citahub/cita/console/KeyImporter.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/KeyImporter.java rename to console/src/main/java/com/citahub/cita/console/KeyImporter.java diff --git a/console/src/main/java/com/cryptape/cita/console/Runner.java b/console/src/main/java/com/citahub/cita/console/Runner.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/Runner.java rename to console/src/main/java/com/citahub/cita/console/Runner.java diff --git a/console/src/main/java/com/cryptape/cita/console/WalletCreator.java b/console/src/main/java/com/citahub/cita/console/WalletCreator.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/WalletCreator.java rename to console/src/main/java/com/citahub/cita/console/WalletCreator.java diff --git a/console/src/main/java/com/cryptape/cita/console/WalletManager.java b/console/src/main/java/com/citahub/cita/console/WalletManager.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/WalletManager.java rename to console/src/main/java/com/citahub/cita/console/WalletManager.java diff --git a/console/src/main/java/com/cryptape/cita/console/WalletUpdater.java b/console/src/main/java/com/citahub/cita/console/WalletUpdater.java similarity index 100% rename from console/src/main/java/com/cryptape/cita/console/WalletUpdater.java rename to console/src/main/java/com/citahub/cita/console/WalletUpdater.java diff --git a/console/src/test/java/com/cryptape/cita/console/KeyImporterTest.java b/console/src/test/java/com/citahub/cita/console/KeyImporterTest.java similarity index 100% rename from console/src/test/java/com/cryptape/cita/console/KeyImporterTest.java rename to console/src/test/java/com/citahub/cita/console/KeyImporterTest.java diff --git a/console/src/test/java/com/cryptape/cita/console/WalletCreatorTest.java b/console/src/test/java/com/citahub/cita/console/WalletCreatorTest.java similarity index 100% rename from console/src/test/java/com/cryptape/cita/console/WalletCreatorTest.java rename to console/src/test/java/com/citahub/cita/console/WalletCreatorTest.java diff --git a/console/src/test/java/com/cryptape/cita/console/WalletTester.java b/console/src/test/java/com/citahub/cita/console/WalletTester.java similarity index 100% rename from console/src/test/java/com/cryptape/cita/console/WalletTester.java rename to console/src/test/java/com/citahub/cita/console/WalletTester.java diff --git a/console/src/test/java/com/cryptape/cita/console/WalletUpdaterTest.java b/console/src/test/java/com/citahub/cita/console/WalletUpdaterTest.java similarity index 100% rename from console/src/test/java/com/cryptape/cita/console/WalletUpdaterTest.java rename to console/src/test/java/com/citahub/cita/console/WalletUpdaterTest.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/CITAj.java b/core/src/main/java/com/citahub/cita/protocol/CITAj.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/CITAj.java rename to core/src/main/java/com/citahub/cita/protocol/CITAj.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/CITAjService.java b/core/src/main/java/com/citahub/cita/protocol/CITAjService.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/CITAjService.java rename to core/src/main/java/com/citahub/cita/protocol/CITAjService.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ObjectMapperFactory.java b/core/src/main/java/com/citahub/cita/protocol/ObjectMapperFactory.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ObjectMapperFactory.java rename to core/src/main/java/com/citahub/cita/protocol/ObjectMapperFactory.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/Service.java b/core/src/main/java/com/citahub/cita/protocol/Service.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/Service.java rename to core/src/main/java/com/citahub/cita/protocol/Service.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/account/Account.java b/core/src/main/java/com/citahub/cita/protocol/account/Account.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/account/Account.java rename to core/src/main/java/com/citahub/cita/protocol/account/Account.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/account/CompiledContract.java b/core/src/main/java/com/citahub/cita/protocol/account/CompiledContract.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/account/CompiledContract.java rename to core/src/main/java/com/citahub/cita/protocol/account/CompiledContract.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/Admin.java b/core/src/main/java/com/citahub/cita/protocol/admin/Admin.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/Admin.java rename to core/src/main/java/com/citahub/cita/protocol/admin/Admin.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/JsonRpc2_0Admin.java b/core/src/main/java/com/citahub/cita/protocol/admin/JsonRpc2_0Admin.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/JsonRpc2_0Admin.java rename to core/src/main/java/com/citahub/cita/protocol/admin/JsonRpc2_0Admin.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/BooleanResponse.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/BooleanResponse.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/BooleanResponse.java rename to core/src/main/java/com/citahub/cita/protocol/admin/methods/response/BooleanResponse.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/NewAccountIdentifier.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/NewAccountIdentifier.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/NewAccountIdentifier.java rename to core/src/main/java/com/citahub/cita/protocol/admin/methods/response/NewAccountIdentifier.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/PersonalListAccounts.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalListAccounts.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/PersonalListAccounts.java rename to core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalListAccounts.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/PersonalSign.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalSign.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/PersonalSign.java rename to core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalSign.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/PersonalUnlockAccount.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalUnlockAccount.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/admin/methods/response/PersonalUnlockAccount.java rename to core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalUnlockAccount.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/CITA.java b/core/src/main/java/com/citahub/cita/protocol/core/CITA.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/CITA.java rename to core/src/main/java/com/citahub/cita/protocol/core/CITA.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/DefaultBlockParameter.java b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/DefaultBlockParameter.java rename to core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/DefaultBlockParameterName.java b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterName.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/DefaultBlockParameterName.java rename to core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterName.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/DefaultBlockParameterNumber.java b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterNumber.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/DefaultBlockParameterNumber.java rename to core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterNumber.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/JsonRpc2_0CITAj.java b/core/src/main/java/com/citahub/cita/protocol/core/JsonRpc2_0CITAj.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/JsonRpc2_0CITAj.java rename to core/src/main/java/com/citahub/cita/protocol/core/JsonRpc2_0CITAj.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/RemoteCall.java b/core/src/main/java/com/citahub/cita/protocol/core/RemoteCall.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/RemoteCall.java rename to core/src/main/java/com/citahub/cita/protocol/core/RemoteCall.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/Request.java b/core/src/main/java/com/citahub/cita/protocol/core/Request.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/Request.java rename to core/src/main/java/com/citahub/cita/protocol/core/Request.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/Response.java b/core/src/main/java/com/citahub/cita/protocol/core/Response.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/Response.java rename to core/src/main/java/com/citahub/cita/protocol/core/Response.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/filters/BlockFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/BlockFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/filters/BlockFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/filters/BlockFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/filters/Callback.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/Callback.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/filters/Callback.java rename to core/src/main/java/com/citahub/cita/protocol/core/filters/Callback.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/filters/Filter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/Filter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/filters/Filter.java rename to core/src/main/java/com/citahub/cita/protocol/core/filters/Filter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/filters/FilterException.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/FilterException.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/filters/FilterException.java rename to core/src/main/java/com/citahub/cita/protocol/core/filters/FilterException.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/filters/LogFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/LogFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/filters/LogFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/filters/LogFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/filters/PendingTransactionFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/filters/PendingTransactionFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/AppFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/AppFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/request/AppFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/request/AppFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Call.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Call.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Call.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/request/Call.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Filter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Filter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Filter.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/request/Filter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/ShhFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/request/ShhFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/ShhPost.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhPost.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/request/ShhPost.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhPost.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Transaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Transaction.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AbiDefinition.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AbiDefinition.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AbiDefinition.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AbiDefinition.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppAccounts.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppAccounts.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppAccounts.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppAccounts.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppBlock.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlock.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppBlock.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlock.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppBlockNumber.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlockNumber.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppBlockNumber.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlockNumber.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppCall.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCall.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppCall.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCall.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppCoinbase.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCoinbase.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppCoinbase.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCoinbase.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGasPrice.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGasPrice.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGasPrice.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGasPrice.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetAbi.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetAbi.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetAbi.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetAbi.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetBalance.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetBalance.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetBalance.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetBalance.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetCode.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetCode.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetCode.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetCode.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetTransactionCount.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionCount.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetTransactionCount.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionCount.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetTransactionReceipt.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionReceipt.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppGetTransactionReceipt.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionReceipt.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppLog.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppLog.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppLog.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppLog.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppMetaData.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppMetaData.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppMetaData.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppMetaData.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppProtocolVersion.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppProtocolVersion.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppProtocolVersion.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppProtocolVersion.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppSendRawTransaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendRawTransaction.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppSendRawTransaction.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendRawTransaction.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppSendTransaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendTransaction.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppSendTransaction.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendTransaction.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppSign.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSign.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppSign.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSign.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppTransaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppTransaction.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppTransaction.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppTransaction.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppUninstallFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppUninstallFilter.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppUninstallFilter.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppUninstallFilter.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppVersion.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppVersion.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/AppVersion.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppVersion.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/CITAClientVersion.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITAClientVersion.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/CITAClientVersion.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITAClientVersion.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/CITASha3.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITASha3.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/CITASha3.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITASha3.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/Log.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Log.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/Log.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/Log.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/NetPeerCount.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeerCount.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/NetPeerCount.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeerCount.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/NetPeersInfo.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeersInfo.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/NetPeersInfo.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeersInfo.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/Transaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Transaction.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/Transaction.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/Transaction.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/TransactionReceipt.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/TransactionReceipt.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/TransactionReceipt.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/TransactionReceipt.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/core/methods/response/VoidResponse.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/VoidResponse.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/core/methods/response/VoidResponse.java rename to core/src/main/java/com/citahub/cita/protocol/core/methods/response/VoidResponse.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/deserializer/RawResponseDeserializer.java b/core/src/main/java/com/citahub/cita/protocol/deserializer/RawResponseDeserializer.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/deserializer/RawResponseDeserializer.java rename to core/src/main/java/com/citahub/cita/protocol/deserializer/RawResponseDeserializer.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/exceptions/ClientConnectionException.java b/core/src/main/java/com/citahub/cita/protocol/exceptions/ClientConnectionException.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/exceptions/ClientConnectionException.java rename to core/src/main/java/com/citahub/cita/protocol/exceptions/ClientConnectionException.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/exceptions/TransactionException.java b/core/src/main/java/com/citahub/cita/protocol/exceptions/TransactionException.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/exceptions/TransactionException.java rename to core/src/main/java/com/citahub/cita/protocol/exceptions/TransactionException.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/http/HttpService.java b/core/src/main/java/com/citahub/cita/protocol/http/HttpService.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/http/HttpService.java rename to core/src/main/java/com/citahub/cita/protocol/http/HttpService.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ipc/IOFacade.java b/core/src/main/java/com/citahub/cita/protocol/ipc/IOFacade.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ipc/IOFacade.java rename to core/src/main/java/com/citahub/cita/protocol/ipc/IOFacade.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ipc/IpcService.java b/core/src/main/java/com/citahub/cita/protocol/ipc/IpcService.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ipc/IpcService.java rename to core/src/main/java/com/citahub/cita/protocol/ipc/IpcService.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ipc/UnixDomainSocket.java b/core/src/main/java/com/citahub/cita/protocol/ipc/UnixDomainSocket.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ipc/UnixDomainSocket.java rename to core/src/main/java/com/citahub/cita/protocol/ipc/UnixDomainSocket.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ipc/UnixIpcService.java b/core/src/main/java/com/citahub/cita/protocol/ipc/UnixIpcService.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ipc/UnixIpcService.java rename to core/src/main/java/com/citahub/cita/protocol/ipc/UnixIpcService.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ipc/WindowsIpcService.java b/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsIpcService.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ipc/WindowsIpcService.java rename to core/src/main/java/com/citahub/cita/protocol/ipc/WindowsIpcService.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/ipc/WindowsNamedPipe.java b/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsNamedPipe.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/ipc/WindowsNamedPipe.java rename to core/src/main/java/com/citahub/cita/protocol/ipc/WindowsNamedPipe.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/rx/CITAjRx.java b/core/src/main/java/com/citahub/cita/protocol/rx/CITAjRx.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/rx/CITAjRx.java rename to core/src/main/java/com/citahub/cita/protocol/rx/CITAjRx.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/rx/JsonRpc2_0Rx.java b/core/src/main/java/com/citahub/cita/protocol/rx/JsonRpc2_0Rx.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/rx/JsonRpc2_0Rx.java rename to core/src/main/java/com/citahub/cita/protocol/rx/JsonRpc2_0Rx.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/CITASystemAddress.java b/core/src/main/java/com/citahub/cita/protocol/system/CITASystemAddress.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/system/CITASystemAddress.java rename to core/src/main/java/com/citahub/cita/protocol/system/CITASystemAddress.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/CITASystemContract.java b/core/src/main/java/com/citahub/cita/protocol/system/CITASystemContract.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/system/CITASystemContract.java rename to core/src/main/java/com/citahub/cita/protocol/system/CITASystemContract.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java b/core/src/main/java/com/citahub/cita/protocol/system/CITAjSystemContract.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/system/CITAjSystemContract.java rename to core/src/main/java/com/citahub/cita/protocol/system/CITAjSystemContract.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/Util.java b/core/src/main/java/com/citahub/cita/protocol/system/Util.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/system/Util.java rename to core/src/main/java/com/citahub/cita/protocol/system/Util.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/entities/QueryInfoResult.java b/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryInfoResult.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/system/entities/QueryInfoResult.java rename to core/src/main/java/com/citahub/cita/protocol/system/entities/QueryInfoResult.java diff --git a/core/src/main/java/com/cryptape/cita/protocol/system/entities/QueryResourceResult.java b/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryResourceResult.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/protocol/system/entities/QueryResourceResult.java rename to core/src/main/java/com/citahub/cita/protocol/system/entities/QueryResourceResult.java diff --git a/core/src/main/java/com/cryptape/cita/tx/ChainId.java b/core/src/main/java/com/citahub/cita/tx/ChainId.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/ChainId.java rename to core/src/main/java/com/citahub/cita/tx/ChainId.java diff --git a/core/src/main/java/com/cryptape/cita/tx/Contract.java b/core/src/main/java/com/citahub/cita/tx/Contract.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/Contract.java rename to core/src/main/java/com/citahub/cita/tx/Contract.java diff --git a/core/src/main/java/com/cryptape/cita/tx/ManagedTransaction.java b/core/src/main/java/com/citahub/cita/tx/ManagedTransaction.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/ManagedTransaction.java rename to core/src/main/java/com/citahub/cita/tx/ManagedTransaction.java diff --git a/core/src/main/java/com/cryptape/cita/tx/RawTransactionManager.java b/core/src/main/java/com/citahub/cita/tx/RawTransactionManager.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/RawTransactionManager.java rename to core/src/main/java/com/citahub/cita/tx/RawTransactionManager.java diff --git a/core/src/main/java/com/cryptape/cita/tx/TransactionManager.java b/core/src/main/java/com/citahub/cita/tx/TransactionManager.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/TransactionManager.java rename to core/src/main/java/com/citahub/cita/tx/TransactionManager.java diff --git a/core/src/main/java/com/cryptape/cita/tx/exceptions/ContractCallException.java b/core/src/main/java/com/citahub/cita/tx/exceptions/ContractCallException.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/exceptions/ContractCallException.java rename to core/src/main/java/com/citahub/cita/tx/exceptions/ContractCallException.java diff --git a/core/src/main/java/com/cryptape/cita/tx/response/Callback.java b/core/src/main/java/com/citahub/cita/tx/response/Callback.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/response/Callback.java rename to core/src/main/java/com/citahub/cita/tx/response/Callback.java diff --git a/core/src/main/java/com/cryptape/cita/tx/response/EmptyTransactionReceipt.java b/core/src/main/java/com/citahub/cita/tx/response/EmptyTransactionReceipt.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/response/EmptyTransactionReceipt.java rename to core/src/main/java/com/citahub/cita/tx/response/EmptyTransactionReceipt.java diff --git a/core/src/main/java/com/cryptape/cita/tx/response/NoOpProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/NoOpProcessor.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/response/NoOpProcessor.java rename to core/src/main/java/com/citahub/cita/tx/response/NoOpProcessor.java diff --git a/core/src/main/java/com/cryptape/cita/tx/response/PollingTransactionReceiptProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/PollingTransactionReceiptProcessor.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/response/PollingTransactionReceiptProcessor.java rename to core/src/main/java/com/citahub/cita/tx/response/PollingTransactionReceiptProcessor.java diff --git a/core/src/main/java/com/cryptape/cita/tx/response/QueuingTransactionReceiptProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/QueuingTransactionReceiptProcessor.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/response/QueuingTransactionReceiptProcessor.java rename to core/src/main/java/com/citahub/cita/tx/response/QueuingTransactionReceiptProcessor.java diff --git a/core/src/main/java/com/cryptape/cita/tx/response/TransactionReceiptProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/TransactionReceiptProcessor.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/tx/response/TransactionReceiptProcessor.java rename to core/src/main/java/com/citahub/cita/tx/response/TransactionReceiptProcessor.java diff --git a/core/src/main/java/com/cryptape/cita/utils/Async.java b/core/src/main/java/com/citahub/cita/utils/Async.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/Async.java rename to core/src/main/java/com/citahub/cita/utils/Async.java diff --git a/core/src/main/java/com/cryptape/cita/utils/CallCmd.java b/core/src/main/java/com/citahub/cita/utils/CallCmd.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/CallCmd.java rename to core/src/main/java/com/citahub/cita/utils/CallCmd.java diff --git a/core/src/main/java/com/cryptape/cita/utils/Collection.java b/core/src/main/java/com/citahub/cita/utils/Collection.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/Collection.java rename to core/src/main/java/com/citahub/cita/utils/Collection.java diff --git a/core/src/main/java/com/cryptape/cita/utils/Files.java b/core/src/main/java/com/citahub/cita/utils/Files.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/Files.java rename to core/src/main/java/com/citahub/cita/utils/Files.java diff --git a/core/src/main/java/com/cryptape/cita/utils/Flowables.java b/core/src/main/java/com/citahub/cita/utils/Flowables.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/Flowables.java rename to core/src/main/java/com/citahub/cita/utils/Flowables.java diff --git a/core/src/main/java/com/cryptape/cita/utils/TransactionUtil.java b/core/src/main/java/com/citahub/cita/utils/TransactionUtil.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/TransactionUtil.java rename to core/src/main/java/com/citahub/cita/utils/TransactionUtil.java diff --git a/core/src/main/java/com/cryptape/cita/utils/TypedAbi.java b/core/src/main/java/com/citahub/cita/utils/TypedAbi.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/TypedAbi.java rename to core/src/main/java/com/citahub/cita/utils/TypedAbi.java diff --git a/core/src/main/java/com/cryptape/cita/utils/Version.java b/core/src/main/java/com/citahub/cita/utils/Version.java similarity index 100% rename from core/src/main/java/com/cryptape/cita/utils/Version.java rename to core/src/main/java/com/citahub/cita/utils/Version.java diff --git a/core/src/test/java/com/cryptape/cita/TempFileProvider.java b/core/src/test/java/com/citahub/cita/TempFileProvider.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/TempFileProvider.java rename to core/src/test/java/com/citahub/cita/TempFileProvider.java diff --git a/core/src/test/java/com/cryptape/cita/contracts/token/ERC20BasicInterface.java b/core/src/test/java/com/citahub/cita/contracts/token/ERC20BasicInterface.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/contracts/token/ERC20BasicInterface.java rename to core/src/test/java/com/citahub/cita/contracts/token/ERC20BasicInterface.java diff --git a/core/src/test/java/com/cryptape/cita/contracts/token/ERC20Interface.java b/core/src/test/java/com/citahub/cita/contracts/token/ERC20Interface.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/contracts/token/ERC20Interface.java rename to core/src/test/java/com/citahub/cita/contracts/token/ERC20Interface.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/RequestTester.java b/core/src/test/java/com/citahub/cita/protocol/RequestTester.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/RequestTester.java rename to core/src/test/java/com/citahub/cita/protocol/RequestTester.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/ResponseTester.java b/core/src/test/java/com/citahub/cita/protocol/ResponseTester.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/ResponseTester.java rename to core/src/test/java/com/citahub/cita/protocol/ResponseTester.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/admin/RequestTest.java b/core/src/test/java/com/citahub/cita/protocol/admin/RequestTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/admin/RequestTest.java rename to core/src/test/java/com/citahub/cita/protocol/admin/RequestTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/admin/ResponseTest.java b/core/src/test/java/com/citahub/cita/protocol/admin/ResponseTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/admin/ResponseTest.java rename to core/src/test/java/com/citahub/cita/protocol/admin/ResponseTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/RawResponseTest.java b/core/src/test/java/com/citahub/cita/protocol/core/RawResponseTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/RawResponseTest.java rename to core/src/test/java/com/citahub/cita/protocol/core/RawResponseTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/RequestTest.java b/core/src/test/java/com/citahub/cita/protocol/core/RequestTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/RequestTest.java rename to core/src/test/java/com/citahub/cita/protocol/core/RequestTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/ResponseTest.java b/core/src/test/java/com/citahub/cita/protocol/core/ResponseTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/ResponseTest.java rename to core/src/test/java/com/citahub/cita/protocol/core/ResponseTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/filters/BlockFilterTest.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/BlockFilterTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/filters/BlockFilterTest.java rename to core/src/test/java/com/citahub/cita/protocol/core/filters/BlockFilterTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/filters/FilterTester.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/FilterTester.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/filters/FilterTester.java rename to core/src/test/java/com/citahub/cita/protocol/core/filters/FilterTester.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/filters/LogFilterTest.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/LogFilterTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/filters/LogFilterTest.java rename to core/src/test/java/com/citahub/cita/protocol/core/filters/LogFilterTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/core/filters/PendingTransactionFilterTest.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilterTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/core/filters/PendingTransactionFilterTest.java rename to core/src/test/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilterTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/http/HttpServiceTest.java b/core/src/test/java/com/citahub/cita/protocol/http/HttpServiceTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/http/HttpServiceTest.java rename to core/src/test/java/com/citahub/cita/protocol/http/HttpServiceTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/ipc/IpcServiceTest.java b/core/src/test/java/com/citahub/cita/protocol/ipc/IpcServiceTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/ipc/IpcServiceTest.java rename to core/src/test/java/com/citahub/cita/protocol/ipc/IpcServiceTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/ipc/UnixDomainSocketTest.java b/core/src/test/java/com/citahub/cita/protocol/ipc/UnixDomainSocketTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/ipc/UnixDomainSocketTest.java rename to core/src/test/java/com/citahub/cita/protocol/ipc/UnixDomainSocketTest.java diff --git a/core/src/test/java/com/cryptape/cita/protocol/rx/JsonRpc2_0RxTest.java b/core/src/test/java/com/citahub/cita/protocol/rx/JsonRpc2_0RxTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/protocol/rx/JsonRpc2_0RxTest.java rename to core/src/test/java/com/citahub/cita/protocol/rx/JsonRpc2_0RxTest.java diff --git a/core/src/test/java/com/cryptape/cita/tx/ManagedTransactionTester.java b/core/src/test/java/com/citahub/cita/tx/ManagedTransactionTester.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/tx/ManagedTransactionTester.java rename to core/src/test/java/com/citahub/cita/tx/ManagedTransactionTester.java diff --git a/core/src/test/java/com/cryptape/cita/utils/AsyncTest.java b/core/src/test/java/com/citahub/cita/utils/AsyncTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/utils/AsyncTest.java rename to core/src/test/java/com/citahub/cita/utils/AsyncTest.java diff --git a/core/src/test/java/com/cryptape/cita/utils/CollectionTest.java b/core/src/test/java/com/citahub/cita/utils/CollectionTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/utils/CollectionTest.java rename to core/src/test/java/com/citahub/cita/utils/CollectionTest.java diff --git a/core/src/test/java/com/cryptape/cita/utils/FlowablesTests.java b/core/src/test/java/com/citahub/cita/utils/FlowablesTests.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/utils/FlowablesTests.java rename to core/src/test/java/com/citahub/cita/utils/FlowablesTests.java diff --git a/core/src/test/java/com/cryptape/cita/utils/TransactionUtilTest.java b/core/src/test/java/com/citahub/cita/utils/TransactionUtilTest.java similarity index 100% rename from core/src/test/java/com/cryptape/cita/utils/TransactionUtilTest.java rename to core/src/test/java/com/citahub/cita/utils/TransactionUtilTest.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/CipherException.java b/crypto/src/main/java/com/citahub/cita/crypto/CipherException.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/CipherException.java rename to crypto/src/main/java/com/citahub/cita/crypto/CipherException.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/ContractUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/ContractUtils.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/ContractUtils.java rename to crypto/src/main/java/com/citahub/cita/crypto/ContractUtils.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/Credentials.java b/crypto/src/main/java/com/citahub/cita/crypto/Credentials.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/Credentials.java rename to crypto/src/main/java/com/citahub/cita/crypto/Credentials.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/ECDSASignature.java b/crypto/src/main/java/com/citahub/cita/crypto/ECDSASignature.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/ECDSASignature.java rename to crypto/src/main/java/com/citahub/cita/crypto/ECDSASignature.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/ECKeyPair.java b/crypto/src/main/java/com/citahub/cita/crypto/ECKeyPair.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/ECKeyPair.java rename to crypto/src/main/java/com/citahub/cita/crypto/ECKeyPair.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/Keys.java b/crypto/src/main/java/com/citahub/cita/crypto/Keys.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/Keys.java rename to crypto/src/main/java/com/citahub/cita/crypto/Keys.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/LinuxSecureRandom.java b/crypto/src/main/java/com/citahub/cita/crypto/LinuxSecureRandom.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/LinuxSecureRandom.java rename to crypto/src/main/java/com/citahub/cita/crypto/LinuxSecureRandom.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/RawTransaction.java b/crypto/src/main/java/com/citahub/cita/crypto/RawTransaction.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/RawTransaction.java rename to crypto/src/main/java/com/citahub/cita/crypto/RawTransaction.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/SecureRandomUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/SecureRandomUtils.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/SecureRandomUtils.java rename to crypto/src/main/java/com/citahub/cita/crypto/SecureRandomUtils.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/Sign.java b/crypto/src/main/java/com/citahub/cita/crypto/Sign.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/Sign.java rename to crypto/src/main/java/com/citahub/cita/crypto/Sign.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/Signature.java b/crypto/src/main/java/com/citahub/cita/crypto/Signature.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/Signature.java rename to crypto/src/main/java/com/citahub/cita/crypto/Signature.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/TransactionEncoder.java b/crypto/src/main/java/com/citahub/cita/crypto/TransactionEncoder.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/TransactionEncoder.java rename to crypto/src/main/java/com/citahub/cita/crypto/TransactionEncoder.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/TransactionUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/TransactionUtils.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/TransactionUtils.java rename to crypto/src/main/java/com/citahub/cita/crypto/TransactionUtils.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/Wallet.java b/crypto/src/main/java/com/citahub/cita/crypto/Wallet.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/Wallet.java rename to crypto/src/main/java/com/citahub/cita/crypto/Wallet.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/WalletFile.java b/crypto/src/main/java/com/citahub/cita/crypto/WalletFile.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/WalletFile.java rename to crypto/src/main/java/com/citahub/cita/crypto/WalletFile.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/WalletUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/WalletUtils.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/WalletUtils.java rename to crypto/src/main/java/com/citahub/cita/crypto/WalletUtils.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/sm2/Params.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/Params.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/sm2/Params.java rename to crypto/src/main/java/com/citahub/cita/crypto/sm2/Params.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM2.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM2.java rename to crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM2KeyPair.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2KeyPair.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM2KeyPair.java rename to crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2KeyPair.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM2Keys.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2Keys.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM2Keys.java rename to crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2Keys.java diff --git a/crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM3.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM3.java similarity index 100% rename from crypto/src/main/java/com/cryptape/cita/crypto/sm2/SM3.java rename to crypto/src/main/java/com/citahub/cita/crypto/sm2/SM3.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/ContractUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/ContractUtilsTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/ContractUtilsTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/ContractUtilsTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/CredentialsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/CredentialsTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/CredentialsTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/CredentialsTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/KeysTest.java b/crypto/src/test/java/com/citahub/cita/crypto/KeysTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/KeysTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/KeysTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/SampleKeys.java b/crypto/src/test/java/com/citahub/cita/crypto/SampleKeys.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/SampleKeys.java rename to crypto/src/test/java/com/citahub/cita/crypto/SampleKeys.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/SecureRandomUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/SecureRandomUtilsTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/SecureRandomUtilsTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/SecureRandomUtilsTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/SignTest.java b/crypto/src/test/java/com/citahub/cita/crypto/SignTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/SignTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/SignTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/TransactionEncoderTest.java b/crypto/src/test/java/com/citahub/cita/crypto/TransactionEncoderTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/TransactionEncoderTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/TransactionEncoderTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/TransactionUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/TransactionUtilsTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/TransactionUtilsTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/TransactionUtilsTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/WalletTest.java b/crypto/src/test/java/com/citahub/cita/crypto/WalletTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/WalletTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/WalletTest.java diff --git a/crypto/src/test/java/com/cryptape/cita/crypto/WalletUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/WalletUtilsTest.java similarity index 100% rename from crypto/src/test/java/com/cryptape/cita/crypto/WalletUtilsTest.java rename to crypto/src/test/java/com/citahub/cita/crypto/WalletUtilsTest.java diff --git a/protobuf/src/main/java/com/cryptape/cita/protobuf/Blockchain.java b/protobuf/src/main/java/com/citahub/cita/protobuf/Blockchain.java similarity index 100% rename from protobuf/src/main/java/com/cryptape/cita/protobuf/Blockchain.java rename to protobuf/src/main/java/com/citahub/cita/protobuf/Blockchain.java diff --git a/protobuf/src/main/java/com/cryptape/cita/protobuf/ConvertStrByte.java b/protobuf/src/main/java/com/citahub/cita/protobuf/ConvertStrByte.java similarity index 100% rename from protobuf/src/main/java/com/cryptape/cita/protobuf/ConvertStrByte.java rename to protobuf/src/main/java/com/citahub/cita/protobuf/ConvertStrByte.java diff --git a/protobuf/src/main/java/com/cryptape/cita/protobuf/blockchain.proto b/protobuf/src/main/java/com/citahub/cita/protobuf/blockchain.proto similarity index 100% rename from protobuf/src/main/java/com/cryptape/cita/protobuf/blockchain.proto rename to protobuf/src/main/java/com/citahub/cita/protobuf/blockchain.proto diff --git a/rlp/src/main/java/com/cryptape/cita/rlp/RlpEncoder.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpEncoder.java similarity index 100% rename from rlp/src/main/java/com/cryptape/cita/rlp/RlpEncoder.java rename to rlp/src/main/java/com/citahub/cita/rlp/RlpEncoder.java diff --git a/rlp/src/main/java/com/cryptape/cita/rlp/RlpList.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpList.java similarity index 100% rename from rlp/src/main/java/com/cryptape/cita/rlp/RlpList.java rename to rlp/src/main/java/com/citahub/cita/rlp/RlpList.java diff --git a/rlp/src/main/java/com/cryptape/cita/rlp/RlpString.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpString.java similarity index 100% rename from rlp/src/main/java/com/cryptape/cita/rlp/RlpString.java rename to rlp/src/main/java/com/citahub/cita/rlp/RlpString.java diff --git a/rlp/src/main/java/com/cryptape/cita/rlp/RlpType.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpType.java similarity index 100% rename from rlp/src/main/java/com/cryptape/cita/rlp/RlpType.java rename to rlp/src/main/java/com/citahub/cita/rlp/RlpType.java diff --git a/rlp/src/test/java/com/cryptape/cita/rlp/RlpEncoderTest.java b/rlp/src/test/java/com/citahub/cita/rlp/RlpEncoderTest.java similarity index 100% rename from rlp/src/test/java/com/cryptape/cita/rlp/RlpEncoderTest.java rename to rlp/src/test/java/com/citahub/cita/rlp/RlpEncoderTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/AdvanceTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/AdvanceTransactionTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/AdvanceTransactionTest.java rename to tests/src/test/java/com/citahub/cita/tests/AdvanceTransactionTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/BlockFilterFlowableTest.java b/tests/src/test/java/com/citahub/cita/tests/BlockFilterFlowableTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/BlockFilterFlowableTest.java rename to tests/src/test/java/com/citahub/cita/tests/BlockFilterFlowableTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/BlockFilterTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/BlockFilterTransactionTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/BlockFilterTransactionTest.java rename to tests/src/test/java/com/citahub/cita/tests/BlockFilterTransactionTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/Config.java b/tests/src/test/java/com/citahub/cita/tests/Config.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/Config.java rename to tests/src/test/java/com/citahub/cita/tests/Config.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/DecodeTxTest.java b/tests/src/test/java/com/citahub/cita/tests/DecodeTxTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/DecodeTxTest.java rename to tests/src/test/java/com/citahub/cita/tests/DecodeTxTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/GroupManagerTest.java b/tests/src/test/java/com/citahub/cita/tests/GroupManagerTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/GroupManagerTest.java rename to tests/src/test/java/com/citahub/cita/tests/GroupManagerTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/PermissionManagerTest.java b/tests/src/test/java/com/citahub/cita/tests/PermissionManagerTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/PermissionManagerTest.java rename to tests/src/test/java/com/citahub/cita/tests/PermissionManagerTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/QuotaManagerTest.java b/tests/src/test/java/com/citahub/cita/tests/QuotaManagerTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/QuotaManagerTest.java rename to tests/src/test/java/com/citahub/cita/tests/QuotaManagerTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/RpcTest.java b/tests/src/test/java/com/citahub/cita/tests/RpcTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/RpcTest.java rename to tests/src/test/java/com/citahub/cita/tests/RpcTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/SM2ValidationTest.java b/tests/src/test/java/com/citahub/cita/tests/SM2ValidationTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/SM2ValidationTest.java rename to tests/src/test/java/com/citahub/cita/tests/SM2ValidationTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/SendTransactionSyncTest.java b/tests/src/test/java/com/citahub/cita/tests/SendTransactionSyncTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/SendTransactionSyncTest.java rename to tests/src/test/java/com/citahub/cita/tests/SendTransactionSyncTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/SendTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/SendTransactionTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/SendTransactionTest.java rename to tests/src/test/java/com/citahub/cita/tests/SendTransactionTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/SimpleDataTest.java b/tests/src/test/java/com/citahub/cita/tests/SimpleDataTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/SimpleDataTest.java rename to tests/src/test/java/com/citahub/cita/tests/SimpleDataTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/StoreRecordTest.java b/tests/src/test/java/com/citahub/cita/tests/StoreRecordTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/StoreRecordTest.java rename to tests/src/test/java/com/citahub/cita/tests/StoreRecordTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/SystemContractTest.java b/tests/src/test/java/com/citahub/cita/tests/SystemContractTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/SystemContractTest.java rename to tests/src/test/java/com/citahub/cita/tests/SystemContractTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TestUtil.java b/tests/src/test/java/com/citahub/cita/tests/TestUtil.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TestUtil.java rename to tests/src/test/java/com/citahub/cita/tests/TestUtil.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/Token.java b/tests/src/test/java/com/citahub/cita/tests/Token.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/Token.java rename to tests/src/test/java/com/citahub/cita/tests/Token.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TokenAccountTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenAccountTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TokenAccountTest.java rename to tests/src/test/java/com/citahub/cita/tests/TokenAccountTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TokenCodegenTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenCodegenTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TokenCodegenTest.java rename to tests/src/test/java/com/citahub/cita/tests/TokenCodegenTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TokenFilterCodeGenTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenFilterCodeGenTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TokenFilterCodeGenTest.java rename to tests/src/test/java/com/citahub/cita/tests/TokenFilterCodeGenTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TokenFilterFlowableTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenFilterFlowableTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TokenFilterFlowableTest.java rename to tests/src/test/java/com/citahub/cita/tests/TokenFilterFlowableTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TokenFilterTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenFilterTransactionTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TokenFilterTransactionTest.java rename to tests/src/test/java/com/citahub/cita/tests/TokenFilterTransactionTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/TokenTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenTransactionTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/TokenTransactionTest.java rename to tests/src/test/java/com/citahub/cita/tests/TokenTransactionTest.java diff --git a/tests/src/test/java/com/cryptape/cita/tests/VerifySignatureTest.java b/tests/src/test/java/com/citahub/cita/tests/VerifySignatureTest.java similarity index 100% rename from tests/src/test/java/com/cryptape/cita/tests/VerifySignatureTest.java rename to tests/src/test/java/com/citahub/cita/tests/VerifySignatureTest.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/EmptyTuple.java b/tuples/src/main/java/com/citahub/cita/tuples/EmptyTuple.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/EmptyTuple.java rename to tuples/src/main/java/com/citahub/cita/tuples/EmptyTuple.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/Tuple.java b/tuples/src/main/java/com/citahub/cita/tuples/Tuple.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/Tuple.java rename to tuples/src/main/java/com/citahub/cita/tuples/Tuple.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple1.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple1.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple1.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple1.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple10.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple10.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple10.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple10.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple11.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple11.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple11.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple11.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple12.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple12.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple12.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple12.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple13.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple13.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple13.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple13.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple14.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple14.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple14.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple14.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple15.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple15.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple15.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple15.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple16.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple16.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple16.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple16.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple17.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple17.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple17.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple17.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple18.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple18.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple18.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple18.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple19.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple19.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple19.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple19.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple2.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple2.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple2.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple2.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple20.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple20.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple20.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple20.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple3.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple3.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple3.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple3.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple4.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple4.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple4.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple4.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple5.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple5.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple5.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple5.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple6.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple6.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple6.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple6.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple7.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple7.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple7.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple7.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple8.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple8.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple8.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple8.java diff --git a/tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple9.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple9.java similarity index 100% rename from tuples/src/main/java/com/cryptape/cita/tuples/generated/Tuple9.java rename to tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple9.java diff --git a/utils/src/main/java/com/cryptape/cita/crypto/Hash.java b/utils/src/main/java/com/citahub/cita/crypto/Hash.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/crypto/Hash.java rename to utils/src/main/java/com/citahub/cita/crypto/Hash.java diff --git a/utils/src/main/java/com/cryptape/cita/exceptions/MessageDecodingException.java b/utils/src/main/java/com/citahub/cita/exceptions/MessageDecodingException.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/exceptions/MessageDecodingException.java rename to utils/src/main/java/com/citahub/cita/exceptions/MessageDecodingException.java diff --git a/utils/src/main/java/com/cryptape/cita/exceptions/MessageEncodingException.java b/utils/src/main/java/com/citahub/cita/exceptions/MessageEncodingException.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/exceptions/MessageEncodingException.java rename to utils/src/main/java/com/citahub/cita/exceptions/MessageEncodingException.java diff --git a/utils/src/main/java/com/cryptape/cita/utils/Assertions.java b/utils/src/main/java/com/citahub/cita/utils/Assertions.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/utils/Assertions.java rename to utils/src/main/java/com/citahub/cita/utils/Assertions.java diff --git a/utils/src/main/java/com/cryptape/cita/utils/Bytes.java b/utils/src/main/java/com/citahub/cita/utils/Bytes.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/utils/Bytes.java rename to utils/src/main/java/com/citahub/cita/utils/Bytes.java diff --git a/utils/src/main/java/com/cryptape/cita/utils/Convert.java b/utils/src/main/java/com/citahub/cita/utils/Convert.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/utils/Convert.java rename to utils/src/main/java/com/citahub/cita/utils/Convert.java diff --git a/utils/src/main/java/com/cryptape/cita/utils/HexUtil.java b/utils/src/main/java/com/citahub/cita/utils/HexUtil.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/utils/HexUtil.java rename to utils/src/main/java/com/citahub/cita/utils/HexUtil.java diff --git a/utils/src/main/java/com/cryptape/cita/utils/Numeric.java b/utils/src/main/java/com/citahub/cita/utils/Numeric.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/utils/Numeric.java rename to utils/src/main/java/com/citahub/cita/utils/Numeric.java diff --git a/utils/src/main/java/com/cryptape/cita/utils/Strings.java b/utils/src/main/java/com/citahub/cita/utils/Strings.java similarity index 100% rename from utils/src/main/java/com/cryptape/cita/utils/Strings.java rename to utils/src/main/java/com/citahub/cita/utils/Strings.java diff --git a/utils/src/test/java/com/cryptape/cita/crypto/HashTest.java b/utils/src/test/java/com/citahub/cita/crypto/HashTest.java similarity index 100% rename from utils/src/test/java/com/cryptape/cita/crypto/HashTest.java rename to utils/src/test/java/com/citahub/cita/crypto/HashTest.java diff --git a/utils/src/test/java/com/cryptape/cita/utils/AssertionsTest.java b/utils/src/test/java/com/citahub/cita/utils/AssertionsTest.java similarity index 100% rename from utils/src/test/java/com/cryptape/cita/utils/AssertionsTest.java rename to utils/src/test/java/com/citahub/cita/utils/AssertionsTest.java diff --git a/utils/src/test/java/com/cryptape/cita/utils/BytesTest.java b/utils/src/test/java/com/citahub/cita/utils/BytesTest.java similarity index 100% rename from utils/src/test/java/com/cryptape/cita/utils/BytesTest.java rename to utils/src/test/java/com/citahub/cita/utils/BytesTest.java diff --git a/utils/src/test/java/com/cryptape/cita/utils/ConvertTest.java b/utils/src/test/java/com/citahub/cita/utils/ConvertTest.java similarity index 100% rename from utils/src/test/java/com/cryptape/cita/utils/ConvertTest.java rename to utils/src/test/java/com/citahub/cita/utils/ConvertTest.java diff --git a/utils/src/test/java/com/cryptape/cita/utils/NumericTest.java b/utils/src/test/java/com/citahub/cita/utils/NumericTest.java similarity index 100% rename from utils/src/test/java/com/cryptape/cita/utils/NumericTest.java rename to utils/src/test/java/com/citahub/cita/utils/NumericTest.java diff --git a/utils/src/test/java/com/cryptape/cita/utils/StringsTest.java b/utils/src/test/java/com/citahub/cita/utils/StringsTest.java similarity index 100% rename from utils/src/test/java/com/cryptape/cita/utils/StringsTest.java rename to utils/src/test/java/com/citahub/cita/utils/StringsTest.java From dae9d5ec760a40f947ba9bbcb17970fd6d45e14c Mon Sep 17 00:00:00 2001 From: UDLD Date: Tue, 3 Dec 2019 20:33:16 +0800 Subject: [PATCH 14/20] change code to citahub --- CHANGELOG.md | 22 ++-- README.md | 58 ++++----- .../com/citahub/cita/abi/EventEncoder.java | 12 +- .../com/citahub/cita/abi/EventValues.java | 4 +- .../com/citahub/cita/abi/FunctionEncoder.java | 14 +-- .../cita/abi/FunctionReturnDecoder.java | 26 ++--- .../com/citahub/cita/abi/TypeDecoder.java | 38 +++--- .../com/citahub/cita/abi/TypeEncoder.java | 30 ++--- .../cita/abi/TypeMappingException.java | 2 +- .../com/citahub/cita/abi/TypeReference.java | 14 +-- .../main/java/com/citahub/cita/abi/Utils.java | 20 ++-- .../citahub/cita/abi/datatypes/Address.java | 6 +- .../com/citahub/cita/abi/datatypes/Array.java | 2 +- .../com/citahub/cita/abi/datatypes/Bool.java | 2 +- .../com/citahub/cita/abi/datatypes/Bytes.java | 2 +- .../citahub/cita/abi/datatypes/BytesType.java | 2 +- .../cita/abi/datatypes/DynamicArray.java | 2 +- .../cita/abi/datatypes/DynamicBytes.java | 2 +- .../com/citahub/cita/abi/datatypes/Event.java | 6 +- .../com/citahub/cita/abi/datatypes/Fixed.java | 2 +- .../cita/abi/datatypes/FixedPointType.java | 2 +- .../citahub/cita/abi/datatypes/Function.java | 6 +- .../com/citahub/cita/abi/datatypes/Int.java | 2 +- .../citahub/cita/abi/datatypes/IntType.java | 2 +- .../cita/abi/datatypes/NumericType.java | 2 +- .../cita/abi/datatypes/StaticArray.java | 4 +- .../com/citahub/cita/abi/datatypes/Type.java | 2 +- .../citahub/cita/abi/datatypes/Ufixed.java | 2 +- .../com/citahub/cita/abi/datatypes/Uint.java | 2 +- .../cita/abi/datatypes/UnorderedEvent.java | 4 +- .../cita/abi/datatypes/Utf8String.java | 2 +- .../abi/datatypes/generated/AbiTypes.java | 12 +- .../cita/abi/datatypes/generated/Bytes1.java | 6 +- .../cita/abi/datatypes/generated/Bytes10.java | 6 +- .../cita/abi/datatypes/generated/Bytes11.java | 6 +- .../cita/abi/datatypes/generated/Bytes12.java | 6 +- .../cita/abi/datatypes/generated/Bytes13.java | 6 +- .../cita/abi/datatypes/generated/Bytes14.java | 6 +- .../cita/abi/datatypes/generated/Bytes15.java | 6 +- .../cita/abi/datatypes/generated/Bytes16.java | 6 +- .../cita/abi/datatypes/generated/Bytes17.java | 6 +- .../cita/abi/datatypes/generated/Bytes18.java | 6 +- .../cita/abi/datatypes/generated/Bytes19.java | 6 +- .../cita/abi/datatypes/generated/Bytes2.java | 6 +- .../cita/abi/datatypes/generated/Bytes20.java | 6 +- .../cita/abi/datatypes/generated/Bytes21.java | 6 +- .../cita/abi/datatypes/generated/Bytes22.java | 6 +- .../cita/abi/datatypes/generated/Bytes23.java | 6 +- .../cita/abi/datatypes/generated/Bytes24.java | 6 +- .../cita/abi/datatypes/generated/Bytes25.java | 6 +- .../cita/abi/datatypes/generated/Bytes26.java | 6 +- .../cita/abi/datatypes/generated/Bytes27.java | 6 +- .../cita/abi/datatypes/generated/Bytes28.java | 6 +- .../cita/abi/datatypes/generated/Bytes29.java | 6 +- .../cita/abi/datatypes/generated/Bytes3.java | 6 +- .../cita/abi/datatypes/generated/Bytes30.java | 6 +- .../cita/abi/datatypes/generated/Bytes31.java | 6 +- .../cita/abi/datatypes/generated/Bytes32.java | 6 +- .../cita/abi/datatypes/generated/Bytes4.java | 6 +- .../cita/abi/datatypes/generated/Bytes5.java | 6 +- .../cita/abi/datatypes/generated/Bytes6.java | 6 +- .../cita/abi/datatypes/generated/Bytes7.java | 6 +- .../cita/abi/datatypes/generated/Bytes8.java | 6 +- .../cita/abi/datatypes/generated/Bytes9.java | 6 +- .../cita/abi/datatypes/generated/Int104.java | 6 +- .../cita/abi/datatypes/generated/Int112.java | 6 +- .../cita/abi/datatypes/generated/Int120.java | 6 +- .../cita/abi/datatypes/generated/Int128.java | 6 +- .../cita/abi/datatypes/generated/Int136.java | 6 +- .../cita/abi/datatypes/generated/Int144.java | 6 +- .../cita/abi/datatypes/generated/Int152.java | 6 +- .../cita/abi/datatypes/generated/Int16.java | 6 +- .../cita/abi/datatypes/generated/Int160.java | 6 +- .../cita/abi/datatypes/generated/Int168.java | 6 +- .../cita/abi/datatypes/generated/Int176.java | 6 +- .../cita/abi/datatypes/generated/Int184.java | 6 +- .../cita/abi/datatypes/generated/Int192.java | 6 +- .../cita/abi/datatypes/generated/Int200.java | 6 +- .../cita/abi/datatypes/generated/Int208.java | 6 +- .../cita/abi/datatypes/generated/Int216.java | 6 +- .../cita/abi/datatypes/generated/Int224.java | 6 +- .../cita/abi/datatypes/generated/Int232.java | 6 +- .../cita/abi/datatypes/generated/Int24.java | 6 +- .../cita/abi/datatypes/generated/Int240.java | 6 +- .../cita/abi/datatypes/generated/Int248.java | 6 +- .../cita/abi/datatypes/generated/Int256.java | 6 +- .../cita/abi/datatypes/generated/Int32.java | 6 +- .../cita/abi/datatypes/generated/Int40.java | 6 +- .../cita/abi/datatypes/generated/Int48.java | 6 +- .../cita/abi/datatypes/generated/Int56.java | 6 +- .../cita/abi/datatypes/generated/Int64.java | 6 +- .../cita/abi/datatypes/generated/Int72.java | 6 +- .../cita/abi/datatypes/generated/Int8.java | 6 +- .../cita/abi/datatypes/generated/Int80.java | 6 +- .../cita/abi/datatypes/generated/Int88.java | 6 +- .../cita/abi/datatypes/generated/Int96.java | 6 +- .../abi/datatypes/generated/StaticArray1.java | 8 +- .../datatypes/generated/StaticArray10.java | 8 +- .../datatypes/generated/StaticArray11.java | 8 +- .../datatypes/generated/StaticArray12.java | 8 +- .../datatypes/generated/StaticArray13.java | 8 +- .../datatypes/generated/StaticArray14.java | 8 +- .../datatypes/generated/StaticArray15.java | 8 +- .../datatypes/generated/StaticArray16.java | 8 +- .../datatypes/generated/StaticArray17.java | 8 +- .../datatypes/generated/StaticArray18.java | 8 +- .../datatypes/generated/StaticArray19.java | 8 +- .../abi/datatypes/generated/StaticArray2.java | 8 +- .../datatypes/generated/StaticArray20.java | 8 +- .../datatypes/generated/StaticArray21.java | 8 +- .../datatypes/generated/StaticArray22.java | 8 +- .../datatypes/generated/StaticArray23.java | 8 +- .../datatypes/generated/StaticArray24.java | 8 +- .../datatypes/generated/StaticArray25.java | 8 +- .../datatypes/generated/StaticArray26.java | 8 +- .../datatypes/generated/StaticArray27.java | 8 +- .../datatypes/generated/StaticArray28.java | 8 +- .../datatypes/generated/StaticArray29.java | 8 +- .../abi/datatypes/generated/StaticArray3.java | 8 +- .../datatypes/generated/StaticArray30.java | 8 +- .../datatypes/generated/StaticArray31.java | 8 +- .../datatypes/generated/StaticArray32.java | 8 +- .../abi/datatypes/generated/StaticArray4.java | 8 +- .../abi/datatypes/generated/StaticArray5.java | 8 +- .../abi/datatypes/generated/StaticArray6.java | 8 +- .../abi/datatypes/generated/StaticArray7.java | 8 +- .../abi/datatypes/generated/StaticArray8.java | 8 +- .../abi/datatypes/generated/StaticArray9.java | 8 +- .../cita/abi/datatypes/generated/Uint104.java | 6 +- .../cita/abi/datatypes/generated/Uint112.java | 6 +- .../cita/abi/datatypes/generated/Uint120.java | 6 +- .../cita/abi/datatypes/generated/Uint128.java | 6 +- .../cita/abi/datatypes/generated/Uint136.java | 6 +- .../cita/abi/datatypes/generated/Uint144.java | 6 +- .../cita/abi/datatypes/generated/Uint152.java | 6 +- .../cita/abi/datatypes/generated/Uint16.java | 6 +- .../cita/abi/datatypes/generated/Uint160.java | 6 +- .../cita/abi/datatypes/generated/Uint168.java | 6 +- .../cita/abi/datatypes/generated/Uint176.java | 6 +- .../cita/abi/datatypes/generated/Uint184.java | 6 +- .../cita/abi/datatypes/generated/Uint192.java | 6 +- .../cita/abi/datatypes/generated/Uint200.java | 6 +- .../cita/abi/datatypes/generated/Uint208.java | 6 +- .../cita/abi/datatypes/generated/Uint216.java | 6 +- .../cita/abi/datatypes/generated/Uint224.java | 6 +- .../cita/abi/datatypes/generated/Uint232.java | 6 +- .../cita/abi/datatypes/generated/Uint24.java | 6 +- .../cita/abi/datatypes/generated/Uint240.java | 6 +- .../cita/abi/datatypes/generated/Uint248.java | 6 +- .../cita/abi/datatypes/generated/Uint256.java | 6 +- .../cita/abi/datatypes/generated/Uint32.java | 6 +- .../cita/abi/datatypes/generated/Uint40.java | 6 +- .../cita/abi/datatypes/generated/Uint48.java | 6 +- .../cita/abi/datatypes/generated/Uint56.java | 6 +- .../cita/abi/datatypes/generated/Uint64.java | 6 +- .../cita/abi/datatypes/generated/Uint72.java | 6 +- .../cita/abi/datatypes/generated/Uint8.java | 6 +- .../cita/abi/datatypes/generated/Uint80.java | 6 +- .../cita/abi/datatypes/generated/Uint88.java | 6 +- .../cita/abi/datatypes/generated/Uint96.java | 6 +- .../citahub/cita/abi/EventEncoderTest.java | 2 +- .../citahub/cita/abi/FunctionEncoderTest.java | 18 +-- .../cita/abi/FunctionReturnDecoderTest.java | 26 ++--- .../com/citahub/cita/abi/TypeDecoderTest.java | 30 ++--- .../com/citahub/cita/abi/TypeEncoderTest.java | 32 ++--- .../java/com/citahub/cita/abi/UtilsTest.java | 26 ++--- .../cita/abi/datatypes/AddressTest.java | 2 +- .../abi/datatypes/FixedPointTypeTest.java | 2 +- .../cita/abi/datatypes/StaticArrayTest.java | 6 +- .../cita/abi/datatypes/Utf8StringTest.java | 2 +- build.gradle | 22 ++-- .../cita/codegen/AbiTypesGenerator.java | 12 +- .../cita/codegen/AbiTypesMapperGenerator.java | 24 ++-- .../com/citahub/cita/codegen/Console.java | 2 +- .../codegen/FunctionWrapperGenerator.java | 4 +- .../com/citahub/cita/codegen/Generator.java | 2 +- .../cita/codegen/SolidityFunctionWrapper.java | 62 +++++----- .../SolidityFunctionWrapperGenerator.java | 14 +-- .../TruffleJsonFunctionWrapperGenerator.java | 14 +-- .../citahub/cita/codegen/TupleGenerator.java | 6 +- .../com/citahub/cita/TempFileProvider.java | 2 +- .../cita/codegen/AbiTypesGeneratorTest.java | 4 +- .../codegen/AbiTypesMapperGeneratorTest.java | 4 +- .../cita/codegen/ContractJsonParseTest.java | 8 +- .../SolidityFunctionWrapperGeneratorTest.java | 16 +-- .../codegen/SolidityFunctionWrapperTest.java | 110 +++++++++--------- ...uffleJsonFunctionWrapperGeneratorTest.java | 12 +- .../cita/codegen/TupleGeneratorTest.java | 8 +- codegen/src/test/resources/solidity/build.sh | 2 +- codegen/src/test/resources/truffle/build.sh | 2 +- console/build.gradle | 2 +- .../citahub/cita/console/ConsoleDevice.java | 2 +- .../com/citahub/cita/console/IODevice.java | 2 +- .../com/citahub/cita/console/KeyImporter.java | 16 +-- .../java/com/citahub/cita/console/Runner.java | 12 +- .../citahub/cita/console/WalletCreator.java | 8 +- .../citahub/cita/console/WalletManager.java | 12 +- .../citahub/cita/console/WalletUpdater.java | 12 +- .../citahub/cita/console/KeyImporterTest.java | 4 +- .../cita/console/WalletCreatorTest.java | 2 +- .../citahub/cita/console/WalletTester.java | 6 +- .../cita/console/WalletUpdaterTest.java | 2 +- .../java/com/citahub/cita/protocol/CITAj.java | 8 +- .../citahub/cita/protocol/CITAjService.java | 6 +- .../cita/protocol/ObjectMapperFactory.java | 6 +- .../com/citahub/cita/protocol/Service.java | 8 +- .../cita/protocol/account/Account.java | 44 +++---- .../protocol/account/CompiledContract.java | 8 +- .../citahub/cita/protocol/admin/Admin.java | 18 +-- .../cita/protocol/admin/JsonRpc2_0Admin.java | 18 +-- .../methods/response/BooleanResponse.java | 4 +- .../response/NewAccountIdentifier.java | 4 +- .../response/PersonalListAccounts.java | 4 +- .../admin/methods/response/PersonalSign.java | 4 +- .../response/PersonalUnlockAccount.java | 4 +- .../com/citahub/cita/protocol/core/CITA.java | 10 +- .../protocol/core/DefaultBlockParameter.java | 2 +- .../core/DefaultBlockParameterName.java | 2 +- .../core/DefaultBlockParameterNumber.java | 4 +- .../cita/protocol/core/JsonRpc2_0CITAj.java | 22 ++-- .../cita/protocol/core/RemoteCall.java | 4 +- .../citahub/cita/protocol/core/Request.java | 4 +- .../citahub/cita/protocol/core/Response.java | 2 +- .../protocol/core/filters/BlockFilter.java | 10 +- .../cita/protocol/core/filters/Callback.java | 2 +- .../cita/protocol/core/filters/Filter.java | 14 +-- .../core/filters/FilterException.java | 2 +- .../cita/protocol/core/filters/LogFilter.java | 14 +-- .../filters/PendingTransactionFilter.java | 10 +- .../core/methods/request/AppFilter.java | 4 +- .../protocol/core/methods/request/Call.java | 4 +- .../protocol/core/methods/request/Filter.java | 2 +- .../core/methods/request/ShhFilter.java | 2 +- .../core/methods/request/ShhPost.java | 4 +- .../core/methods/request/Transaction.java | 34 +++--- .../core/methods/response/AbiDefinition.java | 2 +- .../core/methods/response/AppAccounts.java | 4 +- .../core/methods/response/AppBlock.java | 8 +- .../core/methods/response/AppBlockNumber.java | 6 +- .../core/methods/response/AppCall.java | 4 +- .../core/methods/response/AppCoinbase.java | 4 +- .../core/methods/response/AppFilter.java | 6 +- .../core/methods/response/AppGasPrice.java | 6 +- .../core/methods/response/AppGetAbi.java | 4 +- .../core/methods/response/AppGetBalance.java | 6 +- .../core/methods/response/AppGetCode.java | 4 +- .../response/AppGetTransactionCount.java | 6 +- .../response/AppGetTransactionReceipt.java | 4 +- .../core/methods/response/AppLog.java | 6 +- .../core/methods/response/AppMetaData.java | 8 +- .../methods/response/AppProtocolVersion.java | 4 +- .../response/AppSendRawTransaction.java | 4 +- .../methods/response/AppSendTransaction.java | 4 +- .../core/methods/response/AppSign.java | 4 +- .../core/methods/response/AppTransaction.java | 4 +- .../methods/response/AppUninstallFilter.java | 4 +- .../core/methods/response/AppVersion.java | 4 +- .../methods/response/CITAClientVersion.java | 4 +- .../core/methods/response/CITASha3.java | 4 +- .../protocol/core/methods/response/Log.java | 4 +- .../core/methods/response/NetPeerCount.java | 6 +- .../core/methods/response/NetPeersInfo.java | 4 +- .../core/methods/response/Transaction.java | 8 +- .../methods/response/TransactionReceipt.java | 4 +- .../core/methods/response/VoidResponse.java | 4 +- .../deserializer/RawResponseDeserializer.java | 4 +- .../exceptions/ClientConnectionException.java | 2 +- .../exceptions/TransactionException.java | 2 +- .../cita/protocol/http/HttpService.java | 6 +- .../citahub/cita/protocol/ipc/IOFacade.java | 2 +- .../citahub/cita/protocol/ipc/IpcService.java | 4 +- .../cita/protocol/ipc/UnixDomainSocket.java | 2 +- .../cita/protocol/ipc/UnixIpcService.java | 2 +- .../cita/protocol/ipc/WindowsIpcService.java | 2 +- .../cita/protocol/ipc/WindowsNamedPipe.java | 2 +- .../com/citahub/cita/protocol/rx/CITAjRx.java | 12 +- .../cita/protocol/rx/JsonRpc2_0Rx.java | 32 ++--- .../protocol/system/CITASystemAddress.java | 2 +- .../protocol/system/CITASystemContract.java | 36 +++--- .../protocol/system/CITAjSystemContract.java | 46 ++++---- .../citahub/cita/protocol/system/Util.java | 12 +- .../system/entities/QueryInfoResult.java | 2 +- .../system/entities/QueryResourceResult.java | 2 +- .../java/com/citahub/cita/tx/ChainId.java | 2 +- .../java/com/citahub/cita/tx/Contract.java | 42 +++---- .../citahub/cita/tx/ManagedTransaction.java | 8 +- .../cita/tx/RawTransactionManager.java | 22 ++-- .../citahub/cita/tx/TransactionManager.java | 16 +-- .../tx/exceptions/ContractCallException.java | 2 +- .../citahub/cita/tx/response/Callback.java | 4 +- .../tx/response/EmptyTransactionReceipt.java | 6 +- .../cita/tx/response/NoOpProcessor.java | 8 +- .../PollingTransactionReceiptProcessor.java | 8 +- .../QueuingTransactionReceiptProcessor.java | 10 +- .../response/TransactionReceiptProcessor.java | 10 +- .../java/com/citahub/cita/utils/Async.java | 2 +- .../java/com/citahub/cita/utils/CallCmd.java | 2 +- .../com/citahub/cita/utils/Collection.java | 2 +- .../java/com/citahub/cita/utils/Files.java | 2 +- .../com/citahub/cita/utils/Flowables.java | 2 +- .../citahub/cita/utils/TransactionUtil.java | 14 +-- .../java/com/citahub/cita/utils/TypedAbi.java | 26 ++--- .../java/com/citahub/cita/utils/Version.java | 2 +- .../com/citahub/cita/TempFileProvider.java | 2 +- .../contracts/token/ERC20BasicInterface.java | 8 +- .../cita/contracts/token/ERC20Interface.java | 8 +- .../citahub/cita/protocol/RequestTester.java | 4 +- .../citahub/cita/protocol/ResponseTester.java | 10 +- .../cita/protocol/admin/RequestTest.java | 8 +- .../cita/protocol/admin/ResponseTest.java | 14 +-- .../cita/protocol/core/RawResponseTest.java | 8 +- .../cita/protocol/core/RequestTest.java | 14 +-- .../cita/protocol/core/ResponseTest.java | 46 ++++---- .../core/filters/BlockFilterTest.java | 4 +- .../protocol/core/filters/FilterTester.java | 16 +-- .../protocol/core/filters/LogFilterTest.java | 6 +- .../filters/PendingTransactionFilterTest.java | 4 +- .../cita/protocol/http/HttpServiceTest.java | 2 +- .../cita/protocol/ipc/IpcServiceTest.java | 6 +- .../protocol/ipc/UnixDomainSocketTest.java | 2 +- .../cita/protocol/rx/JsonRpc2_0RxTest.java | 22 ++-- .../cita/tx/ManagedTransactionTester.java | 18 +-- .../com/citahub/cita/utils/AsyncTest.java | 2 +- .../citahub/cita/utils/CollectionTest.java | 12 +- .../citahub/cita/utils/FlowablesTests.java | 2 +- .../cita/utils/TransactionUtilTest.java | 4 +- .../citahub/cita/crypto/CipherException.java | 2 +- .../citahub/cita/crypto/ContractUtils.java | 12 +- .../com/citahub/cita/crypto/Credentials.java | 4 +- .../citahub/cita/crypto/ECDSASignature.java | 2 +- .../com/citahub/cita/crypto/ECKeyPair.java | 4 +- .../java/com/citahub/cita/crypto/Keys.java | 8 +- .../cita/crypto/LinuxSecureRandom.java | 2 +- .../citahub/cita/crypto/RawTransaction.java | 4 +- .../cita/crypto/SecureRandomUtils.java | 2 +- .../java/com/citahub/cita/crypto/Sign.java | 6 +- .../com/citahub/cita/crypto/Signature.java | 2 +- .../cita/crypto/TransactionEncoder.java | 14 +-- .../citahub/cita/crypto/TransactionUtils.java | 4 +- .../java/com/citahub/cita/crypto/Wallet.java | 6 +- .../com/citahub/cita/crypto/WalletFile.java | 2 +- .../com/citahub/cita/crypto/WalletUtils.java | 4 +- .../com/citahub/cita/crypto/sm2/Params.java | 2 +- .../java/com/citahub/cita/crypto/sm2/SM2.java | 10 +- .../citahub/cita/crypto/sm2/SM2KeyPair.java | 2 +- .../com/citahub/cita/crypto/sm2/SM2Keys.java | 8 +- .../java/com/citahub/cita/crypto/sm2/SM3.java | 2 +- .../cita/crypto/ContractUtilsTest.java | 4 +- .../citahub/cita/crypto/CredentialsTest.java | 2 +- .../com/citahub/cita/crypto/KeysTest.java | 8 +- .../com/citahub/cita/crypto/SampleKeys.java | 4 +- .../cita/crypto/SecureRandomUtilsTest.java | 6 +- .../com/citahub/cita/crypto/SignTest.java | 4 +- .../cita/crypto/TransactionEncoderTest.java | 8 +- .../cita/crypto/TransactionUtilsTest.java | 4 +- .../com/citahub/cita/crypto/WalletTest.java | 4 +- .../citahub/cita/crypto/WalletUtilsTest.java | 14 +-- docs/jsonrpc.md | 4 +- .../com/citahub/cita/protobuf/Blockchain.java | 2 +- .../citahub/cita/protobuf/ConvertStrByte.java | 2 +- .../java/com/citahub/cita/rlp/RlpEncoder.java | 2 +- .../java/com/citahub/cita/rlp/RlpList.java | 2 +- .../java/com/citahub/cita/rlp/RlpString.java | 2 +- .../java/com/citahub/cita/rlp/RlpType.java | 2 +- .../com/citahub/cita/rlp/RlpEncoderTest.java | 2 +- scripts/run-system-test.sh | 2 +- .../travis-upload-test-report-to-gh-pages.sh | 2 +- .../cita/tests/AdvanceTransactionTest.java | 24 ++-- .../cita/tests/BlockFilterFlowableTest.java | 4 +- .../tests/BlockFilterTransactionTest.java | 12 +- .../java/com/citahub/cita/tests/Config.java | 6 +- .../com/citahub/cita/tests/DecodeTxTest.java | 14 +-- .../citahub/cita/tests/GroupManagerTest.java | 4 +- .../cita/tests/PermissionManagerTest.java | 12 +- .../citahub/cita/tests/QuotaManagerTest.java | 6 +- .../java/com/citahub/cita/tests/RpcTest.java | 54 ++++----- .../citahub/cita/tests/SM2ValidationTest.java | 12 +- .../cita/tests/SendTransactionSyncTest.java | 18 +-- .../cita/tests/SendTransactionTest.java | 20 ++-- .../citahub/cita/tests/SimpleDataTest.java | 36 +++--- .../citahub/cita/tests/StoreRecordTest.java | 16 +-- .../cita/tests/SystemContractTest.java | 6 +- .../java/com/citahub/cita/tests/TestUtil.java | 12 +- .../java/com/citahub/cita/tests/Token.java | 38 +++--- .../citahub/cita/tests/TokenAccountTest.java | 16 +-- .../citahub/cita/tests/TokenCodegenTest.java | 12 +- .../cita/tests/TokenFilterCodeGenTest.java | 18 +-- .../cita/tests/TokenFilterFlowableTest.java | 38 +++--- .../tests/TokenFilterTransactionTest.java | 42 +++---- .../cita/tests/TokenTransactionTest.java | 28 ++--- .../cita/tests/VerifySignatureTest.java | 18 +-- .../com/citahub/cita/tuples/EmptyTuple.java | 2 +- .../java/com/citahub/cita/tuples/Tuple.java | 2 +- .../citahub/cita/tuples/generated/Tuple1.java | 6 +- .../cita/tuples/generated/Tuple10.java | 6 +- .../cita/tuples/generated/Tuple11.java | 6 +- .../cita/tuples/generated/Tuple12.java | 6 +- .../cita/tuples/generated/Tuple13.java | 6 +- .../cita/tuples/generated/Tuple14.java | 6 +- .../cita/tuples/generated/Tuple15.java | 6 +- .../cita/tuples/generated/Tuple16.java | 6 +- .../cita/tuples/generated/Tuple17.java | 6 +- .../cita/tuples/generated/Tuple18.java | 6 +- .../cita/tuples/generated/Tuple19.java | 6 +- .../citahub/cita/tuples/generated/Tuple2.java | 6 +- .../cita/tuples/generated/Tuple20.java | 6 +- .../citahub/cita/tuples/generated/Tuple3.java | 6 +- .../citahub/cita/tuples/generated/Tuple4.java | 6 +- .../citahub/cita/tuples/generated/Tuple5.java | 6 +- .../citahub/cita/tuples/generated/Tuple6.java | 6 +- .../citahub/cita/tuples/generated/Tuple7.java | 6 +- .../citahub/cita/tuples/generated/Tuple8.java | 6 +- .../citahub/cita/tuples/generated/Tuple9.java | 6 +- .../java/com/citahub/cita/crypto/Hash.java | 4 +- .../exceptions/MessageDecodingException.java | 2 +- .../exceptions/MessageEncodingException.java | 2 +- .../com/citahub/cita/utils/Assertions.java | 2 +- .../java/com/citahub/cita/utils/Bytes.java | 2 +- .../java/com/citahub/cita/utils/Convert.java | 2 +- .../java/com/citahub/cita/utils/HexUtil.java | 2 +- .../java/com/citahub/cita/utils/Numeric.java | 6 +- .../java/com/citahub/cita/utils/Strings.java | 2 +- .../com/citahub/cita/crypto/HashTest.java | 4 +- .../citahub/cita/utils/AssertionsTest.java | 4 +- .../com/citahub/cita/utils/BytesTest.java | 4 +- .../com/citahub/cita/utils/ConvertTest.java | 2 +- .../com/citahub/cita/utils/NumericTest.java | 6 +- .../com/citahub/cita/utils/StringsTest.java | 16 +-- 428 files changed, 1772 insertions(+), 1772 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ebc8483..ec42d665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ 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) +# [v1.0.0](https://github.com/citahub/cita-sdk-java/compare/v0.25.0...v1.0.0) (2019-08-28) ### Added @@ -16,67 +16,67 @@ All notable changes to this project will be documented in this file. * add introduction document -# [v0.25.0](https://github.com/cryptape/cita-sdk-java/compare/v0.24.1...v0.25.0) (2019-08-27) +# [v0.25.0](https://github.com/citahub/cita-sdk-java/compare/v0.24.1...v0.25.0) (2019-08-27) ### Feature * add queryGroups RPC request * add newGroup RPC request -# [v0.24.1](https://github.com/cryptape/cita-sdk-java/compare/v0.24.0...v0.24.1) (2019-08-16) +# [v0.24.1](https://github.com/citahub/cita-sdk-java/compare/v0.24.0...v0.24.1) (2019-08-16) ### Feature * add a constructor parameter to contract deploy method * fix some issues -# [v0.24.0](https://github.com/cryptape/cita-sdk-java/compare/v0.23.0...v0.24.0) (2019-05-30) +# [v0.24.0](https://github.com/citahub/cita-sdk-java/compare/v0.23.0...v0.24.0) (2019-05-30) ### Feature * Support new protocol version 2 -# [v0.23.0](https://github.com/cryptape/cita-sdk-java/compare/v0.22.3...v0.23.0) (2019-04-30) +# [v0.23.0](https://github.com/citahub/cita-sdk-java/compare/v0.22.3...v0.23.0) (2019-04-30) ### Feature * Adapt to CITA v0.23 -# [v0.22.3](https://github.com/cryptape/cita-sdk-java/compare/v0.22.2...v0.22.3) (2019-04-10) +# [v0.22.3](https://github.com/citahub/cita-sdk-java/compare/v0.22.2...v0.22.3) (2019-04-10) ### Feature * add peersInfo RPC request * add getVersion RPC request -# [v0.22.2](https://github.com/cryptape/cita-sdk-java/compare/v0.22.1...v0.22.2) (2019-04-09) +# [v0.22.2](https://github.com/citahub/cita-sdk-java/compare/v0.22.1...v0.22.2) (2019-04-09) ### Feature * refactor http json response handle method -# [v0.22.1](https://github.com/cryptape/cita-sdk-java/compare/v0.22...v0.22.1) (2019-03-29) +# [v0.22.1](https://github.com/citahub/cita-sdk-java/compare/v0.22...v0.22.1) (2019-03-29) ### Feature * update RPC request cases * fix block response parse bug -# [v0.22](https://github.com/cryptape/cita-sdk-java/compare/v0.21...v0.22) (2019-03-28) +# [v0.22](https://github.com/citahub/cita-sdk-java/compare/v0.21...v0.22) (2019-03-28) ### BREAKING CHANGES * Adapt to CITA v0.22 -# [v0.21](https://github.com/cryptape/cita-sdk-java/compare/v0.20.3...v0.21) (2019-02-18) +# [v0.21](https://github.com/citahub/cita-sdk-java/compare/v0.20.3...v0.21) (2019-02-18) ### BREAKING CHANGES * Update Crypto field of protobuf. * Add field from to transaction response. -# [v0.20.3](https://github.com/cryptape/cita-sdk-java/compare/v0.20...v0.20.3) (2019-01-21) +# [v0.20.3](https://github.com/citahub/cita-sdk-java/compare/v0.20...v0.20.3) (2019-01-21) ### BREAKING CHANGES diff --git a/README.md b/README.md index 1cc8f473..ea126bdd 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # cita-sdk-java -[![Build Status](https://travis-ci.org/cryptape/cita-sdk-java.svg?branch=master)](https://travis-ci.org/cryptape/cita-sdk-java) -[![License: Apache-2.0](https://img.shields.io/github/license/cryptape/cita-sdk-java.svg)](https://github.com/cryptape/cita-sdk-java/blob/master/LICENSE) -![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/cryptape/cita-sdk-java.svg) +[![Build Status](https://travis-ci.org/citahub/cita-sdk-java.svg?branch=master)](https://travis-ci.org/citahub/cita-sdk-java) +[![License: Apache-2.0](https://img.shields.io/github/license/citahub/cita-sdk-java.svg)](https://github.com/citahub/cita-sdk-java/blob/master/LICENSE) +![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/citahub/cita-sdk-java.svg) -[English](https://github.com/cryptape/cita-sdk-java#introduction) -[中文](https://github.com/cryptape/cita-sdk-java#简介) +[English](https://github.com/citahub/cita-sdk-java#introduction) +[中文](https://github.com/citahub/cita-sdk-java#简介) ## Introduction @@ -30,14 +30,14 @@ Install from repositories: maven ``` - com.cryptape.cita + com.citahub.cita core 1.0.0 ``` Gradle ``` -compile 'com.cryptape.cita:core:1.0.0' +compile 'com.citahub.cita:core:1.0.0' ``` Install manually @@ -47,7 +47,7 @@ If you want to generate the jar and import manually. > should add `apply plugin: 'com.github.johnrengelman.shadow'` of `console/bulid.gradle` when packing locally.(It's annotated by default) ``` -git clone https://github.com/cryptape/cita-sdk-java.git +git clone https://github.com/citahub/cita-sdk-java.git gradle shadowJar ``` @@ -58,13 +58,13 @@ Use CITA test net (recommended): 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). +Please find more information in [CITA](https://github.com/citahub/cita). ### Get started #### Deploy smart contract -Similar as Ethereum, smart contracts are deployed in CITA network by sending transactions. CITA transaction is defined in [Transaction.java](https://github.com/cryptape/cita-sdk-java/blob/master/core/src/main/java/com/cryptape/cita/protocol/core/methods/request/Transaction.java). +Similar as Ethereum, smart contracts are deployed in CITA network by sending transactions. CITA transaction is defined in [Transaction.java](https://github.com/citahub/cita-sdk-java/blob/master/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java). In CITA transaction, there are 3 special parameters: - nonce: generated randomly or depend on specific logic to avoid replay attack. - quota: transaction execution fee for operation, like gasPrice * gasLimit in Ethereum. @@ -112,7 +112,7 @@ Transaction tx = Transaction.createFunctionCallTransaction(contractAddress, nonc String rawTx = tx.sign(privateKey); String txHash = service.appSendRawTransaction(rawTx).send().getSendTransactionResult().getHash(); ``` -Please check [TokenTransactionExample.java](https://github.com/cryptape/cita-sdk-java/blob/master/tests/src/main/java/com/cryptape/cita/tests/TokenTransactionExample.java) to see a complete example for smart contract deployment and function invocation. +Please check [TokenTransactionExample.java](https://github.com/citahub/cita-sdk-java/blob/master/tests/src/main/java/com/citahub/cita/tests/TokenTransactionExample.java) to see a complete example for smart contract deployment and function invocation. ### Working with smart contract with cita-sdk-java wrapper Besides interacting with smart contracts by sending transactions with binary code, cita-sdk-java provides a tool to help to convert solidity contract to a Java class from which smart contracts can be deployed and called. @@ -125,13 +125,13 @@ $ java -jar console-0.17-all.jar solidity generate [--javaTypes|--solidityTypes] ``` Example generate Java class from `Token.sol`, `Token.bin` and `Token.abi` under `/tests/src/main/resources`: ```shell -java -jar console/build/libs/console-0.17-all.jar solidity generate tests/src/main/resources/Token.bin tests/src/main/resources/Token.abi -o tests/src/main/java/ -p com.cryptape.cita.tests +java -jar console/build/libs/console-0.17-all.jar solidity generate tests/src/main/resources/Token.bin tests/src/main/resources/Token.abi -o tests/src/main/java/ -p com.citahub.cita.tests ``` -`Token.java` will be created from commands above and class `Token` can be used with TransactionManager to deploy and call smart contract `Token`. Please be attention that [TransactionManager](https://github.com/cryptape/cita-sdk-java/blob/master/core/src/main/java/com/cryptape/cita/tx/TransactionManager.java) is supposed to be used as TransactionManager for transaction creation in CITA network. -Please check [TokenCodegenExample.java](https://github.com/cryptape/cita-sdk-java/blob/master/tests/src/main/java/com/cryptape/cita/tests/TokenCodegenExample.java) for a complete example. +`Token.java` will be created from commands above and class `Token` can be used with TransactionManager to deploy and call smart contract `Token`. Please be attention that [TransactionManager](https://github.com/citahub/cita-sdk-java/blob/master/core/src/main/java/com/citahub/cita/tx/TransactionManager.java) is supposed to be used as TransactionManager for transaction creation in CITA network. +Please check [TokenCodegenExample.java](https://github.com/citahub/cita-sdk-java/blob/master/tests/src/main/java/com/citahub/cita/tests/TokenCodegenExample.java) for a complete example. ### Working with smart contract with cita-sdk-java Account (Test) -cita-sdk-java provides interface [Account](https://github.com/cryptape/cita-sdk-java/blob/master/core/src/main/java/com/cryptape/cita/protocol/account/Account.java) for smart contract manipulations. With parameters of smart contract's name, address, method and method's arguments, smart contracts can be deployed and called through the interface without exposing extra java, bin or abi file to developers. +cita-sdk-java provides interface [Account](https://github.com/citahub/cita-sdk-java/blob/master/core/src/main/java/com/citahub/cita/protocol/account/Account.java) for smart contract manipulations. With parameters of smart contract's name, address, method and method's arguments, smart contracts can be deployed and called through the interface without exposing extra java, bin or abi file to developers. Method of smart contract deployment: ```java @@ -148,12 +148,12 @@ public Object callContract(String contractAddress, String funcName, String nonce public Object callContract(String contractAddress, AbiDefinition functionAbi, String nonce, BigInteger quota, Object... args) ``` 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). +Please find complete code in [TokenAccountExample](https://github.com/citahub/cita-sdk-java/blob/master/tests/src/main/java/com/citahub/cita/tests/TokenAccountExample.java). ## Contributing ### Creating a Bug Report -open a new issue: https://github.com/cryptape/cita-sdk-java/issues/new +open a new issue: https://github.com/citahub/cita-sdk-java/issues/new with your version info @@ -209,14 +209,14 @@ Gradle 5.0 通过远程仓库安装： ``` - com.cryptape.cita + com.citahub.cita core 1.0.0 ``` Gradle ``` -compile 'com.cryptape.cita:core:1.0.0' +compile 'com.citahub.cita:core:1.0.0' ``` 手动安装 @@ -226,7 +226,7 @@ compile 'com.cryptape.cita:core:1.0.0' > 你需要添加和保留 `console/bulid.gradle` 文件下第一行 `apply plugin: 'com.github.johnrengelman.shadow'`（改行默认是被注释的）。 ``` -git clone https://github.com/cryptape/cita-sdk-java.git +git clone https://github.com/citahub/cita-sdk-java.git gradle shadowJar ``` @@ -236,12 +236,12 @@ gradle shadowJar https://testnet.citahub.com 或者可以部署你自己的 CITA： -如果需要了解怎么部署 CITA 网络，请查阅[CITA](https://github.com/cryptape/cita)。 +如果需要了解怎么部署 CITA 网络，请查阅[CITA](https://github.com/citahub/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 交易对象定义在 [Transaction.java](https://github.com/citahub/cita-sdk-java/blob/master/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java)。 在 CITA 交易中，有三个特殊的参数： - nonce： 随机数或者通过特定的逻辑生成的随机信息，nonce是为了避免重放攻击。 - quota： 交易执行费用，也就是矿工费，就像以太坊中的 gasPrice * gasLimit。 @@ -289,7 +289,7 @@ Transaction tx = Transaction.createFunctionCallTransaction(contractAddress, nonc String rawTx = tx.sign(privateKey); String txHash = service.appSendRawTransaction(rawTx).send().getSendTransactionResult().getHash(); ``` -请在 [TokenTransactionExample.java](https://github.com/cryptape/cita-sdk-java/blob/master/tests/src/main/java/com/cryptape/cita/tests/TokenTransactionExample.java) 中查看完整代码。 +请在 [TokenTransactionExample.java](https://github.com/citahub/cita-sdk-java/blob/master/tests/src/main/java/com/citahub/cita/tests/TokenTransactionExample.java) 中查看完整代码。 ### 通过 cita-sdk-java 中的 wrapper 与智能合约交互 以上例子展示了直接通过合约二进制码和函数的编码构造交易，并且发送与链上合约进行交互。除此方法以外，cita-sdk-java 提供了 codeGen 工具可以通过 solidity 合约生成 java 类。通过 cita-sdk-java 生成的 java 类，可以方便对合约进行部署和函数调用。 @@ -302,13 +302,13 @@ $ java -jar console-0.17-all.jar solidity generate [--javaTypes|--solidityTypes] ``` 这个例子通过 `Token.sol`, `Token.bin` and `Token.abi` 这三个文件在 `tests/src/main/resources` 生成对应的 java 类，命令如下： ``` -java -jar console/build/libs/console-0.17-all.jar solidity generate tests/src/main/resources/Token.bin tests/src/main/resources/Token.abi -o tests/src/main/java/ -p com.cryptape.cita.tests +java -jar console/build/libs/console-0.17-all.jar solidity generate tests/src/main/resources/Token.bin tests/src/main/resources/Token.abi -o tests/src/main/java/ -p com.citahub.cita.tests ``` -`Token.java` 会通过以上命令生成， `Token` 可以与 `TransactionManager` 一起使用来和 Token 合约交互。请注意在 CITA 中应该使用 [TransactionManager](https://github.com/cryptape/cita-sdk-java/blob/master/core/src/main/java/com/cryptape/cita/tx/TransactionManager.java) 而不是 TransactionManager。 -请在 [TokenCodegenExample.java](https://github.com/cryptape/cita-sdk-java/blob/master/tests/src/main/java/com/cryptape/cita/tests/TokenCodegenExample.java) 查看完整代码. +`Token.java` 会通过以上命令生成， `Token` 可以与 `TransactionManager` 一起使用来和 Token 合约交互。请注意在 CITA 中应该使用 [TransactionManager](https://github.com/citahub/cita-sdk-java/blob/master/core/src/main/java/com/citahub/cita/tx/TransactionManager.java) 而不是 TransactionManager。 +请在 [TokenCodegenExample.java](https://github.com/citahub/cita-sdk-java/blob/master/tests/src/main/java/com/citahub/cita/tests/TokenCodegenExample.java) 查看完整代码. ### 通过 CITAj 中的 Account 与智能合约交互（测试阶段） -cita-sdk-java 还提供了接口 [Account](https://github.com/cryptape/cita-sdk-java/blob/master/core/src/main/java/com/cryptape/cita/protocol/account/Account.java) 与智能合约交互。 通过智能合约的名字，地址，函数名和函数入参，Account 可以进行合约的部署和合约函数的调用。通过 Account 这个方式，开发者无需进行合约二进制文件和 abi 细节处理。 +cita-sdk-java 还提供了接口 [Account](https://github.com/citahub/cita-sdk-java/blob/master/core/src/main/java/com/citahub/cita/protocol/account/Account.java) 与智能合约交互。 通过智能合约的名字，地址，函数名和函数入参，Account 可以进行合约的部署和合约函数的调用。通过 Account 这个方式，开发者无需进行合约二进制文件和 abi 细节处理。 合约部署示例代码： ```java @@ -325,12 +325,12 @@ public Object callContract(String contractAddress, String funcName, String nonce public Object callContract(String contractAddress, AbiDefinition functionAbi, String nonce, BigInteger quota, Object... args) ``` 虽然在第一次部署合约的时候需要提供合约文件，但是在以后调用合约函数的时候 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) 中查看完整代码。 +请在 [TokenAccountExample](https://github.com/citahub/cita-sdk-java/blob/master/tests/src/main/java/com/citahub/cita/tests/TokenAccountExample.java) 中查看完整代码。 ## 参与贡献 ### 报告Bug -提交 issue: https://github.com/cryptape/cita-sdk-java/issues/new +提交 issue: https://github.com/citahub/cita-sdk-java/issues/new 记得声明所使用软件的版本信息 ### 技术栈 diff --git a/abi/src/main/java/com/citahub/cita/abi/EventEncoder.java b/abi/src/main/java/com/citahub/cita/abi/EventEncoder.java index 0380943e..76a84b31 100644 --- a/abi/src/main/java/com/citahub/cita/abi/EventEncoder.java +++ b/abi/src/main/java/com/citahub/cita/abi/EventEncoder.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.util.ArrayList; import java.util.List; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.UnorderedEvent; -import com.cryptape.cita.crypto.Hash; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.Event; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.UnorderedEvent; +import com.citahub.cita.crypto.Hash; +import com.citahub.cita.utils.Numeric; /** *

Ethereum filter encoding. diff --git a/abi/src/main/java/com/citahub/cita/abi/EventValues.java b/abi/src/main/java/com/citahub/cita/abi/EventValues.java index f3ce219e..0865fafe 100644 --- a/abi/src/main/java/com/citahub/cita/abi/EventValues.java +++ b/abi/src/main/java/com/citahub/cita/abi/EventValues.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.util.List; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Type; /** * Persisted solidity event parameters. diff --git a/abi/src/main/java/com/citahub/cita/abi/FunctionEncoder.java b/abi/src/main/java/com/citahub/cita/abi/FunctionEncoder.java index 340a86f2..284df703 100644 --- a/abi/src/main/java/com/citahub/cita/abi/FunctionEncoder.java +++ b/abi/src/main/java/com/citahub/cita/abi/FunctionEncoder.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.crypto.Hash; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.crypto.Hash; +import com.citahub.cita.utils.Numeric; /** *

Ethereum Contract Application Binary Interface (ABI) encoding for functions. diff --git a/abi/src/main/java/com/citahub/cita/abi/FunctionReturnDecoder.java b/abi/src/main/java/com/citahub/cita/abi/FunctionReturnDecoder.java index 9b29e6a0..068a0a76 100644 --- a/abi/src/main/java/com/citahub/cita/abi/FunctionReturnDecoder.java +++ b/abi/src/main/java/com/citahub/cita/abi/FunctionReturnDecoder.java @@ -1,21 +1,21 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.cryptape.cita.abi.datatypes.generated.Bytes32; -import com.cryptape.cita.abi.datatypes.Array; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.BytesType; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.utils.Numeric; - -import static com.cryptape.cita.abi.TypeDecoder.MAX_BYTE_LENGTH_FOR_HEX_STRING; +import com.citahub.cita.abi.datatypes.generated.Bytes32; +import com.citahub.cita.abi.datatypes.Array; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.BytesType; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.utils.Numeric; + +import static com.citahub.cita.abi.TypeDecoder.MAX_BYTE_LENGTH_FOR_HEX_STRING; /** * Decodes values returned by function or event calls. diff --git a/abi/src/main/java/com/citahub/cita/abi/TypeDecoder.java b/abi/src/main/java/com/citahub/cita/abi/TypeDecoder.java index a7d82e19..eede9a59 100644 --- a/abi/src/main/java/com/citahub/cita/abi/TypeDecoder.java +++ b/abi/src/main/java/com/citahub/cita/abi/TypeDecoder.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.ParameterizedType; @@ -8,24 +8,24 @@ import java.util.List; import java.util.function.BiFunction; -import com.cryptape.cita.abi.datatypes.generated.Uint160; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Array; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Fixed; -import com.cryptape.cita.abi.datatypes.FixedPointType; -import com.cryptape.cita.abi.datatypes.Int; -import com.cryptape.cita.abi.datatypes.IntType; -import com.cryptape.cita.abi.datatypes.NumericType; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Ufixed; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.generated.Uint160; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Array; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Fixed; +import com.citahub.cita.abi.datatypes.FixedPointType; +import com.citahub.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.IntType; +import com.citahub.cita.abi.datatypes.NumericType; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Ufixed; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.utils.Numeric; /** *

Ethereum Contract Application Binary Interface (ABI) decoding for types. diff --git a/abi/src/main/java/com/citahub/cita/abi/TypeEncoder.java b/abi/src/main/java/com/citahub/cita/abi/TypeEncoder.java index 4d249c25..d9df7798 100644 --- a/abi/src/main/java/com/citahub/cita/abi/TypeEncoder.java +++ b/abi/src/main/java/com/citahub/cita/abi/TypeEncoder.java @@ -1,22 +1,22 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import java.nio.charset.StandardCharsets; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Array; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.BytesType; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.NumericType; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Ufixed; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Array; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.BytesType; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.NumericType; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Ufixed; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.utils.Numeric; /** *

Ethereum Contract Application Binary Interface (ABI) encoding for types. diff --git a/abi/src/main/java/com/citahub/cita/abi/TypeMappingException.java b/abi/src/main/java/com/citahub/cita/abi/TypeMappingException.java index d9cabeb7..2dacb907 100644 --- a/abi/src/main/java/com/citahub/cita/abi/TypeMappingException.java +++ b/abi/src/main/java/com/citahub/cita/abi/TypeMappingException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; public class TypeMappingException extends RuntimeException { diff --git a/abi/src/main/java/com/citahub/cita/abi/TypeReference.java b/abi/src/main/java/com/citahub/cita/abi/TypeReference.java index fbf17770..52ad32cf 100644 --- a/abi/src/main/java/com/citahub/cita/abi/TypeReference.java +++ b/abi/src/main/java/com/citahub/cita/abi/TypeReference.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import com.cryptape.cita.abi.datatypes.Array; +import com.citahub.cita.abi.datatypes.Array; /** @@ -17,7 +17,7 @@ * Type to * avoid working around this fundamental generics limitation. */ -public abstract class TypeReference +public abstract class TypeReference implements Comparable> { private final Type type; @@ -58,7 +58,7 @@ public Class getClassType() throws ClassNotFoundException { } } - public static + public static TypeReference create(Class cls) { return new TypeReference() { @Override @@ -68,7 +68,7 @@ public Type getType() { }; } - public static + public static TypeReference create(ParameterizedType type) { return new TypeReference() { @Override @@ -78,7 +78,7 @@ public Type getType() { }; } - public static + public static StaticArrayTypeReference create(int length, ParameterizedType type) { return new StaticArrayTypeReference(length) { @Override @@ -89,7 +89,7 @@ public Type getType() { } public abstract static class StaticArrayTypeReference - + extends TypeReference { private final int size; diff --git a/abi/src/main/java/com/citahub/cita/abi/Utils.java b/abi/src/main/java/com/citahub/cita/abi/Utils.java index 108641cd..9e3e80be 100644 --- a/abi/src/main/java/com/citahub/cita/abi/Utils.java +++ b/abi/src/main/java/com/citahub/cita/abi/Utils.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -6,15 +6,15 @@ import java.util.ArrayList; import java.util.List; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Fixed; -import com.cryptape.cita.abi.datatypes.Int; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Ufixed; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Fixed; +import com.citahub.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Ufixed; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; /** * Utility functions. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Address.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Address.java index 8e3b1ab8..315ed4c1 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Address.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Address.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.generated.Uint160; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.generated.Uint160; +import com.citahub.cita.utils.Numeric; /** * Address type, which is equivalent to uint160. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Array.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Array.java index 95c5457d..81f71ab9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Array.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Array.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.Arrays; import java.util.Collections; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Bool.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Bool.java index 81283b12..651e1c16 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Bool.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Bool.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; /** * Boolean type. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Bytes.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Bytes.java index e56aed98..4523ad55 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Bytes.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Bytes.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; /** * Statically allocated sequence of bytes. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/BytesType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/BytesType.java index eee3acdd..3142dc91 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/BytesType.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/BytesType.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.Arrays; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicArray.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicArray.java index 6ef125bf..4f3ff481 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicArray.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicArray.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.List; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicBytes.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicBytes.java index a3eb0e76..745bc999 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicBytes.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/DynamicBytes.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; /** * Dynamically allocated sequence of bytes. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Event.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Event.java index 4dd4c345..a100101c 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Event.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Event.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.List; -import com.cryptape.cita.abi.TypeReference; +import com.citahub.cita.abi.TypeReference; -import static com.cryptape.cita.abi.Utils.convert; +import static com.citahub.cita.abi.Utils.convert; /** * Event wrapper type. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Fixed.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Fixed.java index 0e2e51c0..f7b302f0 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Fixed.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Fixed.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/FixedPointType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/FixedPointType.java index 673a2d81..7e00234a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/FixedPointType.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/FixedPointType.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Function.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Function.java index 07ae5466..6413eef3 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Function.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Function.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.List; -import com.cryptape.cita.abi.TypeReference; +import com.citahub.cita.abi.TypeReference; -import static com.cryptape.cita.abi.Utils.convert; +import static com.citahub.cita.abi.Utils.convert; /** * Function type. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Int.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Int.java index a0e16229..33a84cb9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Int.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Int.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/IntType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/IntType.java index e3b5aea7..52d804f6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/IntType.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/IntType.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/NumericType.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/NumericType.java index de6486d2..324c6abe 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/NumericType.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/NumericType.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/StaticArray.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/StaticArray.java index 28251d5b..46e1d3c7 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/StaticArray.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/StaticArray.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.List; @@ -9,7 +9,7 @@ public class StaticArray extends Array { /** * Warning: increasing this constant will cause more generated StaticArrayN types, see: - * com.cryptape.cita.codegen.AbiTypesGenerator#generateStaticArrayTypes + * com.citahub.cita.codegen.AbiTypesGenerator#generateStaticArrayTypes */ public static int MAX_SIZE_OF_STATIC_ARRAY = 32; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Type.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Type.java index b7ffe1ab..5d2935d6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Type.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Type.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; /** * ABI Types. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Ufixed.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Ufixed.java index 78a7ed93..5fc92625 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Ufixed.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Ufixed.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Uint.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Uint.java index b805054f..c7d6eed6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Uint.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Uint.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/UnorderedEvent.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/UnorderedEvent.java index 11de183f..8c908d5a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/UnorderedEvent.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/UnorderedEvent.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.ArrayList; import java.util.List; -import com.cryptape.cita.abi.TypeReference; +import com.citahub.cita.abi.TypeReference; public class UnorderedEvent { private class EventType { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/Utf8String.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/Utf8String.java index 08e20e33..f93d4137 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/Utf8String.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/Utf8String.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; /** * UTF-8 encoded string type. diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/AbiTypes.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/AbiTypes.java index 964fa776..89af783f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/AbiTypes.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/AbiTypes.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Utf8String; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesMapperGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesMapperGenerator in the */ public final class AbiTypes { private AbiTypes() { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes1.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes1.java index 1b86496a..4f7a836f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes1.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes1.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes1 extends Bytes { public static final Bytes1 DEFAULT = new Bytes1(new byte[1]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes10.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes10.java index ad134106..33ac0d10 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes10.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes10.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes10 extends Bytes { public static final Bytes10 DEFAULT = new Bytes10(new byte[10]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes11.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes11.java index fc099071..0878a85e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes11.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes11.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes11 extends Bytes { public static final Bytes11 DEFAULT = new Bytes11(new byte[11]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes12.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes12.java index 4d918329..df16ef8a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes12.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes12.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes12 extends Bytes { public static final Bytes12 DEFAULT = new Bytes12(new byte[12]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes13.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes13.java index 1cd61dc3..6c8d331d 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes13.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes13.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes13 extends Bytes { public static final Bytes13 DEFAULT = new Bytes13(new byte[13]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes14.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes14.java index e89dc021..9a2783e7 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes14.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes14.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes14 extends Bytes { public static final Bytes14 DEFAULT = new Bytes14(new byte[14]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes15.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes15.java index 873b89ce..e27346d2 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes15.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes15.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes15 extends Bytes { public static final Bytes15 DEFAULT = new Bytes15(new byte[15]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes16.java index 358483dc..27fabe59 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes16.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes16.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes16 extends Bytes { public static final Bytes16 DEFAULT = new Bytes16(new byte[16]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes17.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes17.java index 9cac935c..0b7ac946 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes17.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes17.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes17 extends Bytes { public static final Bytes17 DEFAULT = new Bytes17(new byte[17]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes18.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes18.java index f4f8a6ae..729e5fa1 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes18.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes18.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes18 extends Bytes { public static final Bytes18 DEFAULT = new Bytes18(new byte[18]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes19.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes19.java index 2e67fa41..d7479a3a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes19.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes19.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes19 extends Bytes { public static final Bytes19 DEFAULT = new Bytes19(new byte[19]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes2.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes2.java index 17812600..7badd941 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes2.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes2.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes2 extends Bytes { public static final Bytes2 DEFAULT = new Bytes2(new byte[2]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes20.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes20.java index 2196c136..bad2357f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes20.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes20.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes20 extends Bytes { public static final Bytes20 DEFAULT = new Bytes20(new byte[20]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes21.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes21.java index a9113bcb..d50b61dd 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes21.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes21.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes21 extends Bytes { public static final Bytes21 DEFAULT = new Bytes21(new byte[21]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes22.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes22.java index 996063f6..7a1324d9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes22.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes22.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes22 extends Bytes { public static final Bytes22 DEFAULT = new Bytes22(new byte[22]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes23.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes23.java index 9feeed59..f51c23be 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes23.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes23.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes23 extends Bytes { public static final Bytes23 DEFAULT = new Bytes23(new byte[23]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes24.java index 1e4f3e56..e8e976e0 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes24.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes24.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes24 extends Bytes { public static final Bytes24 DEFAULT = new Bytes24(new byte[24]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes25.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes25.java index db2751bb..062b9615 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes25.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes25.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes25 extends Bytes { public static final Bytes25 DEFAULT = new Bytes25(new byte[25]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes26.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes26.java index ef82d843..d8248907 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes26.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes26.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes26 extends Bytes { public static final Bytes26 DEFAULT = new Bytes26(new byte[26]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes27.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes27.java index a14c4dde..aada15d5 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes27.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes27.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes27 extends Bytes { public static final Bytes27 DEFAULT = new Bytes27(new byte[27]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes28.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes28.java index dffef7ff..944bbe06 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes28.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes28.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes28 extends Bytes { public static final Bytes28 DEFAULT = new Bytes28(new byte[28]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes29.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes29.java index 261b24df..96cd9b86 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes29.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes29.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes29 extends Bytes { public static final Bytes29 DEFAULT = new Bytes29(new byte[29]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes3.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes3.java index 9a3c9d6e..0ad4cc4c 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes3.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes3.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes3 extends Bytes { public static final Bytes3 DEFAULT = new Bytes3(new byte[3]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes30.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes30.java index 1b93ab41..8a9b58e9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes30.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes30.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes30 extends Bytes { public static final Bytes30 DEFAULT = new Bytes30(new byte[30]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes31.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes31.java index f52adbf2..8f6f4b23 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes31.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes31.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes31 extends Bytes { public static final Bytes31 DEFAULT = new Bytes31(new byte[31]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes32.java index b05fcc8d..bbfc63e1 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes32.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes32.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes32 extends Bytes { public static final Bytes32 DEFAULT = new Bytes32(new byte[32]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes4.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes4.java index fd701fd0..af985fac 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes4.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes4.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes4 extends Bytes { public static final Bytes4 DEFAULT = new Bytes4(new byte[4]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes5.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes5.java index 47befda6..cac7bce0 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes5.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes5.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes5 extends Bytes { public static final Bytes5 DEFAULT = new Bytes5(new byte[5]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes6.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes6.java index 874578e6..d88f574f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes6.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes6.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes6 extends Bytes { public static final Bytes6 DEFAULT = new Bytes6(new byte[6]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes7.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes7.java index 1d7099d7..b47bede9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes7.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes7.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes7 extends Bytes { public static final Bytes7 DEFAULT = new Bytes7(new byte[7]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes8.java index bfdc0a5c..243c366a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes8.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes8.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes8 extends Bytes { public static final Bytes8 DEFAULT = new Bytes8(new byte[8]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes9.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes9.java index 1b6a9836..f6d6defe 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes9.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Bytes9.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; -import com.cryptape.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Bytes; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Bytes9 extends Bytes { public static final Bytes9 DEFAULT = new Bytes9(new byte[9]); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int104.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int104.java index 2b89f3fd..92237153 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int104.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int104.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int104 extends Int { public static final Int104 DEFAULT = new Int104(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int112.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int112.java index 5bc7cdf5..8dd2124b 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int112.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int112.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int112 extends Int { public static final Int112 DEFAULT = new Int112(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int120.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int120.java index 07c6f47b..e82a19b5 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int120.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int120.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int120 extends Int { public static final Int120 DEFAULT = new Int120(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int128.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int128.java index 23c22ed5..48cea444 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int128.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int128.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int128 extends Int { public static final Int128 DEFAULT = new Int128(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int136.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int136.java index b59cc855..34bfb730 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int136.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int136.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int136 extends Int { public static final Int136 DEFAULT = new Int136(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int144.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int144.java index 04965e82..6ca90fa7 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int144.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int144.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int144 extends Int { public static final Int144 DEFAULT = new Int144(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int152.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int152.java index 307f63b3..dde65afb 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int152.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int152.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int152 extends Int { public static final Int152 DEFAULT = new Int152(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int16.java index 492a3611..bb38143e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int16.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int16.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int16 extends Int { public static final Int16 DEFAULT = new Int16(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int160.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int160.java index 1e1a79c2..161de00f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int160.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int160.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int160 extends Int { public static final Int160 DEFAULT = new Int160(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int168.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int168.java index aa62e30f..8ef03a7e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int168.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int168.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int168 extends Int { public static final Int168 DEFAULT = new Int168(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int176.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int176.java index ee004e64..2e60d745 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int176.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int176.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int176 extends Int { public static final Int176 DEFAULT = new Int176(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int184.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int184.java index 17e49595..426306d9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int184.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int184.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int184 extends Int { public static final Int184 DEFAULT = new Int184(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int192.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int192.java index 74dcc4bb..0b067a98 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int192.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int192.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int192 extends Int { public static final Int192 DEFAULT = new Int192(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int200.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int200.java index 65e4aada..1414aef3 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int200.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int200.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int200 extends Int { public static final Int200 DEFAULT = new Int200(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int208.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int208.java index 9383420e..dc42d0c9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int208.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int208.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int208 extends Int { public static final Int208 DEFAULT = new Int208(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int216.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int216.java index 82373937..277d9966 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int216.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int216.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int216 extends Int { public static final Int216 DEFAULT = new Int216(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int224.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int224.java index 3f0c0de2..49a43fbf 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int224.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int224.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int224 extends Int { public static final Int224 DEFAULT = new Int224(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int232.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int232.java index c5ba76bf..a6c1cb81 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int232.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int232.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int232 extends Int { public static final Int232 DEFAULT = new Int232(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int24.java index da0c245a..41b0fc84 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int24.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int24.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int24 extends Int { public static final Int24 DEFAULT = new Int24(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int240.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int240.java index 52f00603..d4533916 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int240.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int240.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int240 extends Int { public static final Int240 DEFAULT = new Int240(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int248.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int248.java index 7b5dc2da..380c92e2 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int248.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int248.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int248 extends Int { public static final Int248 DEFAULT = new Int248(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int256.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int256.java index 6485d46d..6e71ab9f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int256.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int256.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int256 extends Int { public static final Int256 DEFAULT = new Int256(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int32.java index aedbc840..dcc003c5 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int32.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int32.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int32 extends Int { public static final Int32 DEFAULT = new Int32(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int40.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int40.java index 8447c470..61bc124a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int40.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int40.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int40 extends Int { public static final Int40 DEFAULT = new Int40(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int48.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int48.java index c3f6e127..2b7c240e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int48.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int48.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int48 extends Int { public static final Int48 DEFAULT = new Int48(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int56.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int56.java index 5baa0f08..fa99d0ee 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int56.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int56.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int56 extends Int { public static final Int56 DEFAULT = new Int56(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int64.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int64.java index d0bc2182..fa6a87f1 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int64.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int64.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int64 extends Int { public static final Int64 DEFAULT = new Int64(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int72.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int72.java index 4101a61b..6d754b24 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int72.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int72.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int72 extends Int { public static final Int72 DEFAULT = new Int72(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int8.java index 07e55ed6..efb9c21d 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int8.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int8.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int8 extends Int { public static final Int8 DEFAULT = new Int8(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int80.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int80.java index 58a90616..cec83c03 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int80.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int80.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int80 extends Int { public static final Int80 DEFAULT = new Int80(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int88.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int88.java index 8493818f..65684131 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int88.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int88.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int88 extends Int { public static final Int88 DEFAULT = new Int88(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int96.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int96.java index 8ac7ff36..246ec186 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int96.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Int96.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Int; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Int96 extends Int { public static final Int96 DEFAULT = new Int96(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray1.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray1.java index b3ffbe0f..87941108 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray1.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray1.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray1 extends StaticArray { public StaticArray1(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray10.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray10.java index d23ccacb..9e6d8b00 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray10.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray10.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray10 extends StaticArray { public StaticArray10(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray11.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray11.java index 30591e26..c8a21a72 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray11.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray11.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray11 extends StaticArray { public StaticArray11(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray12.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray12.java index f275382d..ff8e9e18 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray12.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray12.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray12 extends StaticArray { public StaticArray12(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray13.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray13.java index 6e7efcf1..50a50dab 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray13.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray13.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray13 extends StaticArray { public StaticArray13(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray14.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray14.java index ce2e5f31..4afd0ff3 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray14.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray14.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray14 extends StaticArray { public StaticArray14(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray15.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray15.java index ad9aeb6f..352f8735 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray15.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray15.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray15 extends StaticArray { public StaticArray15(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray16.java index 17cb3870..dab50c49 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray16.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray16.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray16 extends StaticArray { public StaticArray16(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray17.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray17.java index 5544b892..d80058e0 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray17.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray17.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray17 extends StaticArray { public StaticArray17(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray18.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray18.java index 2565c042..8799f60a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray18.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray18.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray18 extends StaticArray { public StaticArray18(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray19.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray19.java index c0c2ac99..2fae6a57 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray19.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray19.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray19 extends StaticArray { public StaticArray19(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray2.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray2.java index b607f215..241240a6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray2.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray2.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray2 extends StaticArray { public StaticArray2(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray20.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray20.java index 6d158015..858524a2 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray20.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray20.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray20 extends StaticArray { public StaticArray20(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray21.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray21.java index a6128807..4c22ca1c 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray21.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray21.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray21 extends StaticArray { public StaticArray21(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray22.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray22.java index 7dff0274..3fa5b8e6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray22.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray22.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray22 extends StaticArray { public StaticArray22(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray23.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray23.java index 95c9e584..0ab7f005 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray23.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray23.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray23 extends StaticArray { public StaticArray23(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray24.java index 6659bd42..4ef2a17a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray24.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray24.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray24 extends StaticArray { public StaticArray24(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray25.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray25.java index f4a4cb85..78e12a7f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray25.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray25.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray25 extends StaticArray { public StaticArray25(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray26.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray26.java index fbb30520..1c1a7be0 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray26.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray26.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray26 extends StaticArray { public StaticArray26(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray27.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray27.java index 291f4a26..48e3fff0 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray27.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray27.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray27 extends StaticArray { public StaticArray27(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray28.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray28.java index c8bded5d..5dc2f638 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray28.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray28.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray28 extends StaticArray { public StaticArray28(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray29.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray29.java index 2950a06e..93d1d81a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray29.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray29.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray29 extends StaticArray { public StaticArray29(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray3.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray3.java index e5991012..6350f2a8 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray3.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray3.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray3 extends StaticArray { public StaticArray3(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray30.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray30.java index d9bf8fdb..d3c39579 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray30.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray30.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray30 extends StaticArray { public StaticArray30(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray31.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray31.java index 75d8a118..38563d0a 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray31.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray31.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray31 extends StaticArray { public StaticArray31(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray32.java index fd23e3c9..3fb684f8 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray32.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray32.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray32 extends StaticArray { public StaticArray32(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray4.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray4.java index c16dec0e..da48f00f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray4.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray4.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray4 extends StaticArray { public StaticArray4(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray5.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray5.java index 2f079991..bf192712 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray5.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray5.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray5 extends StaticArray { public StaticArray5(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray6.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray6.java index f2f96e7d..e09b56e7 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray6.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray6.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray6 extends StaticArray { public StaticArray6(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray7.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray7.java index 54942a1b..50d56b75 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray7.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray7.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray7 extends StaticArray { public StaticArray7(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray8.java index a9cf33a5..abea52bd 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray8.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray8.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray8 extends StaticArray { public StaticArray8(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray9.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray9.java index 7927c755..5b2b323d 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray9.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/StaticArray9.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.util.List; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class StaticArray9 extends StaticArray { public StaticArray9(List values) { diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint104.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint104.java index 328072f8..6ab546f6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint104.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint104.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint104 extends Uint { public static final Uint104 DEFAULT = new Uint104(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint112.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint112.java index 1104a2c7..9ff98549 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint112.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint112.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint112 extends Uint { public static final Uint112 DEFAULT = new Uint112(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint120.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint120.java index 28af9648..f3fd1174 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint120.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint120.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint120 extends Uint { public static final Uint120 DEFAULT = new Uint120(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint128.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint128.java index 4e91b5b0..5c2a811e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint128.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint128.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint128 extends Uint { public static final Uint128 DEFAULT = new Uint128(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint136.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint136.java index cc884329..dfb645a3 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint136.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint136.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint136 extends Uint { public static final Uint136 DEFAULT = new Uint136(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint144.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint144.java index fafd10d1..7af5efbf 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint144.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint144.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint144 extends Uint { public static final Uint144 DEFAULT = new Uint144(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint152.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint152.java index 6af9920d..43c5e2d4 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint152.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint152.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint152 extends Uint { public static final Uint152 DEFAULT = new Uint152(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint16.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint16.java index 86f52b1c..1281019e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint16.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint16.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint16 extends Uint { public static final Uint16 DEFAULT = new Uint16(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint160.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint160.java index d702f0b7..00249444 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint160.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint160.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint160 extends Uint { public static final Uint160 DEFAULT = new Uint160(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint168.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint168.java index 8f8935da..56ae7772 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint168.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint168.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint168 extends Uint { public static final Uint168 DEFAULT = new Uint168(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint176.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint176.java index 615ce124..2593b2ac 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint176.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint176.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint176 extends Uint { public static final Uint176 DEFAULT = new Uint176(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint184.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint184.java index 4c1895ca..50e35e6f 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint184.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint184.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint184 extends Uint { public static final Uint184 DEFAULT = new Uint184(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint192.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint192.java index 852fa893..bae64cc1 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint192.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint192.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint192 extends Uint { public static final Uint192 DEFAULT = new Uint192(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint200.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint200.java index fe1f47cc..bdbe9b43 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint200.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint200.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint200 extends Uint { public static final Uint200 DEFAULT = new Uint200(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint208.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint208.java index b900060e..ff778bab 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint208.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint208.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint208 extends Uint { public static final Uint208 DEFAULT = new Uint208(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint216.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint216.java index 82d70fe0..32c80b41 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint216.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint216.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint216 extends Uint { public static final Uint216 DEFAULT = new Uint216(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint224.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint224.java index d272391a..8b67c35b 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint224.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint224.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint224 extends Uint { public static final Uint224 DEFAULT = new Uint224(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint232.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint232.java index e67f602a..bcafd4d5 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint232.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint232.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint232 extends Uint { public static final Uint232 DEFAULT = new Uint232(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint24.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint24.java index 9b233eac..95103dd9 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint24.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint24.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint24 extends Uint { public static final Uint24 DEFAULT = new Uint24(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint240.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint240.java index d1104af9..51ee7130 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint240.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint240.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint240 extends Uint { public static final Uint240 DEFAULT = new Uint240(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint248.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint248.java index 5876339c..5c78dcd6 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint248.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint248.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint248 extends Uint { public static final Uint248 DEFAULT = new Uint248(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint256.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint256.java index 447127aa..4272e359 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint256.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint256.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint256 extends Uint { public static final Uint256 DEFAULT = new Uint256(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint32.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint32.java index adcc2972..d675b2a2 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint32.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint32.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint32 extends Uint { public static final Uint32 DEFAULT = new Uint32(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint40.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint40.java index 6cb96ff7..47d83aac 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint40.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint40.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint40 extends Uint { public static final Uint40 DEFAULT = new Uint40(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint48.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint48.java index 115811f0..c367b6a4 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint48.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint48.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint48 extends Uint { public static final Uint48 DEFAULT = new Uint48(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint56.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint56.java index 25a6cc5b..470dc547 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint56.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint56.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint56 extends Uint { public static final Uint56 DEFAULT = new Uint56(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint64.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint64.java index 3c3ff872..b7ac05c3 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint64.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint64.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint64 extends Uint { public static final Uint64 DEFAULT = new Uint64(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint72.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint72.java index a3ad6e7d..a038ba4e 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint72.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint72.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint72 extends Uint { public static final Uint72 DEFAULT = new Uint72(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint8.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint8.java index b120ccd1..25b61590 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint8.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint8.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint8 extends Uint { public static final Uint8 DEFAULT = new Uint8(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint80.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint80.java index 26b20a38..e1a8c574 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint80.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint80.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint80 extends Uint { public static final Uint80 DEFAULT = new Uint80(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint88.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint88.java index 8cc5c210..3f6f9c1b 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint88.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint88.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint88 extends Uint { public static final Uint88 DEFAULT = new Uint88(BigInteger.ZERO); diff --git a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint96.java b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint96.java index 707a0057..e8140e87 100644 --- a/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint96.java +++ b/abi/src/main/java/com/citahub/cita/abi/datatypes/generated/Uint96.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.abi.datatypes.generated; +package com.citahub.cita.abi.datatypes.generated; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Uint; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.AbiTypesGenerator in the + *

Please use com.citahub.cita.codegen.AbiTypesGenerator in the */ public class Uint96 extends Uint { public static final Uint96 DEFAULT = new Uint96(BigInteger.ZERO); diff --git a/abi/src/test/java/com/citahub/cita/abi/EventEncoderTest.java b/abi/src/test/java/com/citahub/cita/abi/EventEncoderTest.java index 6efebdd4..fe4f85f7 100644 --- a/abi/src/test/java/com/citahub/cita/abi/EventEncoderTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/EventEncoderTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import org.junit.Test; diff --git a/abi/src/test/java/com/citahub/cita/abi/FunctionEncoderTest.java b/abi/src/test/java/com/citahub/cita/abi/FunctionEncoderTest.java index 66201cb6..7a0aee5c 100644 --- a/abi/src/test/java/com/citahub/cita/abi/FunctionEncoderTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/FunctionEncoderTest.java @@ -1,19 +1,19 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import java.util.Arrays; import java.util.Collections; -import com.cryptape.cita.abi.datatypes.generated.Bytes10; -import com.cryptape.cita.abi.datatypes.generated.Uint32; +import com.citahub.cita.abi.datatypes.generated.Bytes10; +import com.citahub.cita.abi.datatypes.generated.Uint32; import org.junit.Test; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/abi/src/test/java/com/citahub/cita/abi/FunctionReturnDecoderTest.java b/abi/src/test/java/com/citahub/cita/abi/FunctionReturnDecoderTest.java index 53cac43c..d6716fe6 100644 --- a/abi/src/test/java/com/citahub/cita/abi/FunctionReturnDecoderTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/FunctionReturnDecoderTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import java.util.ArrayList; @@ -6,20 +6,20 @@ import java.util.Collections; import java.util.List; -import com.cryptape.cita.abi.datatypes.generated.Bytes16; -import com.cryptape.cita.abi.datatypes.generated.Bytes32; -import com.cryptape.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.abi.datatypes.generated.Bytes16; +import com.citahub.cita.abi.datatypes.generated.Bytes32; +import com.citahub.cita.abi.datatypes.generated.Uint256; import org.junit.Test; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.crypto.Hash; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.crypto.Hash; +import com.citahub.cita.utils.Numeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/abi/src/test/java/com/citahub/cita/abi/TypeDecoderTest.java b/abi/src/test/java/com/citahub/cita/abi/TypeDecoderTest.java index db68528e..a77d8d99 100644 --- a/abi/src/test/java/com/citahub/cita/abi/TypeDecoderTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/TypeDecoderTest.java @@ -1,24 +1,24 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import org.hamcrest.CoreMatchers; import org.junit.Test; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.abi.datatypes.generated.Bytes1; -import com.cryptape.cita.abi.datatypes.generated.Bytes4; -import com.cryptape.cita.abi.datatypes.generated.Bytes6; -import com.cryptape.cita.abi.datatypes.generated.Int256; -import com.cryptape.cita.abi.datatypes.generated.Int64; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.abi.datatypes.generated.Uint64; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.generated.Bytes1; +import com.citahub.cita.abi.datatypes.generated.Bytes4; +import com.citahub.cita.abi.datatypes.generated.Bytes6; +import com.citahub.cita.abi.datatypes.generated.Int256; +import com.citahub.cita.abi.datatypes.generated.Int64; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.abi.datatypes.generated.Uint64; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/abi/src/test/java/com/citahub/cita/abi/TypeEncoderTest.java b/abi/src/test/java/com/citahub/cita/abi/TypeEncoderTest.java index e0b85faf..04b4be17 100644 --- a/abi/src/test/java/com/citahub/cita/abi/TypeEncoderTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/TypeEncoderTest.java @@ -1,24 +1,24 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import org.junit.Test; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Int; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Ufixed; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.abi.datatypes.generated.Bytes1; -import com.cryptape.cita.abi.datatypes.generated.Bytes4; -import com.cryptape.cita.abi.datatypes.generated.Bytes6; -import com.cryptape.cita.abi.datatypes.generated.Int64; -import com.cryptape.cita.abi.datatypes.generated.Uint64; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Ufixed; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.generated.Bytes1; +import com.citahub.cita.abi.datatypes.generated.Bytes4; +import com.citahub.cita.abi.datatypes.generated.Bytes6; +import com.citahub.cita.abi.datatypes.generated.Int64; +import com.citahub.cita.abi.datatypes.generated.Uint64; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/abi/src/test/java/com/citahub/cita/abi/UtilsTest.java b/abi/src/test/java/com/citahub/cita/abi/UtilsTest.java index 20b3f831..ccde7bba 100644 --- a/abi/src/test/java/com/citahub/cita/abi/UtilsTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/UtilsTest.java @@ -1,25 +1,25 @@ -package com.cryptape.cita.abi; +package com.citahub.cita.abi; import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.cryptape.cita.abi.datatypes.generated.Int64; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.abi.datatypes.generated.Uint64; +import com.citahub.cita.abi.datatypes.generated.Int64; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.abi.datatypes.generated.Uint64; import org.hamcrest.MatcherAssert; import org.junit.Test; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Fixed; -import com.cryptape.cita.abi.datatypes.Int; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Ufixed; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Fixed; +import com.citahub.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Ufixed; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/abi/src/test/java/com/citahub/cita/abi/datatypes/AddressTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/AddressTest.java index 52aff3ef..802b16b6 100644 --- a/abi/src/test/java/com/citahub/cita/abi/datatypes/AddressTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/datatypes/AddressTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import org.junit.Test; diff --git a/abi/src/test/java/com/citahub/cita/abi/datatypes/FixedPointTypeTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/FixedPointTypeTest.java index 79429bf9..e2b4b135 100644 --- a/abi/src/test/java/com/citahub/cita/abi/datatypes/FixedPointTypeTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/datatypes/FixedPointTypeTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.math.BigInteger; diff --git a/abi/src/test/java/com/citahub/cita/abi/datatypes/StaticArrayTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/StaticArrayTest.java index 09c84150..aded4f14 100644 --- a/abi/src/test/java/com/citahub/cita/abi/datatypes/StaticArrayTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/datatypes/StaticArrayTest.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import java.util.stream.IntStream; -import com.cryptape.cita.abi.datatypes.generated.StaticArray3; -import com.cryptape.cita.abi.datatypes.generated.Uint8; +import com.citahub.cita.abi.datatypes.generated.StaticArray3; +import com.citahub.cita.abi.datatypes.generated.Uint8; import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/abi/src/test/java/com/citahub/cita/abi/datatypes/Utf8StringTest.java b/abi/src/test/java/com/citahub/cita/abi/datatypes/Utf8StringTest.java index b776786c..a4e15228 100644 --- a/abi/src/test/java/com/citahub/cita/abi/datatypes/Utf8StringTest.java +++ b/abi/src/test/java/com/citahub/cita/abi/datatypes/Utf8StringTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.abi.datatypes; +package com.citahub.cita.abi.datatypes; import org.junit.Test; diff --git a/build.gradle b/build.gradle index c52b3959..5429423f 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ allprojects { sourceCompatibility = 1.8 targetCompatibility = 1.8 - group 'com.cryptape.cita' + group 'com.citahub.cita' version '1.0.0' apply plugin: 'java' @@ -144,7 +144,7 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) { publishing { publications { mavenJava(MavenPublication) { - groupId 'com.cryptape.cita' + groupId 'com.citahub.cita' version '1.0.0' from components.java @@ -175,11 +175,11 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) { name 'cita-sdk-java' packaging 'jar' description project.description - url 'https://github.com/cryptape/cita-sdk-java.git' + url 'https://github.com/citahub/cita-sdk-java.git' scm { - connection 'scm:git@github.com:cryptape/cita-sdk-java.git' - url 'https://github.com/cryptape/cita-sdk-java.git' + connection 'scm:git@github.com:citahub/cita-sdk-java.git' + url 'https://github.com/citahub/cita-sdk-java.git' } licenses { @@ -191,9 +191,9 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) { developers { developer { - id 'cryptape' - name 'cryptape developer' - email 'op@cryptape.com' + id 'citahub' + name 'citahub developer' + email 'op@citahub.com' } } } @@ -241,9 +241,9 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { classDirectories = files(classDirectories.files.collect { fileTree(dir: it, exclude: [ - 'com/cryptape/cita/abi/datatypes/generated/**', - 'com/cryptape/cita/tuples/generated/**', - 'com/cryptape/cita/ens/contracts/generated/**' + 'com/citahub/cita/abi/datatypes/generated/**', + 'com/citahub/cita/tuples/generated/**', + 'com/citahub/cita/ens/contracts/generated/**' ]) }) } diff --git a/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesGenerator.java index 8b2f8c31..b4abedfa 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesGenerator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesGenerator.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.IOException; import java.math.BigInteger; @@ -14,11 +14,11 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeVariableName; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.Int; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Uint; /** * Generator class for creating all the different numeric type variants. diff --git a/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesMapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesMapperGenerator.java index c083c656..fa3383fc 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesMapperGenerator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/AbiTypesMapperGenerator.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.IOException; import javax.lang.model.element.Modifier; @@ -9,16 +9,16 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.WildcardTypeName; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.Bytes; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Fixed; -import com.cryptape.cita.abi.datatypes.Int; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Ufixed; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.Bytes; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Fixed; +import com.citahub.cita.abi.datatypes.Int; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Ufixed; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; /** * Generator class for creating all the different numeric type variants. @@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception { private void generate(String destinationDir) throws IOException { - String typesPackageName = "com.cryptape.cita.abi.datatypes"; + String typesPackageName = "com.citahub.cita.abi.datatypes"; String autoGeneratedTypesPackageName = typesPackageName + ".generated"; MethodSpec.Builder builder = MethodSpec.methodBuilder("getType") diff --git a/codegen/src/main/java/com/citahub/cita/codegen/Console.java b/codegen/src/main/java/com/citahub/cita/codegen/Console.java index 07f0eae5..e6ae76aa 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/Console.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/Console.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; /** * Command line utility classes. diff --git a/codegen/src/main/java/com/citahub/cita/codegen/FunctionWrapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/FunctionWrapperGenerator.java index b78b31e0..a7a1a1f5 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/FunctionWrapperGenerator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/FunctionWrapperGenerator.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; -import static com.cryptape.cita.codegen.Console.exitError; +import static com.citahub.cita.codegen.Console.exitError; /** * Abstract base class for the concrete function wrapper generators. diff --git a/codegen/src/main/java/com/citahub/cita/codegen/Generator.java b/codegen/src/main/java/com/citahub/cita/codegen/Generator.java index d5d79e45..ed4d4ce1 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/Generator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/Generator.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.io.IOException; diff --git a/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapper.java b/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapper.java index 76d4dee6..5a16ca2b 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapper.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapper.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.IOException; import java.math.BigInteger; @@ -11,15 +11,15 @@ import java.util.concurrent.Callable; import javax.lang.model.element.Modifier; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.RemoteCall; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.utils.Collection; -import com.cryptape.cita.utils.Version; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.RemoteCall; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.utils.Collection; +import com.citahub.cita.utils.Version; import com.fasterxml.jackson.databind.ObjectMapper; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -32,24 +32,24 @@ import com.squareup.javapoet.TypeVariableName; import io.reactivex.Flowable; -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.abi.datatypes.generated.AbiTypes; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; -import com.cryptape.cita.tx.Contract; -import com.cryptape.cita.tx.TransactionManager; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.abi.EventEncoder; +import com.citahub.cita.abi.EventValues; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Event; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.generated.AbiTypes; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.tx.Contract; +import com.citahub.cita.tx.TransactionManager; +import com.citahub.cita.utils.Strings; /** * Generate Java Classes based on generated Solidity bin and abi files. @@ -80,7 +80,7 @@ public class SolidityFunctionWrapper extends Generator { private static final String CODEGEN_WARNING = "

Auto generated code.\n" + "

Do not modify!\n" + "

Please use the " - + "" + + "" + "codegen module to update.\n"; private final boolean useNativeJavaTypes; @@ -670,7 +670,7 @@ private void buildConstantFunction( ParameterizedTypeName parameterizedTupleType = ParameterizedTypeName.get( ClassName.get( - "com.cryptape.cita.tuples.generated", + "com.citahub.cita.tuples.generated", "Tuple" + returnTypes.size()), returnTypes.toArray( new TypeName[returnTypes.size()])); @@ -918,7 +918,7 @@ static TypeName buildTypeName(String typeDeclaration) { private static Class getStaticArrayTypeReferenceClass(String[] splitType) { try { - return Class.forName("com.cryptape.cita.abi.datatypes.generated.StaticArray" + return Class.forName("com.citahub.cita.abi.datatypes.generated.StaticArray" + splitType[1]); } catch (ClassNotFoundException e) { // Unfortunately we can't encode it's length as a type if it's > 32. diff --git a/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapperGenerator.java index 080727b3..b6a67caf 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapperGenerator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/SolidityFunctionWrapperGenerator.java @@ -1,19 +1,19 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.utils.Collection; -import com.cryptape.cita.utils.Files; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.utils.Collection; +import com.citahub.cita.utils.Files; import com.fasterxml.jackson.databind.ObjectMapper; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.utils.Strings; -import static com.cryptape.cita.codegen.Console.exitError; +import static com.citahub.cita.codegen.Console.exitError; /** * Java wrapper source code generator for Solidity ABI format. diff --git a/codegen/src/main/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGenerator.java index 7c0904ad..82e84b07 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGenerator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGenerator.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.io.IOException; @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Set; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.utils.Collection; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.utils.Collection; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonFormat; @@ -23,11 +23,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; -import com.cryptape.cita.tx.ChainId; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.tx.ChainId; +import com.citahub.cita.utils.Strings; -import static com.cryptape.cita.codegen.Console.exitError; +import static com.citahub.cita.codegen.Console.exitError; /** * Java wrapper source code generator for Truffle JSON format. Truffle embeds the Solidity ABI diff --git a/codegen/src/main/java/com/citahub/cita/codegen/TupleGenerator.java b/codegen/src/main/java/com/citahub/cita/codegen/TupleGenerator.java index dc2eff88..5dd9de8d 100644 --- a/codegen/src/main/java/com/citahub/cita/codegen/TupleGenerator.java +++ b/codegen/src/main/java/com/citahub/cita/codegen/TupleGenerator.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.IOException; import java.util.ArrayList; @@ -10,8 +10,8 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeVariableName; -import com.cryptape.cita.tuples.Tuple; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.tuples.Tuple; +import com.citahub.cita.utils.Strings; /** * A class for generating arbitrary sized tuples. diff --git a/codegen/src/test/java/com/citahub/cita/TempFileProvider.java b/codegen/src/test/java/com/citahub/cita/TempFileProvider.java index a4ac5c3f..62a1ff99 100644 --- a/codegen/src/test/java/com/citahub/cita/TempFileProvider.java +++ b/codegen/src/test/java/com/citahub/cita/TempFileProvider.java @@ -1,4 +1,4 @@ -package com.cryptape.cita; +package com.citahub.cita; import java.io.File; import java.nio.file.Files; diff --git a/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesGeneratorTest.java index b0c772f9..bdc2cd9c 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesGeneratorTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesGeneratorTest.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import org.junit.Test; -import com.cryptape.cita.TempFileProvider; +import com.citahub.cita.TempFileProvider; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; diff --git a/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesMapperGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesMapperGeneratorTest.java index be4bb4f6..cf12c9d8 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesMapperGeneratorTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/AbiTypesMapperGeneratorTest.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import org.junit.Test; -import com.cryptape.cita.TempFileProvider; +import com.citahub.cita.TempFileProvider; public class AbiTypesMapperGeneratorTest extends TempFileProvider { diff --git a/codegen/src/test/java/com/citahub/cita/codegen/ContractJsonParseTest.java b/codegen/src/test/java/com/citahub/cita/codegen/ContractJsonParseTest.java index 831b1584..84cbdc98 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/ContractJsonParseTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/ContractJsonParseTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.net.URL; @@ -6,13 +6,13 @@ import org.junit.Before; import org.junit.Test; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static com.cryptape.cita.codegen.TruffleJsonFunctionWrapperGenerator.Contract; -import static com.cryptape.cita.codegen.TruffleJsonFunctionWrapperGenerator.loadContractDefinition; +import static com.citahub.cita.codegen.TruffleJsonFunctionWrapperGenerator.Contract; +import static com.citahub.cita.codegen.TruffleJsonFunctionWrapperGenerator.loadContractDefinition; /** * Test that we can parse Truffle Contract from JSON file. diff --git a/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperGeneratorTest.java index cd42b331..47e7d6ca 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperGeneratorTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperGeneratorTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.io.IOException; @@ -12,15 +12,15 @@ import org.junit.Test; -import com.cryptape.cita.TempFileProvider; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.TempFileProvider; +import com.citahub.cita.utils.Strings; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static com.cryptape.cita.codegen.SolidityFunctionWrapperGenerator.JAVA_TYPES_ARG; -import static com.cryptape.cita.codegen.SolidityFunctionWrapperGenerator.SOLIDITY_TYPES_ARG; -import static com.cryptape.cita.codegen.SolidityFunctionWrapperGenerator.getFileNameNoExtension; +import static com.citahub.cita.codegen.SolidityFunctionWrapperGenerator.JAVA_TYPES_ARG; +import static com.citahub.cita.codegen.SolidityFunctionWrapperGenerator.SOLIDITY_TYPES_ARG; +import static com.citahub.cita.codegen.SolidityFunctionWrapperGenerator.getFileNameNoExtension; public class SolidityFunctionWrapperGeneratorTest extends TempFileProvider { @@ -89,7 +89,7 @@ private void testCodeGenerationJvmTypes( String contractName, String inputFileName) throws Exception { testCodeGeneration( - contractName, inputFileName, "com.cryptape.cita.unittests.java", JAVA_TYPES_ARG); + contractName, inputFileName, "com.citahub.cita.unittests.java", JAVA_TYPES_ARG); } @@ -98,7 +98,7 @@ private void testCodeGenerationSolidityTypes( testCodeGeneration( contractName, inputFileName, - "com.cryptape.cita.unittests.solidity", SOLIDITY_TYPES_ARG); + "com.citahub.cita.unittests.solidity", SOLIDITY_TYPES_ARG); } private void testCodeGeneration( diff --git a/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperTest.java b/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperTest.java index a6813eb3..b3228f2d 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/SolidityFunctionWrapperTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.math.BigInteger; import java.util.ArrayList; @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; -import com.cryptape.cita.abi.datatypes.generated.Int256; +import com.citahub.cita.abi.datatypes.generated.Int256; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.ParameterizedTypeName; @@ -14,26 +14,26 @@ import com.squareup.javapoet.TypeSpec; import org.junit.Test; -import com.cryptape.cita.TempFileProvider; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.abi.datatypes.generated.Bytes32; -import com.cryptape.cita.abi.datatypes.generated.StaticArray10; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.abi.datatypes.generated.Uint64; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.TempFileProvider; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.generated.Bytes32; +import com.citahub.cita.abi.datatypes.generated.StaticArray10; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.abi.datatypes.generated.Uint64; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; -import static com.cryptape.cita.codegen.SolidityFunctionWrapper.buildTypeName; -import static com.cryptape.cita.codegen.SolidityFunctionWrapper.createValidParamName; -import static com.cryptape.cita.codegen.SolidityFunctionWrapper.getEventNativeType; -import static com.cryptape.cita.codegen.SolidityFunctionWrapper.getNativeType; +import static com.citahub.cita.codegen.SolidityFunctionWrapper.buildTypeName; +import static com.citahub.cita.codegen.SolidityFunctionWrapper.createValidParamName; +import static com.citahub.cita.codegen.SolidityFunctionWrapper.getEventNativeType; +import static com.citahub.cita.codegen.SolidityFunctionWrapper.getNativeType; public class SolidityFunctionWrapperTest extends TempFileProvider { @@ -138,11 +138,11 @@ public void testBuildFunctionTransaction() throws Exception { //CHECKSTYLE:OFF String expected = - "public com.cryptape.cita.protocol.core.RemoteCall functionName(java.math.BigInteger param, java.lang.Long quota, java.lang.String nonce, java.lang.Long validUntilBlock, java.lang.Integer version, java.math.BigInteger chainId, java.lang.String value) {\n" + - " com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function(\n" + + "public com.citahub.cita.protocol.core.RemoteCall functionName(java.math.BigInteger param, java.lang.Long quota, java.lang.String nonce, java.lang.Long validUntilBlock, java.lang.Integer version, java.math.BigInteger chainId, java.lang.String value) {\n" + + " com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function(\n" + " \"functionName\", \n" + - " java.util.Arrays.asList(new com.cryptape.cita.abi.datatypes.generated.Uint8(param)), \n" + - " java.util.Collections.>emptyList());\n" + + " java.util.Arrays.asList(new com.citahub.cita.abi.datatypes.generated.Uint8(param)), \n" + + " java.util.Collections.>emptyList());\n" + " return executeRemoteCallTransaction(function, quota, nonce, validUntilBlock, version, chainId, value);\n" + "}\n"; //CHECKSTYLE:ON @@ -165,11 +165,11 @@ public void testBuildPayabelFunctionTransaction() throws Exception { //CHECKSTYLE:OFF String expected = - "public com.cryptape.cita.protocol.core.RemoteCall functionName(java.math.BigInteger param, java.math.BigInteger weiValue, java.lang.Long quota, java.lang.String nonce, java.lang.Long validUntilBlock, java.lang.Integer version, java.math.BigInteger chainId, java.lang.String value) {\n" + - " com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function(\n" + + "public com.citahub.cita.protocol.core.RemoteCall functionName(java.math.BigInteger param, java.math.BigInteger weiValue, java.lang.Long quota, java.lang.String nonce, java.lang.Long validUntilBlock, java.lang.Integer version, java.math.BigInteger chainId, java.lang.String value) {\n" + + " com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function(\n" + " \"functionName\", \n" + - " java.util.Arrays.asList(new com.cryptape.cita.abi.datatypes.generated.Uint8(param)), \n" + - " java.util.Collections.>emptyList());\n" + + " java.util.Arrays.asList(new com.citahub.cita.abi.datatypes.generated.Uint8(param)), \n" + + " java.util.Collections.>emptyList());\n" + " return executeRemoteCallTransaction(function, weiValue, quota, nonce, validUntilBlock, version, chainId, value);\n" + "}\n"; //CHECKSTYLE:ON @@ -193,10 +193,10 @@ public void testBuildFunctionConstantSingleValueReturn() throws Exception { //CHECKSTYLE:OFF String expected = - "public com.cryptape.cita.protocol.core.RemoteCall functionName(java.math.BigInteger param) {\n" + - " com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function(\"functionName\", \n" + - " java.util.Arrays.asList(new com.cryptape.cita.abi.datatypes.generated.Uint8(param)), \n" + - " java.util.Arrays.>asList(new com.cryptape.cita.abi.TypeReference() {}));\n" + + "public com.citahub.cita.protocol.core.RemoteCall functionName(java.math.BigInteger param) {\n" + + " com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function(\"functionName\", \n" + + " java.util.Arrays.asList(new com.citahub.cita.abi.datatypes.generated.Uint8(param)), \n" + + " java.util.Arrays.>asList(new com.citahub.cita.abi.TypeReference() {}));\n" + " return executeRemoteCallSingleValueReturn(function, java.math.BigInteger.class);\n" + "}\n"; //CHECKSTYLE:ON @@ -236,17 +236,17 @@ public void testBuildFunctionConstantMultipleValueReturn() throws Exception { MethodSpec methodSpec = solidityFunctionWrapper.buildFunction(functionDefinition); //CHECKSTYLE:OFF - String expected = "public com.cryptape.cita.protocol.core.RemoteCall> functionName(java.math.BigInteger param1, java.math.BigInteger param2) {\n" + - " final com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function(\"functionName\", \n" + - " java.util.Arrays.asList(new com.cryptape.cita.abi.datatypes.generated.Uint8(param1), \n" + - " new com.cryptape.cita.abi.datatypes.generated.Uint32(param2)), \n" + - " java.util.Arrays.>asList(new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}));\n" + - " return new com.cryptape.cita.protocol.core.RemoteCall>(\n" + - " new java.util.concurrent.Callable>() {\n" + + String expected = "public com.citahub.cita.protocol.core.RemoteCall> functionName(java.math.BigInteger param1, java.math.BigInteger param2) {\n" + + " final com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function(\"functionName\", \n" + + " java.util.Arrays.asList(new com.citahub.cita.abi.datatypes.generated.Uint8(param1), \n" + + " new com.citahub.cita.abi.datatypes.generated.Uint32(param2)), \n" + + " java.util.Arrays.>asList(new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}));\n" + + " return new com.citahub.cita.protocol.core.RemoteCall>(\n" + + " new java.util.concurrent.Callable>() {\n" + " @java.lang.Override\n" + - " public com.cryptape.cita.tuples.generated.Tuple2 call() throws java.lang.Exception {\n" + - " java.util.List results = executeCallMultipleValueReturn(function);;\n" + - " return new com.cryptape.cita.tuples.generated.Tuple2(\n" + + " public com.citahub.cita.tuples.generated.Tuple2 call() throws java.lang.Exception {\n" + + " java.util.List results = executeCallMultipleValueReturn(function);;\n" + + " return new com.citahub.cita.tuples.generated.Tuple2(\n" + " (java.math.BigInteger) results.get(0).getValue(), \n" + " (java.math.BigInteger) results.get(1).getValue());\n" + " }\n" + @@ -282,13 +282,13 @@ public void testBuildEventConstantMultipleValueReturn() throws Exception { //CHECKSTYLE:OFF String expected = "class testClass {\n" + - " public java.util.List getTransferEvents(com.cryptape.cita.protocol.core.methods.response.TransactionReceipt transactionReceipt) {\n" + - " final com.cryptape.cita.abi.datatypes.Event event = new com.cryptape.cita.abi.datatypes.Event(\"Transfer\", \n" + - " java.util.Arrays.>asList(new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}),\n" + - " java.util.Arrays.>asList(new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}));\n" + - " java.util.List valueList = extractEventParameters(event, transactionReceipt);\n" + + " public java.util.List getTransferEvents(com.citahub.cita.protocol.core.methods.response.TransactionReceipt transactionReceipt) {\n" + + " final com.citahub.cita.abi.datatypes.Event event = new com.citahub.cita.abi.datatypes.Event(\"Transfer\", \n" + + " java.util.Arrays.>asList(new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}),\n" + + " java.util.Arrays.>asList(new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}));\n" + + " java.util.List valueList = extractEventParameters(event, transactionReceipt);\n" + " java.util.ArrayList responses = new java.util.ArrayList(valueList.size());\n" + - " for (com.cryptape.cita.abi.EventValues eventValues : valueList) {\n" + + " for (com.citahub.cita.abi.EventValues eventValues : valueList) {\n" + " TransferEventResponse typedResponse = new TransferEventResponse();\n" + " typedResponse.id = (byte[]) eventValues.getIndexedValues().get(0).getValue();\n" + " typedResponse.from = (java.lang.String) eventValues.getIndexedValues().get(1).getValue();\n" + @@ -300,16 +300,16 @@ public void testBuildEventConstantMultipleValueReturn() throws Exception { " return responses;\n" + " }\n" + "\n" + - " public io.reactivex.Flowable transferEventFlowable(com.cryptape.cita.protocol.core.DefaultBlockParameter startBlock, com.cryptape.cita.protocol.core.DefaultBlockParameter endBlock) {\n" + - " final com.cryptape.cita.abi.datatypes.Event event = new com.cryptape.cita.abi.datatypes.Event(\"Transfer\", \n" + - " java.util.Arrays.>asList(new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}),\n" + - " java.util.Arrays.>asList(new com.cryptape.cita.abi.TypeReference() {}, new com.cryptape.cita.abi.TypeReference() {}));\n" + - " com.cryptape.cita.protocol.core.methods.request.AppFilter filter = new com.cryptape.cita.protocol.core.methods.request.AppFilter(startBlock, endBlock, getContractAddress());\n" + - " filter.addSingleTopic(com.cryptape.cita.abi.EventEncoder.encode(event));\n" + - " return citaj.appLogFlowable(filter).map(new io.reactivex.functions.Function() {\n" + + " public io.reactivex.Flowable transferEventFlowable(com.citahub.cita.protocol.core.DefaultBlockParameter startBlock, com.citahub.cita.protocol.core.DefaultBlockParameter endBlock) {\n" + + " final com.citahub.cita.abi.datatypes.Event event = new com.citahub.cita.abi.datatypes.Event(\"Transfer\", \n" + + " java.util.Arrays.>asList(new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}),\n" + + " java.util.Arrays.>asList(new com.citahub.cita.abi.TypeReference() {}, new com.citahub.cita.abi.TypeReference() {}));\n" + + " com.citahub.cita.protocol.core.methods.request.AppFilter filter = new com.citahub.cita.protocol.core.methods.request.AppFilter(startBlock, endBlock, getContractAddress());\n" + + " filter.addSingleTopic(com.citahub.cita.abi.EventEncoder.encode(event));\n" + + " return citaj.appLogFlowable(filter).map(new io.reactivex.functions.Function() {\n" + " @java.lang.Override\n" + - " public TransferEventResponse apply(com.cryptape.cita.protocol.core.methods.response.Log log) {\n" + - " com.cryptape.cita.abi.EventValues eventValues = extractEventParameters(event, log);\n" + + " public TransferEventResponse apply(com.citahub.cita.protocol.core.methods.response.Log log) {\n" + + " com.citahub.cita.abi.EventValues eventValues = extractEventParameters(event, log);\n" + " TransferEventResponse typedResponse = new TransferEventResponse();\n" + " typedResponse.id = (byte[]) eventValues.getIndexedValues().get(0).getValue();\n" + " typedResponse.from = (java.lang.String) eventValues.getIndexedValues().get(1).getValue();\n" + diff --git a/codegen/src/test/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java index dd844343..2b186c73 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/TruffleJsonFunctionWrapperGeneratorTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.io.IOException; @@ -15,16 +15,16 @@ import org.junit.Before; import org.junit.Test; -import com.cryptape.cita.TempFileProvider; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.TempFileProvider; +import com.citahub.cita.utils.Strings; import static org.junit.Assert.assertTrue; -import static com.cryptape.cita.codegen.FunctionWrapperGenerator.JAVA_TYPES_ARG; -import static com.cryptape.cita.codegen.FunctionWrapperGenerator.SOLIDITY_TYPES_ARG; +import static com.citahub.cita.codegen.FunctionWrapperGenerator.JAVA_TYPES_ARG; +import static com.citahub.cita.codegen.FunctionWrapperGenerator.SOLIDITY_TYPES_ARG; public class TruffleJsonFunctionWrapperGeneratorTest extends TempFileProvider { - private static final String PackageName = "com.cryptape.cita.unittests.truffle.java"; + private static final String PackageName = "com.citahub.cita.unittests.truffle.java"; private String contractBaseDir; diff --git a/codegen/src/test/java/com/citahub/cita/codegen/TupleGeneratorTest.java b/codegen/src/test/java/com/citahub/cita/codegen/TupleGeneratorTest.java index 7076dcde..72552687 100644 --- a/codegen/src/test/java/com/citahub/cita/codegen/TupleGeneratorTest.java +++ b/codegen/src/test/java/com/citahub/cita/codegen/TupleGeneratorTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.codegen; +package com.citahub.cita.codegen; import java.io.File; import java.io.IOException; @@ -12,11 +12,11 @@ import org.junit.Test; -import com.cryptape.cita.TempFileProvider; +import com.citahub.cita.TempFileProvider; import static org.junit.Assert.assertTrue; -import static com.cryptape.cita.codegen.TupleGenerator.CLASS_NAME; -import static com.cryptape.cita.codegen.TupleGenerator.LIMIT; +import static com.citahub.cita.codegen.TupleGenerator.CLASS_NAME; +import static com.citahub.cita.codegen.TupleGenerator.LIMIT; public class TupleGeneratorTest extends TempFileProvider { diff --git a/codegen/src/test/resources/solidity/build.sh b/codegen/src/test/resources/solidity/build.sh index 32915393..6990ab46 100755 --- a/codegen/src/test/resources/solidity/build.sh +++ b/codegen/src/test/resources/solidity/build.sh @@ -22,7 +22,7 @@ for target in ${targets}; do citaj solidity generate \ build/${fileName}.bin \ build/${fileName}.abi \ - -p com.cryptape.cita.generated \ + -p com.citahub.cita.generated \ -o ../../../../../../integration-tests/src/test/java/ > /dev/null echo "Complete" diff --git a/codegen/src/test/resources/truffle/build.sh b/codegen/src/test/resources/truffle/build.sh index 6495b30c..850fafaa 100755 --- a/codegen/src/test/resources/truffle/build.sh +++ b/codegen/src/test/resources/truffle/build.sh @@ -12,7 +12,7 @@ for target in ${targets}; do echo "Generating citaj bindings" citaj truffle generate \ build/contracts/${fileName}.json \ - -p com.cryptape.cita.generated \ + -p com.citahub.cita.generated \ -o ../../../../../../integration-tests/src/test/java/ > /dev/null echo "Complete" diff --git a/console/build.gradle b/console/build.gradle index ded31abf..77651cad 100644 --- a/console/build.gradle +++ b/console/build.gradle @@ -19,5 +19,5 @@ dependencies { } // Build command line library release with target distShadowZip -mainClassName = 'com.cryptape.cita.console.Runner' +mainClassName = 'com.citahub.cita.console.Runner' applicationName = 'cita' diff --git a/console/src/main/java/com/citahub/cita/console/ConsoleDevice.java b/console/src/main/java/com/citahub/cita/console/ConsoleDevice.java index 312edbe9..e51c3857 100644 --- a/console/src/main/java/com/citahub/cita/console/ConsoleDevice.java +++ b/console/src/main/java/com/citahub/cita/console/ConsoleDevice.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import java.io.Console; diff --git a/console/src/main/java/com/citahub/cita/console/IODevice.java b/console/src/main/java/com/citahub/cita/console/IODevice.java index 2cacee90..7d11871c 100644 --- a/console/src/main/java/com/citahub/cita/console/IODevice.java +++ b/console/src/main/java/com/citahub/cita/console/IODevice.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; /** * IO device abstraction. diff --git a/console/src/main/java/com/citahub/cita/console/KeyImporter.java b/console/src/main/java/com/citahub/cita/console/KeyImporter.java index c2edc220..ff848ddf 100644 --- a/console/src/main/java/com/citahub/cita/console/KeyImporter.java +++ b/console/src/main/java/com/citahub/cita/console/KeyImporter.java @@ -1,16 +1,16 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import java.io.File; import java.io.IOException; -import com.cryptape.cita.codegen.Console; -import com.cryptape.cita.crypto.CipherException; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.crypto.Keys; -import com.cryptape.cita.crypto.WalletUtils; -import com.cryptape.cita.utils.Files; +import com.citahub.cita.codegen.Console; +import com.citahub.cita.crypto.CipherException; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.crypto.Keys; +import com.citahub.cita.crypto.WalletUtils; +import com.citahub.cita.utils.Files; -import static com.cryptape.cita.codegen.Console.exitError; +import static com.citahub.cita.codegen.Console.exitError; /** * Create Ethereum wallet file from a provided private key. diff --git a/console/src/main/java/com/citahub/cita/console/Runner.java b/console/src/main/java/com/citahub/cita/console/Runner.java index 52653e29..545a65a3 100644 --- a/console/src/main/java/com/citahub/cita/console/Runner.java +++ b/console/src/main/java/com/citahub/cita/console/Runner.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; -import com.cryptape.cita.codegen.Console; -import com.cryptape.cita.codegen.SolidityFunctionWrapperGenerator; -import com.cryptape.cita.codegen.TruffleJsonFunctionWrapperGenerator; -import com.cryptape.cita.utils.Collection; -import com.cryptape.cita.utils.Version; +import com.citahub.cita.codegen.Console; +import com.citahub.cita.codegen.SolidityFunctionWrapperGenerator; +import com.citahub.cita.codegen.TruffleJsonFunctionWrapperGenerator; +import com.citahub.cita.utils.Collection; +import com.citahub.cita.utils.Version; /** * Main entry point for running command line utilities. diff --git a/console/src/main/java/com/citahub/cita/console/WalletCreator.java b/console/src/main/java/com/citahub/cita/console/WalletCreator.java index 53b0454d..d5f1ddb6 100644 --- a/console/src/main/java/com/citahub/cita/console/WalletCreator.java +++ b/console/src/main/java/com/citahub/cita/console/WalletCreator.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import java.io.File; import java.io.IOException; @@ -6,9 +6,9 @@ import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import com.cryptape.cita.codegen.Console; -import com.cryptape.cita.crypto.CipherException; -import com.cryptape.cita.crypto.WalletUtils; +import com.citahub.cita.codegen.Console; +import com.citahub.cita.crypto.CipherException; +import com.citahub.cita.crypto.WalletUtils; /** * Simple class for creating a wallet file. diff --git a/console/src/main/java/com/citahub/cita/console/WalletManager.java b/console/src/main/java/com/citahub/cita/console/WalletManager.java index e8c9a29b..28b8438a 100644 --- a/console/src/main/java/com/citahub/cita/console/WalletManager.java +++ b/console/src/main/java/com/citahub/cita/console/WalletManager.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import java.io.File; import java.io.IOException; import java.util.Arrays; -import com.cryptape.cita.codegen.Console; -import com.cryptape.cita.crypto.CipherException; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.crypto.WalletUtils; +import com.citahub.cita.codegen.Console; +import com.citahub.cita.crypto.CipherException; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.crypto.WalletUtils; -import static com.cryptape.cita.codegen.Console.exitError; +import static com.citahub.cita.codegen.Console.exitError; /** * Common functions used by the wallet console tools. diff --git a/console/src/main/java/com/citahub/cita/console/WalletUpdater.java b/console/src/main/java/com/citahub/cita/console/WalletUpdater.java index f6e8a52c..fab6e905 100644 --- a/console/src/main/java/com/citahub/cita/console/WalletUpdater.java +++ b/console/src/main/java/com/citahub/cita/console/WalletUpdater.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import java.io.File; import java.io.IOException; -import com.cryptape.cita.codegen.Console; -import com.cryptape.cita.crypto.CipherException; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.crypto.WalletUtils; +import com.citahub.cita.codegen.Console; +import com.citahub.cita.crypto.CipherException; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.crypto.WalletUtils; -import static com.cryptape.cita.codegen.Console.exitError; +import static com.citahub.cita.codegen.Console.exitError; /** * Simple class for creating a wallet file. diff --git a/console/src/test/java/com/citahub/cita/console/KeyImporterTest.java b/console/src/test/java/com/citahub/cita/console/KeyImporterTest.java index 4cb6900c..0a6a4e13 100644 --- a/console/src/test/java/com/citahub/cita/console/KeyImporterTest.java +++ b/console/src/test/java/com/citahub/cita/console/KeyImporterTest.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; -import com.cryptape.cita.crypto.SampleKeys; +import com.citahub.cita.crypto.SampleKeys; import org.junit.Test; import static org.mockito.Matchers.contains; diff --git a/console/src/test/java/com/citahub/cita/console/WalletCreatorTest.java b/console/src/test/java/com/citahub/cita/console/WalletCreatorTest.java index 4a6d6a42..b7025c7b 100644 --- a/console/src/test/java/com/citahub/cita/console/WalletCreatorTest.java +++ b/console/src/test/java/com/citahub/cita/console/WalletCreatorTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import org.junit.Test; diff --git a/console/src/test/java/com/citahub/cita/console/WalletTester.java b/console/src/test/java/com/citahub/cita/console/WalletTester.java index 652c5237..347e5648 100644 --- a/console/src/test/java/com/citahub/cita/console/WalletTester.java +++ b/console/src/test/java/com/citahub/cita/console/WalletTester.java @@ -1,7 +1,7 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; -import com.cryptape.cita.TempFileProvider; -import com.cryptape.cita.crypto.SampleKeys; +import com.citahub.cita.TempFileProvider; +import com.citahub.cita.crypto.SampleKeys; import org.junit.Before; import static org.mockito.Mockito.mock; diff --git a/console/src/test/java/com/citahub/cita/console/WalletUpdaterTest.java b/console/src/test/java/com/citahub/cita/console/WalletUpdaterTest.java index ea383616..e66ffc2e 100644 --- a/console/src/test/java/com/citahub/cita/console/WalletUpdaterTest.java +++ b/console/src/test/java/com/citahub/cita/console/WalletUpdaterTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.console; +package com.citahub.cita.console; import org.junit.Test; diff --git a/core/src/main/java/com/citahub/cita/protocol/CITAj.java b/core/src/main/java/com/citahub/cita/protocol/CITAj.java index adcd3836..715c1900 100644 --- a/core/src/main/java/com/citahub/cita/protocol/CITAj.java +++ b/core/src/main/java/com/citahub/cita/protocol/CITAj.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol; +package com.citahub.cita.protocol; import java.util.concurrent.ScheduledExecutorService; -import com.cryptape.cita.protocol.core.CITA; -import com.cryptape.cita.protocol.core.JsonRpc2_0CITAj; -import com.cryptape.cita.protocol.rx.CITAjRx; +import com.citahub.cita.protocol.core.CITA; +import com.citahub.cita.protocol.core.JsonRpc2_0CITAj; +import com.citahub.cita.protocol.rx.CITAjRx; /** * JSON-RPC Request object building factory. diff --git a/core/src/main/java/com/citahub/cita/protocol/CITAjService.java b/core/src/main/java/com/citahub/cita/protocol/CITAjService.java index 5009786c..82f5abc0 100644 --- a/core/src/main/java/com/citahub/cita/protocol/CITAjService.java +++ b/core/src/main/java/com/citahub/cita/protocol/CITAjService.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol; +package com.citahub.cita.protocol; import java.io.IOException; import java.util.concurrent.Future; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.Response; import io.reactivex.Flowable; import io.reactivex.Notification; diff --git a/core/src/main/java/com/citahub/cita/protocol/ObjectMapperFactory.java b/core/src/main/java/com/citahub/cita/protocol/ObjectMapperFactory.java index a5aa3320..77dfdda9 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ObjectMapperFactory.java +++ b/core/src/main/java/com/citahub/cita/protocol/ObjectMapperFactory.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol; +package com.citahub.cita.protocol; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.DeserializationConfig; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.cryptape.cita.protocol.deserializer.RawResponseDeserializer; +import com.citahub.cita.protocol.deserializer.RawResponseDeserializer; /** * Factory for managing our ObjectMapper instances. diff --git a/core/src/main/java/com/citahub/cita/protocol/Service.java b/core/src/main/java/com/citahub/cita/protocol/Service.java index a3f380de..fc7a1979 100644 --- a/core/src/main/java/com/citahub/cita/protocol/Service.java +++ b/core/src/main/java/com/citahub/cita/protocol/Service.java @@ -1,17 +1,17 @@ -package com.cryptape.cita.protocol; +package com.citahub.cita.protocol; import java.io.IOException; import java.io.InputStream; import java.util.concurrent.Callable; import java.util.concurrent.Future; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.Response; import com.fasterxml.jackson.databind.ObjectMapper; import io.reactivex.Flowable; import io.reactivex.Notification; -import com.cryptape.cita.utils.Async; +import com.citahub.cita.utils.Async; /** * Base service implementation. diff --git a/core/src/main/java/com/citahub/cita/protocol/account/Account.java b/core/src/main/java/com/citahub/cita/protocol/account/Account.java index 0447a923..5ae911cc 100644 --- a/core/src/main/java/com/citahub/cita/protocol/account/Account.java +++ b/core/src/main/java/com/citahub/cita/protocol/account/Account.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.account; +package com.citahub.cita.protocol.account; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import java.io.File; import java.io.IOException; import java.math.BigInteger; @@ -9,27 +9,27 @@ import java.util.List; import java.util.concurrent.Future; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.UnorderedEvent; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.response.AppCall; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.tx.RawTransactionManager; -import com.cryptape.cita.utils.TypedAbi; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.UnorderedEvent; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.response.AppCall; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.tx.RawTransactionManager; +import com.citahub.cita.utils.TypedAbi; import io.reactivex.Flowable; -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.FunctionReturnDecoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.abi.EventEncoder; +import com.citahub.cita.abi.EventValues; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.FunctionReturnDecoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; public class Account { diff --git a/core/src/main/java/com/citahub/cita/protocol/account/CompiledContract.java b/core/src/main/java/com/citahub/cita/protocol/account/CompiledContract.java index 6ba63a71..31d3ca72 100644 --- a/core/src/main/java/com/citahub/cita/protocol/account/CompiledContract.java +++ b/core/src/main/java/com/citahub/cita/protocol/account/CompiledContract.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.account; +package com.citahub.cita.protocol.account; import java.io.File; import java.io.IOException; @@ -8,11 +8,11 @@ import java.util.Arrays; import java.util.List; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.utils.CallCmd; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.utils.CallCmd; import com.fasterxml.jackson.databind.ObjectMapper; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; public class CompiledContract { public static class ContractCompileError extends Exception { diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/Admin.java b/core/src/main/java/com/citahub/cita/protocol/admin/Admin.java index 67540a74..256038a0 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/Admin.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/Admin.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.protocol.admin; +package com.citahub.cita.protocol.admin; import java.math.BigInteger; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.CITAjService; -import com.cryptape.cita.protocol.admin.methods.response.NewAccountIdentifier; -import com.cryptape.cita.protocol.admin.methods.response.PersonalListAccounts; -import com.cryptape.cita.protocol.admin.methods.response.PersonalUnlockAccount; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.CITAjService; +import com.citahub.cita.protocol.admin.methods.response.NewAccountIdentifier; +import com.citahub.cita.protocol.admin.methods.response.PersonalListAccounts; +import com.citahub.cita.protocol.admin.methods.response.PersonalUnlockAccount; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; /** * JSON-RPC Request object building factory for common Parity and Geth. diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/JsonRpc2_0Admin.java b/core/src/main/java/com/citahub/cita/protocol/admin/JsonRpc2_0Admin.java index 8585bcc7..66164d89 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/JsonRpc2_0Admin.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/JsonRpc2_0Admin.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.admin; +package com.citahub.cita.protocol.admin; import java.math.BigInteger; import java.util.ArrayList; @@ -6,14 +6,14 @@ import java.util.Collections; import java.util.List; -import com.cryptape.cita.protocol.CITAjService; -import com.cryptape.cita.protocol.admin.methods.response.NewAccountIdentifier; -import com.cryptape.cita.protocol.admin.methods.response.PersonalListAccounts; -import com.cryptape.cita.protocol.admin.methods.response.PersonalUnlockAccount; -import com.cryptape.cita.protocol.core.JsonRpc2_0CITAj; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.CITAjService; +import com.citahub.cita.protocol.admin.methods.response.NewAccountIdentifier; +import com.citahub.cita.protocol.admin.methods.response.PersonalListAccounts; +import com.citahub.cita.protocol.admin.methods.response.PersonalUnlockAccount; +import com.citahub.cita.protocol.core.JsonRpc2_0CITAj; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; /** * JSON-RPC 2.0 factory implementation for common Parity and Geth. diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/BooleanResponse.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/BooleanResponse.java index 7cb37219..8cebd1a3 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/BooleanResponse.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/BooleanResponse.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.admin.methods.response; +package com.citahub.cita.protocol.admin.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * Boolean response type. diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/NewAccountIdentifier.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/NewAccountIdentifier.java index 207dd1cd..f37e5d7c 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/NewAccountIdentifier.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/NewAccountIdentifier.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.admin.methods.response; +package com.citahub.cita.protocol.admin.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * personal_newAccount diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalListAccounts.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalListAccounts.java index 26e12522..3a46e8b8 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalListAccounts.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalListAccounts.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.protocol.admin.methods.response; +package com.citahub.cita.protocol.admin.methods.response; import java.util.List; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * personal_listAccounts. diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalSign.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalSign.java index 88201250..ce859f6c 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalSign.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalSign.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.admin.methods.response; +package com.citahub.cita.protocol.admin.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * personal_sign diff --git a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalUnlockAccount.java b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalUnlockAccount.java index 626bb9fc..a99eb780 100644 --- a/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalUnlockAccount.java +++ b/core/src/main/java/com/citahub/cita/protocol/admin/methods/response/PersonalUnlockAccount.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.admin.methods.response; +package com.citahub.cita.protocol.admin.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * personal_unlockAccount. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/CITA.java b/core/src/main/java/com/citahub/cita/protocol/core/CITA.java index cbe940e7..194961bd 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/CITA.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/CITA.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.response.*; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.response.*; /** @@ -54,7 +54,7 @@ Request appGetBlockByNumber( Request appGetTransactionReceipt(String transactionHash); Request appNewFilter( - com.cryptape.cita.protocol.core.methods.request.AppFilter ethFilter); + com.citahub.cita.protocol.core.methods.request.AppFilter ethFilter); Request appNewBlockFilter(); @@ -67,5 +67,5 @@ Request appNewFilter( Request appGetFilterLogs(BigInteger filterId); Request appGetLogs( - com.cryptape.cita.protocol.core.methods.request.AppFilter ethFilter); + com.citahub.cita.protocol.core.methods.request.AppFilter ethFilter); } diff --git a/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameter.java b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameter.java index 7bfebf63..8aa089f1 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameter.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.math.BigInteger; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterName.java b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterName.java index 0bda42ba..299d6897 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterName.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterName.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterNumber.java b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterNumber.java index a5880b89..e09b4e25 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterNumber.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/DefaultBlockParameterNumber.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.math.BigInteger; import com.fasterxml.jackson.annotation.JsonValue; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * DefaultBlockParameter implementation that takes a numeric value. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/JsonRpc2_0CITAj.java b/core/src/main/java/com/citahub/cita/protocol/core/JsonRpc2_0CITAj.java index 46ac3221..6cd236b5 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/JsonRpc2_0CITAj.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/JsonRpc2_0CITAj.java @@ -1,18 +1,18 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.math.BigInteger; import java.util.Arrays; import java.util.Collections; import java.util.concurrent.ScheduledExecutorService; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.response.*; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.response.*; import io.reactivex.Flowable; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.CITAjService; -import com.cryptape.cita.protocol.rx.JsonRpc2_0Rx; -import com.cryptape.cita.utils.Async; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.CITAjService; +import com.citahub.cita.protocol.rx.JsonRpc2_0Rx; +import com.citahub.cita.utils.Async; +import com.citahub.cita.utils.Numeric; /** * JSON-RPC 2.0 factory implementation. @@ -213,7 +213,7 @@ public Request appGetTransactionReceipt(String tran @Override public Request appNewFilter( - com.cryptape.cita.protocol.core.methods.request.AppFilter appFilter) { + com.citahub.cita.protocol.core.methods.request.AppFilter appFilter) { return new Request<>( "newFilter", Arrays.asList(appFilter), @@ -267,7 +267,7 @@ public Request appGetFilterLogs(BigInteger filterId) { @Override public Request appGetLogs( - com.cryptape.cita.protocol.core.methods.request.AppFilter appFilter) { + com.citahub.cita.protocol.core.methods.request.AppFilter appFilter) { return new Request<>( "getLogs", Arrays.asList(appFilter), @@ -287,7 +287,7 @@ public Flowable appPendingTransactionHashFlowable() { @Override public Flowable appLogFlowable( - com.cryptape.cita.protocol.core.methods.request.AppFilter appFilter) { + com.citahub.cita.protocol.core.methods.request.AppFilter appFilter) { return citajRx.appLogFlowable(appFilter, blockTime); } diff --git a/core/src/main/java/com/citahub/cita/protocol/core/RemoteCall.java b/core/src/main/java/com/citahub/cita/protocol/core/RemoteCall.java index c17c79c8..9303ed06 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/RemoteCall.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/RemoteCall.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.util.concurrent.Callable; import java.util.concurrent.Future; import io.reactivex.Flowable; -import com.cryptape.cita.utils.Async; +import com.citahub.cita.utils.Async; /** * A common type for wrapping remote requests. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/Request.java b/core/src/main/java/com/citahub/cita/protocol/core/Request.java index 9ce31548..6477f605 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/Request.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/Request.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.io.IOException; import java.util.List; @@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicLong; import io.reactivex.Flowable; -import com.cryptape.cita.protocol.CITAjService; +import com.citahub.cita.protocol.CITAjService; public class Request { private static AtomicLong nextId = new AtomicLong(0); diff --git a/core/src/main/java/com/citahub/cita/protocol/core/Response.java b/core/src/main/java/com/citahub/cita/protocol/core/Response.java index 46ec5f69..c7eabdc4 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/Response.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/Response.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/filters/BlockFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/BlockFilter.java index 828ea6b4..b246c49a 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/filters/BlockFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/filters/BlockFilter.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; import java.io.IOException; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.Request; /** * Handler for working with block filter requests. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/filters/Callback.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/Callback.java index e3239107..e10bb894 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/filters/Callback.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/filters/Callback.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; /** * Filter callback interface. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/filters/Filter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/Filter.java index 9bb4c0e0..fe2d2669 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/filters/Filter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/filters/Filter.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; import java.io.IOException; import java.math.BigInteger; @@ -8,12 +8,12 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.core.methods.response.AppUninstallFilter; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppUninstallFilter; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/filters/FilterException.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/FilterException.java index 0ddfb31f..d46f89ae 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/filters/FilterException.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/filters/FilterException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; /** * Filter exception wrapper. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/filters/LogFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/LogFilter.java index 61df82bd..3876f1c7 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/filters/LogFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/filters/LogFilter.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; import java.io.IOException; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.Request; /** * Log filter handler. @@ -26,7 +26,7 @@ public LogFilter( @Override - com.cryptape.cita.protocol.core.methods.response.AppFilter sendRequest() throws IOException { + com.citahub.cita.protocol.core.methods.response.AppFilter sendRequest() throws IOException { return citaj.appNewFilter(ethFilter).send(); } diff --git a/core/src/main/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilter.java index 49784d2b..6e6f9a01 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilter.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; import java.io.IOException; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.Request; /** * Handler for working with transaction filter requests. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/AppFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/AppFilter.java index ca4c9fd4..e6e0ecd4 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/AppFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/AppFilter.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.request; +package com.citahub.cita.protocol.core.methods.request; import java.util.Arrays; import java.util.List; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.DefaultBlockParameter; /** * Filter implementation as per diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Call.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Call.java index cf251271..2cab301e 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Call.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Call.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.protocol.core.methods.request; +package com.citahub.cita.protocol.core.methods.request; import com.fasterxml.jackson.annotation.JsonInclude; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; @JsonInclude(JsonInclude.Include.NON_NULL) public class Call { diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Filter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Filter.java index d5557b2a..e29b42a6 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Filter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Filter.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.methods.request; +package com.citahub.cita.protocol.core.methods.request; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhFilter.java index 1a326bcc..1cb3489c 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhFilter.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.methods.request; +package com.citahub.cita.protocol.core.methods.request; /** * Filter implementation as per docs diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhPost.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhPost.java index ac813733..2aa480e6 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhPost.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/ShhPost.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.protocol.core.methods.request; +package com.citahub.cita.protocol.core.methods.request; import java.math.BigInteger; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * https://github.com/ethereum/wiki/wiki/JSON-RPC#shh_post diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java index e384fb44..2cc8a379 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/request/Transaction.java @@ -1,33 +1,33 @@ -package com.cryptape.cita.protocol.core.methods.request; +package com.citahub.cita.protocol.core.methods.request; import java.io.IOException; import java.math.BigInteger; import java.util.Objects; import java.util.Random; -import com.cryptape.cita.protobuf.Blockchain; -import com.cryptape.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protobuf.Blockchain; +import com.citahub.cita.protobuf.ConvertStrByte; import com.fasterxml.jackson.annotation.JsonInclude; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import org.abstractj.kalium.crypto.Hash; import org.abstractj.kalium.keys.SigningKey; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.crypto.ECKeyPair; -import com.cryptape.cita.crypto.Keys; -import com.cryptape.cita.crypto.Sign; -import com.cryptape.cita.crypto.Signature; -import com.cryptape.cita.crypto.sm2.SM2; -import com.cryptape.cita.crypto.sm2.SM2KeyPair; -import com.cryptape.cita.crypto.sm2.SM3; -import com.cryptape.cita.utils.Numeric; -import com.cryptape.cita.utils.Strings; - -import static com.cryptape.cita.utils.Numeric.encodeQuantity; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.crypto.ECKeyPair; +import com.citahub.cita.crypto.Keys; +import com.citahub.cita.crypto.Sign; +import com.citahub.cita.crypto.Signature; +import com.citahub.cita.crypto.sm2.SM2; +import com.citahub.cita.crypto.sm2.SM2KeyPair; +import com.citahub.cita.crypto.sm2.SM3; +import com.citahub.cita.utils.Numeric; +import com.citahub.cita.utils.Strings; + +import static com.citahub.cita.utils.Numeric.encodeQuantity; import static org.abstractj.kalium.encoders.Encoder.HEX; -import static com.cryptape.cita.utils.Numeric.cleanHexPrefix; -import static com.cryptape.cita.utils.Numeric.prependHexPrefix; +import static com.citahub.cita.utils.Numeric.cleanHexPrefix; +import static com.citahub.cita.utils.Numeric.prependHexPrefix; /** * Transaction request object used the below methods. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AbiDefinition.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AbiDefinition.java index 8f66f978..16c5875b 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AbiDefinition.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AbiDefinition.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.util.List; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppAccounts.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppAccounts.java index 00b015e3..53bd8578 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppAccounts.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppAccounts.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.util.List; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_accounts. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlock.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlock.java index 66c8cd26..b2338e8f 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlock.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlock.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlockNumber.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlockNumber.java index 1b29b17b..e6e8f960 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlockNumber.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppBlockNumber.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; /** * eth_blockNumber. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCall.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCall.java index b06270cb..58313f62 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCall.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCall.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_call. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCoinbase.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCoinbase.java index 13fb07f0..b0e6c654 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCoinbase.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppCoinbase.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_coinbase. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppFilter.java index 470b745f..663ae0cd 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppFilter.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; /** * eth_newFilter. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGasPrice.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGasPrice.java index 4bff702e..2e18d2ac 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGasPrice.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGasPrice.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; /** * eth_gasPrice. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetAbi.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetAbi.java index e94cd783..e93c43f3 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetAbi.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetAbi.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; public class AppGetAbi extends Response { diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetBalance.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetBalance.java index 73082d9c..359fc55d 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetBalance.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetBalance.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; /** * eth_getBalance. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetCode.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetCode.java index 6e6a4a66..2b82bb04 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetCode.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetCode.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_getCode. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionCount.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionCount.java index a5cc5b91..d6f83b65 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionCount.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionCount.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; /** * app_getTransactionCount. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionReceipt.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionReceipt.java index 472b58b8..63be912d 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionReceipt.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppGetTransactionReceipt.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * app_getTransactionReceipt. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppLog.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppLog.java index 044e2cf8..e67fd6e9 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppLog.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppLog.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.io.IOException; import java.util.ArrayList; @@ -12,8 +12,8 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.protocol.core.Response; public class AppLog extends Response> { diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppMetaData.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppMetaData.java index 9c53b45d..9eef9991 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppMetaData.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppMetaData.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; public class AppMetaData extends Response { diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppProtocolVersion.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppProtocolVersion.java index 0aa333fb..6306a096 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppProtocolVersion.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppProtocolVersion.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_protocolVersion. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendRawTransaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendRawTransaction.java index 4d1f8519..48b0b1d7 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendRawTransaction.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendRawTransaction.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_sendRawTransaction. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendTransaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendTransaction.java index 8b2b5b9e..c15e8b2f 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendTransaction.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSendTransaction.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_sendTransaction. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSign.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSign.java index 33e9d2f4..02c9a707 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSign.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppSign.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; public class AppSign extends Response { public String getSignature() { diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppTransaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppTransaction.java index 91e24df2..e152a8c4 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppTransaction.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppTransaction.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; public class AppTransaction extends Response { diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppUninstallFilter.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppUninstallFilter.java index 36b68247..102b966b 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppUninstallFilter.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppUninstallFilter.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * eth_uninstallFilter. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppVersion.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppVersion.java index 7d6316b7..49296ed6 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppVersion.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/AppVersion.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * Created by duanyytop on 2019-04-09. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITAClientVersion.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITAClientVersion.java index 49cb41f0..b747654e 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITAClientVersion.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITAClientVersion.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * CITA_clientVersion. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITASha3.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITASha3.java index e42c869b..3fde56de 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITASha3.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/CITASha3.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * CITA_sha3. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Log.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Log.java index f1ea0929..001257fc 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Log.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Log.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** *

Log object used by {@link AppLog} and {@link AppGetTransactionReceipt}.

diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeerCount.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeerCount.java index 9ed9c9f0..5fc4ea09 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeerCount.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeerCount.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.utils.Numeric; /** * net_peerCount. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeersInfo.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeersInfo.java index 5c9c051f..fc5c8b02 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeersInfo.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/NetPeersInfo.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; import java.util.Map; diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Transaction.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Transaction.java index a0188bad..29630569 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Transaction.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/Transaction.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; import java.security.SignatureException; -import com.cryptape.cita.utils.Numeric; -import com.cryptape.cita.utils.TransactionUtil; +import com.citahub.cita.utils.Numeric; +import com.citahub.cita.utils.TransactionUtil; import com.google.protobuf.InvalidProtocolBufferException; /** @@ -88,7 +88,7 @@ public boolean verifySignature(String addr) return TransactionUtil.verifySignature(addr, content); } - public com.cryptape.cita.protocol.core.methods.request.Transaction + public com.citahub.cita.protocol.core.methods.request.Transaction decodeContent() throws InvalidProtocolBufferException { return TransactionUtil.decodeContent(content); } diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/TransactionReceipt.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/TransactionReceipt.java index 5981a509..c656281d 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/TransactionReceipt.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/TransactionReceipt.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * TransactionReceipt object used by {@link AppGetTransactionReceipt}. diff --git a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/VoidResponse.java b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/VoidResponse.java index dcfda34a..ebfdc6b3 100644 --- a/core/src/main/java/com/citahub/cita/protocol/core/methods/response/VoidResponse.java +++ b/core/src/main/java/com/citahub/cita/protocol/core/methods/response/VoidResponse.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.methods.response; +package com.citahub.cita.protocol.core.methods.response; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; /** * Null response object returned by the below methods. diff --git a/core/src/main/java/com/citahub/cita/protocol/deserializer/RawResponseDeserializer.java b/core/src/main/java/com/citahub/cita/protocol/deserializer/RawResponseDeserializer.java index e5e62dd8..5bb5d03b 100644 --- a/core/src/main/java/com/citahub/cita/protocol/deserializer/RawResponseDeserializer.java +++ b/core/src/main/java/com/citahub/cita/protocol/deserializer/RawResponseDeserializer.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.protocol.deserializer; +package com.citahub.cita.protocol.deserializer; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Scanner; -import com.cryptape.cita.protocol.core.Response; +import com.citahub.cita.protocol.core.Response; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; diff --git a/core/src/main/java/com/citahub/cita/protocol/exceptions/ClientConnectionException.java b/core/src/main/java/com/citahub/cita/protocol/exceptions/ClientConnectionException.java index c0c800df..f0cdf251 100644 --- a/core/src/main/java/com/citahub/cita/protocol/exceptions/ClientConnectionException.java +++ b/core/src/main/java/com/citahub/cita/protocol/exceptions/ClientConnectionException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.exceptions; +package com.citahub.cita.protocol.exceptions; /** * Client connection exception. diff --git a/core/src/main/java/com/citahub/cita/protocol/exceptions/TransactionException.java b/core/src/main/java/com/citahub/cita/protocol/exceptions/TransactionException.java index 519f2802..8f6353c3 100644 --- a/core/src/main/java/com/citahub/cita/protocol/exceptions/TransactionException.java +++ b/core/src/main/java/com/citahub/cita/protocol/exceptions/TransactionException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.exceptions; +package com.citahub.cita.protocol.exceptions; /** * Transaction timeout exception indicates that we have breached some threshold waiting for a diff --git a/core/src/main/java/com/citahub/cita/protocol/http/HttpService.java b/core/src/main/java/com/citahub/cita/protocol/http/HttpService.java index 29c2bbcd..8050ea12 100644 --- a/core/src/main/java/com/citahub/cita/protocol/http/HttpService.java +++ b/core/src/main/java/com/citahub/cita/protocol/http/HttpService.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.http; +package com.citahub.cita.protocol.http; import java.io.BufferedInputStream; import java.io.IOException; @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; -import com.cryptape.cita.protocol.Service; -import com.cryptape.cita.protocol.exceptions.ClientConnectionException; +import com.citahub.cita.protocol.Service; +import com.citahub.cita.protocol.exceptions.ClientConnectionException; import okhttp3.Headers; import okhttp3.MediaType; import okhttp3.OkHttpClient; diff --git a/core/src/main/java/com/citahub/cita/protocol/ipc/IOFacade.java b/core/src/main/java/com/citahub/cita/protocol/ipc/IOFacade.java index d9e3f170..50c54c2e 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ipc/IOFacade.java +++ b/core/src/main/java/com/citahub/cita/protocol/ipc/IOFacade.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; import java.io.IOException; diff --git a/core/src/main/java/com/citahub/cita/protocol/ipc/IpcService.java b/core/src/main/java/com/citahub/cita/protocol/ipc/IpcService.java index 008156f0..4356ed70 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ipc/IpcService.java +++ b/core/src/main/java/com/citahub/cita/protocol/ipc/IpcService.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import com.cryptape.cita.protocol.Service; +import com.citahub.cita.protocol.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/citahub/cita/protocol/ipc/UnixDomainSocket.java b/core/src/main/java/com/citahub/cita/protocol/ipc/UnixDomainSocket.java index 2a4fe351..256374f7 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ipc/UnixDomainSocket.java +++ b/core/src/main/java/com/citahub/cita/protocol/ipc/UnixDomainSocket.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; import java.io.IOException; import java.io.InputStreamReader; diff --git a/core/src/main/java/com/citahub/cita/protocol/ipc/UnixIpcService.java b/core/src/main/java/com/citahub/cita/protocol/ipc/UnixIpcService.java index c9ef72d3..53557d6c 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ipc/UnixIpcService.java +++ b/core/src/main/java/com/citahub/cita/protocol/ipc/UnixIpcService.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; /** * Unix domain socket implementation of our services API. diff --git a/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsIpcService.java b/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsIpcService.java index 7563a05d..c94c5d25 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsIpcService.java +++ b/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsIpcService.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; /** * Windows named pipe implementation of our services API. diff --git a/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsNamedPipe.java b/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsNamedPipe.java index 7d84ae6a..aaeccd12 100644 --- a/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsNamedPipe.java +++ b/core/src/main/java/com/citahub/cita/protocol/ipc/WindowsNamedPipe.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/core/src/main/java/com/citahub/cita/protocol/rx/CITAjRx.java b/core/src/main/java/com/citahub/cita/protocol/rx/CITAjRx.java index d9d41983..57163af0 100644 --- a/core/src/main/java/com/citahub/cita/protocol/rx/CITAjRx.java +++ b/core/src/main/java/com/citahub/cita/protocol/rx/CITAjRx.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.protocol.rx; +package com.citahub.cita.protocol.rx; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.Log; import io.reactivex.Flowable; -import com.cryptape.cita.protocol.core.methods.response.Transaction; +import com.citahub.cita.protocol.core.methods.response.Transaction; /** * The Flowables JSON-RPC client event API. diff --git a/core/src/main/java/com/citahub/cita/protocol/rx/JsonRpc2_0Rx.java b/core/src/main/java/com/citahub/cita/protocol/rx/JsonRpc2_0Rx.java index fb7fcf57..84eb929a 100644 --- a/core/src/main/java/com/citahub/cita/protocol/rx/JsonRpc2_0Rx.java +++ b/core/src/main/java/com/citahub/cita/protocol/rx/JsonRpc2_0Rx.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.rx; +package com.citahub.cita.protocol.rx; import java.io.IOException; import java.math.BigInteger; @@ -6,15 +6,15 @@ import java.util.List; import java.util.concurrent.ScheduledExecutorService; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.DefaultBlockParameterNumber; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.AppTransaction; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.utils.Flowables; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.DefaultBlockParameterNumber; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.AppTransaction; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.utils.Flowables; import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; import io.reactivex.FlowableEmitter; @@ -25,12 +25,12 @@ import io.reactivex.functions.Function; import io.reactivex.functions.Predicate; import io.reactivex.schedulers.Schedulers; -import com.cryptape.cita.protocol.core.filters.BlockFilter; -import com.cryptape.cita.protocol.core.filters.Callback; -import com.cryptape.cita.protocol.core.filters.Filter; -import com.cryptape.cita.protocol.core.filters.LogFilter; -import com.cryptape.cita.protocol.core.filters.PendingTransactionFilter; -import com.cryptape.cita.protocol.core.methods.response.Transaction; +import com.citahub.cita.protocol.core.filters.BlockFilter; +import com.citahub.cita.protocol.core.filters.Callback; +import com.citahub.cita.protocol.core.filters.Filter; +import com.citahub.cita.protocol.core.filters.LogFilter; +import com.citahub.cita.protocol.core.filters.PendingTransactionFilter; +import com.citahub.cita.protocol.core.methods.response.Transaction; import org.reactivestreams.Publisher; /** diff --git a/core/src/main/java/com/citahub/cita/protocol/system/CITASystemAddress.java b/core/src/main/java/com/citahub/cita/protocol/system/CITASystemAddress.java index 03d90fea..2673bdb9 100644 --- a/core/src/main/java/com/citahub/cita/protocol/system/CITASystemAddress.java +++ b/core/src/main/java/com/citahub/cita/protocol/system/CITASystemAddress.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.system; +package com.citahub.cita.protocol.system; public interface CITASystemAddress { String STORE_ADDR = "0xffffffffffffffffffffffffffffffffff010000"; diff --git a/core/src/main/java/com/citahub/cita/protocol/system/CITASystemContract.java b/core/src/main/java/com/citahub/cita/protocol/system/CITASystemContract.java index 02c08af7..ac78a2b6 100644 --- a/core/src/main/java/com/citahub/cita/protocol/system/CITASystemContract.java +++ b/core/src/main/java/com/citahub/cita/protocol/system/CITASystemContract.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.system; +package com.citahub.cita.protocol.system; import java.io.IOException; import java.math.BigInteger; @@ -7,26 +7,26 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.FunctionReturnDecoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppCall; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; - -import static com.cryptape.cita.protocol.system.Util.getValidUtilBlock; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.FunctionReturnDecoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppCall; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; + +import static com.citahub.cita.protocol.system.Util.getValidUtilBlock; /** * Please check system smart contracts at - * https://github.com/cryptape/cita/tree/develop/scripts/contracts/src + * https://github.com/citahub/cita/tree/develop/scripts/contracts/src */ public interface CITASystemContract { diff --git a/core/src/main/java/com/citahub/cita/protocol/system/CITAjSystemContract.java b/core/src/main/java/com/citahub/cita/protocol/system/CITAjSystemContract.java index 442d887f..aed635b8 100644 --- a/core/src/main/java/com/citahub/cita/protocol/system/CITAjSystemContract.java +++ b/core/src/main/java/com/citahub/cita/protocol/system/CITAjSystemContract.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.system; +package com.citahub.cita.protocol.system; import java.io.IOException; import java.math.BigInteger; @@ -7,28 +7,28 @@ import java.util.Collections; import java.util.List; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.generated.Bytes32; -import com.cryptape.cita.abi.datatypes.generated.Bytes4; -import com.cryptape.cita.abi.datatypes.generated.Uint64; -import com.cryptape.cita.abi.datatypes.generated.Uint8; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppCall; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.system.entities.QueryInfoResult; -import com.cryptape.cita.protocol.system.entities.QueryResourceResult; -import com.cryptape.cita.utils.Numeric; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Uint; - -import static com.cryptape.cita.protocol.system.Util.getValidUtilBlock; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.generated.Bytes32; +import com.citahub.cita.abi.datatypes.generated.Bytes4; +import com.citahub.cita.abi.datatypes.generated.Uint64; +import com.citahub.cita.abi.datatypes.generated.Uint8; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppCall; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.system.entities.QueryInfoResult; +import com.citahub.cita.protocol.system.entities.QueryResourceResult; +import com.citahub.cita.utils.Numeric; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Uint; + +import static com.citahub.cita.protocol.system.Util.getValidUtilBlock; public class CITAjSystemContract implements CITASystemContract, CITASystemAddress { private CITAj service; diff --git a/core/src/main/java/com/citahub/cita/protocol/system/Util.java b/core/src/main/java/com/citahub/cita/protocol/system/Util.java index 707981dd..d1dc4e2d 100644 --- a/core/src/main/java/com/citahub/cita/protocol/system/Util.java +++ b/core/src/main/java/com/citahub/cita/protocol/system/Util.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.protocol.system; +package com.citahub.cita.protocol.system; -import static com.cryptape.cita.abi.FunctionEncoder.buildMethodId; +import static com.citahub.cita.abi.FunctionEncoder.buildMethodId; import java.math.BigInteger; import java.util.Collections; import java.util.Random; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.utils.Numeric; /** * remove this class later. diff --git a/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryInfoResult.java b/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryInfoResult.java index 0d3f5fe7..5ae39d55 100644 --- a/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryInfoResult.java +++ b/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryInfoResult.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.system.entities; +package com.citahub.cita.protocol.system.entities; import java.util.List; diff --git a/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryResourceResult.java b/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryResourceResult.java index 2661b044..416c0ecc 100644 --- a/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryResourceResult.java +++ b/core/src/main/java/com/citahub/cita/protocol/system/entities/QueryResourceResult.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.system.entities; +package com.citahub.cita.protocol.system.entities; import java.util.List; diff --git a/core/src/main/java/com/citahub/cita/tx/ChainId.java b/core/src/main/java/com/citahub/cita/tx/ChainId.java index ed12b4cc..fd5f0de5 100644 --- a/core/src/main/java/com/citahub/cita/tx/ChainId.java +++ b/core/src/main/java/com/citahub/cita/tx/ChainId.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tx; +package com.citahub.cita.tx; /** * Ethereum chain ids as per diff --git a/core/src/main/java/com/citahub/cita/tx/Contract.java b/core/src/main/java/com/citahub/cita/tx/Contract.java index 194fab3f..da1fff6f 100644 --- a/core/src/main/java/com/citahub/cita/tx/Contract.java +++ b/core/src/main/java/com/citahub/cita/tx/Contract.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tx; +package com.citahub.cita.tx; import java.io.IOException; import java.lang.reflect.Constructor; @@ -9,26 +9,26 @@ import java.util.List; import java.util.Map; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.RemoteCall; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.response.AppCall; -import com.cryptape.cita.protocol.core.methods.response.AppGetCode; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.exceptions.ContractCallException; -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.FunctionReturnDecoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.protocol.exceptions.TransactionException; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.RemoteCall; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.response.AppCall; +import com.citahub.cita.protocol.core.methods.response.AppGetCode; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.exceptions.ContractCallException; +import com.citahub.cita.abi.EventEncoder; +import com.citahub.cita.abi.EventValues; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.FunctionReturnDecoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Event; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.utils.Numeric; /** diff --git a/core/src/main/java/com/citahub/cita/tx/ManagedTransaction.java b/core/src/main/java/com/citahub/cita/tx/ManagedTransaction.java index 18ec948b..530f237d 100644 --- a/core/src/main/java/com/citahub/cita/tx/ManagedTransaction.java +++ b/core/src/main/java/com/citahub/cita/tx/ManagedTransaction.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tx; +package com.citahub.cita.tx; import java.io.IOException; import java.math.BigInteger; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.exceptions.TransactionException; /** diff --git a/core/src/main/java/com/citahub/cita/tx/RawTransactionManager.java b/core/src/main/java/com/citahub/cita/tx/RawTransactionManager.java index 90ecd99f..4089b3c3 100644 --- a/core/src/main/java/com/citahub/cita/tx/RawTransactionManager.java +++ b/core/src/main/java/com/citahub/cita/tx/RawTransactionManager.java @@ -1,19 +1,19 @@ -package com.cryptape.cita.tx; +package com.citahub.cita.tx; import java.io.IOException; import java.math.BigInteger; import java.util.concurrent.Future; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.crypto.Signature; -import com.cryptape.cita.crypto.sm2.SM2KeyPair; -import com.cryptape.cita.crypto.sm2.SM2Keys; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionCount; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.crypto.Signature; +import com.citahub.cita.crypto.sm2.SM2KeyPair; +import com.citahub.cita.crypto.sm2.SM2Keys; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionCount; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.utils.Numeric; import io.reactivex.Flowable; public class RawTransactionManager extends TransactionManager { diff --git a/core/src/main/java/com/citahub/cita/tx/TransactionManager.java b/core/src/main/java/com/citahub/cita/tx/TransactionManager.java index 280a7c5d..134e2660 100644 --- a/core/src/main/java/com/citahub/cita/tx/TransactionManager.java +++ b/core/src/main/java/com/citahub/cita/tx/TransactionManager.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.tx; +package com.citahub.cita.tx; import java.io.IOException; import java.math.BigInteger; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.JsonRpc2_0CITAj; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.response.PollingTransactionReceiptProcessor; -import com.cryptape.cita.tx.response.TransactionReceiptProcessor; -import com.cryptape.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.JsonRpc2_0CITAj; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.response.PollingTransactionReceiptProcessor; +import com.citahub.cita.tx.response.TransactionReceiptProcessor; +import com.citahub.cita.protocol.exceptions.TransactionException; /** * Transaction manager abstraction for executing transactions with CITA client via diff --git a/core/src/main/java/com/citahub/cita/tx/exceptions/ContractCallException.java b/core/src/main/java/com/citahub/cita/tx/exceptions/ContractCallException.java index df33855b..1ec86b16 100644 --- a/core/src/main/java/com/citahub/cita/tx/exceptions/ContractCallException.java +++ b/core/src/main/java/com/citahub/cita/tx/exceptions/ContractCallException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tx.exceptions; +package com.citahub.cita.tx.exceptions; /** * Exception resulting from issues calling methods on Smart Contracts. diff --git a/core/src/main/java/com/citahub/cita/tx/response/Callback.java b/core/src/main/java/com/citahub/cita/tx/response/Callback.java index ae445d36..dbfe80bb 100644 --- a/core/src/main/java/com/citahub/cita/tx/response/Callback.java +++ b/core/src/main/java/com/citahub/cita/tx/response/Callback.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.tx.response; +package com.citahub.cita.tx.response; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; /** * Transaction receipt processor callback. diff --git a/core/src/main/java/com/citahub/cita/tx/response/EmptyTransactionReceipt.java b/core/src/main/java/com/citahub/cita/tx/response/EmptyTransactionReceipt.java index 1bc4e26a..750db916 100644 --- a/core/src/main/java/com/citahub/cita/tx/response/EmptyTransactionReceipt.java +++ b/core/src/main/java/com/citahub/cita/tx/response/EmptyTransactionReceipt.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tx.response; +package com.citahub.cita.tx.response; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; /** * An empty transaction receipt object containing only the transaction hash. This is to support the diff --git a/core/src/main/java/com/citahub/cita/tx/response/NoOpProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/NoOpProcessor.java index b0ea2291..620d42f4 100644 --- a/core/src/main/java/com/citahub/cita/tx/response/NoOpProcessor.java +++ b/core/src/main/java/com/citahub/cita/tx/response/NoOpProcessor.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tx.response; +package com.citahub.cita.tx.response; import java.io.IOException; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.exceptions.TransactionException; /** * Return an {@link EmptyTransactionReceipt} receipt back to callers containing only the diff --git a/core/src/main/java/com/citahub/cita/tx/response/PollingTransactionReceiptProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/PollingTransactionReceiptProcessor.java index 1d83aff6..c554bdc1 100644 --- a/core/src/main/java/com/citahub/cita/tx/response/PollingTransactionReceiptProcessor.java +++ b/core/src/main/java/com/citahub/cita/tx/response/PollingTransactionReceiptProcessor.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tx.response; +package com.citahub.cita.tx.response; import java.io.IOException; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.exceptions.TransactionException; /** * With each provided transaction hash, poll until we obtain a transaction receipt. diff --git a/core/src/main/java/com/citahub/cita/tx/response/QueuingTransactionReceiptProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/QueuingTransactionReceiptProcessor.java index 2e51fbe7..846bbe11 100644 --- a/core/src/main/java/com/citahub/cita/tx/response/QueuingTransactionReceiptProcessor.java +++ b/core/src/main/java/com/citahub/cita/tx/response/QueuingTransactionReceiptProcessor.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tx.response; +package com.citahub.cita.tx.response; import java.io.IOException; import java.util.concurrent.BlockingQueue; @@ -6,10 +6,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.utils.Async; -import com.cryptape.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.utils.Async; +import com.citahub.cita.protocol.exceptions.TransactionException; /** * Transaction receipt processor that uses a single thread to query for transaction receipts. diff --git a/core/src/main/java/com/citahub/cita/tx/response/TransactionReceiptProcessor.java b/core/src/main/java/com/citahub/cita/tx/response/TransactionReceiptProcessor.java index ab287a75..af2cff9f 100644 --- a/core/src/main/java/com/citahub/cita/tx/response/TransactionReceiptProcessor.java +++ b/core/src/main/java/com/citahub/cita/tx/response/TransactionReceiptProcessor.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tx.response; +package com.citahub.cita.tx.response; import java.io.IOException; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; -import com.cryptape.cita.protocol.exceptions.TransactionException; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.exceptions.TransactionException; /** * Abstraction for managing how we wait for transaction receipts to be generated on the network. diff --git a/core/src/main/java/com/citahub/cita/utils/Async.java b/core/src/main/java/com/citahub/cita/utils/Async.java index 0cbdf969..fe406e01 100644 --- a/core/src/main/java/com/citahub/cita/utils/Async.java +++ b/core/src/main/java/com/citahub/cita/utils/Async.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; diff --git a/core/src/main/java/com/citahub/cita/utils/CallCmd.java b/core/src/main/java/com/citahub/cita/utils/CallCmd.java index 9eccc2ce..2da12dc4 100644 --- a/core/src/main/java/com/citahub/cita/utils/CallCmd.java +++ b/core/src/main/java/com/citahub/cita/utils/CallCmd.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.io.BufferedReader; import java.io.File; diff --git a/core/src/main/java/com/citahub/cita/utils/Collection.java b/core/src/main/java/com/citahub/cita/utils/Collection.java index 1ef6d9b0..8ec5d492 100644 --- a/core/src/main/java/com/citahub/cita/utils/Collection.java +++ b/core/src/main/java/com/citahub/cita/utils/Collection.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/com/citahub/cita/utils/Files.java b/core/src/main/java/com/citahub/cita/utils/Files.java index 8665afe2..2f997660 100644 --- a/core/src/main/java/com/citahub/cita/utils/Files.java +++ b/core/src/main/java/com/citahub/cita/utils/Files.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.io.File; import java.io.FileInputStream; diff --git a/core/src/main/java/com/citahub/cita/utils/Flowables.java b/core/src/main/java/com/citahub/cita/utils/Flowables.java index ca50113b..56b36922 100644 --- a/core/src/main/java/com/citahub/cita/utils/Flowables.java +++ b/core/src/main/java/com/citahub/cita/utils/Flowables.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.math.BigInteger; diff --git a/core/src/main/java/com/citahub/cita/utils/TransactionUtil.java b/core/src/main/java/com/citahub/cita/utils/TransactionUtil.java index b291a5f3..be065035 100644 --- a/core/src/main/java/com/citahub/cita/utils/TransactionUtil.java +++ b/core/src/main/java/com/citahub/cita/utils/TransactionUtil.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; -import static com.cryptape.cita.utils.Numeric.prependHexPrefix; +import static com.citahub.cita.utils.Numeric.prependHexPrefix; import java.math.BigInteger; import java.security.SignatureException; -import com.cryptape.cita.crypto.Keys; -import com.cryptape.cita.crypto.Sign; -import com.cryptape.cita.protobuf.Blockchain; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.crypto.Keys; +import com.citahub.cita.crypto.Sign; +import com.citahub.cita.protobuf.Blockchain; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.core.methods.request.Transaction; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/core/src/main/java/com/citahub/cita/utils/TypedAbi.java b/core/src/main/java/com/citahub/cita/utils/TypedAbi.java index 169cfe8a..1d307996 100644 --- a/core/src/main/java/com/citahub/cita/utils/TypedAbi.java +++ b/core/src/main/java/com/citahub/cita/utils/TypedAbi.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -7,15 +7,15 @@ import java.util.ArrayList; import java.util.List; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Bool; -import com.cryptape.cita.abi.datatypes.DynamicArray; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.StaticArray; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.abi.datatypes.generated.AbiTypes; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Bool; +import com.citahub.cita.abi.datatypes.DynamicArray; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.StaticArray; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.generated.AbiTypes; public class TypedAbi { public static class InvalidAbiType extends Exception { @@ -54,7 +54,7 @@ public static ArgRetType newStaticArray(String length, Class baseType) { Class staticArray; try { staticArray = Class.forName( - "com.cryptape.cita.abi.datatypes.generated.StaticArray" + length); + "com.citahub.cita.abi.datatypes.generated.StaticArray" + length); } catch (ClassNotFoundException e) { staticArray = StaticArray.class; } @@ -97,10 +97,10 @@ private Type fromSingleJavaValue(Object value) } else if (typeName.equals("Utf8String")) { ctor = Utf8String.class.getDeclaredConstructor(String.class); } else if (typeName.startsWith("Uint") || typeName.startsWith("Int")) { - Class c = Class.forName("com.cryptape.cita.abi.datatypes.generated." + typeName); + Class c = Class.forName("com.citahub.cita.abi.datatypes.generated." + typeName); ctor = c.getDeclaredConstructor(BigInteger.class); } else if (typeName.startsWith("Bytes")) { - Class c = Class.forName("com.cryptape.cita.abi.datatypes.generated." + typeName); + Class c = Class.forName("com.citahub.cita.abi.datatypes.generated." + typeName); ctor = c.getDeclaredConstructor(byte[].class); } else { throw new InvalidAbiType(typeName); diff --git a/core/src/main/java/com/citahub/cita/utils/Version.java b/core/src/main/java/com/citahub/cita/utils/Version.java index 20493c05..9fee7d15 100644 --- a/core/src/main/java/com/citahub/cita/utils/Version.java +++ b/core/src/main/java/com/citahub/cita/utils/Version.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.io.IOException; import java.util.Properties; diff --git a/core/src/test/java/com/citahub/cita/TempFileProvider.java b/core/src/test/java/com/citahub/cita/TempFileProvider.java index a4ac5c3f..62a1ff99 100644 --- a/core/src/test/java/com/citahub/cita/TempFileProvider.java +++ b/core/src/test/java/com/citahub/cita/TempFileProvider.java @@ -1,4 +1,4 @@ -package com.cryptape.cita; +package com.citahub.cita; import java.io.File; import java.nio.file.Files; diff --git a/core/src/test/java/com/citahub/cita/contracts/token/ERC20BasicInterface.java b/core/src/test/java/com/citahub/cita/contracts/token/ERC20BasicInterface.java index 85758a85..e6867d27 100644 --- a/core/src/test/java/com/citahub/cita/contracts/token/ERC20BasicInterface.java +++ b/core/src/test/java/com/citahub/cita/contracts/token/ERC20BasicInterface.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.contracts.token; +package com.citahub.cita.contracts.token; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import io.reactivex.Flowable; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.RemoteCall; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.RemoteCall; /** * Describes the Ethereum "Basic" subset of the ERC-20 token standard. diff --git a/core/src/test/java/com/citahub/cita/contracts/token/ERC20Interface.java b/core/src/test/java/com/citahub/cita/contracts/token/ERC20Interface.java index 6c968c7a..c6856042 100644 --- a/core/src/test/java/com/citahub/cita/contracts/token/ERC20Interface.java +++ b/core/src/test/java/com/citahub/cita/contracts/token/ERC20Interface.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.contracts.token; +package com.citahub.cita.contracts.token; import java.math.BigInteger; import java.util.List; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import io.reactivex.Flowable; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.RemoteCall; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.RemoteCall; /** * The Ethereum ERC-20 token standard. diff --git a/core/src/test/java/com/citahub/cita/protocol/RequestTester.java b/core/src/test/java/com/citahub/cita/protocol/RequestTester.java index d7e44411..80e11357 100644 --- a/core/src/test/java/com/citahub/cita/protocol/RequestTester.java +++ b/core/src/test/java/com/citahub/cita/protocol/RequestTester.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol; +package com.citahub.cita.protocol; import java.io.IOException; @@ -10,7 +10,7 @@ import okio.Buffer; import org.junit.Before; -import com.cryptape.cita.protocol.http.HttpService; +import com.citahub.cita.protocol.http.HttpService; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/core/src/test/java/com/citahub/cita/protocol/ResponseTester.java b/core/src/test/java/com/citahub/cita/protocol/ResponseTester.java index f394aeea..0c851447 100644 --- a/core/src/test/java/com/citahub/cita/protocol/ResponseTester.java +++ b/core/src/test/java/com/citahub/cita/protocol/ResponseTester.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol; +package com.citahub.cita.protocol; import java.io.IOException; @@ -8,12 +8,12 @@ import okhttp3.ResponseBody; import org.junit.Before; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.Response; -import com.cryptape.cita.protocol.http.HttpService; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.Response; +import com.citahub.cita.protocol.http.HttpService; import static org.junit.Assert.fail; -import static com.cryptape.cita.protocol.http.HttpService.JSON_MEDIA_TYPE; +import static com.citahub.cita.protocol.http.HttpService.JSON_MEDIA_TYPE; /** * Protocol Response tests. diff --git a/core/src/test/java/com/citahub/cita/protocol/admin/RequestTest.java b/core/src/test/java/com/citahub/cita/protocol/admin/RequestTest.java index b266f8de..a51180bc 100644 --- a/core/src/test/java/com/citahub/cita/protocol/admin/RequestTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/admin/RequestTest.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.protocol.admin; +package com.citahub.cita.protocol.admin; import java.math.BigInteger; import org.junit.Ignore; import org.junit.Test; -import com.cryptape.cita.protocol.RequestTester; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.http.HttpService; +import com.citahub.cita.protocol.RequestTester; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.http.HttpService; /* * Method tested in the file are used to do wallet management in console for ethereum. * personal_xx rpc requests are not supported in CITA, so test case in the class is not required. diff --git a/core/src/test/java/com/citahub/cita/protocol/admin/ResponseTest.java b/core/src/test/java/com/citahub/cita/protocol/admin/ResponseTest.java index a9675732..09be81a1 100644 --- a/core/src/test/java/com/citahub/cita/protocol/admin/ResponseTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/admin/ResponseTest.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.protocol.admin; +package com.citahub.cita.protocol.admin; import java.util.Arrays; import org.junit.Test; -import com.cryptape.cita.protocol.ResponseTester; -import com.cryptape.cita.protocol.admin.methods.response.BooleanResponse; -import com.cryptape.cita.protocol.admin.methods.response.NewAccountIdentifier; -import com.cryptape.cita.protocol.admin.methods.response.PersonalListAccounts; -import com.cryptape.cita.protocol.admin.methods.response.PersonalSign; -import com.cryptape.cita.protocol.admin.methods.response.PersonalUnlockAccount; +import com.citahub.cita.protocol.ResponseTester; +import com.citahub.cita.protocol.admin.methods.response.BooleanResponse; +import com.citahub.cita.protocol.admin.methods.response.NewAccountIdentifier; +import com.citahub.cita.protocol.admin.methods.response.PersonalListAccounts; +import com.citahub.cita.protocol.admin.methods.response.PersonalSign; +import com.citahub.cita.protocol.admin.methods.response.PersonalUnlockAccount; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/core/src/test/java/com/citahub/cita/protocol/core/RawResponseTest.java b/core/src/test/java/com/citahub/cita/protocol/core/RawResponseTest.java index 61b29aa5..9b3a2dd3 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/RawResponseTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/RawResponseTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.CITAClientVersion; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.CITAClientVersion; import org.junit.Test; -import com.cryptape.cita.protocol.ResponseTester; +import com.citahub.cita.protocol.ResponseTester; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/core/src/test/java/com/citahub/cita/protocol/core/RequestTest.java b/core/src/test/java/com/citahub/cita/protocol/core/RequestTest.java index ed6ac748..706847bb 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/RequestTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/RequestTest.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import org.junit.Test; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.RequestTester; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.http.HttpService; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.RequestTester; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.http.HttpService; +import com.citahub.cita.utils.Numeric; public class RequestTest extends RequestTester { diff --git a/core/src/test/java/com/citahub/cita/protocol/core/ResponseTest.java b/core/src/test/java/com/citahub/cita/protocol/core/ResponseTest.java index 212bcbe2..319f4c27 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/ResponseTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/ResponseTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core; +package com.citahub.cita.protocol.core; import java.io.IOException; import java.math.BigInteger; @@ -10,28 +10,28 @@ import org.junit.Ignore; import org.junit.Test; -import com.cryptape.cita.protocol.ResponseTester; -import com.cryptape.cita.protocol.core.methods.response.AppAccounts; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.AppBlockNumber; -import com.cryptape.cita.protocol.core.methods.response.AppCall; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppGetBalance; -import com.cryptape.cita.protocol.core.methods.response.AppGetCode; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionCount; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.core.methods.response.AppSendRawTransaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.AppSign; -import com.cryptape.cita.protocol.core.methods.response.AppTransaction; -import com.cryptape.cita.protocol.core.methods.response.AppUninstallFilter; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.NetPeerCount; -import com.cryptape.cita.protocol.core.methods.response.Transaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.CITAClientVersion; -import com.cryptape.cita.protocol.core.methods.response.CITASha3; +import com.citahub.cita.protocol.ResponseTester; +import com.citahub.cita.protocol.core.methods.response.AppAccounts; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.AppBlockNumber; +import com.citahub.cita.protocol.core.methods.response.AppCall; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppGetBalance; +import com.citahub.cita.protocol.core.methods.response.AppGetCode; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionCount; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppSendRawTransaction; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.AppSign; +import com.citahub.cita.protocol.core.methods.response.AppTransaction; +import com.citahub.cita.protocol.core.methods.response.AppUninstallFilter; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.NetPeerCount; +import com.citahub.cita.protocol.core.methods.response.Transaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.CITAClientVersion; +import com.citahub.cita.protocol.core.methods.response.CITASha3; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/core/src/test/java/com/citahub/cita/protocol/core/filters/BlockFilterTest.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/BlockFilterTest.java index 2ec5b078..4c874922 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/filters/BlockFilterTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/filters/BlockFilterTest.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; -import com.cryptape.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppLog; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/core/src/test/java/com/citahub/cita/protocol/core/filters/FilterTester.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/FilterTester.java index 2fae2f0f..4f46d3af 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/filters/FilterTester.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/filters/FilterTester.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; import java.util.ArrayList; import java.util.Collections; @@ -10,18 +10,18 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.core.methods.response.AppUninstallFilter; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppUninstallFilter; import com.fasterxml.jackson.databind.ObjectMapper; import io.reactivex.Flowable; import io.reactivex.disposables.Disposable; import org.junit.Before; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.CITAjService; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.CITAjService; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.protocol.core.Request; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.protocol.core.Request; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/core/src/test/java/com/citahub/cita/protocol/core/filters/LogFilterTest.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/LogFilterTest.java index b033527a..363df624 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/filters/LogFilterTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/filters/LogFilterTest.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; -import com.cryptape.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppLog; import org.junit.Test; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.request.AppFilter; public class LogFilterTest extends FilterTester { diff --git a/core/src/test/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilterTest.java b/core/src/test/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilterTest.java index 44ff8eb9..d43eea7b 100644 --- a/core/src/test/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilterTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/core/filters/PendingTransactionFilterTest.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.protocol.core.filters; +package com.citahub.cita.protocol.core.filters; -import com.cryptape.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppLog; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/core/src/test/java/com/citahub/cita/protocol/http/HttpServiceTest.java b/core/src/test/java/com/citahub/cita/protocol/http/HttpServiceTest.java index 67db7911..63ffc03b 100644 --- a/core/src/test/java/com/citahub/cita/protocol/http/HttpServiceTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/http/HttpServiceTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.http; +package com.citahub.cita.protocol.http; import java.util.HashMap; diff --git a/core/src/test/java/com/citahub/cita/protocol/ipc/IpcServiceTest.java b/core/src/test/java/com/citahub/cita/protocol/ipc/IpcServiceTest.java index 4f402b39..82715bac 100644 --- a/core/src/test/java/com/citahub/cita/protocol/ipc/IpcServiceTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/ipc/IpcServiceTest.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; import java.io.IOException; -import com.cryptape.cita.protocol.core.methods.response.CITAClientVersion; +import com.citahub.cita.protocol.core.methods.response.CITAClientVersion; import org.junit.Before; import org.junit.Test; -import com.cryptape.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.Request; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/com/citahub/cita/protocol/ipc/UnixDomainSocketTest.java b/core/src/test/java/com/citahub/cita/protocol/ipc/UnixDomainSocketTest.java index 6a40ca16..4bea6a7d 100644 --- a/core/src/test/java/com/citahub/cita/protocol/ipc/UnixDomainSocketTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/ipc/UnixDomainSocketTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.ipc; +package com.citahub.cita.protocol.ipc; import java.io.IOException; import java.io.InputStreamReader; diff --git a/core/src/test/java/com/citahub/cita/protocol/rx/JsonRpc2_0RxTest.java b/core/src/test/java/com/citahub/cita/protocol/rx/JsonRpc2_0RxTest.java index 5f089053..b5198d9a 100644 --- a/core/src/test/java/com/citahub/cita/protocol/rx/JsonRpc2_0RxTest.java +++ b/core/src/test/java/com/citahub/cita/protocol/rx/JsonRpc2_0RxTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protocol.rx; +package com.citahub.cita.protocol.rx; import java.math.BigInteger; import java.util.ArrayList; @@ -8,10 +8,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.core.methods.response.AppUninstallFilter; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppUninstallFilter; import com.fasterxml.jackson.databind.ObjectMapper; import io.reactivex.Flowable; import io.reactivex.disposables.Disposable; @@ -19,12 +19,12 @@ import org.junit.Test; import org.mockito.stubbing.OngoingStubbing; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.CITAjService; -import com.cryptape.cita.protocol.ObjectMapperFactory; -import com.cryptape.cita.protocol.core.DefaultBlockParameterNumber; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.CITAjService; +import com.citahub.cita.protocol.ObjectMapperFactory; +import com.citahub.cita.protocol.core.DefaultBlockParameterNumber; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.utils.Numeric; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/core/src/test/java/com/citahub/cita/tx/ManagedTransactionTester.java b/core/src/test/java/com/citahub/cita/tx/ManagedTransactionTester.java index 14280e73..fc2c3fa6 100644 --- a/core/src/test/java/com/citahub/cita/tx/ManagedTransactionTester.java +++ b/core/src/test/java/com/citahub/cita/tx/ManagedTransactionTester.java @@ -1,17 +1,17 @@ -package com.cryptape.cita.tx; +package com.citahub.cita.tx; import java.io.IOException; -import com.cryptape.cita.crypto.SampleKeys; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionCount; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.crypto.SampleKeys; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionCount; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import org.junit.Before; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/com/citahub/cita/utils/AsyncTest.java b/core/src/test/java/com/citahub/cita/utils/AsyncTest.java index 4afbeac9..3b333765 100644 --- a/core/src/test/java/com/citahub/cita/utils/AsyncTest.java +++ b/core/src/test/java/com/citahub/cita/utils/AsyncTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.concurrent.ExecutionException; diff --git a/core/src/test/java/com/citahub/cita/utils/CollectionTest.java b/core/src/test/java/com/citahub/cita/utils/CollectionTest.java index c23d4dec..14e34f70 100644 --- a/core/src/test/java/com/citahub/cita/utils/CollectionTest.java +++ b/core/src/test/java/com/citahub/cita/utils/CollectionTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.Arrays; import java.util.List; @@ -7,11 +7,11 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import static com.cryptape.cita.utils.Collection.EMPTY_STRING_ARRAY; -import static com.cryptape.cita.utils.Collection.Function; -import static com.cryptape.cita.utils.Collection.create; -import static com.cryptape.cita.utils.Collection.join; -import static com.cryptape.cita.utils.Collection.tail; +import static com.citahub.cita.utils.Collection.EMPTY_STRING_ARRAY; +import static com.citahub.cita.utils.Collection.Function; +import static com.citahub.cita.utils.Collection.create; +import static com.citahub.cita.utils.Collection.join; +import static com.citahub.cita.utils.Collection.tail; public class CollectionTest { diff --git a/core/src/test/java/com/citahub/cita/utils/FlowablesTests.java b/core/src/test/java/com/citahub/cita/utils/FlowablesTests.java index a7faff85..54d21b84 100644 --- a/core/src/test/java/com/citahub/cita/utils/FlowablesTests.java +++ b/core/src/test/java/com/citahub/cita/utils/FlowablesTests.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.math.BigInteger; import java.util.ArrayList; diff --git a/core/src/test/java/com/citahub/cita/utils/TransactionUtilTest.java b/core/src/test/java/com/citahub/cita/utils/TransactionUtilTest.java index 2ddfa469..7da56460 100644 --- a/core/src/test/java/com/citahub/cita/utils/TransactionUtilTest.java +++ b/core/src/test/java/com/citahub/cita/utils/TransactionUtilTest.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; -import com.cryptape.cita.protobuf.Blockchain; +import com.citahub.cita.protobuf.Blockchain; import com.google.gson.Gson; import org.junit.Test; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/CipherException.java b/crypto/src/main/java/com/citahub/cita/crypto/CipherException.java index 1209c0c8..1179e323 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/CipherException.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/CipherException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; /** * Cipher exception wrapper. diff --git a/crypto/src/main/java/com/citahub/cita/crypto/ContractUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/ContractUtils.java index 5d026556..b0977232 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/ContractUtils.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/ContractUtils.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.cryptape.cita.rlp.RlpEncoder; -import com.cryptape.cita.rlp.RlpList; -import com.cryptape.cita.rlp.RlpString; -import com.cryptape.cita.rlp.RlpType; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.rlp.RlpEncoder; +import com.citahub.cita.rlp.RlpList; +import com.citahub.cita.rlp.RlpString; +import com.citahub.cita.rlp.RlpType; +import com.citahub.cita.utils.Numeric; /** * Smart Contract utility functions. diff --git a/crypto/src/main/java/com/citahub/cita/crypto/Credentials.java b/crypto/src/main/java/com/citahub/cita/crypto/Credentials.java index 91b02cb0..e915d6d3 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/Credentials.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/Credentials.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * Credentials wrapper. diff --git a/crypto/src/main/java/com/citahub/cita/crypto/ECDSASignature.java b/crypto/src/main/java/com/citahub/cita/crypto/ECDSASignature.java index be352c0c..22d58cd8 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/ECDSASignature.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/ECDSASignature.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/ECKeyPair.java b/crypto/src/main/java/com/citahub/cita/crypto/ECKeyPair.java index e5efa375..c932704e 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/ECKeyPair.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/ECKeyPair.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.security.KeyPair; @@ -11,7 +11,7 @@ import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey; import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * Elliptic Curve SECP-256k1 generated key pair. diff --git a/crypto/src/main/java/com/citahub/cita/crypto/Keys.java b/crypto/src/main/java/com/citahub/cita/crypto/Keys.java index c5898c80..5e10bb9c 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/Keys.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/Keys.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; @@ -12,10 +12,10 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; -import com.cryptape.cita.utils.Numeric; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.utils.Numeric; +import com.citahub.cita.utils.Strings; -import static com.cryptape.cita.crypto.SecureRandomUtils.secureRandom; +import static com.citahub.cita.crypto.SecureRandomUtils.secureRandom; /** diff --git a/crypto/src/main/java/com/citahub/cita/crypto/LinuxSecureRandom.java b/crypto/src/main/java/com/citahub/cita/crypto/LinuxSecureRandom.java index 4931966a..92f79ae3 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/LinuxSecureRandom.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/LinuxSecureRandom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.io.DataInputStream; import java.io.File; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/RawTransaction.java b/crypto/src/main/java/com/citahub/cita/crypto/RawTransaction.java index db4cbc7f..29e921ea 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/RawTransaction.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/RawTransaction.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * Transaction class used for signing transactions locally.
diff --git a/crypto/src/main/java/com/citahub/cita/crypto/SecureRandomUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/SecureRandomUtils.java index 3821d5f3..a5766377 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/SecureRandomUtils.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/SecureRandomUtils.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.security.SecureRandom; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/Sign.java b/crypto/src/main/java/com/citahub/cita/crypto/Sign.java index e4e72878..b3adcc01 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/Sign.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/Sign.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.security.SignatureException; @@ -13,9 +13,9 @@ import org.bouncycastle.math.ec.FixedPointCombMultiplier; import org.bouncycastle.math.ec.custom.sec.SecP256K1Curve; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; -import static com.cryptape.cita.utils.Assertions.verifyPrecondition; +import static com.citahub.cita.utils.Assertions.verifyPrecondition; /** *

Transaction signing logic.

diff --git a/crypto/src/main/java/com/citahub/cita/crypto/Signature.java b/crypto/src/main/java/com/citahub/cita/crypto/Signature.java index 4ab04da8..37021f5e 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/Signature.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/Signature.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; public abstract class Signature { diff --git a/crypto/src/main/java/com/citahub/cita/crypto/TransactionEncoder.java b/crypto/src/main/java/com/citahub/cita/crypto/TransactionEncoder.java index a3f6f9f9..7b8f630b 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/TransactionEncoder.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/TransactionEncoder.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.util.ArrayList; import java.util.List; -import com.cryptape.cita.rlp.RlpEncoder; -import com.cryptape.cita.rlp.RlpList; -import com.cryptape.cita.rlp.RlpString; -import com.cryptape.cita.rlp.RlpType; -import com.cryptape.cita.utils.Bytes; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.rlp.RlpEncoder; +import com.citahub.cita.rlp.RlpList; +import com.citahub.cita.rlp.RlpString; +import com.citahub.cita.rlp.RlpType; +import com.citahub.cita.utils.Bytes; +import com.citahub.cita.utils.Numeric; /** * Create RLP encoded transaction, implementation as per p4 of the diff --git a/crypto/src/main/java/com/citahub/cita/crypto/TransactionUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/TransactionUtils.java index 0f84fac8..d1169ed2 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/TransactionUtils.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/TransactionUtils.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * Transaction utility functions. diff --git a/crypto/src/main/java/com/citahub/cita/crypto/Wallet.java b/crypto/src/main/java/com/citahub/cita/crypto/Wallet.java index b356f78e..dc34968f 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/Wallet.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/Wallet.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -17,10 +17,10 @@ import org.bouncycastle.crypto.generators.SCrypt; import org.bouncycastle.crypto.params.KeyParameter; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import static java.nio.charset.StandardCharsets.UTF_8; -import static com.cryptape.cita.crypto.SecureRandomUtils.secureRandom; +import static com.citahub.cita.crypto.SecureRandomUtils.secureRandom; /** *

Ethereum wallet file management. For reference, refer to diff --git a/crypto/src/main/java/com/citahub/cita/crypto/WalletFile.java b/crypto/src/main/java/com/citahub/cita/crypto/WalletFile.java index e18c30ef..f47cea09 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/WalletFile.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/WalletFile.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.io.IOException; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/WalletUtils.java b/crypto/src/main/java/com/citahub/cita/crypto/WalletUtils.java index 9b79d63c..7b3b1cce 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/WalletUtils.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/WalletUtils.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.io.File; import java.io.IOException; @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * Utility functions for working with Wallet files. diff --git a/crypto/src/main/java/com/citahub/cita/crypto/sm2/Params.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/Params.java index 1e66dcc3..930da5ea 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/sm2/Params.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/sm2/Params.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto.sm2; +package com.citahub.cita.crypto.sm2; import java.math.BigInteger; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2.java index bf1a424f..f9df355b 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto.sm2; +package com.citahub.cita.crypto.sm2; import java.io.ByteArrayOutputStream; import java.io.File; @@ -16,11 +16,11 @@ import org.bouncycastle.crypto.params.ECDomainParameters; import org.bouncycastle.math.ec.ECCurve; import org.bouncycastle.math.ec.ECPoint; -import com.cryptape.cita.utils.HexUtil; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.HexUtil; +import com.citahub.cita.utils.Numeric; -import static com.cryptape.cita.crypto.sm2.SM2.Signature.fillBytes32; -import static com.cryptape.cita.crypto.sm2.SM2.Signature.fillStr64; +import static com.citahub.cita.crypto.sm2.SM2.Signature.fillBytes32; +import static com.citahub.cita.crypto.sm2.SM2.Signature.fillStr64; public class SM2 { private static BigInteger n = new BigInteger( diff --git a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2KeyPair.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2KeyPair.java index 71dd5331..b8bd2806 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2KeyPair.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2KeyPair.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto.sm2; +package com.citahub.cita.crypto.sm2; import java.math.BigInteger; diff --git a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2Keys.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2Keys.java index 345041f4..68a372e1 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2Keys.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM2Keys.java @@ -1,12 +1,12 @@ -package com.cryptape.cita.crypto.sm2; +package com.citahub.cita.crypto.sm2; import java.io.IOException; import java.math.BigInteger; import org.bouncycastle.math.ec.ECPoint; -import com.cryptape.cita.utils.HexUtil; -import com.cryptape.cita.utils.Numeric; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.utils.HexUtil; +import com.citahub.cita.utils.Numeric; +import com.citahub.cita.utils.Strings; public class SM2Keys { diff --git a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM3.java b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM3.java index dde8de9d..85e08c2c 100644 --- a/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM3.java +++ b/crypto/src/main/java/com/citahub/cita/crypto/sm2/SM3.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto.sm2; +package com.citahub.cita.crypto.sm2; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/crypto/src/test/java/com/citahub/cita/crypto/ContractUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/ContractUtilsTest.java index 335ba04b..5f4db30d 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/ContractUtilsTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/ContractUtilsTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; @@ -6,7 +6,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static com.cryptape.cita.crypto.ContractUtils.generateContractAddress; +import static com.citahub.cita.crypto.ContractUtils.generateContractAddress; public class ContractUtilsTest { diff --git a/crypto/src/test/java/com/citahub/cita/crypto/CredentialsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/CredentialsTest.java index 4bea14b4..8ff80a87 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/CredentialsTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/CredentialsTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import org.junit.Test; diff --git a/crypto/src/test/java/com/citahub/cita/crypto/KeysTest.java b/crypto/src/test/java/com/citahub/cita/crypto/KeysTest.java index 5908d395..d47a5103 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/KeysTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/KeysTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.security.KeyPair; @@ -8,8 +8,8 @@ import org.junit.Test; -import com.cryptape.cita.utils.Numeric; -import com.cryptape.cita.utils.Strings; +import com.citahub.cita.utils.Numeric; +import com.citahub.cita.utils.Strings; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -24,7 +24,7 @@ public class KeysTest { static { byte[] privateKey = Numeric.hexStringToByteArray(SampleKeys.PRIVATE_KEY_STRING); - byte[] publicKey = Numeric.hexStringToByteArray(SampleKeys.PUBLIC_KEY_STRING); + byte[] publicKey = Numeric.hexStringToByteArray(com.citahub.cita.crypto.SampleKeys.PUBLIC_KEY_STRING); ENCODED = Arrays.copyOf(privateKey, privateKey.length + publicKey.length); System.arraycopy(publicKey, 0, ENCODED, privateKey.length, publicKey.length); } diff --git a/crypto/src/test/java/com/citahub/cita/crypto/SampleKeys.java b/crypto/src/test/java/com/citahub/cita/crypto/SampleKeys.java index 35cdb94c..788a24fb 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/SampleKeys.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/SampleKeys.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; /** * Keys generated for unit testing purposes. diff --git a/crypto/src/test/java/com/citahub/cita/crypto/SecureRandomUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/SecureRandomUtilsTest.java index 1074c45a..45de80dd 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/SecureRandomUtilsTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/SecureRandomUtilsTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import org.junit.Test; import static org.junit.Assert.assertFalse; -import static com.cryptape.cita.crypto.SecureRandomUtils.isAndroidRuntime; -import static com.cryptape.cita.crypto.SecureRandomUtils.secureRandom; +import static com.citahub.cita.crypto.SecureRandomUtils.isAndroidRuntime; +import static com.citahub.cita.crypto.SecureRandomUtils.secureRandom; public class SecureRandomUtilsTest { diff --git a/crypto/src/test/java/com/citahub/cita/crypto/SignTest.java b/crypto/src/test/java/com/citahub/cita/crypto/SignTest.java index 8c9ceb69..ac32c6c0 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/SignTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/SignTest.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.security.SignatureException; import org.junit.Test; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/crypto/src/test/java/com/citahub/cita/crypto/TransactionEncoderTest.java b/crypto/src/test/java/com/citahub/cita/crypto/TransactionEncoderTest.java index e3a8becf..d20aa53c 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/TransactionEncoderTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/TransactionEncoderTest.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.math.BigInteger; import java.util.List; import org.junit.Test; -import com.cryptape.cita.rlp.RlpString; -import com.cryptape.cita.rlp.RlpType; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.rlp.RlpString; +import com.citahub.cita.rlp.RlpType; +import com.citahub.cita.utils.Numeric; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/crypto/src/test/java/com/citahub/cita/crypto/TransactionUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/TransactionUtilsTest.java index 8f07dc63..9ee53255 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/TransactionUtilsTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/TransactionUtilsTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import org.junit.Test; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import static com.cryptape.cita.crypto.TransactionUtils.generateTransactionHashHexEncoded; +import static com.citahub.cita.crypto.TransactionUtils.generateTransactionHashHexEncoded; public class TransactionUtilsTest { diff --git a/crypto/src/test/java/com/citahub/cita/crypto/WalletTest.java b/crypto/src/test/java/com/citahub/cita/crypto/WalletTest.java index 5c88be3f..6034d2f8 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/WalletTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/WalletTest.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.io.IOException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/crypto/src/test/java/com/citahub/cita/crypto/WalletUtilsTest.java b/crypto/src/test/java/com/citahub/cita/crypto/WalletUtilsTest.java index e7cd8232..a985bf25 100644 --- a/crypto/src/test/java/com/citahub/cita/crypto/WalletUtilsTest.java +++ b/crypto/src/test/java/com/citahub/cita/crypto/WalletUtilsTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.io.File; import java.nio.file.Files; @@ -8,17 +8,17 @@ import org.junit.Ignore; import org.junit.Test; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static com.cryptape.cita.crypto.SampleKeys.CREDENTIALS; -import static com.cryptape.cita.crypto.SampleKeys.KEY_PAIR; -import static com.cryptape.cita.crypto.SampleKeys.PASSWORD; -import static com.cryptape.cita.crypto.WalletUtils.isValidAddress; -import static com.cryptape.cita.crypto.WalletUtils.isValidPrivateKey; +import static com.citahub.cita.crypto.SampleKeys.CREDENTIALS; +import static com.citahub.cita.crypto.SampleKeys.KEY_PAIR; +import static com.citahub.cita.crypto.SampleKeys.PASSWORD; +import static com.citahub.cita.crypto.WalletUtils.isValidAddress; +import static com.citahub.cita.crypto.WalletUtils.isValidPrivateKey; public class WalletUtilsTest { diff --git a/docs/jsonrpc.md b/docs/jsonrpc.md index c36998b5..b83f66cd 100644 --- a/docs/jsonrpc.md +++ b/docs/jsonrpc.md @@ -417,7 +417,7 @@ blockFitlerObservable.subscribe(block -> { **方法名** -`Request appNewFilter(com.cryptape.cita.protocol.core.methods.request.AppFilter appFilter)` +`Request appNewFilter(com.citahub.cita.protocol.core.methods.request.AppFilter appFilter)` 创建一个新的Event过滤器以用来监听合约中的Event。 @@ -433,7 +433,7 @@ Request ``` CITAj service = CITAj.build(new HttpService("http://127.0.0.1")); -com.cryptape.cita.protocol.core.methods.request.AppFilter appFilter = new AppFilter(fromBlock, toBlock, addresses); +com.citahub.cita.protocol.core.methods.request.AppFilter appFilter = new AppFilter(fromBlock, toBlock, addresses); AppFilter appFilter = service.appNewFilter(txHash).send(); BigInteger filterId = appFilter.getFilterId(); ``` diff --git a/protobuf/src/main/java/com/citahub/cita/protobuf/Blockchain.java b/protobuf/src/main/java/com/citahub/cita/protobuf/Blockchain.java index 7cebcbda..e0065abe 100644 --- a/protobuf/src/main/java/com/citahub/cita/protobuf/Blockchain.java +++ b/protobuf/src/main/java/com/citahub/cita/protobuf/Blockchain.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protobuf; +package com.citahub.cita.protobuf; // Generated by the protocol buffer compiler. DO NOT EDIT! // source: blockchain.proto diff --git a/protobuf/src/main/java/com/citahub/cita/protobuf/ConvertStrByte.java b/protobuf/src/main/java/com/citahub/cita/protobuf/ConvertStrByte.java index 08fb6237..8ae335d1 100644 --- a/protobuf/src/main/java/com/citahub/cita/protobuf/ConvertStrByte.java +++ b/protobuf/src/main/java/com/citahub/cita/protobuf/ConvertStrByte.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.protobuf; +package com.citahub.cita.protobuf; import java.util.Collections; import java.util.List; diff --git a/rlp/src/main/java/com/citahub/cita/rlp/RlpEncoder.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpEncoder.java index 1c7d6ba8..f6cc7f77 100644 --- a/rlp/src/main/java/com/citahub/cita/rlp/RlpEncoder.java +++ b/rlp/src/main/java/com/citahub/cita/rlp/RlpEncoder.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.rlp; +package com.citahub.cita.rlp; import java.util.Arrays; import java.util.List; diff --git a/rlp/src/main/java/com/citahub/cita/rlp/RlpList.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpList.java index 7ac8f983..f3f7657a 100644 --- a/rlp/src/main/java/com/citahub/cita/rlp/RlpList.java +++ b/rlp/src/main/java/com/citahub/cita/rlp/RlpList.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.rlp; +package com.citahub.cita.rlp; import java.util.Arrays; import java.util.List; diff --git a/rlp/src/main/java/com/citahub/cita/rlp/RlpString.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpString.java index 15548aad..39bd62cb 100644 --- a/rlp/src/main/java/com/citahub/cita/rlp/RlpString.java +++ b/rlp/src/main/java/com/citahub/cita/rlp/RlpString.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.rlp; +package com.citahub.cita.rlp; import java.math.BigInteger; import java.util.Arrays; diff --git a/rlp/src/main/java/com/citahub/cita/rlp/RlpType.java b/rlp/src/main/java/com/citahub/cita/rlp/RlpType.java index a9adfeef..d2d67283 100644 --- a/rlp/src/main/java/com/citahub/cita/rlp/RlpType.java +++ b/rlp/src/main/java/com/citahub/cita/rlp/RlpType.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.rlp; +package com.citahub.cita.rlp; /** * Base RLP type. diff --git a/rlp/src/test/java/com/citahub/cita/rlp/RlpEncoderTest.java b/rlp/src/test/java/com/citahub/cita/rlp/RlpEncoderTest.java index 0213f3ba..8404c303 100644 --- a/rlp/src/test/java/com/citahub/cita/rlp/RlpEncoderTest.java +++ b/rlp/src/test/java/com/citahub/cita/rlp/RlpEncoderTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.rlp; +package com.citahub.cita.rlp; import java.math.BigInteger; diff --git a/scripts/run-system-test.sh b/scripts/run-system-test.sh index ad2d1f04..dd9838e8 100644 --- a/scripts/run-system-test.sh +++ b/scripts/run-system-test.sh @@ -34,7 +34,7 @@ cat pom.xml | grep -A 3 ">core<" # install cita-cli and run test rm -r target/* make install-cita-cli > ${DEBUG_LOG_PATH} -mvn test -Dtest=com.cryptape.function.sdkcase.** +mvn test -Dtest=com.citahub.function.sdkcase.** MAVEN_TEST_RESULT=$? # collect result diff --git a/scripts/travis-upload-test-report-to-gh-pages.sh b/scripts/travis-upload-test-report-to-gh-pages.sh index 52c64696..dec61c69 100755 --- a/scripts/travis-upload-test-report-to-gh-pages.sh +++ b/scripts/travis-upload-test-report-to-gh-pages.sh @@ -12,7 +12,7 @@ echo "Starting to update gh-pages" # gh page info owner_name=`echo $TRAVIS_REPO_SLUG|cut -d / -f 1` repo_name=`echo $TRAVIS_REPO_SLUG|cut -d / -f 2` -gh_pages_url="https://cryptape.github.io/cita-sdk-java" +gh_pages_url="https://citahub.github.io/cita-sdk-java" test_report_url="$gh_pages_url/reports/${TRAVIS_JOB_ID}/" test_result_mark="×" diff --git a/tests/src/test/java/com/citahub/cita/tests/AdvanceTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/AdvanceTransactionTest.java index d6024429..ce63785e 100644 --- a/tests/src/test/java/com/citahub/cita/tests/AdvanceTransactionTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/AdvanceTransactionTest.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.tests; - -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.FunctionReturnDecoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +package com.citahub.cita.tests; + +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.FunctionReturnDecoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import java.math.BigInteger; import java.text.DecimalFormat; import java.util.Arrays; diff --git a/tests/src/test/java/com/citahub/cita/tests/BlockFilterFlowableTest.java b/tests/src/test/java/com/citahub/cita/tests/BlockFilterFlowableTest.java index 70121ecc..4a34aaa7 100644 --- a/tests/src/test/java/com/citahub/cita/tests/BlockFilterFlowableTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/BlockFilterFlowableTest.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import com.cryptape.cita.protocol.CITAj; +import com.citahub.cita.protocol.CITAj; import io.reactivex.Flowable; import org.junit.Test; diff --git a/tests/src/test/java/com/citahub/cita/tests/BlockFilterTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/BlockFilterTransactionTest.java index 9b98ecd4..e7ce7540 100644 --- a/tests/src/test/java/com/citahub/cita/tests/BlockFilterTransactionTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/BlockFilterTransactionTest.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.AppFilter; +import com.citahub.cita.protocol.core.methods.response.AppLog; import java.io.IOException; import java.math.BigInteger; import java.util.List; diff --git a/tests/src/test/java/com/citahub/cita/tests/Config.java b/tests/src/test/java/com/citahub/cita/tests/Config.java index 781a6a09..3a4990d5 100644 --- a/tests/src/test/java/com/citahub/cita/tests/Config.java +++ b/tests/src/test/java/com/citahub/cita/tests/Config.java @@ -1,7 +1,7 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.http.HttpService; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.http.HttpService; import java.io.FileInputStream; import java.util.Properties; diff --git a/tests/src/test/java/com/citahub/cita/tests/DecodeTxTest.java b/tests/src/test/java/com/citahub/cita/tests/DecodeTxTest.java index ea910d8d..2f6935f9 100644 --- a/tests/src/test/java/com/citahub/cita/tests/DecodeTxTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/DecodeTxTest.java @@ -1,14 +1,14 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import static com.cryptape.cita.utils.Numeric.decodeQuantity; +import static com.citahub.cita.utils.Numeric.decodeQuantity; import static junit.framework.TestCase.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; import com.alibaba.fastjson.JSONObject; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppTransaction; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppTransaction; import com.google.gson.Gson; import java.io.IOException; import java.math.BigInteger; @@ -66,7 +66,7 @@ public void testDecodeTx( ) throws Exception { //get response transaction AppTransaction appTx = service.appGetTransactionByHash(hash).send(); - com.cryptape.cita.protocol.core.methods.response.Transaction tx = appTx.getTransaction(); + com.citahub.cita.protocol.core.methods.response.Transaction tx = appTx.getTransaction(); JSONObject contendJson = JSONObject.parseObject(new Gson().toJson(tx.decodeContent())); assertTrue(payeeAddr.equals("0x"+contendJson.getString("to"))); System.out.println(new Gson().toJson(tx.decodeContent())); diff --git a/tests/src/test/java/com/citahub/cita/tests/GroupManagerTest.java b/tests/src/test/java/com/citahub/cita/tests/GroupManagerTest.java index 3afdc8b1..56186985 100644 --- a/tests/src/test/java/com/citahub/cita/tests/GroupManagerTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/GroupManagerTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; -import com.cryptape.cita.protocol.system.CITAjSystemContract; +import com.citahub.cita.protocol.system.CITAjSystemContract; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/tests/src/test/java/com/citahub/cita/tests/PermissionManagerTest.java b/tests/src/test/java/com/citahub/cita/tests/PermissionManagerTest.java index 19663da6..7e96e200 100644 --- a/tests/src/test/java/com/citahub/cita/tests/PermissionManagerTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/PermissionManagerTest.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.system.CITAjSystemContract; -import com.cryptape.cita.protocol.system.entities.QueryInfoResult; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.system.CITAjSystemContract; +import com.citahub.cita.protocol.system.entities.QueryInfoResult; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collections; diff --git a/tests/src/test/java/com/citahub/cita/tests/QuotaManagerTest.java b/tests/src/test/java/com/citahub/cita/tests/QuotaManagerTest.java index d2f02fc1..ec474c3f 100644 --- a/tests/src/test/java/com/citahub/cita/tests/QuotaManagerTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/QuotaManagerTest.java @@ -1,7 +1,7 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.system.CITAjSystemContract; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.system.CITAjSystemContract; import java.math.BigInteger; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/tests/src/test/java/com/citahub/cita/tests/RpcTest.java b/tests/src/test/java/com/citahub/cita/tests/RpcTest.java index e693c729..a0e96923 100644 --- a/tests/src/test/java/com/citahub/cita/tests/RpcTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/RpcTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static junit.framework.TestCase.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; @@ -7,32 +7,32 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppBlock; -import com.cryptape.cita.protocol.core.methods.response.AppBlockNumber; -import com.cryptape.cita.protocol.core.methods.response.AppCall; -import com.cryptape.cita.protocol.core.methods.response.AppGetBalance; -import com.cryptape.cita.protocol.core.methods.response.AppGetCode; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionCount; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AppMetaData; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.AppTransaction; -import com.cryptape.cita.protocol.core.methods.response.AppVersion; -import com.cryptape.cita.protocol.core.methods.response.NetPeerCount; -import com.cryptape.cita.protocol.core.methods.response.NetPeersInfo; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.utils.Convert; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppBlock; +import com.citahub.cita.protocol.core.methods.response.AppBlockNumber; +import com.citahub.cita.protocol.core.methods.response.AppCall; +import com.citahub.cita.protocol.core.methods.response.AppGetBalance; +import com.citahub.cita.protocol.core.methods.response.AppGetCode; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionCount; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.AppMetaData; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.AppTransaction; +import com.citahub.cita.protocol.core.methods.response.AppVersion; +import com.citahub.cita.protocol.core.methods.response.NetPeerCount; +import com.citahub.cita.protocol.core.methods.response.NetPeersInfo; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.utils.Convert; import com.google.gson.Gson; import java.io.IOException; import java.math.BigInteger; diff --git a/tests/src/test/java/com/citahub/cita/tests/SM2ValidationTest.java b/tests/src/test/java/com/citahub/cita/tests/SM2ValidationTest.java index cc525ee2..8002a30c 100644 --- a/tests/src/test/java/com/citahub/cita/tests/SM2ValidationTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/SM2ValidationTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import com.cryptape.cita.crypto.sm2.SM2; -import com.cryptape.cita.crypto.sm2.SM2KeyPair; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.crypto.sm2.SM2; +import com.citahub.cita.crypto.sm2.SM2KeyPair; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; import java.math.BigInteger; /** diff --git a/tests/src/test/java/com/citahub/cita/tests/SendTransactionSyncTest.java b/tests/src/test/java/com/citahub/cita/tests/SendTransactionSyncTest.java index 9554c688..dddae348 100644 --- a/tests/src/test/java/com/citahub/cita/tests/SendTransactionSyncTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/SendTransactionSyncTest.java @@ -1,17 +1,17 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static junit.framework.TestCase.assertNull; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppGetBalance; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.response.PollingTransactionReceiptProcessor; -import com.cryptape.cita.utils.Convert; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppGetBalance; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.response.PollingTransactionReceiptProcessor; +import com.citahub.cita.utils.Convert; import java.math.BigDecimal; import java.math.BigInteger; import org.junit.Test; diff --git a/tests/src/test/java/com/citahub/cita/tests/SendTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/SendTransactionTest.java index 41c632aa..a12db213 100644 --- a/tests/src/test/java/com/citahub/cita/tests/SendTransactionTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/SendTransactionTest.java @@ -1,18 +1,18 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static junit.framework.TestCase.assertNull; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.RemoteCall; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppGetBalance; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.response.PollingTransactionReceiptProcessor; -import com.cryptape.cita.utils.Convert; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.RemoteCall; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppGetBalance; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.response.PollingTransactionReceiptProcessor; +import com.citahub.cita.utils.Convert; import java.math.BigDecimal; import java.math.BigInteger; import java.util.concurrent.ExecutionException; diff --git a/tests/src/test/java/com/citahub/cita/tests/SimpleDataTest.java b/tests/src/test/java/com/citahub/cita/tests/SimpleDataTest.java index edf7c1b9..c283bc64 100644 --- a/tests/src/test/java/com/citahub/cita/tests/SimpleDataTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/SimpleDataTest.java @@ -1,25 +1,25 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.FunctionReturnDecoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.DynamicBytes; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.Utf8String; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.FunctionReturnDecoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.DynamicBytes; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.Utf8String; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; import java.io.IOException; import java.math.BigInteger; import java.nio.file.Files; diff --git a/tests/src/test/java/com/citahub/cita/tests/StoreRecordTest.java b/tests/src/test/java/com/citahub/cita/tests/StoreRecordTest.java index a0d71d5f..bdf496e5 100644 --- a/tests/src/test/java/com/citahub/cita/tests/StoreRecordTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/StoreRecordTest.java @@ -1,15 +1,15 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import com.cryptape.cita.protobuf.Blockchain; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.system.CITAjSystemContract; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protobuf.Blockchain; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.system.CITAjSystemContract; +import com.citahub.cita.utils.Numeric; import java.io.IOException; import java.math.BigInteger; import java.util.concurrent.TimeUnit; diff --git a/tests/src/test/java/com/citahub/cita/tests/SystemContractTest.java b/tests/src/test/java/com/citahub/cita/tests/SystemContractTest.java index d82e56a8..31f9c148 100644 --- a/tests/src/test/java/com/citahub/cita/tests/SystemContractTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/SystemContractTest.java @@ -1,9 +1,9 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.junit.Assert.assertTrue; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.system.CITAjSystemContract; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.system.CITAjSystemContract; import java.math.BigInteger; import java.util.List; import org.junit.Test; diff --git a/tests/src/test/java/com/citahub/cita/tests/TestUtil.java b/tests/src/test/java/com/citahub/cita/tests/TestUtil.java index 4a0786d3..830e443c 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TestUtil.java +++ b/tests/src/test/java/com/citahub/cita/tests/TestUtil.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.response.AppMetaData; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.response.AppMetaData; +import com.citahub.cita.utils.Numeric; import java.math.BigInteger; import java.util.Random; diff --git a/tests/src/test/java/com/citahub/cita/tests/Token.java b/tests/src/test/java/com/citahub/cita/tests/Token.java index 6dd18d3c..c88e2220 100644 --- a/tests/src/test/java/com/citahub/cita/tests/Token.java +++ b/tests/src/test/java/com/citahub/cita/tests/Token.java @@ -1,20 +1,20 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; //CHECKSTYLE:OFF -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.RemoteCall; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.Contract; -import com.cryptape.cita.tx.TransactionManager; +import com.citahub.cita.abi.EventEncoder; +import com.citahub.cita.abi.EventValues; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Event; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.RemoteCall; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.Contract; +import com.citahub.cita.tx.TransactionManager; import io.reactivex.Flowable; import io.reactivex.functions.Function; import java.math.BigInteger; @@ -66,14 +66,14 @@ public TransferEventResponse apply(Log log) { } public RemoteCall balances(String param0) { - com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function("balances", + com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function("balances", Arrays.asList(new Address(param0)), Arrays.>asList(new TypeReference() {})); return executeRemoteCallSingleValueReturn(function, BigInteger.class); } public RemoteCall transfer(String _to, BigInteger _value, Long quota, String nonce, Long validUntilBlock, Integer version, BigInteger chainId, String value) { - com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function( + com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function( "transfer", Arrays.asList(new Address(_to), new Uint256(_value)), @@ -82,7 +82,7 @@ public RemoteCall transfer(String _to, BigInteger _value, Lo } public RemoteCall getBalance(String account) { - com.cryptape.cita.abi.datatypes.Function function = new com.cryptape.cita.abi.datatypes.Function("getBalance", + com.citahub.cita.abi.datatypes.Function function = new com.citahub.cita.abi.datatypes.Function("getBalance", Arrays.asList(new Address(account)), Arrays.>asList(new TypeReference() {})); return executeRemoteCallSingleValueReturn(function, BigInteger.class); diff --git a/tests/src/test/java/com/citahub/cita/tests/TokenAccountTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenAccountTest.java index fe18d909..1e50d337 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TokenAccountTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/TokenAccountTest.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tests; - -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.account.Account; -import com.cryptape.cita.protocol.account.CompiledContract; -import com.cryptape.cita.protocol.core.methods.response.AbiDefinition; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +package com.citahub.cita.tests; + +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.account.Account; +import com.citahub.cita.protocol.account.CompiledContract; +import com.citahub.cita.protocol.core.methods.response.AbiDefinition; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import java.io.File; import java.math.BigInteger; import org.junit.Ignore; diff --git a/tests/src/test/java/com/citahub/cita/tests/TokenCodegenTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenCodegenTest.java index 2f0c20c4..c3bb4296 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TokenCodegenTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/TokenCodegenTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.RawTransactionManager; -import com.cryptape.cita.tx.TransactionManager; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.RawTransactionManager; +import com.citahub.cita.tx.TransactionManager; import java.math.BigInteger; import java.util.ArrayList; import java.util.HashMap; diff --git a/tests/src/test/java/com/citahub/cita/tests/TokenFilterCodeGenTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenFilterCodeGenTest.java index c382403c..e3617658 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TokenFilterCodeGenTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/TokenFilterCodeGenTest.java @@ -1,17 +1,17 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; -import com.cryptape.cita.crypto.Credentials; -import com.cryptape.cita.crypto.sm2.SM2; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameter; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.tx.RawTransactionManager; -import com.cryptape.cita.tx.TransactionManager; +import com.citahub.cita.crypto.Credentials; +import com.citahub.cita.crypto.sm2.SM2; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameter; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.tx.RawTransactionManager; +import com.citahub.cita.tx.TransactionManager; import io.reactivex.Flowable; import io.reactivex.functions.Consumer; import java.math.BigInteger; diff --git a/tests/src/test/java/com/citahub/cita/tests/TokenFilterFlowableTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenFilterFlowableTest.java index 6f858232..806788c1 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TokenFilterFlowableTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/TokenFilterFlowableTest.java @@ -1,24 +1,24 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; -import static com.cryptape.cita.tx.Contract.staticExtractEventParameters; +import static com.citahub.cita.tx.Contract.staticExtractEventParameters; import static org.junit.Assert.assertTrue; -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.abi.EventEncoder; +import com.citahub.cita.abi.EventValues; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Event; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import io.reactivex.Flowable; import java.io.IOException; import java.math.BigInteger; @@ -94,7 +94,7 @@ private static AppFilter createNewFilter(Event event, String contractAddr) { //this will call JSON RPC "newFilter" and get the filterId. private static String newFilter(AppFilter appFilter) throws IOException { - com.cryptape.cita.protocol.core.methods.response.AppFilter responseFilter + com.citahub.cita.protocol.core.methods.response.AppFilter responseFilter = service.appNewFilter(appFilter).send(); return responseFilter.getFilterId().toString(); } diff --git a/tests/src/test/java/com/citahub/cita/tests/TokenFilterTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenFilterTransactionTest.java index 3d10afab..c7e7d86f 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TokenFilterTransactionTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/TokenFilterTransactionTest.java @@ -1,26 +1,26 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.junit.Assert.assertTrue; -import com.cryptape.cita.abi.EventEncoder; -import com.cryptape.cita.abi.EventValues; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Event; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.Request; -import com.cryptape.cita.protocol.core.methods.request.AppFilter; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppGetTransactionReceipt; -import com.cryptape.cita.protocol.core.methods.response.AppLog; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.Log; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; -import com.cryptape.cita.tx.Contract; +import com.citahub.cita.abi.EventEncoder; +import com.citahub.cita.abi.EventValues; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Event; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.Request; +import com.citahub.cita.protocol.core.methods.request.AppFilter; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppGetTransactionReceipt; +import com.citahub.cita.protocol.core.methods.response.AppLog; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.Log; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.tx.Contract; import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; @@ -110,7 +110,7 @@ private static AppFilter createNewFilter(Event event, String contractAddr) throw //this will call JSON RPC "newFilter" and get the filterId. private static String newFilter(AppFilter appFilter) throws IOException { - com.cryptape.cita.protocol.core.methods.response.AppFilter responseFilter + com.citahub.cita.protocol.core.methods.response.AppFilter responseFilter = service.appNewFilter(appFilter).send(); return responseFilter.getFilterId().toString(); } diff --git a/tests/src/test/java/com/citahub/cita/tests/TokenTransactionTest.java b/tests/src/test/java/com/citahub/cita/tests/TokenTransactionTest.java index 311d3bb1..9c4c402e 100644 --- a/tests/src/test/java/com/citahub/cita/tests/TokenTransactionTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/TokenTransactionTest.java @@ -1,22 +1,22 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNull; -import com.cryptape.cita.abi.FunctionEncoder; -import com.cryptape.cita.abi.FunctionReturnDecoder; -import com.cryptape.cita.abi.TypeReference; -import com.cryptape.cita.abi.datatypes.Address; -import com.cryptape.cita.abi.datatypes.Function; -import com.cryptape.cita.abi.datatypes.Type; -import com.cryptape.cita.abi.datatypes.Uint; -import com.cryptape.cita.abi.datatypes.generated.Uint256; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.DefaultBlockParameterName; -import com.cryptape.cita.protocol.core.methods.request.Call; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.TransactionReceipt; +import com.citahub.cita.abi.FunctionEncoder; +import com.citahub.cita.abi.FunctionReturnDecoder; +import com.citahub.cita.abi.TypeReference; +import com.citahub.cita.abi.datatypes.Address; +import com.citahub.cita.abi.datatypes.Function; +import com.citahub.cita.abi.datatypes.Type; +import com.citahub.cita.abi.datatypes.Uint; +import com.citahub.cita.abi.datatypes.generated.Uint256; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.DefaultBlockParameterName; +import com.citahub.cita.protocol.core.methods.request.Call; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.TransactionReceipt; import java.math.BigInteger; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/tests/src/test/java/com/citahub/cita/tests/VerifySignatureTest.java b/tests/src/test/java/com/citahub/cita/tests/VerifySignatureTest.java index d8b2fbbc..ffe2d45c 100644 --- a/tests/src/test/java/com/citahub/cita/tests/VerifySignatureTest.java +++ b/tests/src/test/java/com/citahub/cita/tests/VerifySignatureTest.java @@ -1,13 +1,13 @@ -package com.cryptape.cita.tests; +package com.citahub.cita.tests; import static org.junit.Assert.assertTrue; -import com.cryptape.cita.protobuf.ConvertStrByte; -import com.cryptape.cita.protocol.CITAj; -import com.cryptape.cita.protocol.core.methods.request.Transaction; -import com.cryptape.cita.protocol.core.methods.response.AppSendTransaction; -import com.cryptape.cita.protocol.core.methods.response.AppTransaction; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.protobuf.ConvertStrByte; +import com.citahub.cita.protocol.CITAj; +import com.citahub.cita.protocol.core.methods.request.Transaction; +import com.citahub.cita.protocol.core.methods.response.AppSendTransaction; +import com.citahub.cita.protocol.core.methods.response.AppTransaction; +import com.citahub.cita.utils.Numeric; import java.io.IOException; import java.math.BigInteger; import java.util.concurrent.TimeUnit; @@ -56,7 +56,7 @@ private static String sendSampleTransaction(String signedTx) } } - private static com.cryptape.cita.protocol.core.methods.response.Transaction + private static com.citahub.cita.protocol.core.methods.response.Transaction getResponseTransaction(String hash) throws IOException { AppTransaction appTransaction = service.appGetTransactionByHash(hash).send(); if (appTransaction.getTransaction() != null) { @@ -83,7 +83,7 @@ public void testVerifySignatureTest() throws Exception { TimeUnit.SECONDS.sleep(10); //get response transaction - com.cryptape.cita.protocol.core.methods.response.Transaction + com.citahub.cita.protocol.core.methods.response.Transaction respTx = getResponseTransaction(txHash); //verify signature in response transaction diff --git a/tuples/src/main/java/com/citahub/cita/tuples/EmptyTuple.java b/tuples/src/main/java/com/citahub/cita/tuples/EmptyTuple.java index b89f6079..8afa048d 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/EmptyTuple.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/EmptyTuple.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tuples; +package com.citahub.cita.tuples; /** * Empty Tuple type. diff --git a/tuples/src/main/java/com/citahub/cita/tuples/Tuple.java b/tuples/src/main/java/com/citahub/cita/tuples/Tuple.java index 9142753a..dba4ae89 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/Tuple.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/Tuple.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.tuples; +package com.citahub.cita.tuples; /** * Tuple abstraction. diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple1.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple1.java index 4676474b..0460fa55 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple1.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple1.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple1 implements Tuple { private static final int SIZE = 1; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple10.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple10.java index 5ce88561..88da4681 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple10.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple10.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple10 implements Tuple { private static final int SIZE = 10; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple11.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple11.java index aab40b23..a4e3d246 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple11.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple11.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple11 implements Tuple { private static final int SIZE = 11; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple12.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple12.java index 96bceccb..607cb69a 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple12.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple12.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple12 implements Tuple { private static final int SIZE = 12; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple13.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple13.java index 03f9ce22..83756927 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple13.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple13.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple13 implements Tuple { private static final int SIZE = 13; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple14.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple14.java index 49020f41..1e017994 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple14.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple14.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple14 implements Tuple { private static final int SIZE = 14; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple15.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple15.java index 3de258bb..d3d5e5d4 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple15.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple15.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple15 implements Tuple { private static final int SIZE = 15; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple16.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple16.java index a4518a18..095eb7ed 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple16.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple16.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple16 implements Tuple { private static final int SIZE = 16; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple17.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple17.java index 3ecd2af4..0279d77e 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple17.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple17.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple17 implements Tuple { private static final int SIZE = 17; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple18.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple18.java index a9030c00..3477c547 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple18.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple18.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple18 implements Tuple { private static final int SIZE = 18; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple19.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple19.java index 07bd3edb..d58716e4 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple19.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple19.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple19 implements Tuple { private static final int SIZE = 19; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple2.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple2.java index 34b77c59..3c332704 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple2.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple2.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple2 implements Tuple { private static final int SIZE = 2; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple20.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple20.java index 88e72a96..fa4ac78a 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple20.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple20.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple20 implements Tuple { private static final int SIZE = 20; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple3.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple3.java index 05207bc7..64e05335 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple3.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple3.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple3 implements Tuple { private static final int SIZE = 3; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple4.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple4.java index c45d3938..07caf76b 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple4.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple4.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple4 implements Tuple { private static final int SIZE = 4; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple5.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple5.java index 26c08dca..3083e715 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple5.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple5.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple5 implements Tuple { private static final int SIZE = 5; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple6.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple6.java index 3b1fd31d..9b66f6fc 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple6.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple6.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple6 implements Tuple { private static final int SIZE = 6; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple7.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple7.java index 013f576f..fff28c6c 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple7.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple7.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple7 implements Tuple { private static final int SIZE = 7; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple8.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple8.java index 6547ef19..0f7b5365 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple8.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple8.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple8 implements Tuple { private static final int SIZE = 8; diff --git a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple9.java b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple9.java index d4dc45e1..4a159978 100644 --- a/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple9.java +++ b/tuples/src/main/java/com/citahub/cita/tuples/generated/Tuple9.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.tuples.generated; +package com.citahub.cita.tuples.generated; -import com.cryptape.cita.tuples.Tuple; +import com.citahub.cita.tuples.Tuple; /** * Auto generated code. *

Do not modifiy! - *

Please use com.cryptape.cita.codegen.TupleGenerator in the + *

Please use com.citahub.cita.codegen.TupleGenerator in the */ public final class Tuple9 implements Tuple { private static final int SIZE = 9; diff --git a/utils/src/main/java/com/citahub/cita/crypto/Hash.java b/utils/src/main/java/com/citahub/cita/crypto/Hash.java index 13029ecc..c98dd50d 100644 --- a/utils/src/main/java/com/citahub/cita/crypto/Hash.java +++ b/utils/src/main/java/com/citahub/cita/crypto/Hash.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; import java.nio.charset.StandardCharsets; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import org.bouncycastle.jcajce.provider.digest.Keccak; /** diff --git a/utils/src/main/java/com/citahub/cita/exceptions/MessageDecodingException.java b/utils/src/main/java/com/citahub/cita/exceptions/MessageDecodingException.java index a65412d6..08dc32eb 100644 --- a/utils/src/main/java/com/citahub/cita/exceptions/MessageDecodingException.java +++ b/utils/src/main/java/com/citahub/cita/exceptions/MessageDecodingException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.exceptions; +package com.citahub.cita.exceptions; /** * Encoding exception. diff --git a/utils/src/main/java/com/citahub/cita/exceptions/MessageEncodingException.java b/utils/src/main/java/com/citahub/cita/exceptions/MessageEncodingException.java index 31f95b98..09c89cf1 100644 --- a/utils/src/main/java/com/citahub/cita/exceptions/MessageEncodingException.java +++ b/utils/src/main/java/com/citahub/cita/exceptions/MessageEncodingException.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.exceptions; +package com.citahub.cita.exceptions; /** * Encoding exception. diff --git a/utils/src/main/java/com/citahub/cita/utils/Assertions.java b/utils/src/main/java/com/citahub/cita/utils/Assertions.java index 802a12da..fe4c5953 100644 --- a/utils/src/main/java/com/citahub/cita/utils/Assertions.java +++ b/utils/src/main/java/com/citahub/cita/utils/Assertions.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; /** * Assertion utility functions. diff --git a/utils/src/main/java/com/citahub/cita/utils/Bytes.java b/utils/src/main/java/com/citahub/cita/utils/Bytes.java index bdba906c..ab2aa542 100644 --- a/utils/src/main/java/com/citahub/cita/utils/Bytes.java +++ b/utils/src/main/java/com/citahub/cita/utils/Bytes.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.Arrays; diff --git a/utils/src/main/java/com/citahub/cita/utils/Convert.java b/utils/src/main/java/com/citahub/cita/utils/Convert.java index ff4e26f6..bb3fbc6a 100644 --- a/utils/src/main/java/com/citahub/cita/utils/Convert.java +++ b/utils/src/main/java/com/citahub/cita/utils/Convert.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.math.BigDecimal; diff --git a/utils/src/main/java/com/citahub/cita/utils/HexUtil.java b/utils/src/main/java/com/citahub/cita/utils/HexUtil.java index 3fb85123..854b4f71 100644 --- a/utils/src/main/java/com/citahub/cita/utils/HexUtil.java +++ b/utils/src/main/java/com/citahub/cita/utils/HexUtil.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; public class HexUtil { diff --git a/utils/src/main/java/com/citahub/cita/utils/Numeric.java b/utils/src/main/java/com/citahub/cita/utils/Numeric.java index 70f11a0a..9af5d4dd 100644 --- a/utils/src/main/java/com/citahub/cita/utils/Numeric.java +++ b/utils/src/main/java/com/citahub/cita/utils/Numeric.java @@ -1,11 +1,11 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Arrays; -import com.cryptape.cita.exceptions.MessageDecodingException; -import com.cryptape.cita.exceptions.MessageEncodingException; +import com.citahub.cita.exceptions.MessageDecodingException; +import com.citahub.cita.exceptions.MessageEncodingException; /** *

Message codec functions.

diff --git a/utils/src/main/java/com/citahub/cita/utils/Strings.java b/utils/src/main/java/com/citahub/cita/utils/Strings.java index ad8de0a0..03c6f542 100644 --- a/utils/src/main/java/com/citahub/cita/utils/Strings.java +++ b/utils/src/main/java/com/citahub/cita/utils/Strings.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.Collections; import java.util.List; diff --git a/utils/src/test/java/com/citahub/cita/crypto/HashTest.java b/utils/src/test/java/com/citahub/cita/crypto/HashTest.java index 9ab09329..d475ea45 100644 --- a/utils/src/test/java/com/citahub/cita/crypto/HashTest.java +++ b/utils/src/test/java/com/citahub/cita/crypto/HashTest.java @@ -1,6 +1,6 @@ -package com.cryptape.cita.crypto; +package com.citahub.cita.crypto; -import com.cryptape.cita.utils.Numeric; +import com.citahub.cita.utils.Numeric; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/utils/src/test/java/com/citahub/cita/utils/AssertionsTest.java b/utils/src/test/java/com/citahub/cita/utils/AssertionsTest.java index 77116cc1..3d23b213 100644 --- a/utils/src/test/java/com/citahub/cita/utils/AssertionsTest.java +++ b/utils/src/test/java/com/citahub/cita/utils/AssertionsTest.java @@ -1,8 +1,8 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import org.junit.Test; -import static com.cryptape.cita.utils.Assertions.verifyPrecondition; +import static com.citahub.cita.utils.Assertions.verifyPrecondition; public class AssertionsTest { diff --git a/utils/src/test/java/com/citahub/cita/utils/BytesTest.java b/utils/src/test/java/com/citahub/cita/utils/BytesTest.java index 019767b8..8dd98212 100644 --- a/utils/src/test/java/com/citahub/cita/utils/BytesTest.java +++ b/utils/src/test/java/com/citahub/cita/utils/BytesTest.java @@ -1,10 +1,10 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static com.cryptape.cita.utils.Bytes.trimLeadingZeroes; +import static com.citahub.cita.utils.Bytes.trimLeadingZeroes; public class BytesTest { diff --git a/utils/src/test/java/com/citahub/cita/utils/ConvertTest.java b/utils/src/test/java/com/citahub/cita/utils/ConvertTest.java index 337d7c67..e26a6bc5 100644 --- a/utils/src/test/java/com/citahub/cita/utils/ConvertTest.java +++ b/utils/src/test/java/com/citahub/cita/utils/ConvertTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.math.BigDecimal; diff --git a/utils/src/test/java/com/citahub/cita/utils/NumericTest.java b/utils/src/test/java/com/citahub/cita/utils/NumericTest.java index 84c7bed8..d18f692e 100644 --- a/utils/src/test/java/com/citahub/cita/utils/NumericTest.java +++ b/utils/src/test/java/com/citahub/cita/utils/NumericTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.math.BigDecimal; import java.math.BigInteger; @@ -6,8 +6,8 @@ import org.junit.Ignore; import org.junit.Test; -import com.cryptape.cita.exceptions.MessageDecodingException; -import com.cryptape.cita.exceptions.MessageEncodingException; +import com.citahub.cita.exceptions.MessageDecodingException; +import com.citahub.cita.exceptions.MessageEncodingException; import static junit.framework.TestCase.assertFalse; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/utils/src/test/java/com/citahub/cita/utils/StringsTest.java b/utils/src/test/java/com/citahub/cita/utils/StringsTest.java index bacd3bd3..52fb06d5 100644 --- a/utils/src/test/java/com/citahub/cita/utils/StringsTest.java +++ b/utils/src/test/java/com/citahub/cita/utils/StringsTest.java @@ -1,4 +1,4 @@ -package com.cryptape.cita.utils; +package com.citahub.cita.utils; import java.util.Arrays; import java.util.Collections; @@ -10,13 +10,13 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static com.cryptape.cita.utils.Strings.capitaliseFirstLetter; -import static com.cryptape.cita.utils.Strings.isEmpty; -import static com.cryptape.cita.utils.Strings.join; -import static com.cryptape.cita.utils.Strings.lowercaseFirstLetter; -import static com.cryptape.cita.utils.Strings.repeat; -import static com.cryptape.cita.utils.Strings.toCsv; -import static com.cryptape.cita.utils.Strings.zeros; +import static com.citahub.cita.utils.Strings.capitaliseFirstLetter; +import static com.citahub.cita.utils.Strings.isEmpty; +import static com.citahub.cita.utils.Strings.join; +import static com.citahub.cita.utils.Strings.lowercaseFirstLetter; +import static com.citahub.cita.utils.Strings.repeat; +import static com.citahub.cita.utils.Strings.toCsv; +import static com.citahub.cita.utils.Strings.zeros; public class StringsTest { From c9911439afae29864f45f48732ebcb5815237522 Mon Sep 17 00:00:00 2001 From: UDLD Date: Wed, 4 Dec 2019 13:46:10 +0800 Subject: [PATCH 15/20] change branch of cita_quality --- scripts/run-system-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-system-test.sh b/scripts/run-system-test.sh index dd9838e8..a5553756 100644 --- a/scripts/run-system-test.sh +++ b/scripts/run-system-test.sh @@ -14,7 +14,7 @@ test -e cita_quality | git clone ${SYSTEM_TEST_CODE_URL} cp cita-sdk-java/console/build/libs/console-*-all.jar ./cita_quality/systemTest/console.jar cd ./cita_quality/systemTest system_test_dir=$(pwd) -git checkout master | git pull +git checkout change-cryptape-citahub | git pull # use local sdk change the maven sdk CITA_SDk_VERSION=$( cat pom.xml | grep -A 1 ">core<" | grep version | awk -F "[<>]" '{print $3}') @@ -34,7 +34,7 @@ cat pom.xml | grep -A 3 ">core<" # install cita-cli and run test rm -r target/* make install-cita-cli > ${DEBUG_LOG_PATH} -mvn test -Dtest=com.citahub.function.sdkcase.** +mvn test -Dtest=com.cryptape.function.sdkcase.** MAVEN_TEST_RESULT=$? # collect result From b10fb730e5bca8e538ce5a418113b6062d557ea8 Mon Sep 17 00:00:00 2001 From: RainChen Date: Tue, 3 Dec 2019 22:42:58 +0800 Subject: [PATCH 16/20] reduce output messages for CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46e82d62..ea306fa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ cache: before_script: # upgrade gradle to 5.0 - - test -e $HOME/.gradle/caches/gradle-5.0.zip || sudo wget https://services.gradle.org/distributions/gradle-5.0-all.zip -O $HOME/.gradle/caches/gradle-5.0.zip > debug.log + - test -e $HOME/.gradle/caches/gradle-5.0.zip || sudo wget -q https://services.gradle.org/distributions/gradle-5.0-all.zip -O $HOME/.gradle/caches/gradle-5.0.zip > debug.log - sudo unzip $HOME/.gradle/caches/gradle-5.0.zip > debug.log - ./gradle-5.0/bin/gradle -v From 931319c9d847fc9e33315f9a9162a2224767d12a Mon Sep 17 00:00:00 2001 From: RainChen Date: Tue, 3 Dec 2019 22:43:28 +0800 Subject: [PATCH 17/20] speed up git clone SYSTEM_TEST_CODE_URL in scripts/run-system-test.sh --- scripts/run-system-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-system-test.sh b/scripts/run-system-test.sh index a5553756..af793fe0 100644 --- a/scripts/run-system-test.sh +++ b/scripts/run-system-test.sh @@ -10,7 +10,7 @@ docker pull ${DOCKER_IMAGE_URL}:${CITA_DOCKER_IMAGE_TAG_NAME} > ${DEBUG_LOG_PATH # get cita_quality code cd .. -test -e cita_quality | git clone ${SYSTEM_TEST_CODE_URL} +test -e cita_quality | git clone --depth 1 ${SYSTEM_TEST_CODE_URL} cp cita-sdk-java/console/build/libs/console-*-all.jar ./cita_quality/systemTest/console.jar cd ./cita_quality/systemTest system_test_dir=$(pwd) From 51841c185094ff3ee78306c8da3e622ca73fb593 Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 17 Feb 2020 17:09:05 +0800 Subject: [PATCH 18/20] update version and changelog and readme for v20.2.0 --- CHANGELOG.md | 15 +++++++++++++++ README.md | 8 ++++---- build.gradle | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec42d665..535343b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ All notable changes to this project will be documented in this file. +# [v20.2.0](https://github.com/citahub/cita-sdk-java/compare/v1.0.0...v20.2.0) (2020-02-17) + +### Added + +* add gradle cache in travis ci + +### Changed + +* change cryptape to citahub in tests module + +### Documented + +* show license and tag badges in README +* change cryptape to citahub in CHANGELOG + # [v1.0.0](https://github.com/citahub/cita-sdk-java/compare/v0.25.0...v1.0.0) (2019-08-28) ### Added diff --git a/README.md b/README.md index ea126bdd..fa2ba135 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,12 @@ maven com.citahub.cita core - 1.0.0 + 20.2.0 ``` Gradle ``` -compile 'com.citahub.cita:core:1.0.0' +compile 'com.citahub.cita:core:20.2.0' ``` Install manually @@ -211,12 +211,12 @@ Gradle 5.0 com.citahub.cita core - 1.0.0 + 20.2.0 ``` Gradle ``` -compile 'com.citahub.cita:core:1.0.0' +compile 'com.citahub.cita:core:20.2.0' ``` 手动安装 diff --git a/build.gradle b/build.gradle index 5429423f..60accc64 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ allprojects { targetCompatibility = 1.8 group 'com.citahub.cita' - version '1.0.0' + version '20.2.0' apply plugin: 'java' apply plugin: 'jacoco' @@ -145,7 +145,7 @@ configure(subprojects.findAll { it.name != 'integration-tests' }) { publications { mavenJava(MavenPublication) { groupId 'com.citahub.cita' - version '1.0.0' + version '20.2.0' from components.java artifact sourcesJar { From 9cdd97e211843b548199bec2d05812e25a516c58 Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 17 Feb 2020 17:09:32 +0800 Subject: [PATCH 19/20] change branch of cita_quality --- scripts/run-system-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-system-test.sh b/scripts/run-system-test.sh index af793fe0..c53153e9 100644 --- a/scripts/run-system-test.sh +++ b/scripts/run-system-test.sh @@ -14,7 +14,7 @@ test -e cita_quality | git clone --depth 1 ${SYSTEM_TEST_CODE_URL} cp cita-sdk-java/console/build/libs/console-*-all.jar ./cita_quality/systemTest/console.jar cd ./cita_quality/systemTest system_test_dir=$(pwd) -git checkout change-cryptape-citahub | git pull +git checkout master | git pull # use local sdk change the maven sdk CITA_SDk_VERSION=$( cat pom.xml | grep -A 1 ">core<" | grep version | awk -F "[<>]" '{print $3}') From 9567d4e2eb126953eaea6c43af5f0185f1a932c4 Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 17 Feb 2020 17:09:55 +0800 Subject: [PATCH 20/20] add CITA v20.2.0 in test travis ci --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea306fa2..2d665f47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,8 @@ jdk: env: - TEST_TYPE=UT - - CITA_DOCKER_IMAGE_TAG_NAME=sha3 TEST_TYPE=ST TEST_CITA_VERSION=CITA1.0 + - CITA_DOCKER_IMAGE_TAG_NAME=sha3_d8f6587 TEST_TYPE=ST TEST_CITA_VERSION=CITA20.2.0 + - CITA_DOCKER_IMAGE_TAG_NAME=sha3_48cf859 TEST_TYPE=ST TEST_CITA_VERSION=CITA1.0.1 - 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