Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix file contract element bug #28

Merged
merged 3 commits into from
May 15, 2024
Merged

Fix file contract element bug #28

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75a8eb6
account for multiple revisions of one contract in same block
chris124567 May 3, 2024
5536d50
reuse code in addFileContractElements
chris124567 May 4, 2024
806ba88
add regression test
chris124567 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 45 additions & 16 deletions persist/sqlite/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ func deleteBlock(tx *txn, bid types.BlockID) error {
return err
}

func addFileContractElements(tx *txn, bid types.BlockID, fces []explorer.FileContractUpdate) (map[explorer.DBFileContract]int64, error) {
func addFileContractElements(tx *txn, b types.Block, fces []explorer.FileContractUpdate) (map[explorer.DBFileContract]int64, error) {
stmt, err := tx.Prepare(`INSERT INTO file_contract_elements(block_id, contract_id, leaf_index, resolved, valid, filesize, file_merkle_root, window_start, window_end, payout, unlock_hash, revision_number)
VALUES (?, ?, ?, FALSE, TRUE, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT (contract_id, revision_number)
Expand All @@ -575,28 +575,57 @@ func addFileContractElements(tx *txn, bid types.BlockID, fces []explorer.FileCon
return nil, fmt.Errorf("addFileContractElements: failed to prepare last_contract_revision statement: %w", err)
}

var updateErr error
fcDBIds := make(map[explorer.DBFileContract]int64)
for _, update := range fces {
fce := update.FileContractElement
addFC := func(fcID types.FileContractID, leafIndex uint64, fc types.FileContract, resolved, valid bool) error {
var dbID int64
err := stmt.QueryRow(encode(b.ID()), encode(fcID), encode(leafIndex), fc.Filesize, encode(fc.FileMerkleRoot), fc.WindowStart, fc.WindowEnd, encode(fc.Payout), encode(fc.UnlockHash), fc.RevisionNumber, resolved, valid, encode(leafIndex)).Scan(&dbID)
if err != nil {
return fmt.Errorf("failed to execute file_contract_elements statement: %w", err)
}

fc := &fce.FileContract
if update.Revision != nil {
fc = &update.Revision.FileContract
if _, err := revisionStmt.Exec(encode(fcID), dbID, dbID); err != nil {
return fmt.Errorf("failed to update last revision number: %w", err)
}

var dbID int64
err := stmt.QueryRow(encode(bid), encode(fce.StateElement.ID), encode(fce.StateElement.LeafIndex), fc.Filesize, encode(fc.FileMerkleRoot), fc.WindowStart, fc.WindowEnd, encode(fc.Payout), encode(fc.UnlockHash), fc.RevisionNumber, update.Resolved, update.Valid, encode(fce.StateElement.LeafIndex)).Scan(&dbID)
if err != nil {
return nil, fmt.Errorf("addFileContractElements: failed to execute file_contract_elements statement: %w", err)
fcDBIds[explorer.DBFileContract{ID: fcID, RevisionNumber: fc.RevisionNumber}] = dbID
return nil
}

var updateErr error
for _, update := range fces {
fce := &update.FileContractElement
if update.Revision != nil {
fce = update.Revision
}
if err := addFC(types.FileContractID(fce.StateElement.ID), fce.StateElement.LeafIndex, fce.FileContract, update.Resolved, update.Valid); err != nil {
return nil, fmt.Errorf("addFileContractElements: %w", err)
}
}
for _, txn := range b.Transactions {
for j, fc := range txn.FileContracts {
fcID := txn.FileContractID(j)
dbFC := explorer.DBFileContract{ID: txn.FileContractID(j), RevisionNumber: fc.RevisionNumber}
if _, exists := fcDBIds[dbFC]; exists {
continue
}

if _, err := revisionStmt.Exec(encode(fce.StateElement.ID), dbID, dbID); err != nil {
return nil, fmt.Errorf("addFileContractElements: failed to update last revision number: %w", err)
if err := addFC(fcID, 0, fc, false, true); err != nil {
return nil, fmt.Errorf("addFileContractElements: %w", err)
}
}
for _, fcr := range txn.FileContractRevisions {
fc := fcr.FileContract
dbFC := explorer.DBFileContract{ID: fcr.ParentID, RevisionNumber: fc.RevisionNumber}
if _, exists := fcDBIds[dbFC]; exists {
continue
}

fcDBIds[explorer.DBFileContract{ID: types.FileContractID(fce.StateElement.ID), RevisionNumber: fc.RevisionNumber}] = dbID
if err := addFC(fcr.ParentID, 0, fc, false, true); err != nil {
return nil, fmt.Errorf("addFileContractElements: %w", err)
}
}
}

return fcDBIds, updateErr
}

Expand Down Expand Up @@ -629,7 +658,7 @@ func (ut *updateTx) ApplyIndex(state explorer.UpdateState) error {
return fmt.Errorf("ApplyIndex: failed to update balances: %w", err)
}

fcDBIds, err := addFileContractElements(ut.tx, state.Block.ID(), state.FileContractElements)
fcDBIds, err := addFileContractElements(ut.tx, state.Block, state.FileContractElements)
if err != nil {
return fmt.Errorf("v: failed to add file contracts: %w", err)
}
Expand Down Expand Up @@ -664,7 +693,7 @@ func (ut *updateTx) RevertIndex(state explorer.UpdateState) error {
return fmt.Errorf("RevertIndex: failed to update siafund output state: %w", err)
} else if err := updateBalances(ut.tx, state.Index.Height, state.SpentSiacoinElements, state.NewSiacoinElements, state.SpentSiafundElements, state.NewSiafundElements); err != nil {
return fmt.Errorf("RevertIndex: failed to update balances: %w", err)
} else if _, err := addFileContractElements(ut.tx, state.Block.ID(), state.FileContractElements); err != nil {
} else if _, err := addFileContractElements(ut.tx, state.Block, state.FileContractElements); err != nil {
return fmt.Errorf("RevertIndex: failed to update file contract state: %w", err)
} else if err := deleteBlock(ut.tx, state.Block.ID()); err != nil {
return fmt.Errorf("RevertIndex: failed to delete block: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion persist/sqlite/init.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ CREATE TABLE transaction_file_contract_revisions (
transaction_id INTEGER REFERENCES transactions(id) ON DELETE CASCADE NOT NULL,
transaction_order INTEGER NOT NULL,
contract_id INTEGER REFERENCES file_contract_elements(id) ON DELETE CASCADE NOT NULL,
parent_id BLOB UNIQUE NOT NULL,
parent_id BLOB NOT NULL,
unlock_conditions BLOB NOT NULL,
UNIQUE(transaction_id, transaction_order)
);
Expand Down
Loading