Merge pull request #213 from cherry1603/develop

fix miner address displayed in the RPC
XDagger · Apr 9, 2023 · 4734086 · 4734086
2 parents 7076a5a + 5eed030
commit 4734086
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/io/xdag/rpc/modules/web3/Web3XdagModuleImpl.java b/src/main/java/io/xdag/rpc/modules/web3/Web3XdagModuleImpl.java
@@ -63,6 +63,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+
+import io.xdag.utils.PubkeyAddressUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.bytes.MutableBytes32;
@@ -285,7 +287,7 @@ public String xdag_getMaxXferBalance() throws Exception {
     }
 
     private PoolWorkerDTO getPoolWorkerDTO(PoolWorkerDTO.PoolWorkerDTOBuilder poolWorkerDTOBuilder,Miner miner){
-        poolWorkerDTOBuilder.address(BasicUtils.hash2Address(miner.getAddressHash()))
+        poolWorkerDTOBuilder.address(PubkeyAddressUtils.toBase58(miner.getAddressHashByte()))
                 .status(miner.getMinerStates().toString())
                 .unpaidShares(MinerCalculate.calculateUnpaidShares(miner))
                 .hashrate(BasicUtils.xdag_log_difficulty2hashrate(miner.getMeanLogDiff()))