update after the specs PR merged

blockchain/blockchain.go

@@ -36,6 +36,7 @@ type Reader interface {
 	StateUpdateByHash(hash *felt.Felt) (update *core.StateUpdate, err error)
 
 	HeadState() (core.StateReader, StateCloser, error)
+	HeadTrie() (core.TrieReader, StateCloser, error)
 	StateAtBlockHash(blockHash *felt.Felt) (core.StateReader, StateCloser, error)
 	StateAtBlockNumber(blockNumber uint64) (core.StateReader, StateCloser, error)
 	PendingState() (core.StateReader, StateCloser, error)
@@ -769,6 +770,17 @@ func (b *Blockchain) HeadState() (core.StateReader, StateCloser, error) {
 	return core.NewState(txn), txn.Discard, nil
 }
 
+func (b *Blockchain) HeadTrie() (core.TrieReader, StateCloser, error) {
+	// Note: I'm not sure I should open a new db txn since the TrieReader is a State
+	// so the same instance of the state we create in HeadState will do job.
+	txn, err := b.database.NewTransaction(false)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return core.NewState(txn), txn.Discard, nil
+}
+
 // StateAtBlockNumber returns a StateReader that provides a stable view to the state at the given block number
 func (b *Blockchain) StateAtBlockNumber(blockNumber uint64) (core.StateReader, StateCloser, error) {
 	b.listener.OnRead("StateAtBlockNumber")

blockchain/pending.go

@@ -1,11 +1,8 @@
 package blockchain
 
 import (
-	"errors"
-
 	"github.com/NethermindEth/juno/core"
 	"github.com/NethermindEth/juno/core/felt"
-	"github.com/NethermindEth/juno/core/trie"
 )
 
 type Pending struct {
@@ -68,25 +65,3 @@ func (p *PendingState) Class(classHash *felt.Felt) (*core.DeclaredClass, error)
 
 	return p.head.Class(classHash)
 }
-
-// Note[pnowosie]: Maybe extending StateReader with the following methods was not a good idea?
-func (p *PendingState) ClassTrie() (*trie.Trie, func() error, error) {
-	return nil, nopCloser, errFeatureNotImplemented
-}
-
-func (p *PendingState) StorageTrie() (*trie.Trie, func() error, error) {
-	return nil, nopCloser, errFeatureNotImplemented
-}
-
-func (p *PendingState) StorageTrieForAddr(*felt.Felt) (*trie.Trie, error) {
-	return nil, errFeatureNotImplemented
-}
-
-func (p *PendingState) StateAndClassRoot() (*felt.Felt, *felt.Felt, error) {
-	return nil, nil, errFeatureNotImplemented
-}
-
-var (
-	errFeatureNotImplemented = errors.New("feature not implemented for a historical state")
-	nopCloser                = func() error { return nil }
-)

core/state.go

@@ -42,8 +42,13 @@ type StateReader interface {
 	ContractNonce(addr *felt.Felt) (*felt.Felt, error)
 	ContractStorage(addr, key *felt.Felt) (*felt.Felt, error)
 	Class(classHash *felt.Felt) (*DeclaredClass, error)
+}
+
+// TrieReader used for storage proofs, can only be supported by current state implementation (for now, we plan to add db snapshots)
+var _ TrieReader = (*State)(nil)
 
-	// NOTE: Not a best way to add them here - it assumes current state and atm cannot be implemented for hitsrical states
+//go:generate mockgen -destination=../mocks/mock_trie.go -package=mocks github.com/NethermindEth/juno/core TrieReader
+type TrieReader interface {
 	ClassTrie() (*trie.Trie, func() error, error)
 	StorageTrie() (*trie.Trie, func() error, error)
 	StorageTrieForAddr(addr *felt.Felt) (*trie.Trie, error)

core/state_snapshot.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 
 	"github.com/NethermindEth/juno/core/felt"
-	"github.com/NethermindEth/juno/core/trie"
 	"github.com/NethermindEth/juno/db"
 )
 
@@ -88,25 +87,3 @@ func (s *stateSnapshot) Class(classHash *felt.Felt) (*DeclaredClass, error) {
 	}
 	return declaredClass, nil
 }
-
-// Note[pnowosie]: Maybe extending StateReader with the following methods was not a good idea?
-func (s *stateSnapshot) ClassTrie() (*trie.Trie, func() error, error) {
-	return nil, nopCloser, errFeatureNotImplemented
-}
-
-func (s *stateSnapshot) StorageTrie() (*trie.Trie, func() error, error) {
-	return nil, nopCloser, errFeatureNotImplemented
-}
-
-func (s *stateSnapshot) StorageTrieForAddr(*felt.Felt) (*trie.Trie, error) {
-	return nil, errFeatureNotImplemented
-}
-
-func (s *stateSnapshot) StateAndClassRoot() (*felt.Felt, *felt.Felt, error) {
-	return nil, nil, errFeatureNotImplemented
-}
-
-var (
-	errFeatureNotImplemented = errors.New("feature not implemented for a historical state")
-	nopCloser                = func() error { return nil }
-)

rpc/handlers.go

@@ -60,9 +60,9 @@ var (
 	ErrSubscriptionNotFound = &jsonrpc.Error{Code: 100, Message: "Subscription not found"}
 
 	// TODO[pnowosie]: Update the error while specification describe it
-	ErrBlockNotRecentForProof = &jsonrpc.Error{
-		Code:    1001,
-		Message: "Block is not sufficiently recent for storage proofs. Use 'latest' as block id",
+	ErrStorageProofNotSupported = &jsonrpc.Error{
+		Code:    42,
+		Message: "the node doesn't support storage proofs for blocks that are too far in the past. Use 'latest' as block id",
 	}
 )