chore(trie): version trie functions

dot/core/helpers_test.go

@@ -108,9 +108,9 @@ func createTestService(t *testing.T, genesisFilePath string,
 	cfgRuntime, err := wazero_runtime.NewRuntimeFromGenesis(rtCfg)
 	require.NoError(t, err)
 
-	cfgRuntime.Context.Storage.Put(aliceBalanceKey, encodedAccountInfo)
+	cfgRuntime.Context.Storage.Put(aliceBalanceKey, encodedAccountInfo, trie.V0)
 	// this key is System.UpgradedToDualRefCount -> set to true since all accounts have been upgraded to v0.9 format
-	cfgRuntime.Context.Storage.Put(common.UpgradedToDualRefKey, []byte{1})
+	cfgRuntime.Context.Storage.Put(common.UpgradedToDualRefKey, []byte{1}, trie.V0)
 
 	cfgBlockState.StoreRuntime(cfgBlockState.BestBlockHash(), cfgRuntime)
 

dot/rpc/modules/childstate_test.go

@@ -24,13 +24,13 @@ func createTestTrieState(t *testing.T) (*trie.Trie, common.Hash) {
 	_, genesisTrie, _ := newWestendLocalGenesisWithTrieAndHeader(t)
 	tr := rtstorage.NewTrieState(&genesisTrie)
 
-	tr.Put([]byte(":first_key"), []byte(":value1"))
-	tr.Put([]byte(":second_key"), []byte(":second_value"))
+	tr.Put([]byte(":first_key"), []byte(":value1"), trie.V0)
+	tr.Put([]byte(":second_key"), []byte(":second_value"), trie.V0)
 
 	childTr := trie.NewEmptyTrie()
-	childTr.Put([]byte(":child_first"), []byte(":child_first_value"))
-	childTr.Put([]byte(":child_second"), []byte(":child_second_value"))
-	childTr.Put([]byte(":another_child"), []byte("value"))
+	childTr.Put([]byte(":child_first"), []byte(":child_first_value"), trie.V0)
+	childTr.Put([]byte(":child_second"), []byte(":child_second_value"), trie.V0)
+	childTr.Put([]byte(":another_child"), []byte("value"), trie.V0)
 
 	err := tr.SetChild([]byte(":child_storage_key"), childTr)
 	require.NoError(t, err)

dot/state/base_test.go

@@ -23,7 +23,7 @@ func TestTrie_StoreAndLoadFromDB(t *testing.T) {
 
 	for keyString, value := range kv {
 		key := []byte(keyString)
-		tt.Put(key, value)
+		tt.Put(key, value, trie.V0)
 	}
 
 	err := tt.WriteDirty(db)

dot/state/storage_notify_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/ChainSafe/chaindb"
 	"github.com/ChainSafe/gossamer/lib/common"
+	"github.com/ChainSafe/gossamer/lib/trie"
 	"github.com/dgraph-io/badger/v4/pb"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
@@ -49,7 +50,7 @@ func TestStorageState_RegisterStorageObserver(t *testing.T) {
 	ss.RegisterStorageObserver(mockobs)
 	defer ss.UnregisterStorageObserver(mockobs)
 
-	ts.Put([]byte("mackcom"), []byte("wuz here"))
+	ts.Put([]byte("mackcom"), []byte("wuz here"), trie.V0)
 	err = ss.StoreTrie(ts, nil)
 	require.NoError(t, err)
 
@@ -86,7 +87,7 @@ func TestStorageState_RegisterStorageObserver_Multi(t *testing.T) {
 	key1 := []byte("key1")
 	value1 := []byte("value1")
 
-	ts.Put(key1, value1)
+	ts.Put(key1, value1, trie.V0)
 
 	err = ss.StoreTrie(ts, nil)
 	require.NoError(t, err)
@@ -125,7 +126,7 @@ func TestStorageState_RegisterStorageObserver_Multi_Filter(t *testing.T) {
 		ss.RegisterStorageObserver(mockobs)
 	}
 
-	ts.Put(key1, value1)
+	ts.Put(key1, value1, trie.V0)
 	err = ss.StoreTrie(ts, nil)
 	require.NoError(t, err)
 

dot/state/storage_test.go

@@ -56,7 +56,7 @@ func TestStorage_GetStorageByBlockHash(t *testing.T) {
 
 	key := []byte("testkey")
 	value := []byte("testvalue")
-	ts.Put(key, value)
+	ts.Put(key, value, trie.V0)
 
 	root, err := ts.Root()
 	require.NoError(t, err)
@@ -88,7 +88,7 @@ func TestStorage_TrieState(t *testing.T) {
 	storage := newTestStorageState(t)
 	ts, err := storage.TrieState(&trie.EmptyHash)
 	require.NoError(t, err)
-	ts.Put([]byte("noot"), []byte("washere"))
+	ts.Put([]byte("noot"), []byte("washere"), trie.V0)
 
 	root, err := ts.Root()
 	require.NoError(t, err)
@@ -120,7 +120,7 @@ func TestStorage_LoadFromDB(t *testing.T) {
 	}
 
 	for _, kv := range trieKV {
-		ts.Put(kv.key, kv.value)
+		ts.Put(kv.key, kv.value, trie.V0)
 	}
 
 	root, err := ts.Root()
@@ -157,7 +157,7 @@ func TestStorage_StoreTrie_NotSyncing(t *testing.T) {
 
 	key := []byte("testkey")
 	value := []byte("testvalue")
-	ts.Put(key, value)
+	ts.Put(key, value, trie.V0)
 
 	err = storage.StoreTrie(ts, nil)
 	require.NoError(t, err)
@@ -188,7 +188,7 @@ func TestGetStorageChildAndGetStorageFromChild(t *testing.T) {
 	}
 	testChildTrie := trie.NewTrie(trieRoot, dbGetter)
 
-	testChildTrie.Put([]byte("keyInsidechild"), []byte("voila"))
+	testChildTrie.Put([]byte("keyInsidechild"), []byte("voila"), trie.V0)
 
 	err = genTrie.SetChild([]byte("keyToChild"), testChildTrie)
 	require.NoError(t, err)

dot/state/test_helpers.go

@@ -244,7 +244,7 @@ func generateBlockWithRandomTrie(t *testing.T, serv *Service,
 	rand := time.Now().UnixNano()
 	key := []byte("testKey" + fmt.Sprint(rand))
 	value := []byte("testValue" + fmt.Sprint(rand))
-	err = trieState.Put(key, value)
+	err = trieState.Put(key, value, trie.V0)
 	require.NoError(t, err)
 
 	trieStateRoot, err := trieState.Root()

lib/runtime/interfaces.go

@@ -11,7 +11,7 @@ import (
 
 // Storage runtime interface.
 type Storage interface {
-	Put(key []byte, value []byte) (err error)
+	Put(key []byte, value []byte, version trie.Version) (err error)
 	Get(key []byte) []byte
 	Root() (common.Hash, error)
 	SetChild(keyToChild []byte, child *trie.Trie) error

lib/runtime/storage/trie.go

@@ -70,10 +70,10 @@ func (s *TrieState) RollbackStorageTransaction() {
 }
 
 // Put puts a key-value pair in the trie
-func (s *TrieState) Put(key, value []byte) (err error) {
+func (s *TrieState) Put(key, value []byte, version trie.Version) (err error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
-	return s.t.Put(key, value)
+	return s.t.Put(key, value, version)
 }
 
 // Get gets a value from the trie

lib/runtime/storage/trie_test.go

@@ -27,7 +27,7 @@ var testCases = []string{
 func TestTrieState_SetGet(t *testing.T) {
 	testFunc := func(ts *TrieState) {
 		for _, tc := range testCases {
-			ts.Put([]byte(tc), []byte(tc))
+			ts.Put([]byte(tc), []byte(tc), trie.V0)
 		}
 
 		for _, tc := range testCases {
@@ -43,7 +43,7 @@ func TestTrieState_SetGet(t *testing.T) {
 func TestTrieState_Delete(t *testing.T) {
 	testFunc := func(ts *TrieState) {
 		for _, tc := range testCases {
-			ts.Put([]byte(tc), []byte(tc))
+			ts.Put([]byte(tc), []byte(tc), trie.V0)
 		}
 
 		ts.Delete([]byte(testCases[0]))
@@ -58,7 +58,7 @@ func TestTrieState_Delete(t *testing.T) {
 func TestTrieState_Root(t *testing.T) {
 	testFunc := func(ts *TrieState) {
 		for _, tc := range testCases {
-			ts.Put([]byte(tc), []byte(tc))
+			ts.Put([]byte(tc), []byte(tc), trie.V0)
 		}
 
 		expected := ts.MustRoot()
@@ -79,7 +79,7 @@ func TestTrieState_ClearPrefix(t *testing.T) {
 	}
 
 	for i, key := range keys {
-		ts.Put([]byte(key), []byte{byte(i)})
+		ts.Put([]byte(key), []byte{byte(i)}, trie.V0)
 	}
 
 	ts.ClearPrefix([]byte("noo"))
@@ -105,7 +105,7 @@ func TestTrieState_ClearPrefixInChild(t *testing.T) {
 	}
 
 	for i, key := range keys {
-		child.Put([]byte(key), []byte{byte(i)})
+		child.Put([]byte(key), []byte{byte(i)}, trie.V0)
 	}
 
 	keyToChild := []byte("keytochild")
@@ -131,7 +131,7 @@ func TestTrieState_NextKey(t *testing.T) {
 	ts := &TrieState{t: trie.NewEmptyTrie()}
 
 	for _, tc := range testCases {
-		ts.Put([]byte(tc), []byte(tc))
+		ts.Put([]byte(tc), []byte(tc), trie.V0)
 	}
 
 	sort.Slice(testCases, func(i, j int) bool {
@@ -152,12 +152,12 @@ func TestTrieState_CommitStorageTransaction(t *testing.T) {
 	ts := &TrieState{t: trie.NewEmptyTrie()}
 
 	for _, tc := range testCases {
-		ts.Put([]byte(tc), []byte(tc))
+		ts.Put([]byte(tc), []byte(tc), trie.V0)
 	}
 
 	ts.BeginStorageTransaction()
 	testValue := []byte("noot")
-	ts.Put([]byte(testCases[0]), testValue)
+	ts.Put([]byte(testCases[0]), testValue, trie.V0)
 	ts.CommitStorageTransaction()
 
 	val := ts.Get([]byte(testCases[0]))
@@ -168,12 +168,12 @@ func TestTrieState_RollbackStorageTransaction(t *testing.T) {
 	ts := &TrieState{t: trie.NewEmptyTrie()}
 
 	for _, tc := range testCases {
-		ts.Put([]byte(tc), []byte(tc))
+		ts.Put([]byte(tc), []byte(tc), trie.V0)
 	}
 
 	ts.BeginStorageTransaction()
 	testValue := []byte("noot")
-	ts.Put([]byte(testCases[0]), testValue)
+	ts.Put([]byte(testCases[0]), testValue, trie.V0)
 	ts.RollbackStorageTransaction()
 
 	val := ts.Get([]byte(testCases[0]))
@@ -191,7 +191,7 @@ func TestTrieState_DeleteChildLimit(t *testing.T) {
 	}
 
 	for i, key := range keys {
-		child.Put([]byte(key), []byte{byte(i)})
+		child.Put([]byte(key), []byte{byte(i)}, trie.V0)
 	}
 
 	keyToChild := []byte("keytochild")

lib/runtime/wasmer/exports_test.go

@@ -204,9 +204,9 @@ func TestWestendRuntime_ValidateTransaction(t *testing.T) {
 	encBal, err := scale.Marshal(accInfo)
 	require.NoError(t, err)
 
-	rt.ctx.Storage.Put(aliceBalanceKey, encBal)
+	rt.ctx.Storage.Put(aliceBalanceKey, encBal, trie.V0)
 	// this key is System.UpgradedToDualRefCount -> set to true since all accounts have been upgraded to v0.9 format
-	rt.ctx.Storage.Put(common.UpgradedToDualRefKey, []byte{1})
+	rt.ctx.Storage.Put(common.UpgradedToDualRefKey, []byte{1}, trie.V0)
 
 	genesisHeader := &types.Header{
 		Number:    0,
@@ -237,7 +237,7 @@ func TestInstance_GrandpaAuthorities_NodeRuntime(t *testing.T) {
 	require.NoError(t, err)
 
 	key := common.MustHexToBytes(genesis.GrandpaAuthoritiesKeyHex)
-	tt.Put(key, value)
+	tt.Put(key, value, trie.V0)
 
 	rt := NewTestInstanceWithTrie(t, runtime.WESTEND_RUNTIME_v0929, tt)
 
@@ -265,7 +265,7 @@ func TestInstance_GrandpaAuthorities_PolkadotRuntime(t *testing.T) {
 	require.NoError(t, err)
 
 	key := common.MustHexToBytes(genesis.GrandpaAuthoritiesKeyHex)
-	tt.Put(key, value)
+	tt.Put(key, value, trie.V0)
 
 	rt := NewTestInstanceWithTrie(t, runtime.POLKADOT_RUNTIME_v0929, tt)
 
@@ -312,13 +312,13 @@ func TestInstance_BabeGenerateKeyOwnershipProof(t *testing.T) {
 			randomnessValue, err := common.HexToHash("0x01")
 			require.NoError(t, err)
 			key := common.MustHexToBytes(genesis.BABERandomnessKeyHex)
-			tt.Put(key, randomnessValue[:])
+			tt.Put(key, randomnessValue[:], trie.V0)
 
 			authorityValue, err := common.HexToBytes("0x08eea1eabcac7d2c8a6459b7322cf997874482bfc3d2ec7a80888a3a7d714103640100000000000000b64994460e59b30364cad3c92e3df6052f9b0ebbb8f88460c194dc5794d6d7170100000000000000") //nolint:lll
 			require.NoError(t, err)
 
 			key = common.MustHexToBytes(genesis.BABEAuthoritiesKeyHex)
-			tt.Put(key, authorityValue)
+			tt.Put(key, authorityValue, trie.V0)
 
 			rt := NewTestInstanceWithTrie(t, testCase.targetRuntime, tt)
 
@@ -399,13 +399,13 @@ func TestInstance_BabeConfiguration_WestendRuntime_WithAuthorities(t *testing.T)
 	randomnessValue, err := common.HexToHash("0x01")
 	require.NoError(t, err)
 	key := common.MustHexToBytes(genesis.BABERandomnessKeyHex)
-	tt.Put(key, randomnessValue[:])
+	tt.Put(key, randomnessValue[:], trie.V0)
 
 	authorityValue, err := common.HexToBytes("0x08eea1eabcac7d2c8a6459b7322cf997874482bfc3d2ec7a80888a3a7d714103640100000000000000b64994460e59b30364cad3c92e3df6052f9b0ebbb8f88460c194dc5794d6d7170100000000000000") //nolint:lll
 	require.NoError(t, err)
 
 	key = common.MustHexToBytes(genesis.BABEAuthoritiesKeyHex)
-	tt.Put(key, authorityValue)
+	tt.Put(key, authorityValue, trie.V0)
 
 	rt := NewTestInstanceWithTrie(t, runtime.WESTEND_RUNTIME_v0929, tt)
 

lib/runtime/wasmer/helpers.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/ChainSafe/gossamer/lib/common/types"
 	"github.com/ChainSafe/gossamer/lib/runtime"
+	"github.com/ChainSafe/gossamer/lib/trie"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 	"github.com/wasmerio/go-ext-wasm/wasmer"
 )
@@ -208,7 +209,7 @@ func toWasmMemoryFixedSizeOptional(context wasmer.InstanceContext, data []byte)
 	return toWasmMemory(context, encodedOptionalFixedSize)
 }
 
-func storageAppend(storage runtime.Storage, key, valueToAppend []byte) (err error) {
+func storageAppend(storage runtime.Storage, key, valueToAppend []byte, version trie.Version) (err error) {
 	// this function assumes the item in storage is a SCALE encoded array of items
 	// the valueToAppend is a new item, so it appends the item and increases the length prefix by 1
 	currentValue := storage.Get(key)
@@ -259,7 +260,7 @@ func storageAppend(storage runtime.Storage, key, valueToAppend []byte) (err erro
 		}
 	}
 
-	err = storage.Put(key, value)
+	err = storage.Put(key, value, version)
 	if err != nil {
 		return fmt.Errorf("putting key and value in storage: %w", err)
 	}

lib/runtime/wasmer/imports.go

@@ -820,7 +820,7 @@ func ext_trie_blake2_256_root_version_1(context unsafe.Pointer, dataSpan C.int64
 	}
 
 	for _, kv := range kvs {
-		err := t.Put(kv.Key, kv.Value)
+		err := t.Put(kv.Key, kv.Value, trie.V0)
 		if err != nil {
 			logger.Errorf("failed putting key 0x%x and value 0x%x into trie: %s",
 				kv.Key, kv.Value, err)
@@ -873,7 +873,7 @@ func ext_trie_blake2_256_ordered_root_version_1(context unsafe.Pointer, dataSpan
 			"put key=0x%x and value=0x%x",
 			key, value)
 
-		err = t.Put(key, value)
+		err = t.Put(key, value, trie.V0)
 		if err != nil {
 			logger.Errorf("failed putting key 0x%x and value 0x%x into trie: %s",
 				key, value, err)
@@ -1916,7 +1916,7 @@ func ext_storage_append_version_1(context unsafe.Pointer, keySpan, valueSpan C.i
 	cp := make([]byte, len(valueAppend))
 	copy(cp, valueAppend)
 
-	err := storageAppend(storage, key, cp)
+	err := storageAppend(storage, key, cp, trie.V0)
 	if err != nil {
 		logger.Errorf("failed appending to storage: %s", err)
 	}
@@ -2156,7 +2156,7 @@ func ext_storage_set_version_1(context unsafe.Pointer, keySpan, valueSpan C.int6
 	logger.Debugf(
 		"key 0x%x has value 0x%x",
 		key, value)
-	err := storage.Put(key, cp)
+	err := storage.Put(key, cp, trie.V0)
 	panicOnError(err)
 }