Upgrade Carmen to b32b42b

rus-alex · Apr 11, 2024 · ba5cf8d · ba5cf8d
1 parent f3513bd
commit ba5cf8d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/cmd/sonictool/check/archive.go b/cmd/sonictool/check/archive.go
@@ -2,9 +2,9 @@ package check
 
 import (
 	"fmt"
+	"github.com/Fantom-foundation/Carmen/go/database/mpt"
+	"github.com/Fantom-foundation/Carmen/go/database/mpt/io"
 	carmen "github.com/Fantom-foundation/Carmen/go/state"
-	"github.com/Fantom-foundation/Carmen/go/state/mpt"
-	"github.com/Fantom-foundation/Carmen/go/state/mpt/io"
 	"github.com/Fantom-foundation/lachesis-base/inter/idx"
 	"github.com/Fantom-foundation/lachesis-base/utils/cachescale"
 	"github.com/ethereum/go-ethereum/log"

diff --git a/cmd/sonictool/check/live.go b/cmd/sonictool/check/live.go
@@ -2,9 +2,9 @@ package check
 
 import (
 	"fmt"
+	"github.com/Fantom-foundation/Carmen/go/database/mpt"
+	"github.com/Fantom-foundation/Carmen/go/database/mpt/io"
 	carmen "github.com/Fantom-foundation/Carmen/go/state"
-	"github.com/Fantom-foundation/Carmen/go/state/mpt"
-	"github.com/Fantom-foundation/Carmen/go/state/mpt/io"
 	"github.com/Fantom-foundation/lachesis-base/utils/cachescale"
 	"github.com/ethereum/go-ethereum/log"
 	"path/filepath"

diff --git a/go.mod b/go.mod
@@ -43,7 +43,7 @@ require (
 	gopkg.in/urfave/cli.v1 v1.20.0
 )
 
-require github.com/Fantom-foundation/Carmen/go v0.0.0-20240304081312-ad4c7efe9986
+require github.com/Fantom-foundation/Carmen/go v0.0.0-20240410130417-b32b42b6efcb
 
 require (
 	github.com/DataDog/zstd v1.4.5 // indirect

diff --git a/go.sum b/go.sum
@@ -57,8 +57,8 @@ github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mo
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
-github.com/Fantom-foundation/Carmen/go v0.0.0-20240304081312-ad4c7efe9986 h1:+Ma48SWpwg31ip03d5RuXGcAxXG01S+8hlc3cc8fdIo=
-github.com/Fantom-foundation/Carmen/go v0.0.0-20240304081312-ad4c7efe9986/go.mod h1:2lViPW06I9AP6tPm0Xrwmvnw50foRSfjpKLQiaNox2I=
+github.com/Fantom-foundation/Carmen/go v0.0.0-20240410130417-b32b42b6efcb h1:3WDuoVz++3EeU5WGdnkjRYxCpMSNskcHvWAUk/eweq0=
+github.com/Fantom-foundation/Carmen/go v0.0.0-20240410130417-b32b42b6efcb/go.mod h1:2lViPW06I9AP6tPm0Xrwmvnw50foRSfjpKLQiaNox2I=
 github.com/Fantom-foundation/Substate v0.0.0-20230224090651-4c8c024214f4 h1:AA0BtERxmlf7jvDF4fwIB2k/Lsc7HTRE3QHTZnfcSVA=
 github.com/Fantom-foundation/Substate v0.0.0-20230224090651-4c8c024214f4/go.mod h1:/yIHWCDDJcdKMJYvOLdYOnHt5eUBF9XWnrvrNE+90ik=
 github.com/Fantom-foundation/go-ethereum-substate v1.1.1-0.20240319145015-f7e7f3221dc6 h1:T3MFXYTnVGzyXbHt8QVxodObQAfTvopn9of2fLxBhoE=

diff --git a/gossip/evmstore/statedb_import.go b/gossip/evmstore/statedb_import.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 	cc "github.com/Fantom-foundation/Carmen/go/common"
+	io2 "github.com/Fantom-foundation/Carmen/go/database/mpt/io"
 	carmen "github.com/Fantom-foundation/Carmen/go/state"
-	io2 "github.com/Fantom-foundation/Carmen/go/state/mpt/io"
 	"github.com/Fantom-foundation/go-opera/opera/genesis"
 	"github.com/Fantom-foundation/go-opera/utils/adapters/kvdb2ethdb"
 	"github.com/Fantom-foundation/lachesis-base/kvdb/nokeyiserr"

diff --git a/gossip/evmstore/statedb_verify.go b/gossip/evmstore/statedb_verify.go
@@ -3,9 +3,9 @@ package evmstore
 import (
 	"fmt"
 	cc "github.com/Fantom-foundation/Carmen/go/common"
+	"github.com/Fantom-foundation/Carmen/go/database/mpt"
+	"github.com/Fantom-foundation/Carmen/go/database/mpt/io"
 	carmen "github.com/Fantom-foundation/Carmen/go/state"
-	"github.com/Fantom-foundation/Carmen/go/state/mpt"
-	"github.com/Fantom-foundation/Carmen/go/state/mpt/io"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"path/filepath"

diff --git a/integration/makegenesis/genesis.go b/integration/makegenesis/genesis.go
@@ -30,8 +30,8 @@ import (
 	"github.com/Fantom-foundation/go-opera/opera/genesis"
 	"github.com/Fantom-foundation/go-opera/opera/genesisstore"
 
+	mptIo "github.com/Fantom-foundation/Carmen/go/database/mpt/io"
 	carmen "github.com/Fantom-foundation/Carmen/go/state"
-	mptIo "github.com/Fantom-foundation/Carmen/go/state/mpt/io"
 )
 
 type GenesisBuilder struct {