rm e2 changesets tables (#12940)

erigontech · Dec 3, 2024 · 4e40c9f · 4e40c9f
1 parent 93c8008
commit 4e40c9f
Show file tree

Hide file tree

Showing 24 changed files with 316 additions and 1,106 deletions.
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
@@ -657,11 +657,11 @@ func CalculateStateRoot(tx kv.RwTx) (*libcommon.Hash, error) {
 			h.Sha.Write(k[length.Addr+length.Incarnation:])
 			//nolint:errcheck
 			h.Sha.Read(newK[length.Hash+length.Incarnation:])
-			if err = tx.Put(kv.HashedStorage, newK, libcommon.CopyBytes(v)); err != nil {
+			if err = tx.Put(kv.HashedStorageDeprecated, newK, libcommon.CopyBytes(v)); err != nil {
 				return nil, fmt.Errorf("insert hashed key: %w", err)
 			}
 		} else {
-			if err = tx.Put(kv.HashedAccounts, newK, libcommon.CopyBytes(v)); err != nil {
+			if err = tx.Put(kv.HashedAccountsDeprecated, newK, libcommon.CopyBytes(v)); err != nil {
 				return nil, fmt.Errorf("insert hashed key: %w", err)
 			}
 		}

diff --git a/cmd/integration/commands/refetence_db.go b/cmd/integration/commands/refetence_db.go
@@ -41,12 +41,10 @@ import (
 )
 
 var stateBuckets = []string{
-	kv.HashedAccounts,
-	kv.HashedStorage,
+	kv.HashedAccountsDeprecated,
+	kv.HashedStorageDeprecated,
 	kv.ContractCode,
 	kv.PlainState,
-	kv.AccountChangeSet,
-	kv.StorageChangeSet,
 	kv.PlainContractCode,
 	kv.IncarnationMap,
 	kv.Code,

diff --git a/cmd/pics/state.go b/cmd/pics/state.go
@@ -86,27 +86,23 @@ import (
 }*/
 
 var bucketLabels = map[string]string{
-	kv.Receipts:          "Receipts",
-	kv.Log:               "Event Logs",
-	kv.E2AccountsHistory: "History Of Accounts",
-	kv.E2StorageHistory:  "History Of Storage",
-	kv.Headers:           "Headers",
-	kv.HeaderCanonical:   "Canonical headers",
-	kv.HeaderTD:          "Headers TD",
-	kv.BlockBody:         "Block Bodies",
-	kv.HeaderNumber:      "Header Numbers",
-	kv.TxLookup:          "Transaction Index",
-	kv.Code:              "Code Of Contracts",
-	kv.SyncStageProgress: "Sync Progress",
-	kv.PlainState:        "Plain State",
-	kv.HashedAccounts:    "Hashed Accounts",
-	kv.HashedStorage:     "Hashed Storage",
-	kv.TrieOfAccounts:    "Intermediate Hashes Of Accounts",
-	kv.TrieOfStorage:     "Intermediate Hashes Of Storage",
-	kv.AccountChangeSet:  "Account Changes",
-	kv.StorageChangeSet:  "Storage Changes",
-	kv.IncarnationMap:    "Incarnations",
-	kv.Senders:           "Transaction Senders",
+	kv.Receipts:                 "Receipts",
+	kv.Log:                      "Event Logs",
+	kv.Headers:                  "Headers",
+	kv.HeaderCanonical:          "Canonical headers",
+	kv.HeaderTD:                 "Headers TD",
+	kv.BlockBody:                "Block Bodies",
+	kv.HeaderNumber:             "Header Numbers",
+	kv.TxLookup:                 "Transaction Index",
+	kv.Code:                     "Code Of Contracts",
+	kv.SyncStageProgress:        "Sync Progress",
+	kv.PlainState:               "Plain State",
+	kv.HashedAccountsDeprecated: "Hashed Accounts",
+	kv.HashedStorageDeprecated:  "Hashed Storage",
+	kv.TrieOfAccounts:           "Intermediate Hashes Of Accounts",
+	kv.TrieOfStorage:            "Intermediate Hashes Of Storage",
+	kv.IncarnationMap:           "Incarnations",
+	kv.Senders:                  "Transaction Senders",
 }
 
 /*dbutils.PlainContractCode,

diff --git a/cmd/state/commands/check_enc.go b/cmd/state/commands/check_enc.go
diff --git a/cmd/state/commands/check_index.go b/cmd/state/commands/check_index.go
diff --git a/cmd/state/commands/global_flags_vars.go b/cmd/state/commands/global_flags_vars.go
@@ -25,15 +25,12 @@ import (
 )
 
 var (
-	datadirCli      string
-	chaindata       string
-	statsfile       string
-	block           uint64
-	changeSetBucket string
-	indexBucket     string
-	snapshotsCli    bool
-	chain           string
-	logdir          string
+	datadirCli  string
+	chaindata   string
+	statsfile   string
+	block       uint64
+	indexBucket string
+	chain       string
 )
 
 func must(err error) {
@@ -59,14 +56,6 @@ func withStatsfile(cmd *cobra.Command) {
 	must(cmd.MarkFlagFilename("statsfile", "csv"))
 }
 
-func withCSBucket(cmd *cobra.Command) {
-	cmd.Flags().StringVar(&changeSetBucket, "changeset-bucket", kv.AccountChangeSet, kv.AccountChangeSet+" for account and "+kv.StorageChangeSet+" for storage")
-}
-
 func withIndexBucket(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&indexBucket, "index-bucket", kv.E2AccountsHistory, kv.E2AccountsHistory+" for account and "+kv.E2StorageHistory+" for storage")
 }
-
-func withChain(cmd *cobra.Command) {
-	cmd.Flags().StringVar(&chain, "chain", "", "pick a chain to assume (mainnet, sepolia, etc.)")
-}
diff --git a/cmd/state/verify/check_changeset_enc.go b/cmd/state/verify/check_changeset_enc.go