Skip to content

Commit ce4461c

Browse files
authored
Merge pull request #419 from kyonRay/release-3.1.0
<fix>(auth): move auth service to sdk transaction, add method auth interface.
2 parents eb868e6 + 299f15d commit ce4461c

File tree

21 files changed

+627
-330
lines changed

21 files changed

+627
-330
lines changed

sdk-core/src/main/java/org/fisco/bcos/sdk/model/TransactionReceipt.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void setGasUsed(String gasUsed) {
193193
}
194194

195195
public String getContractAddress() {
196-
if (!isWasm() && Objects.nonNull(contractAddress)) {
196+
if (!isWasm() && Objects.nonNull(contractAddress) && !contractAddress.isEmpty()) {
197197
return "0x" + contractAddress;
198198
}
199199

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/manager/AuthManager.java

Lines changed: 0 additions & 246 deletions
This file was deleted.

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/po/CommitteeInfo.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

sdk-service/src/test/java/org/fisco/bcos/sdk/test/client/ResponseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ public void testTransactionReceipt() throws JsonProcessingException {
735735
+ " \"result\": {\n"
736736
+ " \"blockHash\": \"0x977efec48c248ea4be87016446b40d7785d7b71b7d4e3aa0b103b9cf0f5fe19e\",\n"
737737
+ " \"blockNumber\": \"0xa\",\n"
738-
+ " \"contractAddress\": \"0x0000000000000000000000000000000000000000\",\n"
738+
+ " \"contractAddress\": \"0000000000000000000000000000000000000000\",\n"
739739
+ " \"from\": \"0xcdcce60801c0a2e6bb534322c32ae528b9dec8d2\",\n"
740740
+ " \"gasUsed\": \"0x1fb8d\",\n"
741741
+ " \"input\": \"0xb602109a000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000203078313030303030303030303030303030303030303030303030303030303030000000000000000000000000000000000000000000000000000000000000000832303139303733300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002616100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026262000000000000000000000000000000000000000000000000000000000000\",\n"
@@ -822,7 +822,7 @@ public void testTransactionReceiptWithProof() throws JsonProcessingException {
822822
+ " ],\n"
823823
+ " \"blockHash\": \"0xcd31b05e466bce99460b1ed70d6069fdfbb15e6eef84e9b9e4534358edb3899a\",\n"
824824
+ " \"blockNumber\": \"0x5\",\n"
825-
+ " \"contractAddress\": \"0x0000000000000000000000000000000000000000\",\n"
825+
+ " \"contractAddress\": \"0000000000000000000000000000000000000000\",\n"
826826
+ " \"from\": \"0x148947262ec5e21739fe3a931c29e8b84ee34a0f\",\n"
827827
+ " \"gasUsed\": \"0x21dc1b\",\n"
828828
+ " \"input\": \"0x8a42ebe90000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000000000000000000000000000000000000000000a3564646636663863653800000000000000000000000000000000000000000000\",\n"

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/contracts/Committee.java renamed to sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/contracts/Committee.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fisco.bcos.sdk.auth.contracts;
1+
package org.fisco.bcos.sdk.contract.auth.contracts;
22

33
import java.math.BigInteger;
44
import java.util.Arrays;

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/contracts/CommitteeManager.java renamed to sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/contracts/CommitteeManager.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fisco.bcos.sdk.auth.contracts;
1+
package org.fisco.bcos.sdk.contract.auth.contracts;
22

33
import java.math.BigInteger;
44
import java.util.Arrays;
@@ -106,15 +106,6 @@ public String _committee() throws ContractException {
106106
return executeCallWithSingleValueReturn(function, String.class);
107107
}
108108

109-
public String _contractPrecompiled() throws ContractException {
110-
final Function function =
111-
new Function(
112-
FUNC__CONTRACTPRECOMPILED,
113-
Arrays.<Type>asList(),
114-
Arrays.<TypeReference<?>>asList(new TypeReference<Address>() {}));
115-
return executeCallWithSingleValueReturn(function, String.class);
116-
}
117-
118109
public String _proposalMgr() throws ContractException {
119110
final Function function =
120111
new Function(

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/contracts/ContractAuthPrecompiled.java renamed to sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/contracts/ContractAuthPrecompiled.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fisco.bcos.sdk.auth.contracts;
1+
package org.fisco.bcos.sdk.contract.auth.contracts;
22

33
import java.math.BigInteger;
44
import java.util.Arrays;

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/contracts/ContractInterceptor.java renamed to sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/contracts/ContractInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fisco.bcos.sdk.auth.contracts;
1+
package org.fisco.bcos.sdk.contract.auth.contracts;
22

33
import java.util.Arrays;
44
import org.fisco.bcos.sdk.client.Client;

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/contracts/DeployAuthManager.java renamed to sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/contracts/DeployAuthManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fisco.bcos.sdk.auth.contracts;
1+
package org.fisco.bcos.sdk.contract.auth.contracts;
22

33
import java.math.BigInteger;
44
import java.util.Arrays;

sdk-service/src/main/java/org/fisco/bcos/sdk/auth/contracts/MethodAuthManager.java renamed to sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/contracts/MethodAuthManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fisco.bcos.sdk.auth.contracts;
1+
package org.fisco.bcos.sdk.contract.auth.contracts;
22

33
import java.math.BigInteger;
44
import java.util.Arrays;

0 commit comments

Comments
 (0)