diff --git a/blob/commitment_proof.go b/blob/commitment_proof.go index ff08001060..8fa7467179 100644 --- a/blob/commitment_proof.go +++ b/blob/commitment_proof.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/celestiaorg/celestia-app/pkg/appconsts" - "github.com/celestiaorg/celestia-app/pkg/shares" + "github.com/celestiaorg/celestia-app/v2/pkg/appconsts" "github.com/celestiaorg/celestia-app/v2/pkg/proof" + "github.com/celestiaorg/go-square/inclusion" "github.com/celestiaorg/nmt" "github.com/celestiaorg/nmt/namespace" @@ -98,7 +98,7 @@ func (commitmentProof *CommitmentProof) Verify(root []byte, subtreeRootThreshold // the subtree roots width is defined in ADR-013: // //https://github.com/celestiaorg/celestia-app/blob/main/docs/architecture/adr-013-non-interactive-default-rules-for-zero-padding.md - subtreeRootsWidth := shares.SubTreeWidth(numberOfShares, subtreeRootThreshold) + subtreeRootsWidth := inclusion.SubTreeWidth(numberOfShares, subtreeRootThreshold) // verify the proof of the subtree roots subtreeRootsCursor := 0 diff --git a/blob/service.go b/blob/service.go index caf54d2a01..ee3b7e5cac 100644 --- a/blob/service.go +++ b/blob/service.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - "github.com/celestiaorg/celestia-app/pkg/appconsts" + "github.com/celestiaorg/celestia-app/v2/pkg/appconsts" pkgproof "github.com/celestiaorg/celestia-app/v2/pkg/proof" "github.com/celestiaorg/go-square/inclusion" appns "github.com/celestiaorg/go-square/namespace" diff --git a/core/header_test.go b/core/header_test.go index d40bd4ce60..be4521d609 100644 --- a/core/header_test.go +++ b/core/header_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/rand" - "github.com/celestiaorg/celestia-app/pkg/appconsts" + "github.com/celestiaorg/celestia-app/v2/pkg/appconsts" "github.com/celestiaorg/celestia-node/header" "github.com/celestiaorg/celestia-node/header/headertest" diff --git a/go.mod b/go.mod index 7b301db903..807900651d 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/BurntSushi/toml v1.4.0 github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b github.com/benbjohnson/clock v1.3.5 - github.com/celestiaorg/celestia-app v1.13.0 github.com/celestiaorg/celestia-app/v2 v2.0.0 github.com/celestiaorg/go-fraud v0.2.1 github.com/celestiaorg/go-header v0.6.2 diff --git a/go.sum b/go.sum index ba837aef75..e2892d79eb 100644 --- a/go.sum +++ b/go.sum @@ -354,8 +354,6 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-app v1.13.0 h1:7MWEox6lim6WDyiP84Y2/ERfWUJxWPfZlKxzO6OFcig= -github.com/celestiaorg/celestia-app v1.13.0/go.mod h1:CF9VZwWAlTU0Is/BOsmxqkbkYnnmrgl0YRlSBIzr0m0= github.com/celestiaorg/celestia-app/v2 v2.0.0 h1:cGrkLbqbaNqj+g+LhvmQ0iFKFyrD/GdU5z3WQI/bq8E= github.com/celestiaorg/celestia-app/v2 v2.0.0/go.mod h1:0wP0W+GLghvsODxLhAYToKsy0RFKeg1HdZftQG90W5A= github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29 h1:HwbA4OegRvXX0aNchBA7Cmu+oIxnH7xRcOhISuDP0ak= diff --git a/header/header.go b/header/header.go index 282d8d69c4..a014864551 100644 --- a/header/header.go +++ b/header/header.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/light" core "github.com/tendermint/tendermint/types" - "github.com/celestiaorg/celestia-app/pkg/appconsts" + "github.com/celestiaorg/celestia-app/v2/pkg/appconsts" "github.com/celestiaorg/celestia-app/v2/pkg/da" libhead "github.com/celestiaorg/go-header" "github.com/celestiaorg/rsmt2d"