feat(SPV-1387, SPV-1396): replace estimated unlocking script size with estimated input size; rename UsersUTXO (#857)

dorzepowski · web-flow · commit d4c97023a95c · 2025-01-20T15:09:32.000+01:00
diff --git a/engine/database/models.go b/engine/database/models.go
@@ -9,7 +9,7 @@ func Models() []any {
 		User{},
 		Paymail{},
 		Address{},
-		UserUtxos{},
+		UserUTXO{},
 		Operation{},
 	}
 }
diff --git a/engine/database/repository/users.go b/engine/database/repository/users.go
@@ -50,7 +50,7 @@ func (u *Users) GetBalance(ctx context.Context, userID string, bucket string) (b
 	var balance bsv.Satoshis
 	err := u.db.
 		WithContext(ctx).
-		Model(&database.UserUtxos{}).
+		Model(&database.UserUTXO{}).
 		Where("user_id = ? AND bucket = ?", userID, bucket).
 		Select("COALESCE(SUM(satoshis), 0)").
 		Row().
diff --git a/engine/database/testabilities/fixture_database.go b/engine/database/testabilities/fixture_database.go
@@ -26,7 +26,7 @@ type UserUtxoFixture interface {
 	// WithSatoshis sets the satoshis value of the UTXO.
 	WithSatoshis(satoshis bsv.Satoshis) UserUtxoFixture
 
-	Storable[database.UserUtxos]
+	Storable[database.UserUTXO]
 }
 
 type Storable[Data any] interface {
diff --git a/engine/database/testabilities/user_utxo_fixture.go b/engine/database/testabilities/user_utxo_fixture.go
@@ -8,32 +8,33 @@ import (
 	"github.com/bitcoin-sv/spv-wallet/engine/database"
 	"github.com/bitcoin-sv/spv-wallet/engine/tester/fixtures"
 	"github.com/bitcoin-sv/spv-wallet/models/bsv"
+	"github.com/bitcoin-sv/spv-wallet/models/transaction/bucket"
 	"gorm.io/gorm"
 )
 
 var FirstCreatedAt = time.Date(2006, 02, 01, 15, 4, 5, 7, time.UTC)
 
 type userUtxoFixture struct {
-	db                           *gorm.DB
-	t                            testing.TB
-	index                        uint
-	userID                       string
-	txID                         string
-	vout                         uint32
-	satoshis                     bsv.Satoshis
-	unlockingScriptEstimatedSize uint64
+	db                 *gorm.DB
+	t                  testing.TB
+	index              uint
+	userID             string
+	txID               string
+	vout               uint32
+	satoshis           bsv.Satoshis
+	estimatedInputSize uint64
 }
 
 func newUtxoFixture(t testing.TB, db *gorm.DB, index uint32) *userUtxoFixture {
 	return &userUtxoFixture{
-		t:                            t,
-		db:                           db,
-		index:                        uint(index),
-		userID:                       fixtures.Sender.ID(),
-		txID:                         txIDTemplated(uint(index)),
-		vout:                         index,
-		satoshis:                     1,
-		unlockingScriptEstimatedSize: 106,
+		t:                  t,
+		db:                 db,
+		index:              uint(index),
+		userID:             fixtures.Sender.ID(),
+		txID:               txIDTemplated(uint(index)),
+		vout:               index,
+		satoshis:           1,
+		estimatedInputSize: database.EstimatedInputSizeForP2PKH,
 	}
 }
 
@@ -47,7 +48,7 @@ func (f *userUtxoFixture) OwnedBySender() UserUtxoFixture {
 }
 
 func (f *userUtxoFixture) P2PKH() UserUtxoFixture {
-	f.unlockingScriptEstimatedSize = fixtures.EstimatedUnlockingScriptSizeForP2PKH
+	f.estimatedInputSize = database.EstimatedInputSizeForP2PKH
 	return f
 }
 
@@ -56,16 +57,16 @@ func (f *userUtxoFixture) WithSatoshis(satoshis bsv.Satoshis) UserUtxoFixture {
 	return f
 }
 
-func (f *userUtxoFixture) Stored() *database.UserUtxos {
-	utxo := &database.UserUtxos{
-		UserID:                       f.userID,
-		TxID:                         f.txID,
-		Vout:                         f.vout,
-		Satoshis:                     uint64(f.satoshis),
-		UnlockingScriptEstimatedSize: f.unlockingScriptEstimatedSize,
-		Bucket:                       "bsv",
-		CreatedAt:                    FirstCreatedAt.Add(time.Duration(f.index) * time.Second), //nolint:gosec // this is used for testing and it should be fine even in case of integer overflow.
-		TouchedAt:                    FirstCreatedAt.Add(time.Duration(24) * time.Hour),
+func (f *userUtxoFixture) Stored() *database.UserUTXO {
+	utxo := &database.UserUTXO{
+		UserID:             f.userID,
+		TxID:               f.txID,
+		Vout:               f.vout,
+		Satoshis:           uint64(f.satoshis),
+		EstimatedInputSize: f.estimatedInputSize,
+		Bucket:             string(bucket.BSV),
+		CreatedAt:          FirstCreatedAt.Add(time.Duration(f.index) * time.Second), //nolint:gosec // this is used for testing and it should be fine even in case of integer overflow.
+		TouchedAt:          FirstCreatedAt.Add(time.Duration(24) * time.Hour),
 	}
 
 	f.db.Create(utxo)
diff --git a/engine/database/tracked_transaction.go b/engine/database/tracked_transaction.go
@@ -22,7 +22,7 @@ type TrackedTransaction struct {
 	Inputs  []*TrackedOutput `gorm:"foreignKey:SpendingTX"`
 	Outputs []*TrackedOutput `gorm:"foreignKey:TxID"`
 
-	newUTXOs []*UserUtxos `gorm:"-"`
+	newUTXOs []*UserUTXO `gorm:"-"`
 }
 
 // CreateP2PKHOutput prepares a new P2PKH output and adds it to the transaction.
@@ -52,7 +52,7 @@ func (t *TrackedTransaction) AddInputs(inputs ...*TrackedOutput) {
 func (t *TrackedTransaction) AfterCreate(tx *gorm.DB) error {
 	// Add new UTXOs
 	if len(t.newUTXOs) > 0 {
-		err := tx.Model(&UserUtxos{}).Create(t.newUTXOs).Error
+		err := tx.Model(&UserUTXO{}).Create(t.newUTXOs).Error
 		if err != nil {
 			return spverrors.Wrapf(err, "failed to save user utxos")
 		}
@@ -67,7 +67,7 @@ func (t *TrackedTransaction) AfterCreate(tx *gorm.DB) error {
 			}
 		})
 	if len(spentOutpoints) > 0 {
-		err := tx.Where("(tx_id, vout) IN ?", spentOutpoints).Delete(&UserUtxos{}).Error
+		err := tx.Where("(tx_id, vout) IN ?", spentOutpoints).Delete(&UserUTXO{}).Error
 		if err != nil {
 			return spverrors.Wrapf(err, "failed to delete spent utxos")
 		}
diff --git a/engine/database/user_utxos.go b/engine/database/user_utxos.go
@@ -6,29 +6,39 @@ import (
 	"gorm.io/datatypes"
 )
 
-// UserUtxos is a table holding user's Unspent Transaction Outputs (UTXOs).
-// TODO: It should be renamed to UserUTXO.
-type UserUtxos struct {
-	UserID                       string `gorm:"primaryKey;uniqueIndex:idx_window,sort:asc,priority:1"`
-	TxID                         string `gorm:"primaryKey;uniqueIndex:idx_window,sort:asc,priority:4"`
-	Vout                         uint32 `gorm:"primaryKey;uniqueIndex:idx_window,sort:asc,priority:5"`
-	Satoshis                     uint64
-	UnlockingScriptEstimatedSize uint64
-	Bucket                       string    `gorm:"check:chk_not_data_bucket,bucket <> 'data'"`
-	CreatedAt                    time.Time `gorm:"uniqueIndex:idx_window,sort:asc,priority:3"`
-	TouchedAt                    time.Time `gorm:"uniqueIndex:idx_window,sort:asc,priority:2"`
-	CustomInstructions           datatypes.JSONSlice[CustomInstruction]
+// EstimatedInputSizeForP2PKH is the estimated size increase when adding and unlocking P2PKH input to transaction.
+// 32 bytes txID
+// + 4 bytes vout index
+// + 1 byte script length
+// + 107 bytes script pub key
+// + 4 bytes nSequence
+const EstimatedInputSizeForP2PKH = 148
+
+// UserUTXO is a table holding user's Unspent Transaction Outputs (UTXOs).
+type UserUTXO struct {
+	UserID   string `gorm:"primaryKey;uniqueIndex:idx_window,sort:asc,priority:1"`
+	TxID     string `gorm:"primaryKey;uniqueIndex:idx_window,sort:asc,priority:4"`
+	Vout     uint32 `gorm:"primaryKey;uniqueIndex:idx_window,sort:asc,priority:5"`
+	Satoshis uint64
+	// EstimatedInputSize is the estimated size increase when adding and unlocking this UTXO to a transaction.
+	EstimatedInputSize uint64
+	Bucket             string    `gorm:"check:chk_not_data_bucket,bucket <> 'data'"`
+	CreatedAt          time.Time `gorm:"uniqueIndex:idx_window,sort:asc,priority:3"`
+	// TouchedAt is the time when the UTXO was last touched (selected for preparing transaction outline) - used for prioritizing UTXO selection.
+	TouchedAt time.Time `gorm:"uniqueIndex:idx_window,sort:asc,priority:2"`
+	// CustomInstructions is the list of instructions for unlocking given UTXO (it should be understood by client).
+	CustomInstructions datatypes.JSONSlice[CustomInstruction]
 }
 
-// NewP2PKHUserUTXO creates a new UserUtxos instance for a P2PKH output based on the given output and custom instructions.
-func NewP2PKHUserUTXO(output *TrackedOutput, customInstructions datatypes.JSONSlice[CustomInstruction]) *UserUtxos {
-	return &UserUtxos{
-		UserID:                       output.UserID,
-		TxID:                         output.TxID,
-		Vout:                         output.Vout,
-		Satoshis:                     uint64(output.Satoshis),
-		UnlockingScriptEstimatedSize: 106,
-		Bucket:                       "bsv",
-		CustomInstructions:           customInstructions,
+// NewP2PKHUserUTXO creates a new UserUTXO instance for a P2PKH output based on the given output and custom instructions.
+func NewP2PKHUserUTXO(output *TrackedOutput, customInstructions datatypes.JSONSlice[CustomInstruction]) *UserUTXO {
+	return &UserUTXO{
+		UserID:             output.UserID,
+		TxID:               output.TxID,
+		Vout:               output.Vout,
+		Satoshis:           uint64(output.Satoshis),
+		EstimatedInputSize: EstimatedInputSizeForP2PKH,
+		Bucket:             "bsv",
+		CustomInstructions: customInstructions,
 	}
 }
diff --git a/engine/tester/fixtures/tx_const_fixtures.go b/engine/tester/fixtures/tx_const_fixtures.go
@@ -7,6 +7,3 @@ var DefaultFeeUnit = bsv.FeeUnit{
 	Satoshis: 1,
 	Bytes:    1000,
 }
-
-// EstimatedUnlockingScriptSizeForP2PKH is the estimated unlocking script size for a P2PKH transaction.
-const EstimatedUnlockingScriptSizeForP2PKH = 106
diff --git a/engine/tester/fixtures/tx_fixtures_test.go b/engine/tester/fixtures/tx_fixtures_test.go
@@ -49,7 +49,8 @@ func TestMockTXGeneration(t *testing.T) {
 			spec := test.spec
 
 			// when
-			ok, err := spv.VerifyScripts(spec.TX())
+			tx := spec.TX()
+			ok, err := spv.VerifyScripts(tx)
 
 			// then:
 			require.NoError(t, err)
diff --git a/engine/transaction/outlines/internal/inputs/inputs_query_composer.go b/engine/transaction/outlines/internal/inputs/inputs_query_composer.go
@@ -22,12 +22,12 @@ func (c *inputsQueryComposer) build(db *gorm.DB) *gorm.DB {
 	utxoWithMinChange := c.searchForMinimalChangeValue(db, utxoWithChange)
 	selectedOutpoints := c.chooseInputsToCoverOutputsAndFeesAndHaveMinimalChange(db, utxoWithMinChange)
 
-	res := db.Model(&database.UserUtxos{}).Where("(tx_id, vout) in (?)", selectedOutpoints)
+	res := db.Model(&database.UserUTXO{}).Where("(tx_id, vout) in (?)", selectedOutpoints)
 	return res
 }
 
 func (c *inputsQueryComposer) utxos(db *gorm.DB) *gorm.DB {
-	return db.Model(&database.UserUtxos{}).
+	return db.Model(&database.UserUTXO{}).
 		Select(
 			txIdColumn,
 			voutColumn,
@@ -60,11 +60,11 @@ func (c *inputsQueryComposer) searchForMinimalChangeValue(db *gorm.DB, utxoWithC
 }
 
 func (c *inputsQueryComposer) feeCalculatedWithChangeOutput() string {
-	return fmt.Sprintf("ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d + %d) / cast(%d as float)) * %d as fee_with_change_output", c.txWithoutInputsSize, estimatedChangeOutputSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)
+	return fmt.Sprintf("ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d + %d) / cast(%d as float)) * %d as fee_with_change_output", c.txWithoutInputsSize, estimatedChangeOutputSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)
 }
 
 func (c *inputsQueryComposer) feeCalculatedWithoutChangeOutput() string {
-	return fmt.Sprintf("ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d) / cast(%d as float)) * %d as fee_no_change_output", c.txWithoutInputsSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)
+	return fmt.Sprintf("ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d) / cast(%d as float)) * %d as fee_no_change_output", c.txWithoutInputsSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)
 }
 
 func (c *inputsQueryComposer) remainingValue() string {
diff --git a/engine/transaction/outlines/internal/inputs/selector.go b/engine/transaction/outlines/internal/inputs/selector.go
@@ -16,7 +16,7 @@ const voutColumn = "vout"
 
 // Selector is a service that selects inputs for transaction.
 type Selector interface {
-	SelectInputsForTransaction(ctx context.Context, userID string, satoshis bsv.Satoshis, byteSizeOfTxBeforeAddingSelectedInputs uint64) ([]*database.UserUtxos, error)
+	SelectInputsForTransaction(ctx context.Context, userID string, satoshis bsv.Satoshis, byteSizeOfTxBeforeAddingSelectedInputs uint64) ([]*database.UserUTXO, error)
 }
 
 const (
@@ -39,7 +39,7 @@ func NewSelector(db *gorm.DB, feeUnit bsv.FeeUnit) Selector {
 	}
 }
 
-func (r *sqlInputsSelector) SelectInputsForTransaction(ctx context.Context, userID string, outputsTotalValue bsv.Satoshis, byteSizeOfTxWithoutInputs uint64) (utxos []*database.UserUtxos, err error) {
+func (r *sqlInputsSelector) SelectInputsForTransaction(ctx context.Context, userID string, outputsTotalValue bsv.Satoshis, byteSizeOfTxWithoutInputs uint64) (utxos []*database.UserUTXO, err error) {
 	err = r.db.WithContext(ctx).Transaction(func(db *gorm.DB) error {
 		inputsQuery := r.buildQueryForInputs(db, userID, outputsTotalValue, byteSizeOfTxWithoutInputs)
 
@@ -78,10 +78,10 @@ func (r *sqlInputsSelector) buildQueryForInputs(db *gorm.DB, userID string, outp
 	return composer.build(db)
 }
 
-func (r *sqlInputsSelector) buildUpdateTouchedAtQuery(db *gorm.DB, utxos []*database.UserUtxos) *gorm.DB {
+func (r *sqlInputsSelector) buildUpdateTouchedAtQuery(db *gorm.DB, utxos []*database.UserUTXO) *gorm.DB {
 	outpoints := make([][]any, 0, len(utxos))
 	for _, utxo := range utxos {
 		outpoints = append(outpoints, []any{utxo.TxID, utxo.Vout})
 	}
-	return db.Model(&database.UserUtxos{}).Where("(tx_id, vout) in (?)", outpoints)
+	return db.Model(&database.UserUTXO{}).Where("(tx_id, vout) in (?)", outpoints)
 }
diff --git a/engine/transaction/outlines/internal/inputs/selector_example_test.go b/engine/transaction/outlines/internal/inputs/selector_example_test.go
@@ -19,13 +19,13 @@ func ExampleSelector_buildQueryForInputs_sqlite() {
 
 	query := db.ToSQL(func(db *gorm.DB) *gorm.DB {
 		query := selector.buildQueryForInputs(db, "someuserid", 1, 10)
-		query.Find(&database.UserUtxos{})
+		query.Find(&database.UserUTXO{})
 		return query
 	})
 
 	fmt.Println(query)
 
-	// Output: SELECT * FROM `xapi_user_utxos` WHERE (tx_id, vout) in (SELECT tx_id,vout FROM (SELECT tx_id,vout,change,min(case when change >= 0 then change end) over () as min_change FROM (SELECT tx_id,vout,case when remaining_value - fee_no_change_output <= 0 then remaining_value - fee_no_change_output else remaining_value - fee_with_change_output end as change FROM (SELECT `tx_id`,`vout`,sum(satoshis) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) - 1 as remaining_value,ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10) / cast(1000 as float)) * 1 as fee_no_change_output,ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10 + 34) / cast(1000 as float)) * 1 as fee_with_change_output FROM `xapi_user_utxos` WHERE user_id = "someuserid") as utxo) as utxoWithChange) as utxoWithMinChange WHERE change <= min_change)
+	// Output: SELECT * FROM `xapi_user_utxos` WHERE (tx_id, vout) in (SELECT tx_id,vout FROM (SELECT tx_id,vout,change,min(case when change >= 0 then change end) over () as min_change FROM (SELECT tx_id,vout,case when remaining_value - fee_no_change_output <= 0 then remaining_value - fee_no_change_output else remaining_value - fee_with_change_output end as change FROM (SELECT `tx_id`,`vout`,sum(satoshis) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) - 1 as remaining_value,ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10) / cast(1000 as float)) * 1 as fee_no_change_output,ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10 + 34) / cast(1000 as float)) * 1 as fee_with_change_output FROM `xapi_user_utxos` WHERE user_id = "someuserid") as utxo) as utxoWithChange) as utxoWithMinChange WHERE change <= min_change)
 }
 
 // ExampleSelector_buildQueryForInputs_postgresql demonstrates what would be the query used to select inputs for a transaction.
@@ -37,13 +37,13 @@ func ExampleSelector_buildQueryForInputs_postgresql() {
 
 	query := db.ToSQL(func(db *gorm.DB) *gorm.DB {
 		query := selector.buildQueryForInputs(db, "someuserid", 1, 10)
-		query.Find(&database.UserUtxos{})
+		query.Find(&database.UserUTXO{})
 		return query
 	})
 
 	fmt.Println(query)
 
-	// Output: SELECT * FROM "xapi_user_utxos" WHERE (tx_id, vout) in (SELECT tx_id,vout FROM (SELECT tx_id,vout,change,min(case when change >= 0 then change end) over () as min_change FROM (SELECT tx_id,vout,case when remaining_value - fee_no_change_output <= 0 then remaining_value - fee_no_change_output else remaining_value - fee_with_change_output end as change FROM (SELECT "tx_id","vout",sum(satoshis) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) - 1 as remaining_value,ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10) / cast(1000 as float)) * 1 as fee_no_change_output,ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10 + 34) / cast(1000 as float)) * 1 as fee_with_change_output FROM "xapi_user_utxos" WHERE user_id = 'someuserid') as utxo) as utxoWithChange) as utxoWithMinChange WHERE change <= min_change)
+	// Output: SELECT * FROM "xapi_user_utxos" WHERE (tx_id, vout) in (SELECT tx_id,vout FROM (SELECT tx_id,vout,change,min(case when change >= 0 then change end) over () as min_change FROM (SELECT tx_id,vout,case when remaining_value - fee_no_change_output <= 0 then remaining_value - fee_no_change_output else remaining_value - fee_with_change_output end as change FROM (SELECT "tx_id","vout",sum(satoshis) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) - 1 as remaining_value,ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10) / cast(1000 as float)) * 1 as fee_no_change_output,ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + 10 + 34) / cast(1000 as float)) * 1 as fee_with_change_output FROM "xapi_user_utxos" WHERE user_id = 'someuserid') as utxo) as utxoWithChange) as utxoWithMinChange WHERE change <= min_change)
 }
 
 // ExampleSelector_buildUpdateTouchedAtQuery_sqlite demonstrates what would be the SQL statement used to update inputs after selecting them.
@@ -52,10 +52,10 @@ func ExampleSelector_buildUpdateTouchedAtQuery_sqlite() {
 
 	selector := givenInputsSelector(db)
 
-	utxos := []*database.UserUtxos{
-		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 0, Satoshis: 10, UnlockingScriptEstimatedSize: 106, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
-		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 1, Satoshis: 10, UnlockingScriptEstimatedSize: 106, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
-		{UserID: "id_of_user_1", TxID: "tx_id_2", Vout: 0, Satoshis: 10, UnlockingScriptEstimatedSize: 106, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
+	utxos := []*database.UserUTXO{
+		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 0, Satoshis: 10, EstimatedInputSize: 148, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
+		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 1, Satoshis: 10, EstimatedInputSize: 148, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
+		{UserID: "id_of_user_1", TxID: "tx_id_2", Vout: 0, Satoshis: 10, EstimatedInputSize: 148, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
 	}
 
 	query := db.ToSQL(func(db *gorm.DB) *gorm.DB {
@@ -75,10 +75,10 @@ func ExampleSelector_buildUpdateTouchedAtQuery_postgres() {
 
 	selector := givenInputsSelector(db)
 
-	utxos := []*database.UserUtxos{
-		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 0, Satoshis: 10, UnlockingScriptEstimatedSize: 106, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
-		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 1, Satoshis: 10, UnlockingScriptEstimatedSize: 106, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
-		{UserID: "id_of_user_1", TxID: "tx_id_2", Vout: 0, Satoshis: 10, UnlockingScriptEstimatedSize: 106, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
+	utxos := []*database.UserUTXO{
+		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 0, Satoshis: 10, EstimatedInputSize: 148, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
+		{UserID: "id_of_user_1", TxID: "tx_id_1", Vout: 1, Satoshis: 10, EstimatedInputSize: 148, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
+		{UserID: "id_of_user_1", TxID: "tx_id_2", Vout: 0, Satoshis: 10, EstimatedInputSize: 148, Bucket: "bsv", CreatedAt: time.Now(), TouchedAt: time.Now()},
 	}
 
 	query := db.ToSQL(func(db *gorm.DB) *gorm.DB {
diff --git a/engine/transaction/outlines/internal/inputs/selector_test.go b/engine/transaction/outlines/internal/inputs/selector_test.go
diff --git a/engine/transaction/outlines/internal/inputs/testabilities/assertions_inputs_selector.go b/engine/transaction/outlines/internal/inputs/testabilities/assertions_inputs_selector.go

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ func Models() []any {`
`9`	`9`	`User{},`
`10`	`10`	`Paymail{},`
`11`	`11`	`Address{},`
`12`		`- UserUtxos{},`
	`12`	`+ UserUTXO{},`
`13`	`13`	`Operation{},`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type UserUtxoFixture interface {`
`26`	`26`	`// WithSatoshis sets the satoshis value of the UTXO.`
`27`	`27`	`WithSatoshis(satoshis bsv.Satoshis) UserUtxoFixture`
`28`	`28`
`29`		`- Storable[database.UserUtxos]`
	`29`	`+ Storable[database.UserUTXO]`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`type Storable[Data any] interface {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ type TrackedTransaction struct {`
`22`	`22`	Inputs []*TrackedOutput `gorm:"foreignKey:SpendingTX"`
`23`	`23`	Outputs []*TrackedOutput `gorm:"foreignKey:TxID"`
`24`	`24`
`25`		- newUTXOs []*UserUtxos `gorm:"-"`
	`25`	+ newUTXOs []*UserUTXO `gorm:"-"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// CreateP2PKHOutput prepares a new P2PKH output and adds it to the transaction.`
`@@ -52,7 +52,7 @@ func (t TrackedTransaction) AddInputs(inputs ...TrackedOutput) {`
`52`	`52`	`func (t TrackedTransaction) AfterCreate(tx gorm.DB) error {`
`53`	`53`	`// Add new UTXOs`
`54`	`54`	`if len(t.newUTXOs) > 0 {`
`55`		`- err := tx.Model(&UserUtxos{}).Create(t.newUTXOs).Error`
	`55`	`+ err := tx.Model(&UserUTXO{}).Create(t.newUTXOs).Error`
`56`	`56`	`if err != nil {`
`57`	`57`	`return spverrors.Wrapf(err, "failed to save user utxos")`
`58`	`58`	`}`
`@@ -67,7 +67,7 @@ func (t TrackedTransaction) AfterCreate(tx gorm.DB) error {`
`67`	`67`	`}`
`68`	`68`	`})`
`69`	`69`	`if len(spentOutpoints) > 0 {`
`70`		`- err := tx.Where("(tx_id, vout) IN ?", spentOutpoints).Delete(&UserUtxos{}).Error`
	`70`	`+ err := tx.Where("(tx_id, vout) IN ?", spentOutpoints).Delete(&UserUTXO{}).Error`
`71`	`71`	`if err != nil {`
`72`	`72`	`return spverrors.Wrapf(err, "failed to delete spent utxos")`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,3 @@ var DefaultFeeUnit = bsv.FeeUnit{`
`7`	`7`	`Satoshis: 1,`
`8`	`8`	`Bytes: 1000,`
`9`	`9`	`}`
`10`		`-`
`11`		`-// EstimatedUnlockingScriptSizeForP2PKH is the estimated unlocking script size for a P2PKH transaction.`
`12`		`-const EstimatedUnlockingScriptSizeForP2PKH = 106`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ func (c inputsQueryComposer) build(db gorm.DB) *gorm.DB {`
`22`	`22`	`utxoWithMinChange := c.searchForMinimalChangeValue(db, utxoWithChange)`
`23`	`23`	`selectedOutpoints := c.chooseInputsToCoverOutputsAndFeesAndHaveMinimalChange(db, utxoWithMinChange)`
`24`	`24`
`25`		`- res := db.Model(&database.UserUtxos{}).Where("(tx_id, vout) in (?)", selectedOutpoints)`
	`25`	`+ res := db.Model(&database.UserUTXO{}).Where("(tx_id, vout) in (?)", selectedOutpoints)`
`26`	`26`	`return res`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func (c inputsQueryComposer) utxos(db gorm.DB) *gorm.DB {`
`30`		`- return db.Model(&database.UserUtxos{}).`
	`30`	`+ return db.Model(&database.UserUTXO{}).`
`31`	`31`	`Select(`
`32`	`32`	`txIdColumn,`
`33`	`33`	`voutColumn,`
`@@ -60,11 +60,11 @@ func (c inputsQueryComposer) searchForMinimalChangeValue(db gorm.DB, utxoWithC`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func (c *inputsQueryComposer) feeCalculatedWithChangeOutput() string {`
`63`		`- return fmt.Sprintf("ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d + %d) / cast(%d as float)) * %d as fee_with_change_output", c.txWithoutInputsSize, estimatedChangeOutputSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)`
	`63`	`+ return fmt.Sprintf("ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d + %d) / cast(%d as float)) * %d as fee_with_change_output", c.txWithoutInputsSize, estimatedChangeOutputSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func (c *inputsQueryComposer) feeCalculatedWithoutChangeOutput() string {`
`67`		`- return fmt.Sprintf("ceil((sum(unlocking_script_estimated_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d) / cast(%d as float)) * %d as fee_no_change_output", c.txWithoutInputsSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)`
	`67`	`+ return fmt.Sprintf("ceil((sum(estimated_input_size) over (order by touched_at ASC, created_at ASC, tx_id ASC, vout ASC) + %d) / cast(%d as float)) * %d as fee_no_change_output", c.txWithoutInputsSize, c.feeUnit.Bytes, c.feeUnit.Satoshis)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func (c *inputsQueryComposer) remainingValue() string {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ const voutColumn = "vout"`
`16`	`16`
`17`	`17`	`// Selector is a service that selects inputs for transaction.`
`18`	`18`	`type Selector interface {`
`19`		`- SelectInputsForTransaction(ctx context.Context, userID string, satoshis bsv.Satoshis, byteSizeOfTxBeforeAddingSelectedInputs uint64) ([]*database.UserUtxos, error)`
	`19`	`+ SelectInputsForTransaction(ctx context.Context, userID string, satoshis bsv.Satoshis, byteSizeOfTxBeforeAddingSelectedInputs uint64) ([]*database.UserUTXO, error)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`const (`
`@@ -39,7 +39,7 @@ func NewSelector(db *gorm.DB, feeUnit bsv.FeeUnit) Selector {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (r sqlInputsSelector) SelectInputsForTransaction(ctx context.Context, userID string, outputsTotalValue bsv.Satoshis, byteSizeOfTxWithoutInputs uint64) (utxos []database.UserUtxos, err error) {`
	`42`	`+func (r sqlInputsSelector) SelectInputsForTransaction(ctx context.Context, userID string, outputsTotalValue bsv.Satoshis, byteSizeOfTxWithoutInputs uint64) (utxos []database.UserUTXO, err error) {`
`43`	`43`	`err = r.db.WithContext(ctx).Transaction(func(db *gorm.DB) error {`
`44`	`44`	`inputsQuery := r.buildQueryForInputs(db, userID, outputsTotalValue, byteSizeOfTxWithoutInputs)`
`45`	`45`
`@@ -78,10 +78,10 @@ func (r sqlInputsSelector) buildQueryForInputs(db gorm.DB, userID string, outp`
`78`	`78`	`return composer.build(db)`
`79`	`79`	`}`
`80`	`80`
`81`		`-func (r sqlInputsSelector) buildUpdateTouchedAtQuery(db gorm.DB, utxos []database.UserUtxos) gorm.DB {`
	`81`	`+func (r sqlInputsSelector) buildUpdateTouchedAtQuery(db gorm.DB, utxos []database.UserUTXO) gorm.DB {`
`82`	`82`	`outpoints := make([][]any, 0, len(utxos))`
`83`	`83`	`for _, utxo := range utxos {`
`84`	`84`	`outpoints = append(outpoints, []any{utxo.TxID, utxo.Vout})`
`85`	`85`	`}`
`86`		`- return db.Model(&database.UserUtxos{}).Where("(tx_id, vout) in (?)", outpoints)`
	`86`	`+ return db.Model(&database.UserUTXO{}).Where("(tx_id, vout) in (?)", outpoints)`
`87`	`87`	`}`