diff --git a/x/cert/keeper/key.go b/x/cert/keeper/key.go
index 978d0d3442..61b4741f6f 100644
--- a/x/cert/keeper/key.go
+++ b/x/cert/keeper/key.go
@@ -41,6 +41,7 @@ func CertificateKey(id types.CertID) []byte {
 	return buf.Bytes()
 }
 
+<<<<<<< Updated upstream
 func CertificatePrefix(id sdk.Address) []byte {
 	addr, err := address.LengthPrefix(id.Bytes())
 	if err != nil {
@@ -59,6 +60,15 @@ func CertificatePrefix(id sdk.Address) []byte {
 // format <0x01><add len><add bytes><serial length><serial bytes>
 
 func ParseCertID(prefix []byte, from []byte) (types.CertID, error) {
+||||||| Stash base
+// ParseCertKey parse certificate key into id
+// format <0x01><state><add len><add bytes><serial length><serial bytes>
+func ParseCertKey(from []byte) (types.Certificate_State, types.CertID, error) {
+=======
+// ParseCertKey parse certificate key into id
+// format <0x11><state><add len><add bytes><serial length><serial bytes>
+func ParseCertKey(from []byte) (types.Certificate_State, types.CertID, error) {
+>>>>>>> Stashed changes
 	res := types.CertID{
 		Serial: *big.NewInt(0),
 	}
diff --git a/x/cert/keeper/key_test.go b/x/cert/keeper/key_test.go
new file mode 100644
index 0000000000..5fe45bf09c
--- /dev/null
+++ b/x/cert/keeper/key_test.go
@@ -0,0 +1,285 @@
+package keeper
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/types/address"
+	"github.com/stretchr/testify/require"
+	"github.com/tendermint/tendermint/crypto/ed25519"
+
+	types "github.com/akash-network/akash-api/go/node/cert/v1beta3"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+func TestCertStateToPrefix(t *testing.T) {
+	tests := []struct {
+		name     string
+		state    types.Certificate_State
+		expected []byte
+	}{
+		{
+			name:     "valid certificate state",
+			state:    types.CertificateValid,
+			expected: CertStateValidPrefix,
+		},
+		{
+			name:     "revoked certificate state",
+			state:    types.CertificateRevoked,
+			expected: CertStateRevokedPrefix,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			result := certStateToPrefix(tc.state)
+			require.Equal(t, tc.expected, result)
+		})
+	}
+}
+
+func TestCertStateToPrefixPanics(t *testing.T) {
+	require.Panics(t, func() {
+		certStateToPrefix(types.CertificateStateInvalid)
+	}, "should panic for invalid certificate state")
+}
+
+func TestBuildCertPrefix(t *testing.T) {
+	tests := []struct {
+		name     string
+		state    types.Certificate_State
+		expected []byte
+	}{
+		{
+			name:     "valid certificate state",
+			state:    types.CertificateValid,
+			expected: append(CertPrefix, CertStateValidPrefix...),
+		},
+		{
+			name:     "revoked certificate state",
+			state:    types.CertificateRevoked,
+			expected: append(CertPrefix, CertStateRevokedPrefix...),
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			result := buildCertPrefix(tc.state)
+			require.Equal(t, tc.expected, result)
+		})
+	}
+}
+
+func TestBuildCertPrefixPanics(t *testing.T) {
+	require.Panics(t, func() {
+		buildCertPrefix(types.CertificateStateInvalid)
+	}, "should panic for invalid certificate state")
+}
+
+func TestCertificateKey(t *testing.T) {
+	owner := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address())
+	serial := big.NewInt(123)
+
+	tests := []struct {
+		name     string
+		state    types.Certificate_State
+		certID   types.CertID
+		expected []byte
+		wantErr  bool
+	}{
+		{
+			name:  "valid certificate",
+			state: types.CertificateValid,
+			certID: types.CertID{
+				Owner:  owner,
+				Serial: *serial,
+			},
+			wantErr: false,
+		},
+		{
+			name:  "revoked certificate",
+			state: types.CertificateRevoked,
+			certID: types.CertID{
+				Owner:  owner,
+				Serial: *serial,
+			},
+			wantErr: false,
+		},
+		{
+			name:  "empty owner",
+			state: types.CertificateValid,
+			certID: types.CertID{
+				Owner:  sdk.AccAddress{},
+				Serial: *serial,
+			},
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			result, err := CertificateKey(tc.state, tc.certID)
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotEmpty(t, result)
+
+			// Verify the key structure
+			state, parsedID, err := ParseCertKey(result)
+			require.NoError(t, err)
+			require.Equal(t, tc.state, state)
+			require.Equal(t, tc.certID.Owner, parsedID.Owner)
+			require.Equal(t, tc.certID.Serial.String(), parsedID.Serial.String())
+		})
+	}
+}
+
+func TestCertificateKeyRaw(t *testing.T) {
+	owner := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address())
+	serial := big.NewInt(123)
+
+	tests := []struct {
+		name     string
+		state    types.Certificate_State
+		certID   types.CertID
+		expected []byte
+		wantErr  bool
+	}{
+		{
+			name:  "valid key",
+			state: types.CertificateValid,
+			certID: types.CertID{
+				Owner:  owner,
+				Serial: *serial,
+			},
+			expected: append(append(append(CertPrefix, CertStateValidPrefix...), address.MustLengthPrefix(owner.Bytes())...), mustSerialPrefix(serial.Bytes())...),
+			wantErr:  false,
+		},
+		{
+			name:  "valid key 2",
+			state: types.CertificateRevoked,
+			certID: types.CertID{
+				Owner:  owner,
+				Serial: *serial,
+			},
+			expected: append(append(append(CertPrefix, CertStateRevokedPrefix...), address.MustLengthPrefix(owner.Bytes())...), mustSerialPrefix(serial.Bytes())...),
+			wantErr:  false,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			result, err := CertificateKey(tc.state, tc.certID)
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotEmpty(t, result)
+			require.Equal(t, tc.expected, result)
+		})
+	}
+}
+
+func TestMustCertificateKey(t *testing.T) {
+	owner := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address())
+	serial := big.NewInt(123)
+	validID := types.CertID{
+		Owner:  owner,
+		Serial: *serial,
+	}
+
+	t.Run("valid case", func(t *testing.T) {
+		require.NotPanics(t, func() {
+			key := MustCertificateKey(types.CertificateValid, validID)
+			require.NotEmpty(t, key)
+		})
+	})
+
+	t.Run("panic on invalid input", func(t *testing.T) {
+		require.Panics(t, func() {
+			MustCertificateKey(types.CertificateValid, types.CertID{})
+		})
+	})
+}
+
+func TestParseCertKey(t *testing.T) {
+	owner := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address())
+	serial := big.NewInt(123)
+	certID := types.CertID{
+		Owner:  owner,
+		Serial: *serial,
+	}
+
+	tests := []struct {
+		name    string
+		key     []byte
+		state   types.Certificate_State
+		certID  types.CertID
+		wantErr bool
+	}{
+		{
+			name:    "valid key - valid state",
+			key:     MustCertificateKey(types.CertificateValid, certID),
+			state:   types.CertificateValid,
+			certID:  certID,
+			wantErr: false,
+		},
+		{
+			name:    "valid key - revoked state",
+			key:     MustCertificateKey(types.CertificateRevoked, certID),
+			state:   types.CertificateRevoked,
+			certID:  certID,
+			wantErr: false,
+		},
+		{
+			name:    "invalid key - too short",
+			key:     []byte{0x11},
+			wantErr: true,
+		},
+		{
+			name:    "invalid key - wrong prefix",
+			key:     []byte{0x12, 0x01, 0x20},
+			wantErr: true,
+		},
+		{
+			name:    "invalid key - invalid address length",
+			key:     append(append(CertPrefix, CertStateValidPrefix...), 0xFF),
+			wantErr: true,
+		},
+		{
+			name:    "invalid key - malformed address",
+			key:     append(append(CertPrefix, CertStateValidPrefix...), 0x01, 0x00),
+			wantErr: true,
+		},
+		{
+			name:    "invalid key - malformed address 2",
+			key:     append(append(CertPrefix, CertStateValidPrefix...), 0x13, 0x00),
+			wantErr: true,
+		},
+		{
+			name:    "invalid key - malformed address 2",
+			key:     append(append(CertPrefix, CertStateValidPrefix...), 0x04, 0x00, 0x01, 0x02, 0x03, 0x04, 0x00),
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			state, parsedID, err := ParseCertKey(tc.key)
+			if tc.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, tc.state, state)
+			require.Equal(t, tc.certID.Owner.String(), parsedID.Owner.String())
+			require.Equal(t, tc.certID.Serial.String(), parsedID.Serial.String())
+		})
+	}
+}