diff --git a/api/gateway/state.go b/api/gateway/state.go
index fdd627b232..63ada8ebb2 100644
--- a/api/gateway/state.go
+++ b/api/gateway/state.go
@@ -10,8 +10,8 @@ import (
 	"github.com/gorilla/mux"
 
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 
+	"github.com/celestiaorg/celestia-node/blob"
 	"github.com/celestiaorg/celestia-node/state"
 )
 
@@ -141,14 +141,14 @@ func (h *Handler) handleSubmitPFB(w http.ResponseWriter, r *http.Request) {
 	}
 	fee := types.NewInt(req.Fee)
 
-	blob := &apptypes.Blob{
-		NamespaceId:  nID,
-		Data:         data,
-		ShareVersion: uint32(appconsts.DefaultShareVersion),
+	constructedBlob, err := blob.NewBlob(appconsts.DefaultShareVersion, nID, data)
+	if err != nil {
+		writeError(w, http.StatusBadRequest, submitPFBEndpoint, err)
+		return
 	}
 
 	// perform request
-	txResp, txerr := h.state.SubmitPayForBlob(r.Context(), fee, req.GasLimit, []*apptypes.Blob{blob})
+	txResp, txerr := h.state.SubmitPayForBlob(r.Context(), fee, req.GasLimit, []*blob.Blob{constructedBlob})
 	if txerr != nil && txResp == nil {
 		// no tx data to return
 		writeError(w, http.StatusInternalServerError, submitPFBEndpoint, err)
diff --git a/api/gateway/state_test.go b/api/gateway/state_test.go
index 3c01c9f0f8..7e96cf4035 100644
--- a/api/gateway/state_test.go
+++ b/api/gateway/state_test.go
@@ -2,8 +2,10 @@ package gateway
 
 import (
 	"bytes"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -12,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	stateMock "github.com/celestiaorg/celestia-node/nodebuilder/state/mocks"
+	"github.com/celestiaorg/celestia-node/share"
 	"github.com/celestiaorg/celestia-node/state"
 )
 
@@ -32,12 +35,20 @@ func TestHandleSubmitPFB(t *testing.T) {
 		mock.EXPECT().SubmitPayForBlob(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
 			Return(&txResponse, timedErr)
 
-		bs, err := json.Marshal(submitPFBRequest{})
+		ns, err := share.NewNamespaceV0([]byte("abc"))
+		require.NoError(t, err)
+		hexNs := hex.EncodeToString(ns[:])
+
+		bs, err := json.Marshal(submitPFBRequest{
+			NamespaceID: hexNs,
+			Data:        "DEADBEEF",
+		})
 		require.NoError(t, err)
 		httpreq := httptest.NewRequest("GET", "/", bytes.NewReader(bs))
 		respRec := httptest.NewRecorder()
 		handler.handleSubmitPFB(respRec, httpreq)
 
+		fmt.Println(respRec.Body.String())
 		var resp state.TxResponse
 		err = json.NewDecoder(respRec.Body).Decode(&resp)
 		require.NoError(t, err)
diff --git a/blob/service.go b/blob/service.go
index 0d1ccf0bf1..0b43493e27 100644
--- a/blob/service.go
+++ b/blob/service.go
@@ -6,17 +6,16 @@ import (
 	"fmt"
 	"sync"
 
+	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/types"
 	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/pkg/shares"
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/celestiaorg/nmt/namespace"
 
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/share"
-	"github.com/celestiaorg/celestia-node/state"
 )
 
 var (
@@ -26,9 +25,16 @@ var (
 	log = logging.Logger("blob")
 )
 
+// Submitter is an interface that allows submitting blobs to the celestia-core. It is used to
+// avoid a circular dependency between the blob and the state package, since the state package needs
+// the blob.Blob type for this signature.
+type Submitter interface {
+	SubmitPayForBlob(ctx context.Context, fee math.Int, gasLim uint64, blobs []*Blob) (*types.TxResponse, error)
+}
+
 type Service struct {
 	// accessor dials the given celestia-core endpoint to submit blobs.
-	accessor *state.CoreAccessor
+	blobSumitter Submitter
 	// shareGetter retrieves the EDS to fetch all shares from the requested header.
 	shareGetter share.Getter
 	//  headerGetter fetches header by the provided height
@@ -36,12 +42,12 @@ type Service struct {
 }
 
 func NewService(
-	state *state.CoreAccessor,
+	submitter Submitter,
 	getter share.Getter,
 	headerGetter func(context.Context, uint64) (*header.ExtendedHeader, error),
 ) *Service {
 	return &Service{
-		accessor:     state,
+		blobSumitter: submitter,
 		shareGetter:  getter,
 		headerGetter: headerGetter,
 	}
@@ -56,14 +62,9 @@ func (s *Service) Submit(ctx context.Context, blobs []*Blob) (uint64, error) {
 	var (
 		gasLimit = estimateGas(blobs...)
 		fee      = int64(appconsts.DefaultMinGasPrice * float64(gasLimit))
-		b        = make([]*apptypes.Blob, len(blobs))
 	)
 
-	for i, blob := range blobs {
-		b[i] = &blob.Blob
-	}
-
-	resp, err := s.accessor.SubmitPayForBlob(ctx, types.NewInt(fee), gasLimit, b)
+	resp, err := s.blobSumitter.SubmitPayForBlob(ctx, types.NewInt(fee), gasLimit, blobs)
 	if err != nil {
 		return 0, err
 	}
diff --git a/cmd/celestia/rpc.go b/cmd/celestia/rpc.go
index 4139e0f709..de8c55e3f4 100644
--- a/cmd/celestia/rpc.go
+++ b/cmd/celestia/rpc.go
@@ -18,7 +18,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/spf13/cobra"
 
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	"github.com/celestiaorg/nmt/namespace"
 
 	"github.com/celestiaorg/celestia-node/api/rpc/client"
@@ -190,12 +189,11 @@ func parseParams(method string, params []string) []interface{} {
 				panic("Error decoding blob: base64 string could not be decoded.")
 			}
 		}
-		parsedParams[2] = []*apptypes.Blob{{
-			NamespaceId:      nID[1:],
-			Data:             blobData,
-			ShareVersion:     0,
-			NamespaceVersion: 0,
-		}}
+		parsedBlob, err := blob.NewBlob(0, nID, blobData)
+		if err != nil {
+			panic(fmt.Sprintf("Error creating blob: %v", err))
+		}
+		parsedParams[2] = []*blob.Blob{parsedBlob}
 		return parsedParams[:3]
 	case "Get":
 		// 1. Height
diff --git a/nodebuilder/blob/mocks/api.go b/nodebuilder/blob/mocks/api.go
index b7c61aa450..f99d1d8168 100644
--- a/nodebuilder/blob/mocks/api.go
+++ b/nodebuilder/blob/mocks/api.go
@@ -8,10 +8,9 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
-
 	blob "github.com/celestiaorg/celestia-node/blob"
 	namespace "github.com/celestiaorg/nmt/namespace"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockModule is a mock of Module interface.
diff --git a/nodebuilder/das/mocks/api.go b/nodebuilder/das/mocks/api.go
index 68ffaf3c8c..c4046e90e8 100644
--- a/nodebuilder/das/mocks/api.go
+++ b/nodebuilder/das/mocks/api.go
@@ -8,9 +8,8 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
-
 	das "github.com/celestiaorg/celestia-node/das"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockModule is a mock of Module interface.
diff --git a/nodebuilder/fraud/mocks/api.go b/nodebuilder/fraud/mocks/api.go
index 5ede6f27c5..ba88131695 100644
--- a/nodebuilder/fraud/mocks/api.go
+++ b/nodebuilder/fraud/mocks/api.go
@@ -8,10 +8,9 @@ import (
 	context "context"
 	reflect "reflect"
 
+	fraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
+	fraud0 "github.com/celestiaorg/go-fraud"
 	gomock "github.com/golang/mock/gomock"
-
-	fraud0 "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
-	"github.com/celestiaorg/go-fraud"
 )
 
 // MockModule is a mock of Module interface.
@@ -38,10 +37,10 @@ func (m *MockModule) EXPECT() *MockModuleMockRecorder {
 }
 
 // Get mocks base method.
-func (m *MockModule) Get(arg0 context.Context, arg1 fraud.ProofType) ([]fraud0.Proof, error) {
+func (m *MockModule) Get(arg0 context.Context, arg1 fraud0.ProofType) ([]fraud.Proof, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Get", arg0, arg1)
-	ret0, _ := ret[0].([]fraud0.Proof)
+	ret0, _ := ret[0].([]fraud.Proof)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -53,10 +52,10 @@ func (mr *MockModuleMockRecorder) Get(arg0, arg1 interface{}) *gomock.Call {
 }
 
 // Subscribe mocks base method.
-func (m *MockModule) Subscribe(arg0 context.Context, arg1 fraud.ProofType) (<-chan fraud0.Proof, error) {
+func (m *MockModule) Subscribe(arg0 context.Context, arg1 fraud0.ProofType) (<-chan fraud.Proof, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Subscribe", arg0, arg1)
-	ret0, _ := ret[0].(<-chan fraud0.Proof)
+	ret0, _ := ret[0].(<-chan fraud.Proof)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/nodebuilder/header/mocks/api.go b/nodebuilder/header/mocks/api.go
index 538169c6be..02529a8ef9 100644
--- a/nodebuilder/header/mocks/api.go
+++ b/nodebuilder/header/mocks/api.go
@@ -8,11 +8,10 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
-
 	header "github.com/celestiaorg/celestia-node/header"
 	header0 "github.com/celestiaorg/go-header"
 	sync "github.com/celestiaorg/go-header/sync"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockModule is a mock of Module interface.
@@ -156,3 +155,18 @@ func (mr *MockModuleMockRecorder) SyncWait(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncWait", reflect.TypeOf((*MockModule)(nil).SyncWait), arg0)
 }
+
+// WaitForHeight mocks base method.
+func (m *MockModule) WaitForHeight(arg0 context.Context, arg1 uint64) (*header.ExtendedHeader, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "WaitForHeight", arg0, arg1)
+	ret0, _ := ret[0].(*header.ExtendedHeader)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// WaitForHeight indicates an expected call of WaitForHeight.
+func (mr *MockModuleMockRecorder) WaitForHeight(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForHeight", reflect.TypeOf((*MockModule)(nil).WaitForHeight), arg0, arg1)
+}
diff --git a/nodebuilder/node/mocks/api.go b/nodebuilder/node/mocks/api.go
index 39d500bc04..98df713429 100644
--- a/nodebuilder/node/mocks/api.go
+++ b/nodebuilder/node/mocks/api.go
@@ -8,10 +8,9 @@ import (
 	context "context"
 	reflect "reflect"
 
+	node "github.com/celestiaorg/celestia-node/nodebuilder/node"
 	auth "github.com/filecoin-project/go-jsonrpc/auth"
 	gomock "github.com/golang/mock/gomock"
-
-	node "github.com/celestiaorg/celestia-node/nodebuilder/node"
 )
 
 // MockModule is a mock of Module interface.
diff --git a/nodebuilder/share/mocks/api.go b/nodebuilder/share/mocks/api.go
index 1b26273c0f..586c6dab4b 100644
--- a/nodebuilder/share/mocks/api.go
+++ b/nodebuilder/share/mocks/api.go
@@ -8,12 +8,11 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
-
 	da "github.com/celestiaorg/celestia-app/pkg/da"
 	share "github.com/celestiaorg/celestia-node/share"
 	namespace "github.com/celestiaorg/nmt/namespace"
 	rsmt2d "github.com/celestiaorg/rsmt2d"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockModule is a mock of Module interface.
diff --git a/nodebuilder/state/mocks/api.go b/nodebuilder/state/mocks/api.go
index 8398e0fd7b..814b9a0113 100644
--- a/nodebuilder/state/mocks/api.go
+++ b/nodebuilder/state/mocks/api.go
@@ -9,11 +9,11 @@ import (
 	reflect "reflect"
 
 	math "cosmossdk.io/math"
+	blob "github.com/celestiaorg/celestia-node/blob"
 	types "github.com/cosmos/cosmos-sdk/types"
 	types0 "github.com/cosmos/cosmos-sdk/x/staking/types"
 	gomock "github.com/golang/mock/gomock"
-	types1 "github.com/tendermint/tendermint/proto/tendermint/types"
-	types2 "github.com/tendermint/tendermint/types"
+	types1 "github.com/tendermint/tendermint/types"
 )
 
 // MockModule is a mock of Module interface.
@@ -189,7 +189,7 @@ func (mr *MockModuleMockRecorder) QueryUnbonding(arg0, arg1 interface{}) *gomock
 }
 
 // SubmitPayForBlob mocks base method.
-func (m *MockModule) SubmitPayForBlob(arg0 context.Context, arg1 math.Int, arg2 uint64, arg3 []*types1.Blob) (*types.TxResponse, error) {
+func (m *MockModule) SubmitPayForBlob(arg0 context.Context, arg1 math.Int, arg2 uint64, arg3 []*blob.Blob) (*types.TxResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SubmitPayForBlob", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(*types.TxResponse)
@@ -204,7 +204,7 @@ func (mr *MockModuleMockRecorder) SubmitPayForBlob(arg0, arg1, arg2, arg3 interf
 }
 
 // SubmitTx mocks base method.
-func (m *MockModule) SubmitTx(arg0 context.Context, arg1 types2.Tx) (*types.TxResponse, error) {
+func (m *MockModule) SubmitTx(arg0 context.Context, arg1 types1.Tx) (*types.TxResponse, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SubmitTx", arg0, arg1)
 	ret0, _ := ret[0].(*types.TxResponse)
diff --git a/nodebuilder/state/state.go b/nodebuilder/state/state.go
index 57f46a8fd6..c66205d594 100644
--- a/nodebuilder/state/state.go
+++ b/nodebuilder/state/state.go
@@ -5,8 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
-
+	"github.com/celestiaorg/celestia-node/blob"
 	"github.com/celestiaorg/celestia-node/state"
 )
 
@@ -36,7 +35,9 @@ type Module interface {
 
 	// Transfer sends the given amount of coins from default wallet of the node to the given account
 	// address.
-	Transfer(ctx context.Context, to state.AccAddress, amount, fee state.Int, gasLimit uint64) (*state.TxResponse, error)
+	Transfer(
+		ctx context.Context, to state.AccAddress, amount, fee state.Int, gasLimit uint64,
+	) (*state.TxResponse, error)
 	// SubmitTx submits the given transaction/message to the
 	// Celestia network and blocks until the tx is included in
 	// a block.
@@ -46,7 +47,7 @@ type Module interface {
 		ctx context.Context,
 		fee state.Int,
 		gasLim uint64,
-		blobs []*apptypes.Blob,
+		blobs []*blob.Blob,
 	) (*state.TxResponse, error)
 
 	// CancelUnbondingDelegation cancels a user's pending undelegation from a validator.
@@ -114,7 +115,7 @@ type API struct {
 			ctx context.Context,
 			fee state.Int,
 			gasLim uint64,
-			blobs []*apptypes.Blob,
+			blobs []*blob.Blob,
 		) (*state.TxResponse, error) `perm:"write"`
 		CancelUnbondingDelegation func(
 			ctx context.Context,
@@ -192,7 +193,7 @@ func (api *API) SubmitPayForBlob(
 	ctx context.Context,
 	fee state.Int,
 	gasLim uint64,
-	blobs []*apptypes.Blob,
+	blobs []*blob.Blob,
 ) (*state.TxResponse, error) {
 	return api.Internal.SubmitPayForBlob(ctx, fee, gasLim, blobs)
 }
diff --git a/share/mocks/getter.go b/share/mocks/getter.go
index 12c36cb015..1c73c9170d 100644
--- a/share/mocks/getter.go
+++ b/share/mocks/getter.go
@@ -8,12 +8,11 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
-
 	da "github.com/celestiaorg/celestia-app/pkg/da"
 	share "github.com/celestiaorg/celestia-node/share"
 	namespace "github.com/celestiaorg/nmt/namespace"
 	rsmt2d "github.com/celestiaorg/rsmt2d"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockGetter is a mock of Getter interface.
diff --git a/state/core_access.go b/state/core_access.go
index 0a265c2d08..e1bb0edd95 100644
--- a/state/core_access.go
+++ b/state/core_access.go
@@ -21,10 +21,11 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/celestiaorg/celestia-app/app"
-	"github.com/celestiaorg/celestia-app/x/blob"
+	appblob "github.com/celestiaorg/celestia-app/x/blob"
 	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	libhead "github.com/celestiaorg/go-header"
 
+	"github.com/celestiaorg/celestia-node/blob"
 	"github.com/celestiaorg/celestia-node/header"
 )
 
@@ -159,17 +160,22 @@ func (ca *CoreAccessor) SubmitPayForBlob(
 	ctx context.Context,
 	fee Int,
 	gasLim uint64,
-	blobs []*apptypes.Blob,
+	blobs []*blob.Blob,
 ) (*TxResponse, error) {
 	if len(blobs) == 0 {
 		return nil, errors.New("state: no blobs provided")
 	}
 
-	response, err := blob.SubmitPayForBlob(
+	appblobs := make([]*apptypes.Blob, len(blobs))
+	for i, blob := range blobs {
+		appblobs[i] = &blob.Blob
+	}
+
+	response, err := appblob.SubmitPayForBlob(
 		ctx,
 		ca.signer,
 		ca.coreConn,
-		blobs,
+		appblobs,
 		apptypes.SetGasLimit(gasLim),
 		withFee(fee),
 	)