(VDB-68) Verify log block hash matches header block hash
- Delete header on conflict to prompt data refresh (cascade deletes all data associated with that block) - Derive header hash from rpc payload rather than computing it from data (prevents hash mismatch between blockchain and cache)
This commit is contained in:
@@ -73,8 +73,7 @@ func (converter BiteConverter) ToModels(entities []interface{}) ([]interface{},
|
||||
flip := biteEntity.Flip
|
||||
logIdx := biteEntity.LogIndex
|
||||
txIdx := biteEntity.TransactionIndex
|
||||
rawLogJson, err := json.Marshal(biteEntity.Raw)
|
||||
rawLogString := string(rawLogJson)
|
||||
rawLog, err := json.Marshal(biteEntity.Raw)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -89,7 +88,7 @@ func (converter BiteConverter) ToModels(entities []interface{}) ([]interface{},
|
||||
NFlip: shared.BigIntToString(flip),
|
||||
LogIndex: logIdx,
|
||||
TransactionIndex: txIdx,
|
||||
Raw: rawLogString,
|
||||
Raw: rawLog,
|
||||
}
|
||||
models = append(models, model)
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ var _ = Describe("Bite Converter", func() {
|
||||
Tab: "",
|
||||
NFlip: "",
|
||||
TransactionIndex: 0,
|
||||
Raw: string(emptyLog),
|
||||
Raw: emptyLog,
|
||||
}
|
||||
models, err := converter.ToModels([]interface{}{emptyEntity})
|
||||
|
||||
|
||||
@@ -24,5 +24,5 @@ type BiteModel struct {
|
||||
NFlip string
|
||||
LogIndex uint `db:"log_idx"`
|
||||
TransactionIndex uint `db:"tx_idx"`
|
||||
Raw string `db:"raw_log"`
|
||||
Raw []byte `db:"raw_log"`
|
||||
}
|
||||
|
||||
@@ -41,7 +41,14 @@ func (repository BiteRepository) Create(headerID int64, models []interface{}) er
|
||||
tx.Rollback()
|
||||
return fmt.Errorf("model of type %T, not %T", model, BiteModel{})
|
||||
}
|
||||
_, err := tx.Exec(
|
||||
|
||||
err = shared.ValidateHeaderConsistency(headerID, biteModel.Raw, repository.db)
|
||||
if err != nil {
|
||||
tx.Rollback()
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Exec(
|
||||
`INSERT into maker.bite (header_id, ilk, urn, ink, art, iart, tab, nflip, log_idx, tx_idx, raw_log)
|
||||
VALUES($1, $2, $3, $4::NUMERIC, $5::NUMERIC, $6::NUMERIC, $7::NUMERIC, $8::NUMERIC, $9, $10, $11)`,
|
||||
headerID, biteModel.Ilk, biteModel.Urn, biteModel.Ink, biteModel.Art, biteModel.IArt, biteModel.Tab, biteModel.NFlip, biteModel.LogIndex, biteModel.TransactionIndex, biteModel.Raw,
|
||||
@@ -51,6 +58,7 @@ func (repository BiteRepository) Create(headerID int64, models []interface{}) er
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.BiteChecked)
|
||||
if err != nil {
|
||||
tx.Rollback()
|
||||
|
||||
Reference in New Issue
Block a user