fix inscribe fee

b2network · Feb 20, 2024 · 598779f · 598779f
1 parent 6bb326e
commit 598779f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/internal/handler/inscribe.go b/internal/handler/inscribe.go
@@ -79,6 +79,6 @@ func Inscribe(ctx *svc.ServiceContext) {
 				}
 			}
 		}
-		time.Sleep(10 * time.Second)
+		time.Sleep(3 * time.Second)
 	}
 }
diff --git a/pkg/inscribe/inscribe.go b/pkg/inscribe/inscribe.go
@@ -137,8 +137,8 @@ func NewInscriptionRequest(btcAPIClient btcapi.Client, address btcutil.Address,
 	return &InscriptionRequest{
 		CommitTxOutPointList:   commitTxOutPointList,
 		CommitTxPrivateKeyList: commitTxPrivateKeyList,
-		CommitFeeRate:          recommendedFees.FastestFee + 1,
-		FeeRate:                recommendedFees.FastestFee + 2,
+		CommitFeeRate:          recommendedFees.FastestFee,
+		FeeRate:                recommendedFees.FastestFee,
 		DataList:               dataList,
 		SingleRevealTxOnly:     false,
 	}, nil
@@ -330,8 +330,9 @@ func (tool *InscriptionTool) buildCommitTx(commitTxOutPointList []*wire.OutPoint
 		tx.AddTxOut(tool.txCtxDataList[i].revealTxPrevOutput)
 	}
 
+	witnessSize := len(tx.TxIn)*66 + 2
 	tx.AddTxOut(wire.NewTxOut(0, *changePkScript))
-	fee := btcutil.Amount(mempool.GetTxVirtualSize(btcutil.NewTx(tx))) * btcutil.Amount(commitFeeRate)
+	fee := (btcutil.Amount(mempool.GetTxVirtualSize(btcutil.NewTx(tx))) + btcutil.Amount(witnessSize)) * btcutil.Amount(commitFeeRate)
 	changeAmount := totalSenderAmount - btcutil.Amount(totalRevealPrevOutput) - fee
 	if changeAmount > 0 {
 		tx.TxOut[len(tx.TxOut)-1].Value = int64(changeAmount)

diff --git a/test-docker/docker-compose.yml b/test-docker/docker-compose.yml
@@ -49,7 +49,7 @@ services:
       BITCOIN_NETWORK_NAME: "testnet3"
       BITCOIN_PRIVATE_KEY: "55968c09fb90a496096bafdeaac0f791f527b17324d1d0e63d3550e68a7b0cc5"
       COMMITTER_DESTINATION_ADDRESS: "tb1ptlp06cp6da4quje623ne8ataf2d4jy80m3jyjqr34c6dp6s5jddqtusute"
-    image: ghcr.io/b2network/b2-committer:sha-0a6e6ff
+    image: ghcr.io/b2network/b2-committer:sha-6bb326e
 #
 #
 #  node2:
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,6 @@ func Inscribe(ctx *svc.ServiceContext) { @@
     				}
     			}
     		}
-    		time.Sleep(10 * time.Second)
+    		time.Sleep(3 * time.Second)
     	}
     }