From 54ac6dbad74295199d4f7829621bf68a0ee6367a Mon Sep 17 00:00:00 2001
From: zhangbin <apple@192.168.1.82>
Date: Mon, 23 Sep 2024 14:32:54 +0800
Subject: [PATCH] fixed resolved did bug

---
 internal/didapi/didtype.go | 16 ++++++++++------
 internal/ethapi/didapi.go  |  5 ++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/internal/didapi/didtype.go b/internal/didapi/didtype.go
index 70596fd5..cc48a392 100644
--- a/internal/didapi/didtype.go
+++ b/internal/didapi/didtype.go
@@ -60,7 +60,11 @@ type RpcTranasactionData struct {
 }
 
 func (rpcTxData *RpcTranasactionData) FromTranasactionData(txData did.DIDTransactionData) bool {
-	hash, err := elacom.Uint256FromHexString(txData.TXID)
+	txid := txData.TXID
+	if txid[0:2] == "0x" {
+		txid = txid[2:]
+	}
+	hash, err := elacom.Uint256FromHexString(txid)
 	if err != nil {
 		return false
 	}
@@ -91,14 +95,14 @@ func (rpcTxData *RpcTranasactionData) ToResolveTxData() ResolveTranasactionData
 
 // resolve payload of DID transaction
 type ResolvePayloadDIDInfo struct {
-	DID        string                	 `json:"did"`
-	Status     int                   	 `json:"status"`
+	DID        string                    `json:"did"`
+	Status     int                       `json:"status"`
 	RpcTXDatas []ResolveTranasactionData `json:"transaction,omitempty"`
 }
 
 type ResolveTranasactionData struct {
-	TXID      string       	   `json:"txid"`
-	Timestamp string       	   `json:"timestamp"`
+	TXID      string           `json:"txid"`
+	Timestamp string           `json:"timestamp"`
 	Operation ResolveOperation `json:"operation"`
 }
 
@@ -106,4 +110,4 @@ type ResolveOperation struct {
 	Header  did.Header `json:"header"`
 	Payload did.DIDDoc `json:"payload"`
 	Proof   did.Proof  `json:"proof"`
-}
\ No newline at end of file
+}
diff --git a/internal/ethapi/didapi.go b/internal/ethapi/didapi.go
index 8e0330db..8d52feb0 100644
--- a/internal/ethapi/didapi.go
+++ b/internal/ethapi/didapi.go
@@ -480,11 +480,13 @@ func (s *PublicTransactionPoolAPI) ResolveDID(ctx context.Context, param map[str
 		rpcPayloadDid.DID = txData.Operation.DIDDoc.ID
 		err, timestamp := s.getTxTime(ctx, txData.TXID)
 		if err != nil {
+			log.Error("getTxTime failed ", "error", err)
 			continue
 		}
 		tempTXData := new(didapi.RpcTranasactionData)
 		succe := tempTXData.FromTranasactionData(txData)
-		if succe == false {
+		if !succe {
+			log.Error("FromTranasactionData error >>>> ")
 			continue
 		}
 
@@ -495,6 +497,7 @@ func (s *PublicTransactionPoolAPI) ResolveDID(ctx context.Context, param map[str
 				//fill in
 				deactiveTXData, err := s.getDeactiveTx(ctx, buf.Bytes())
 				if err != nil {
+					log.Error("getDeactiveTx failed >>>> ", " error ", err)
 					return nil, err
 				}
 				rpcPayloadDid.RpcTXDatas = append(rpcPayloadDid.RpcTXDatas, *deactiveTXData)