Merge branch 'b/testnet' into b/master

bitcat365 · Jul 16, 2024 · 8dcb9ac · 8dcb9ac
2 parents 64decba + 2e51f56
commit 8dcb9ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/api/internal/logic/runtime/runtimetransactioninfologic.go b/api/internal/logic/runtime/runtimetransactioninfologic.go
@@ -49,11 +49,19 @@ func (l *RuntimeTransactionInfoLogic) RuntimeTransactionInfo(req *types.RuntimeT
 		return nil, errort.NewDefaultError()
 	}
 
+	if txModel == nil {
+		return nil, nil
+	}
+
+	runtimeName := ""
 	runtimeModel, err := l.svcCtx.RuntimeModel.FindOneByRuntimeId(l.ctx, runtimeId)
 	if err != nil && !errors.Is(err, sqlx.ErrNotFound) {
 		logc.Errorf(l.ctx, "find runtime info error, %v", err)
 		return nil, errort.NewDefaultError()
 	}
+	if runtimeModel != nil {
+		runtimeName = runtimeModel.Name
+	}
 
 	var consensusTx *types.RuntimeTransactionConsensusTx = nil
 	var evmTx *types.RuntimeTransactionEvmTx = nil
@@ -71,6 +79,7 @@ func (l *RuntimeTransactionInfoLogic) RuntimeTransactionInfo(req *types.RuntimeT
 			return nil, errort.NewDefaultError()
 		}
 		evmTx = &types.RuntimeTransactionEvmTx{
+			Hash:     txModel.EvmHash,
 			From:     txModel.EvmFrom,
 			To:       txModel.EvmTo,
 			Nonce:    int64(txData.Nonce()),
@@ -150,7 +159,7 @@ func (l *RuntimeTransactionInfoLogic) RuntimeTransactionInfo(req *types.RuntimeT
 
 	resp = &types.RuntimeTransactionInfoResponse{
 		RuntimeId:   runtimeId,
-		RuntimeName: runtimeModel.Name,
+		RuntimeName: runtimeName,
 		TxHash:      txModel.TxHash,
 		Round:       txModel.Round,
 		Result:      txModel.Result,

diff --git a/api/internal/types/types.go b/api/internal/types/types.go
diff --git a/api/oasisscan.api b/api/oasisscan.api
@@ -387,6 +387,7 @@ type (
 		Nonce  int64  `json:"nonce"`
 	}
 	RuntimeTransactionEvmTx {
+		Hash     string `json:"hash"`
 		From     string `json:"from"`
 		To       string `json:"to"`
 		Nonce    int64  `json:"nonce"`