From caf0a90bba8540889700ce86276fd391407a442d Mon Sep 17 00:00:00 2001
From: DevinZeng <studyzy@qq.com>
Date: Sun, 28 Apr 2024 23:30:36 +0800
Subject: [PATCH] fix: Cmd config and mempool bug

--bug=1
---
 cmd/runestonecli/config.go   |  2 +-
 cmd/runestonecli/config.yaml | 16 ++++++++--------
 cmd/runestonecli/i18n.go     |  2 +-
 cmd/runestonecli/mempool.go  | 17 ++++++++++-------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/cmd/runestonecli/config.go b/cmd/runestonecli/config.go
index cd2cf75..0746b55 100644
--- a/cmd/runestonecli/config.go
+++ b/cmd/runestonecli/config.go
@@ -81,7 +81,7 @@ func (c Config) GetEtching() (*runestone.Etching, error) {
 	etching.Spacers = &r.Spacers
 	if c.Etching.Symbol != nil {
 		symbolStr := *c.Etching.Symbol
-		symbol := rune(symbolStr[0])
+		symbol := ([]rune(symbolStr))[0]
 		etching.Symbol = &symbol
 	}
 	if c.Etching.Premine != nil {
diff --git a/cmd/runestonecli/config.yaml b/cmd/runestonecli/config.yaml
index 9592051..8f7cfe9 100644
--- a/cmd/runestonecli/config.yaml
+++ b/cmd/runestonecli/config.yaml
@@ -1,18 +1,18 @@
-PrivateKey: "1234567890"
+PrivateKey: "b3a6727304df7ce886b678c8cca6a29d443fecd78f6913bc9d923657416ff100"
 Network: "testnet" # mainnet or testnet
-RpcUrl: "https://blockstream.info/testnet/api" #https://mempool.space/api https://mempool.space/testnet/api
-FeePerByte: 5
-UtxoAmount: 1000
+RpcUrl: "https://mempool.space/testnet/api" #https://mempool.space/api https://mempool.space/testnet/api
+FeePerByte: 10
+UtxoAmount: 666
 Etching:
-  Rune: "STUDYZY"
-  Symbol: "曾"
+  Rune: "GOOD.LUCK.COIN"
+  Symbol: "🪙"
   Premine: 1000000
   Amount: 1000
   Cap: 20000
 #  Divisibility: 0
 #  HeightStart: 0
 #  HeightEnd: 0
-#  HeightOffsetStart: 0
-#  HeightOffsetEnd: 0
+  HeightOffsetStart: 0
+  HeightOffsetEnd: 100000
 Mint:
   RuneId: "2609649:946"
\ No newline at end of file
diff --git a/cmd/runestonecli/i18n.go b/cmd/runestonecli/i18n.go
index e163ab0..95ff729 100644
--- a/cmd/runestonecli/i18n.go
+++ b/cmd/runestonecli/i18n.go
@@ -60,7 +60,7 @@ func getDefaultLanguage() language.Tag {
 	langTag := strings.Split(langEnv, ".")[0]
 	tag, err := language.Parse(langTag)
 	if err != nil {
-		return language.Chinese
+		return language.English
 	}
 	return tag
 }
diff --git a/cmd/runestonecli/mempool.go b/cmd/runestonecli/mempool.go
index 654d822..e602550 100644
--- a/cmd/runestonecli/mempool.go
+++ b/cmd/runestonecli/mempool.go
@@ -209,13 +209,16 @@ func (m MempoolConnector) GetTxByHash(hash string) (*BtcTxInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	txInfo := &BtcTxInfo{
-		Tx:            nil,
-		BlockHeight:   resp.Status.BlockHeight,
-		BlockHash:     HexToHash(resp.Status.BlockHash),
-		BlockTime:     uint64(resp.Status.BlockTime),
-		Confirmations: 0,
-		TxIndex:       0,
+	txInfo := &BtcTxInfo{}
+	if resp.Status.Confirmed {
+		txInfo.BlockHeight = resp.Status.BlockHeight
+		txInfo.BlockHash = HexToHash(resp.Status.BlockHash)
+		txInfo.BlockTime = uint64(resp.Status.BlockTime)
+		latest, err := m.GetBlockHeight()
+		if err != nil {
+			return nil, err
+		}
+		txInfo.Confirmations = latest - txInfo.BlockHeight + 1
 	}
 	tx, err := m.GetRawTxByHash(hash)
 	if err != nil {