fix(txpool, cmd, gtk): broadcast transactions with zero fee (#1589)

Co-authored-by: Javad Rajabzadeh <[email protected]>
pactus-project · Nov 10, 2024 · ca9820b · ca9820b
1 parent e89feff
commit ca9820b
Show file tree

Hide file tree

Showing 33 changed files with 612 additions and 482 deletions.
diff --git a/cmd/gtk/assets/ui/dialog_transaction_bond.ui b/cmd/gtk/assets/ui/dialog_transaction_bond.ui
@@ -272,7 +272,7 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Fee (Optional):</property>
+                <property name="label" translatable="yes">Fee:</property>
               </object>
               <packing>
                 <property name="expand">False</property>

diff --git a/cmd/gtk/assets/ui/dialog_transaction_transfer.ui b/cmd/gtk/assets/ui/dialog_transaction_transfer.ui
@@ -231,7 +231,7 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Fee (Optional):</property>
+                <property name="label" translatable="yes">Fee:</property>
               </object>
               <packing>
                 <property name="expand">False</property>

diff --git a/cmd/gtk/assets/ui/dialog_transaction_withdraw.ui b/cmd/gtk/assets/ui/dialog_transaction_withdraw.ui
@@ -226,7 +226,7 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes">Fee (Optional):</property>
+                <property name="label" translatable="yes">Fee:</property>
               </object>
               <packing>
                 <property name="expand">False</property>

diff --git a/cmd/gtk/dialog_address_change_password.go b/cmd/gtk/dialog_address_change_password.go
@@ -47,10 +47,14 @@ func changePassword(wlt *wallet.Wallet) {
 		}
 
 		err = wlt.UpdatePassword(oldPassword, newPassword)
-		errorCheck(err)
+		if err != nil {
+			showError(err)
+
+			return
+		}
 
 		err = wlt.Save()
-		errorCheck(err)
+		fatalErrorCheck(err)
 
 		dlg.Close()
 	}

diff --git a/cmd/gtk/dialog_addresss_private_key.go b/cmd/gtk/dialog_addresss_private_key.go
@@ -22,7 +22,11 @@ func showAddressPrivateKey(wlt *wallet.Wallet, addr string) {
 	}
 
 	prv, err := wlt.PrivateKey(password, addr)
-	errorCheck(err)
+	if err != nil {
+		showError(err)
+
+		return
+	}
 
 	dlg := getDialogObj(builder, "id_dialog_address_private_key")
 	addressEntry := getEntryObj(builder, "id_entry_address")

diff --git a/cmd/gtk/dialog_transaction_bond.go b/cmd/gtk/dialog_transaction_bond.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 
 	"github.com/gotk3/gotk3/gtk"
-	"github.com/pactus-project/pactus/cmd"
 	"github.com/pactus-project/pactus/types/amount"
 	"github.com/pactus-project/pactus/types/tx/payload"
 	"github.com/pactus-project/pactus/wallet"
@@ -35,6 +34,9 @@ func broadcastTransactionBond(wlt *wallet.Wallet) {
 	getButtonObj(builder, "id_button_cancel").SetImage(CancelIcon())
 	getButtonObj(builder, "id_button_send").SetImage(SendIcon())
 
+	estimatedFee := estimatedFee(wlt, payload.TypeBond)
+	feeEntry.SetText(fmt.Sprintf("%g", estimatedFee.ToPAC()))
+
 	for _, ai := range wlt.AllAccountAddresses() {
 		senderEntry.Append(ai.Address, ai.Address)
 	}
@@ -48,6 +50,7 @@ func broadcastTransactionBond(wlt *wallet.Wallet) {
 	onSenderChanged := func() {
 		senderStr := senderEntry.GetActiveID()
 		updateAccountHint(senderHint, senderStr, wlt)
+		updateBalanceHint(amountHint, senderEntry.GetActiveID(), wlt)
 	}
 
 	onReceiverChanged := func() {
@@ -56,10 +59,6 @@ func broadcastTransactionBond(wlt *wallet.Wallet) {
 		updateValidatorHint(receiverHint, receiverStr, wlt)
 	}
 
-	onAmountChanged := func() {
-		updateAmountHint(amountHint, senderEntry.GetActiveID(), wlt)
-	}
-
 	onFeeChanged := func() {
 		updateFeeHint(feeHint, wlt, payload.TypeTransfer)
 	}
@@ -74,25 +73,20 @@ func broadcastTransactionBond(wlt *wallet.Wallet) {
 
 		amt, err := amount.FromString(amountStr)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}
 
+		feeStr, _ := feeEntry.GetText()
 		opts := []wallet.TxOption{
 			wallet.OptionMemo(memo),
-		}
-
-		fee, _ := feeEntry.GetText()
-		if fee != "" {
-			feeAmount, err := amount.FromString(fee)
-			cmd.FatalErrorCheck(err)
-			opts = append(opts, wallet.OptionFee(feeAmount))
+			wallet.OptionFeeFromString(feeStr),
 		}
 
 		trx, err := wlt.MakeBondTx(sender, receiver, publicKey, amt, opts...)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}
@@ -120,7 +114,6 @@ Memo:   %s
 	signals := map[string]any{
 		"on_sender_changed":   onSenderChanged,
 		"on_receiver_changed": onReceiverChanged,
-		"on_amount_changed":   onAmountChanged,
 		"on_fee_changed":      onFeeChanged,
 		"on_send":             onSend,
 		"on_cancel":           onClose,

diff --git a/cmd/gtk/dialog_transaction_transfer.go b/cmd/gtk/dialog_transaction_transfer.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 
 	"github.com/gotk3/gotk3/gtk"
-	"github.com/pactus-project/pactus/cmd"
 	"github.com/pactus-project/pactus/types/amount"
 	"github.com/pactus-project/pactus/types/tx/payload"
 	"github.com/pactus-project/pactus/wallet"
@@ -34,6 +33,9 @@ func broadcastTransactionTransfer(wlt *wallet.Wallet) {
 	getButtonObj(builder, "id_button_cancel").SetImage(CancelIcon())
 	getButtonObj(builder, "id_button_send").SetImage(SendIcon())
 
+	estimatedFee := estimatedFee(wlt, payload.TypeTransfer)
+	feeEntry.SetText(fmt.Sprintf("%g", estimatedFee.ToPAC()))
+
 	for _, i := range wlt.AllAccountAddresses() {
 		senderEntry.Append(i.Address, i.Address)
 	}
@@ -42,17 +44,13 @@ func broadcastTransactionTransfer(wlt *wallet.Wallet) {
 	onSenderChanged := func() {
 		senderStr := senderEntry.GetActiveID()
 		updateAccountHint(senderHint, senderStr, wlt)
+		updateBalanceHint(amountHint, senderEntry.GetActiveID(), wlt)
 	}
 
 	onReceiverChanged := func() {
 		receiverStr, _ := receiverEntry.GetText()
 		updateAccountHint(receiverHint, receiverStr, wlt)
 	}
-
-	onAmountChanged := func() {
-		updateAmountHint(amountHint, senderEntry.GetActiveID(), wlt)
-	}
-
 	onFeeChanged := func() {
 		updateFeeHint(feeHint, wlt, payload.TypeTransfer)
 	}
@@ -65,25 +63,20 @@ func broadcastTransactionTransfer(wlt *wallet.Wallet) {
 
 		amt, err := amount.FromString(amountStr)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}
 
+		feeStr, _ := feeEntry.GetText()
 		opts := []wallet.TxOption{
 			wallet.OptionMemo(memo),
-		}
-
-		fee, _ := feeEntry.GetText()
-		if fee != "" {
-			feeAmount, err := amount.FromString(fee)
-			cmd.FatalErrorCheck(err)
-			opts = append(opts, wallet.OptionFee(feeAmount))
+			wallet.OptionFeeFromString(feeStr),
 		}
 
 		trx, err := wlt.MakeTransferTx(sender, receiver, amt, opts...)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}
@@ -111,7 +104,6 @@ Memo:   %s
 	signals := map[string]any{
 		"on_sender_changed":   onSenderChanged,
 		"on_receiver_changed": onReceiverChanged,
-		"on_amount_changed":   onAmountChanged,
 		"on_fee_changed":      onFeeChanged,
 		"on_send":             onSend,
 		"on_cancel":           onClose,

diff --git a/cmd/gtk/dialog_transaction_unbond.go b/cmd/gtk/dialog_transaction_unbond.go
@@ -46,7 +46,7 @@ func broadcastTransactionUnbond(wlt *wallet.Wallet) {
 
 		trx, err := wlt.MakeUnbondTx(validator, opts...)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}

diff --git a/cmd/gtk/dialog_transaction_withdraw.go b/cmd/gtk/dialog_transaction_withdraw.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 
 	"github.com/gotk3/gotk3/gtk"
-	"github.com/pactus-project/pactus/cmd"
 	"github.com/pactus-project/pactus/types/amount"
 	"github.com/pactus-project/pactus/types/tx/payload"
 	"github.com/pactus-project/pactus/wallet"
@@ -34,6 +33,9 @@ func broadcastTransactionWithdraw(wlt *wallet.Wallet) {
 	getButtonObj(builder, "id_button_cancel").SetImage(CancelIcon())
 	getButtonObj(builder, "id_button_send").SetImage(SendIcon())
 
+	estimatedFee := estimatedFee(wlt, payload.TypeWithdraw)
+	feeEntry.SetText(fmt.Sprintf("%g", estimatedFee.ToPAC()))
+
 	for _, ai := range wlt.AllValidatorAddresses() {
 		validatorEntry.Append(ai.Address, ai.Address)
 	}
@@ -46,6 +48,7 @@ func broadcastTransactionWithdraw(wlt *wallet.Wallet) {
 	onSenderChanged := func() {
 		senderStr := validatorEntry.GetActiveID()
 		updateValidatorHint(validatorHint, senderStr, wlt)
+		updateStakeHint(stakeHint, validatorEntry.GetActiveID(), wlt)
 	}
 
 	onReceiverChanged := func() {
@@ -54,10 +57,6 @@ func broadcastTransactionWithdraw(wlt *wallet.Wallet) {
 		updateAccountHint(receiverHint, receiverStr, wlt)
 	}
 
-	onAmountChanged := func() {
-		updateAmountHint(stakeHint, validatorEntry.GetActiveID(), wlt)
-	}
-
 	onFeeChanged := func() {
 		updateFeeHint(feeHint, wlt, payload.TypeTransfer)
 	}
@@ -71,25 +70,20 @@ func broadcastTransactionWithdraw(wlt *wallet.Wallet) {
 
 		amt, err := amount.FromString(amountStr)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}
 
+		feeStr, _ := feeEntry.GetText()
 		opts := []wallet.TxOption{
 			wallet.OptionMemo(memo),
-		}
-
-		fee, _ := feeEntry.GetText()
-		if fee != "" {
-			feeAmount, err := amount.FromString(fee)
-			cmd.FatalErrorCheck(err)
-			opts = append(opts, wallet.OptionFee(feeAmount))
+			wallet.OptionFeeFromString(feeStr),
 		}
 
 		trx, err := wlt.MakeWithdrawTx(sender, receiver, amt, opts...)
 		if err != nil {
-			errorCheck(err)
+			showError(err)
 
 			return
 		}
@@ -117,7 +111,6 @@ Memo:   %s
 	signals := map[string]any{
 		"on_sender_changed":   onSenderChanged,
 		"on_receiver_changed": onReceiverChanged,
-		"on_stake_changed":    onAmountChanged,
 		"on_fee_changed":      onFeeChanged,
 		"on_send":             onSend,
 		"on_cancel":           onClose,

diff --git a/cmd/gtk/dialog_wallet_create_address.go b/cmd/gtk/dialog_wallet_create_address.go
@@ -50,10 +50,14 @@ func createAddress(wdgWallet *widgetWallet) {
 			_, err = wdgWallet.model.wallet.NewValidatorAddress(walletAddressLabel)
 		}
 
-		errorCheck(err)
+		if err != nil {
+			showError(err)
+
+			return
+		}
 
 		err = wdgWallet.model.wallet.Save()
-		errorCheck(err)
+		fatalErrorCheck(err)
 
 		wdgWallet.model.rebuildModel()
 

diff --git a/cmd/gtk/model_wallet.go b/cmd/gtk/model_wallet.go
@@ -77,7 +77,7 @@ func (model *walletModel) rebuildModel() {
 			model.listStore.Clear()
 			for _, item := range data {
 				iter := model.listStore.Append()
-				err := model.listStore.Set(iter,
+				_ = model.listStore.Set(iter,
 					[]int{
 						IDAddressesColumnNo,
 						IDAddressesColumnAddress,
@@ -94,8 +94,6 @@ func (model *walletModel) rebuildModel() {
 						item[4],
 						item[5],
 					})
-
-				errorCheck(err)
 			}
 
 			return false

diff --git a/cmd/gtk/startup_assistant.go b/cmd/gtk/startup_assistant.go
@@ -225,7 +225,11 @@ func startupAssistant(workingDir string, chainType genesis.ChainType) bool {
 								snapshotURL,
 								storeDir,
 							)
-							fatalErrorCheck(err)
+							if err != nil {
+								showError(err)
+
+								return
+							}
 
 							ctx := context.Background()
 							mdCh := getMetadata(ctx, importer, listBox)