fix(state,rpc,vm): rebase and trie id

Author: weiihann

core/state/contract.go

@@ -247,7 +247,7 @@ func (s *StateContract) getTrie(txn db.Transaction) (*trie2.Trie, error) {
 		return s.tr, nil
 	}
 
-	tr, err := trie2.New(trie2.ContractTrieID(*s.Address), ContractStorageTrieHeight, crypto.Pedersen, txn)
+	tr, err := trie2.New(trie2.NewContractStorageTrieID(*s.Address), ContractStorageTrieHeight, crypto.Pedersen, txn)
 	if err != nil {
 		return nil, err
 	}

core/state/state.go

@@ -43,12 +43,12 @@ type State struct {
 }
 
 func New(txn db.Transaction) (*State, error) {
-	contractTrie, err := trie2.New(trie2.ContractTrieID(felt.Zero), ContractTrieHeight, crypto.Pedersen, txn)
+	contractTrie, err := trie2.New(trie2.NewContractTrieID(), ContractTrieHeight, crypto.Pedersen, txn)
 	if err != nil {
 		return nil, err
 	}
 
-	classTrie, err := trie2.New(trie2.ClassTrieID(), ClassTrieHeight, crypto.Poseidon, txn)
+	classTrie, err := trie2.New(trie2.NewClassTrieID(), ClassTrieHeight, crypto.Poseidon, txn)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -34,6 +34,7 @@ require (
 	go.uber.org/mock v0.5.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.34.0
+	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa
 	golang.org/x/sync v0.11.0
 	google.golang.org/grpc v1.70.0
 	google.golang.org/protobuf v1.36.5
@@ -194,7 +195,6 @@ require (
 	go.uber.org/dig v1.18.0 // indirect
 	go.uber.org/fx v1.23.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
 	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect

mocks/mock_vm.go

@@ -141,14 +141,14 @@ func TestStorageProof(t *testing.T) {
 	testDB := pebble.NewMemTest(t)
 	txn, err := testDB.NewTransaction(true)
 	require.NoError(t, err)
-	tempTrie, err := trie2.New(trie2.TrieID(), 251, crypto.Pedersen, txn)
+	tempTrie, err := trie2.New(trie2.NewEmptyTrieID(), 251, crypto.Pedersen, txn)
 	require.NoError(t, err)
 	_ = tempTrie.Update(key, value)
 	_ = tempTrie.Update(key2, value2)
 	_, _ = tempTrie.Commit()
 	trieRoot := tempTrie.Hash()
 
-	tempTrie, err = trie2.New(trie2.TrieID(), 251, crypto.Pedersen, txn)
+	tempTrie, err = trie2.New(trie2.NewEmptyTrieID(), 251, crypto.Pedersen, txn)
 	require.NoError(t, err)
 
 	mockReader := mocks.NewMockReader(mockCtrl)

rpc/v8/storage_test.go

@@ -38,7 +38,7 @@ type CallResult struct {
 
 //go:generate mockgen -destination=../mocks/mock_vm.go -package=mocks github.com/NethermindEth/juno/vm VM
 type VM interface {
-	Call(callInfo *CallInfo, blockInfo *BlockInfo, state core.StateReader, network *utils.Network,
+	Call(callInfo *CallInfo, blockInfo *BlockInfo, state StateReader, network *utils.Network,
 		maxSteps uint64, sierraVersion string) (CallResult, error)
 	Execute(txns []core.Transaction, declaredClasses []core.Class, paidFeesOnL1 []*felt.Felt, blockInfo *BlockInfo,
 		state StateReader, network *utils.Network, skipChargeFee, skipValidate, errOnRevert bool,