feat(model): add service fee to onchain BTC transactions (#23)

dwarvesf · Feb 26, 2025 · 84eaf4f · 84eaf4f
1 parent 92c773d
commit 84eaf4f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/internal/model/onchain_btc_processed_transaction.go b/internal/model/onchain_btc_processed_transaction.go
@@ -25,5 +25,6 @@ type OnchainBtcProcessedTransaction struct {
 	CreatedAt                 time.Time                 `json:"created_at"`
 	UpdatedAt                 time.Time                 `json:"updated_at"`
 	NetworkFee                string                    `gorm:"column:network_fee" json:"network_fee"`
+	ServiceFee                string                    `gorm:"column:service_fee" json:"service_fee"`
 	TotalAmount               string                    `gorm:"-" json:"total_amount"`
 }
diff --git a/internal/store/onchainbtcprocessedtransaction/onchain_btc_processed_transaction.go b/internal/store/onchainbtcprocessedtransaction/onchain_btc_processed_transaction.go
@@ -112,11 +112,11 @@ func (s *store) Find(db *gorm.DB, filter ListFilter) ([]*model.OnchainBtcProcess
 		if err != nil {
 			continue
 		}
-		networkFee, err := strconv.ParseInt(transactions[i].NetworkFee, 10, 64)
+		svcFee, err := strconv.ParseInt(transactions[i].ServiceFee, 10, 64)
 		if err != nil {
 			continue
 		}
-		totalAmount := amount - networkFee
+		totalAmount := amount - svcFee
 		transactions[i].TotalAmount = strconv.FormatInt(totalAmount, 10)
 	}
 

diff --git a/internal/utils/config/config.go b/internal/utils/config/config.go
@@ -46,9 +46,10 @@ type DBConnection struct {
 }
 
 type BitcoinConfig struct {
-	WalletWIF         string
-	BlockstreamAPIURL string
-	MaxTxFeeUSD       float64
+	WalletWIF            string
+	BlockstreamAPIURL    string
+	MaxTxFeeUSD          float64
+	ServiceFeePercentage float64
 }
 
 func New() *AppConfig {
@@ -73,9 +74,10 @@ func New() *AppConfig {
 			SSLMode: os.Getenv("DB_SSL_MODE"),
 		},
 		Bitcoin: BitcoinConfig{
-			WalletWIF:         os.Getenv("BTC_WALLET_WIF"),
-			BlockstreamAPIURL: os.Getenv("BTC_BLOCKSTREAM_API_URL"),
-			MaxTxFeeUSD:       envVarAsFloat("BTC_MAX_TX_FEE_USD", 1.0),
+			WalletWIF:            os.Getenv("BTC_WALLET_WIF"),
+			BlockstreamAPIURL:    os.Getenv("BTC_BLOCKSTREAM_API_URL"),
+			MaxTxFeeUSD:          envVarAsFloat("BTC_MAX_TX_FEE_USD", 1.0),
+			ServiceFeePercentage: envVarAsFloat("BTC_SERVICE_FEE_PERCENTAGE", 0.01),
 		},
 		Blockchain: BlockchainConfig{
 			BaseRPCEndpoint:           os.Getenv("BLOCKCHAIN_BASE_RPC_ENDPOINT"),

diff --git a/migrations/schema/0011_add_service_fee_to_onchain_btc_processed_transactions.down.sql b/migrations/schema/0011_add_service_fee_to_onchain_btc_processed_transactions.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE onchain_btc_processed_transactions
+DROP COLUMN IF EXISTS service_fee; 
diff --git a/migrations/schema/0011_add_service_fee_to_onchain_btc_processed_transactions.up.sql b/migrations/schema/0011_add_service_fee_to_onchain_btc_processed_transactions.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE onchain_btc_processed_transactions
+ADD COLUMN service_fee VARCHAR(255) DEFAULT '0';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE onchain_btc_processed_transactions
		DROP COLUMN IF EXISTS service_fee;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE onchain_btc_processed_transactions
		ADD COLUMN service_fee VARCHAR(255) DEFAULT '0';