Skip to content

Commit 1e54ed8

Browse files
MaksymMalickiMaksymMalicki
committed
minor fixes after rebase
1 parent 9813f7c commit 1e54ed8

File tree

18 files changed

+51
-139
lines changed

18 files changed

+51
-139
lines changed

‎blockchain/blockchain.go‎

Lines changed: 4 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -134,22 +134,6 @@ func (b *Blockchain) TransactionLayout() core.TransactionLayout {
134134
return b.transactionLayout
135135
}
136136

137-
// WithTransactionLayout sets the transaction storage layout.
138-
// If combined is true, uses combined (per-block) layout; otherwise uses per-tx layout.
139-
func (b *Blockchain) WithTransactionLayout(combined bool) *Blockchain {
140-
if combined {
141-
b.transactionLayout = core.TransactionLayoutCombined
142-
} else {
143-
b.transactionLayout = core.TransactionLayoutPerTx
144-
}
145-
return b
146-
}
147-
148-
// TransactionLayout returns the transaction storage layout used by this blockchain
149-
func (b *Blockchain) TransactionLayout() core.TransactionLayout {
150-
return b.transactionLayout
151-
}
152-
153137
func (b *Blockchain) WithListener(listener EventListener) *Blockchain {
154138
b.listener = listener
155139
return b
@@ -433,58 +417,6 @@ func (b *Blockchain) store(
433417
if err := core.WriteBlockHeader(batch, block.Header); err != nil {
434418
return err
435419
}
436-
for i, tx := range block.Transactions {
437-
if err := core.WriteTxAndReceipt(batch, block.Number, uint64(i), tx,
438-
block.Receipts[i]); err != nil {
439-
return err
440-
}
441-
}
442-
if err := core.WriteStateUpdateByBlockNum(batch, block.Number, stateUpdate); err != nil {
443-
return err
444-
}
445-
446-
if err := core.WriteBlockCommitment(batch, block.Number, blockCommitments); err != nil {
447-
return err
448-
}
449-
450-
if err := core.WriteL1HandlerMsgHashes(batch, block.Transactions); err != nil {
451-
return err
452-
}
453-
454-
if err := core.WriteChainHeight(batch, block.Number); err != nil {
455-
return err
456-
}
457-
458-
if err := batch.Write(); err != nil {
459-
return err
460-
}
461-
462-
return b.runningFilter.Insert(block.EventsBloom, block.Number)
463-
}
464-
465-
func (b *Blockchain) store(
466-
block *core.Block,
467-
blockCommitments *core.BlockCommitments,
468-
stateUpdate *core.StateUpdate,
469-
newClasses map[felt.Felt]core.ClassDefinition,
470-
) error {
471-
// TODO(weiihann): handle unexpected shutdown
472-
if err := verifyBlock(b.database, block); err != nil {
473-
return err
474-
}
475-
476-
state, err := b.StateFactory.NewState(stateUpdate.OldRoot, nil)
477-
if err != nil {
478-
return err
479-
}
480-
if err := state.Update(block.Number, stateUpdate, newClasses, false, true); err != nil {
481-
return err
482-
}
483-
484-
batch := b.database.NewBatch()
485-
if err := core.WriteBlockHeader(batch, block.Header); err != nil {
486-
return err
487-
}
488420
err = b.transactionLayout.WriteTransactionsAndReceipts(
489421
batch,
490422
block.Number,
@@ -1224,7 +1156,7 @@ func (b *Blockchain) storeBlockData(
12241156
commitments *core.BlockCommitments,
12251157
) error {
12261158
// Store block header
1227-
if err := core.WriteBlockHeader(w, block.Header); err != nil {
1159+
if err := core.WriteBlockHeader(txn, block.Header); err != nil {
12281160
return err
12291161
}
12301162

@@ -1239,17 +1171,17 @@ func (b *Blockchain) storeBlockData(
12391171
}
12401172

12411173
// Store state update
1242-
if err := core.WriteStateUpdateByBlockNum(w, block.Number, stateUpdate); err != nil {
1174+
if err := core.WriteStateUpdateByBlockNum(txn, block.Number, stateUpdate); err != nil {
12431175
return err
12441176
}
12451177

12461178
// Store block commitments
1247-
if err := core.WriteBlockCommitment(w, block.Number, commitments); err != nil {
1179+
if err := core.WriteBlockCommitment(txn, block.Number, commitments); err != nil {
12481180
return err
12491181
}
12501182

12511183
// Store L1 handler message hashes
1252-
if err := core.WriteL1HandlerMsgHashes(w, block.Transactions); err != nil {
1184+
if err := core.WriteL1HandlerMsgHashes(txn, block.Transactions); err != nil {
12531185
return err
12541186
}
12551187

@@ -1291,20 +1223,3 @@ func (b *Blockchain) StoreGenesis(
12911223
func (b *Blockchain) WriteRunningEventFilter() error {
12921224
return b.runningFilter.Write()
12931225
}
1294-
1295-
func (b *Blockchain) Stop() error {
1296-
if b.trieDB.Scheme() == triedb.PathScheme && b.StateFactory.UseNewState {
1297-
head, err := b.HeadsHeader()
1298-
if err != nil {
1299-
return err
1300-
}
1301-
1302-
stateUpdate, err := b.StateUpdateByNumber(head.Number)
1303-
if err != nil {
1304-
return err
1305-
}
1306-
1307-
return b.trieDB.Journal(stateUpdate.NewRoot)
1308-
}
1309-
return nil
1310-
}

‎cmd/juno/dbcmd_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ func prepareDB(t *testing.T, network *utils.Network, syncToBlock uint64) string
9797

9898
require.NoError(t, chain.Store(block, &emptyCommitments, stateUpdate, nil))
9999
}
100-
require.NoError(t, chain.Stop())
101100
require.NoError(t, testDB.Close())
102101

103102
return dbPath

‎core/history.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (s *deprecatedStateHistory) checkDeployed(addr *felt.Felt) error {
8888
func (s *deprecatedStateHistory) Class(classHash *felt.Felt) (*DeclaredClassDefinition, error) {
8989
declaredClass, err := s.state.Class(classHash)
9090
if err != nil {
91-
return felt.Felt{}, err
91+
return nil, err
9292
}
9393

9494
if s.blockNumber < declaredClass.At {

‎core/state/history.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type stateHistory struct {
1616
state *State
1717
}
1818

19-
func NewStateHistory(blockNum uint64, stateRoot *felt.Felt, db *StateDB) (StateHistory, error) {
19+
func NewStateHistory(blockNum uint64, stateRoot *felt.Felt, db *StateDB) (stateHistory, error) {
2020
state, err := New(stateRoot, db, nil)
2121
if err != nil {
2222
return stateHistory{}, err

‎core/state/state.go‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -186,27 +186,6 @@ func (s *State) CompiledClassHashV2(
186186
return metadata.CasmHashV2(), nil
187187
}
188188

189-
func (s *State) CompiledClassHash(
190-
classHash *felt.SierraClassHash,
191-
) (felt.CasmClassHash, error) {
192-
casmHash, err := s.classTrie.Get((*felt.Felt)(classHash))
193-
if err != nil {
194-
return felt.CasmClassHash{}, err
195-
}
196-
197-
if casmHash.IsZero() {
198-
return felt.CasmClassHash{}, errors.New("casm hash not found")
199-
}
200-
201-
return felt.CasmClassHash(casmHash), nil
202-
}
203-
204-
func (s *State) CompiledClassHashV2(
205-
classHash *felt.SierraClassHash,
206-
) (felt.CasmClassHash, error) {
207-
return core.GetCasmClassHashV2(s.db.disk, classHash)
208-
}
209-
210189
// Returns the state commitment
211190
func (s *State) Commitment() (felt.Felt, error) {
212191
contractRoot, err := s.contractTrie.Hash()
@@ -550,8 +529,8 @@ func (s *State) flush(
550529
storeHistory bool,
551530
) error {
552531
if err := s.db.triedb.Update(
553-
&update.curComm,
554-
&update.prevComm,
532+
(*felt.StateRootHash)(&update.curComm),
533+
(*felt.StateRootHash)(&update.prevComm),
555534
blockNum,
556535
update.classNodes,
557536
update.contractNodes,
@@ -567,7 +546,7 @@ func (s *State) flush(
567546
}
568547

569548
// TODO(weiihann): handle hash-based, and there should be better ways of doing this
570-
err := trieutils.DeleteStorageNodesByPath(s.batch, addr)
549+
err := trieutils.DeleteStorageNodesByPath(s.batch, (*felt.Address)(&addr))
571550
if err != nil {
572551
return err
573552
}

‎core/trie2/triedb/database/db.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ type TrieDB interface {
4444
blockNum uint64,
4545
mergeClassNodes,
4646
mergeContractNodes *trienode.MergeNodeSet,
47+
batch db.Batch,
4748
) error
4849
Scheme() TrieDBScheme
4950
}

‎core/trie2/triedb/hashdb/database.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ func (d *Database) Update(
192192
blockNum uint64,
193193
mergedClassNodes *trienode.MergeNodeSet,
194194
mergedContractNodes *trienode.MergeNodeSet,
195+
_ db.Batch, // todo(maksym): added for interface compatibility, not used
195196
) error {
196197
d.lock.Lock()
197198
defer d.lock.Unlock()

‎core/trie2/triedb/hashdb/database_test.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ func TestDatabase(t *testing.T) {
171171
42,
172172
createMergeNodeSet(deepClassNodes),
173173
createContractMergeNodeSet(nil),
174+
nil,
174175
)
175176
require.NoError(t, err)
176177

@@ -240,6 +241,7 @@ func TestDatabase(t *testing.T) {
240241
42,
241242
createMergeNodeSet(basicClassNodes),
242243
createContractMergeNodeSet(allContractNodes),
244+
nil,
243245
)
244246
require.NoError(t, err)
245247

@@ -302,6 +304,7 @@ func TestDatabase(t *testing.T) {
302304
42,
303305
createMergeNodeSet(edgeClassNodes),
304306
createContractMergeNodeSet(nil),
307+
nil,
305308
)
306309
require.NoError(t, err)
307310

@@ -362,7 +365,14 @@ func TestDatabase(t *testing.T) {
362365
contractRoot: felt.FromUint64[felt.Hash](uint64(3000 + i)),
363366
}
364367

365-
err := database.Update(&tries[i].root, &tries[i].parent, uint64(i), createMergeNodeSet(tries[i].classNodes), createContractMergeNodeSet(nil))
368+
err := database.Update(
369+
&tries[i].root,
370+
&tries[i].parent,
371+
uint64(i),
372+
createMergeNodeSet(tries[i].classNodes),
373+
createContractMergeNodeSet(nil),
374+
nil,
375+
)
366376
require.NoError(t, err)
367377
}
368378

@@ -394,6 +404,7 @@ func TestDatabase(t *testing.T) {
394404
42,
395405
createMergeNodeSet(basicClassNodes),
396406
createContractMergeNodeSet(nil),
407+
nil,
397408
)
398409
require.NoError(t, err)
399410

@@ -412,6 +423,7 @@ func TestDatabase(t *testing.T) {
412423
42,
413424
createMergeNodeSet(updatedNodes),
414425
createContractMergeNodeSet(nil),
426+
nil,
415427
)
416428
require.NoError(t, err)
417429

‎core/trie2/triedb/pathdb/database.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ func (d *Database) Update(
8181
blockNum uint64,
8282
mergeClassNodes,
8383
mergeContractNodes *trienode.MergeNodeSet,
84+
_ db.Batch, // todo(maksym): added for interface compatibility, not used
8485
) error {
8586
d.lock.Lock()
8687
defer d.lock.Unlock()

‎core/trie2/triedb/pathdb/database_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestCommit(t *testing.T) {
3434
root := felt.NewFromUint64[felt.StateRootHash](uint64(i))
3535
classNodes := createTestNodeSet(numNodes, i, tc.numDiffs, true)
3636
contractNodes := createTestNodeSet(numNodes, i, tc.numDiffs, false)
37-
require.NoError(t, pathDB.Update(root, parent, uint64(i), classNodes, contractNodes))
37+
require.NoError(t, pathDB.Update(root, parent, uint64(i), classNodes, contractNodes, nil))
3838

3939
flatClass, _ := classNodes.Flatten()
4040
flatContract, flatStorage := contractNodes.Flatten()

0 commit comments

Comments
 (0)