Skip to content

<fix>(auth): move auth service to sdk transaction, add method auth interface. #419

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2021
Merged

<fix>(auth): move auth service to sdk transaction, add method auth interface. #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf931bf
<fix>(auth): move auth service to sdk transaction, add method auth in…
kyonRay Nov 28, 2021
299f15d
<fix>(auth): fix auth bug, add auth interfaces.
kyonRay Nov 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk-core/src/main/java/org/fisco/bcos/sdk/model/TransactionReceipt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public void setGasUsed(String gasUsed) {
}

public String getContractAddress() {
if (!isWasm() && Objects.nonNull(contractAddress)) {
if (!isWasm() && Objects.nonNull(contractAddress) && !contractAddress.isEmpty()) {
return "0x" + contractAddress;
}

Expand Down
246 changes: 0 additions & 246 deletions sdk-service/src/main/java/org/fisco/bcos/sdk/auth/manager/AuthManager.java
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions sdk-service/src/main/java/org/fisco/bcos/sdk/auth/po/CommitteeInfo.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions sdk-service/src/test/java/org/fisco/bcos/sdk/test/client/ResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ public void testTransactionReceipt() throws JsonProcessingException {
+ " \"result\": {\n"
+ " \"blockHash\": \"0x977efec48c248ea4be87016446b40d7785d7b71b7d4e3aa0b103b9cf0f5fe19e\",\n"
+ " \"blockNumber\": \"0xa\",\n"
+ " \"contractAddress\": \"0x0000000000000000000000000000000000000000\",\n"
+ " \"contractAddress\": \"0000000000000000000000000000000000000000\",\n"
+ " \"from\": \"0xcdcce60801c0a2e6bb534322c32ae528b9dec8d2\",\n"
+ " \"gasUsed\": \"0x1fb8d\",\n"
+ " \"input\": \"0xb602109a000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000203078313030303030303030303030303030303030303030303030303030303030000000000000000000000000000000000000000000000000000000000000000832303139303733300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002616100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026262000000000000000000000000000000000000000000000000000000000000\",\n"
Expand Down Expand Up @@ -822,7 +822,7 @@ public void testTransactionReceiptWithProof() throws JsonProcessingException {
+ " ],\n"
+ " \"blockHash\": \"0xcd31b05e466bce99460b1ed70d6069fdfbb15e6eef84e9b9e4534358edb3899a\",\n"
+ " \"blockNumber\": \"0x5\",\n"
+ " \"contractAddress\": \"0x0000000000000000000000000000000000000000\",\n"
+ " \"contractAddress\": \"0000000000000000000000000000000000000000\",\n"
+ " \"from\": \"0x148947262ec5e21739fe3a931c29e8b84ee34a0f\",\n"
+ " \"gasUsed\": \"0x21dc1b\",\n"
+ " \"input\": \"0x8a42ebe90000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000000000000000000000000000000000000000000a3564646636663863653800000000000000000000000000000000000000000000\",\n"
Expand Down
2 changes: 1 addition & 1 deletion ...co/bcos/sdk/auth/contracts/Committee.java → ...dk/contract/auth/contracts/Committee.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.math.BigInteger;
import java.util.Arrays;
Expand Down
11 changes: 1 addition & 10 deletions .../sdk/auth/contracts/CommitteeManager.java → ...ract/auth/contracts/CommitteeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.math.BigInteger;
import java.util.Arrays;
Expand Down Expand Up @@ -106,15 +106,6 @@ public String _committee() throws ContractException {
return executeCallWithSingleValueReturn(function, String.class);
}

public String _contractPrecompiled() throws ContractException {
final Function function =
new Function(
FUNC__CONTRACTPRECOMPILED,
Arrays.<Type>asList(),
Arrays.<TypeReference<?>>asList(new TypeReference<Address>() {}));
return executeCallWithSingleValueReturn(function, String.class);
}

public String _proposalMgr() throws ContractException {
final Function function =
new Function(
Expand Down
2 changes: 1 addition & 1 deletion ...th/contracts/ContractAuthPrecompiled.java → ...th/contracts/ContractAuthPrecompiled.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.math.BigInteger;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion ...k/auth/contracts/ContractInterceptor.java → ...t/auth/contracts/ContractInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.util.Arrays;
import org.fisco.bcos.sdk.client.Client;
Expand Down
2 changes: 1 addition & 1 deletion ...sdk/auth/contracts/DeployAuthManager.java → ...act/auth/contracts/DeployAuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.math.BigInteger;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion ...sdk/auth/contracts/MethodAuthManager.java → ...act/auth/contracts/MethodAuthManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.math.BigInteger;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion ...s/sdk/auth/contracts/ProposalManager.java → ...tract/auth/contracts/ProposalManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.fisco.bcos.sdk.auth.contracts;
package org.fisco.bcos.sdk.contract.auth.contracts;

import java.math.BigInteger;
import java.util.Arrays;
Expand Down
Loading