ethereum/eip712/eip712.go

@@ -2,6 +2,7 @@ package eip712
 
 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"math/big"
@@ -9,22 +10,22 @@ import (
 	"strings"
 	"time"
 
+	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	errorsmod "cosmossdk.io/errors"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
-
-	registry "github.com/cerc-io/laconicd/x/registry/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
 )
 
+const bytesStr = "bytes"
+
 // WrapTxToTypedData is an ultimate method that wraps Amino-encoded Cosmos Tx JSON data
 // into an EIP712-compatible TypedData request.
 func WrapTxToTypedData(
@@ -34,25 +35,6 @@ func WrapTxToTypedData(
 	data []byte,
 	feeDelegation *FeeDelegationOptions,
 ) (apitypes.TypedData, error) {
-	txData := make(map[string]interface{})
-
-	if err := json.Unmarshal(data, &txData); err != nil {
-		return apitypes.TypedData{}, errorsmod.Wrap(errortypes.ErrJSONUnmarshal, "failed to JSON unmarshal data")
-	}
-
-	if txData["msgs"].([]interface{})[0].(map[string]interface{})["value"].(map[string]interface{})["payload"] != nil {
-		setRecordMsg := msg.(*registry.MsgSetRecord)
-		var attr []interface{}
-		for _, b := range setRecordMsg.Payload.Record.Attributes.Value {
-			attr = append(attr, fmt.Sprintf("%v", b))
-		}
-
-		txData["msgs"].([]interface{})[0].(map[string]interface{})["value"].(map[string]interface{})["payload"].(map[string]interface{})["record"].(map[string]interface{})["attributes"] = map[string]interface{}{ //nolint:lll
-			"type_url": setRecordMsg.Payload.Record.Attributes.TypeUrl,
-			"value":    attr,
-		}
-	}
-
 	domain := apitypes.TypedDataDomain{
 		Name:              "Cosmos Web3",
 		Version:           "1.0.0",
@@ -66,22 +48,13 @@ func WrapTxToTypedData(
 		return apitypes.TypedData{}, err
 	}
 
-	if msgTypes["TypePayloadRecord"] != nil {
+	txData := make(map[string]interface{})
-		msgTypes["TypePayloadRecord"] = []apitypes.Type{
+	if err := json.Unmarshal(data, &txData); err != nil {
-			{Name: "id", Type: "string"},
+		return apitypes.TypedData{}, errorsmod.Wrap(errortypes.ErrJSONUnmarshal, "failed to JSON unmarshal data")
-			{Name: "bond_id", Type: "string"},
-			{Name: "create_time", Type: "string"},
-			{Name: "expiry_time", Type: "string"},
-			{Name: "deleted", Type: "bool"},
-			{Name: "attributes", Type: "TypePayloadRecordAttributes"},
-		}
 	}
-	if msgTypes["TypePayloadRecordAttributes"] != nil {
+
-		msgTypes["TypePayloadRecordAttributes"] = []apitypes.Type{
+	if err := patchTxData(txData, msgTypes, "Tx"); err != nil {
-			{Name: "type_url", Type: "string"},
+		return apitypes.TypedData{}, errorsmod.Wrap(errortypes.ErrJSONUnmarshal, "failed to patch JSON data")
-			{Name: "value", Type: "uint8[]"},
-		}
-		delete(msgTypes, "TypePayloadRecordAttributesValue")
 	}
 
 	if feeDelegation != nil {
@@ -320,10 +293,15 @@ func traverseFields(
 		ethTyp := typToEth(fieldType)
 		if len(ethTyp) > 0 {
 			// Support array of uint64
-			if isCollection && fieldType.Kind() != reflect.Slice && fieldType.Kind() != reflect.Array {
+			if isCollection {
-				ethTyp += "[]"
+				if fieldType.Kind() != reflect.Slice && fieldType.Kind() != reflect.Array {
+					ethTyp += "[]"
+				}
+				// convert uint8[] to bytes
+				if fieldType.Kind() == reflect.Uint8 {
+					ethTyp = bytesStr
+				}
 			}
-
 			if prefix == typeDefPrefix {
 				typeMap[rootType] = append(typeMap[rootType], apitypes.Type{
 					Name: fieldName,
@@ -466,14 +444,13 @@ func typToEth(typ reflect.Type) string {
 		return "uint32"
 	case reflect.Uint64:
 		return "uint64"
-	case reflect.Slice:
+	case reflect.Slice | reflect.Array:
-		ethName := typToEth(typ.Elem())
+		// Note: this case may never be reached due to previous handling in traverseFields
-		if len(ethName) > 0 {
-			return ethName + "[]"
-		}
-	case reflect.Array:
 		ethName := typToEth(typ.Elem())
 		if len(ethName) > 0 {
+			if ethName == "uint8" {
+				return bytesStr
+			}
 			return ethName + "[]"
 		}
 	case reflect.Ptr:
@@ -510,3 +487,77 @@ func doRecover(err *error) {
 		*err = fmt.Errorf("%v", r)
 	}
 }
+
+// Performs extra type conversions on JSON-decoded data accoding to the provided type definitions
+// for compatibility with Geth's encoding
+func patchTxData(data map[string]any, schema apitypes.Types, rootType string) error {
+	// Scan the data for any types that need to be converted.
+	// This is adapted from TypedData.EncodeData
+	for _, field := range schema[rootType] {
+		encType := field.Type
+		encValue := data[field.Name]
+
+		switch {
+		case encType[len(encType)-1:] == "]":
+			arrayValue, ok := encValue.([]interface{})
+			if !ok {
+				return dataMismatchError(encType, encValue)
+			}
+
+			parsedType := strings.Split(encType, "[")[0]
+			if schema[parsedType] != nil {
+				for _, item := range arrayValue {
+					mapValue, ok := item.(map[string]interface{})
+					if !ok {
+						return dataMismatchError(parsedType, item)
+					}
+
+					err := patchTxData(mapValue, schema, parsedType)
+					if err != nil {
+						return err
+					}
+				}
+			} else {
+				for i, item := range arrayValue {
+					converted, err := handleConversion(parsedType, item)
+					if err != nil {
+						return err
+					}
+					arrayValue[i] = converted
+				}
+			}
+		case schema[encType] != nil:
+			mapValue, ok := encValue.(map[string]interface{})
+			if !ok {
+				return dataMismatchError(encType, encValue)
+			}
+			err := patchTxData(mapValue, schema, encType)
+			if err != nil {
+				return err
+			}
+		default:
+			converted, err := handleConversion(encType, encValue)
+			if err != nil {
+				return err
+			}
+			data[field.Name] = converted
+		}
+	}
+	return nil
+}
+
+func handleConversion(encType string, encValue any) (any, error) {
+	if encType == bytesStr {
+		// Protobuf encodes byte strings in base64
+		if v, ok := encValue.(string); ok {
+			return base64.StdEncoding.DecodeString(v)
+		}
+	}
+	return encValue, nil
+}
+
+// dataMismatchError generates an error for a mismatch between
+// the provided type and data
+func dataMismatchError(encType string, encValue any) error {
+	return fmt.Errorf("provided data '%v' doesn't match type '%s'", encValue, encType)
+}

ethereum/eip712/eip712_test.go

@@ -4,28 +4,25 @@ import (
 	"testing"
 
 	"cosmossdk.io/math"
-
+	registrytypes "github.com/cerc-io/laconicd/x/registry/types"
-	"github.com/cerc-io/laconicd/ethereum/eip712"
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/simapp/params"
-	"github.com/ethereum/go-ethereum/crypto"
-
-	"github.com/cerc-io/laconicd/crypto/ethsecp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+	"github.com/cosmos/cosmos-sdk/simapp/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"github.com/cerc-io/laconicd/app"
-	"github.com/cerc-io/laconicd/encoding"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-
 	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
-
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/cerc-io/laconicd/app"
+	"github.com/cerc-io/laconicd/crypto/ethsecp256k1"
+	"github.com/cerc-io/laconicd/encoding"
+	"github.com/cerc-io/laconicd/ethereum/eip712"
 )
 
 // Unit tests for single-signer EIP-712 signature verification. Multi-signer verification tests are included
@@ -332,6 +329,54 @@ func (suite *EIP712TestSuite) TestEIP712SignatureVerification() {
 			sequence:      78,
 			expectSuccess: false,
 		},
+
+		// test laconic registry messages
+		{
+			title: "Succeeds - Standard MsgSetName",
+			fee: txtypes.Fee{
+				Amount:   suite.makeCoins("aphoton", math.NewInt(2000)),
+				GasLimit: 100000,
+			},
+			memo: "",
+			msgs: []sdk.Msg{
+				registrytypes.NewMsgSetName(
+					"testcrn",
+					"testcid",
+					suite.createTestAddress(),
+				),
+			},
+			accountNumber: 25,
+			sequence:      78,
+			expectSuccess: true,
+		},
+		{
+			title: "Succeeds - Standard MsgSetRecord",
+			fee: txtypes.Fee{
+				Amount:   suite.makeCoins("aphoton", math.NewInt(2000)),
+				GasLimit: 100000,
+			},
+			memo: "",
+			msgs: []sdk.Msg{
+				registrytypes.NewMsgSetRecord(
+					registrytypes.Payload{
+						Record: &registrytypes.Record{
+							Attributes: []byte("test attributes"),
+						},
+						Signatures: []registrytypes.Signature{
+							{
+								Sig:    "fake sig",
+								PubKey: "fake pubkey",
+							},
+						},
+					},
+					"testbondid",
+					suite.createTestAddress(),
+				),
+			},
+			accountNumber: 25,
+			sequence:      78,
+			expectSuccess: true,
+		},
 	}
 
 	for _, tc := range testCases {

gql/cerc-io/laconicd/schema.graphql

@@ -1,12 +1,5 @@
 # Reference to another record.
-type Reference {
+scalar Link
-  id: String! # ID of linked record.
-}
-
-# Reference to another record.
-input ReferenceInput {
-  id: String!
-}
 
 # Bonds contain funds that are used to pay rent on record registration and renewal.
 type Bond {
@@ -37,44 +30,71 @@ type Account {
   balance: [Coin!] # Current balance for each coin type.
 }
 
-# Value of a given type.
+# Value describes a DAG-JSON compatible value.
-type Value {
+union Value =
-  null: Boolean
+   BooleanValue
+ | IntValue
+ | FloatValue
+ | StringValue
+ | BytesValue
+ | LinkValue
+ | ArrayValue
+ | MapValue
 
-  int: Int
+type BooleanValue {
-  float: Float
+  value: Boolean!
-  string: String
-  boolean: Boolean
-  json: String
-
-  reference: Reference
-
-  values: [Value]
 }
-# Value of a given type used as input to queries.
-input ValueInput {
-  null: Boolean
 
-  int: Int
+type IntValue {
-  float: Float
+  value: Int!
-  string: String
+}
-  boolean: Boolean
 
-  reference: ReferenceInput
+type FloatValue {
+  value: Float!
+}
 
-  values: [ValueInput]
+type StringValue {
+  value: String!
+}
+
+type BytesValue {
+  value: String!
+}
+
+type ArrayValue {
+  value: [Value]!
+}
+
+type LinkValue {
+  value: Link!
+}
+
+type MapValue {
+  value: [Attribute!]!
 }
 
 # Key/value pair.
-type KeyValue {
+type Attribute {
   key: String!
-  value: Value!
+  value: Value
+}
+
+# Value of a given type used as input to queries.
+# Note: GQL doesn't allow union input types.
+input ValueInput {
+  int: Int
+  float: Float
+  string: String
+  boolean: Boolean
+  link: Link
+  array: [ValueInput]
+  map: [KeyValueInput!]
 }
 
 # Key/value pair for inputs.
 input KeyValueInput {
   key: String!
-  value: ValueInput!
+  value: ValueInput
 }
 
 # Status information about a node (https://docs.tendermint.com/master/rpc/#/Info/status).
@@ -155,7 +175,7 @@ type Record {
   createTime: String! # Record create time.
   expiryTime: String! # Record expiry time.
   owners: [String!] # Addresses of record owners.
-  attributes: [KeyValue] # Record attributes.
+  attributes: [Attribute!] # Record attributes.
   references: [Record] # Record references.
 }
 
@@ -195,7 +215,7 @@ type Query {
   getBondsByIds(ids: [String!]): [Bond]
 
   # Query bonds.
-  queryBonds(attributes: [KeyValueInput]): [Bond]
+  queryBonds(attributes: [KeyValueInput!]): [Bond]
 
   # Query bonds by owner.
   queryBondsByOwner(ownerAddresses: [String!]): [OwnerBonds]
@@ -210,7 +230,7 @@ type Query {
   # Query records.
   queryRecords(
     # Multiple attribute conditions are in a logical AND.
-    attributes: [KeyValueInput]
+    attributes: [KeyValueInput!]
 
     # Whether to query all records, not just named ones (false by default).
     all: Boolean

gql/gqlgen.yml

@@ -1,5 +1,3 @@
-# .gqlgen.yml example
-#
 # Refer to https://gqlgen.com/config/
 # for detailed .gqlgen.yml documentation.
 
@@ -12,3 +10,8 @@ model:
 resolver:
   filename: resolver.go
   type: Resolver
+
+models:
+  Link:
+    model:
+      - github.com/cerc-io/laconicd/gql.Link

gql/models_gen.go

@@ -2,6 +2,10 @@
 
 package gql
 
+type Value interface {
+	IsValue()
+}
+
 type Account struct {
 	Address  string  `json:"address"`
 	PubKey   *string `json:"pubKey"`
@@ -10,6 +14,17 @@ type Account struct {
 	Balance  []*Coin `json:"balance"`
 }
 
+type ArrayValue struct {
+	Value []Value `json:"value"`
+}
+
+func (ArrayValue) IsValue() {}
+
+type Attribute struct {
+	Key   string `json:"key"`
+	Value Value  `json:"value"`
+}
+
 type Auction struct {
 	ID             string        `json:"id"`
 	Status         string        `json:"status"`
@@ -53,21 +68,52 @@ type Bond struct {
 	Balance []*Coin `json:"balance"`
 }
 
+type BooleanValue struct {
+	Value bool `json:"value"`
+}
+
+func (BooleanValue) IsValue() {}
+
+type BytesValue struct {
+	Value string `json:"value"`
+}
+
+func (BytesValue) IsValue() {}
+
 type Coin struct {
 	Type     string `json:"type"`
 	Quantity string `json:"quantity"`
 }
 
-type KeyValue struct {
+type FloatValue struct {
-	Key   string `json:"key"`
+	Value float64 `json:"value"`
-	Value *Value `json:"value"`
 }
 
+func (FloatValue) IsValue() {}
+
+type IntValue struct {
+	Value int `json:"value"`
+}
+
+func (IntValue) IsValue() {}
+
 type KeyValueInput struct {
 	Key   string      `json:"key"`
 	Value *ValueInput `json:"value"`
 }
 
+type LinkValue struct {
+	Value Link `json:"value"`
+}
+
+func (LinkValue) IsValue() {}
+
+type MapValue struct {
+	Value []*Attribute `json:"value"`
+}
+
+func (MapValue) IsValue() {}
+
 type NameRecord struct {
 	Latest  *NameRecordEntry   `json:"latest"`
 	History []*NameRecordEntry `json:"history"`
@@ -96,22 +142,14 @@ type PeerInfo struct {
 }
 
 type Record struct {
-	ID         string      `json:"id"`
+	ID         string       `json:"id"`
-	Names      []string    `json:"names"`
+	Names      []string     `json:"names"`
-	BondID     string      `json:"bondId"`
+	BondID     string       `json:"bondId"`
-	CreateTime string      `json:"createTime"`
+	CreateTime string       `json:"createTime"`
-	ExpiryTime string      `json:"expiryTime"`
+	ExpiryTime string       `json:"expiryTime"`
-	Owners     []string    `json:"owners"`
+	Owners     []string     `json:"owners"`
-	Attributes []*KeyValue `json:"attributes"`
+	Attributes []*Attribute `json:"attributes"`
-	References []*Record   `json:"references"`
+	References []*Record    `json:"references"`
-}
-
-type Reference struct {
-	ID string `json:"id"`
-}
-
-type ReferenceInput struct {
-	ID string `json:"id"`
 }
 
 type Status struct {
@@ -125,6 +163,12 @@ type Status struct {
 	DiskUsage  string           `json:"disk_usage"`
 }
 
+type StringValue struct {
+	Value string `json:"value"`
+}
+
+func (StringValue) IsValue() {}
+
 type SyncInfo struct {
 	LatestBlockHash   string `json:"latest_block_hash"`
 	LatestBlockHeight string `json:"latest_block_height"`
@@ -138,23 +182,12 @@ type ValidatorInfo struct {
 	ProposerPriority *string `json:"proposer_priority"`
 }
 
-type Value struct {
-	Null      *bool      `json:"null"`
-	Int       *int       `json:"int"`
-	Float     *float64   `json:"float"`
-	String    *string    `json:"string"`
-	Boolean   *bool      `json:"boolean"`
-	JSON      *string    `json:"json"`
-	Reference *Reference `json:"reference"`
-	Values    []*Value   `json:"values"`
-}
-
 type ValueInput struct {
-	Null      *bool           `json:"null"`
+	Int     *int             `json:"int"`
-	Int       *int            `json:"int"`
+	Float   *float64         `json:"float"`
-	Float     *float64        `json:"float"`
+	String  *string          `json:"string"`
-	String    *string         `json:"string"`
+	Boolean *bool            `json:"boolean"`
-	Boolean   *bool           `json:"boolean"`
+	Link    *Link            `json:"link"`
-	Reference *ReferenceInput `json:"reference"`
+	Array   []*ValueInput    `json:"array"`
-	Values    []*ValueInput   `json:"values"`
+	Map     []*KeyValueInput `json:"map"`
 }

gql/resolver.go

@@ -121,7 +121,7 @@ func (q queryResolver) QueryRecords(ctx context.Context, attributes []*KeyValueI
 	res, err := nsQueryClient.ListRecords(
 		context.Background(),
 		&registrytypes.QueryListRecordsRequest{
-			Attributes: parseRequestAttributes(attributes),
+			Attributes: toRPCAttributes(attributes),
 			All:        (all != nil && *all),
 		},
 	)

gql/scalar.go

@@ -0,0 +1,33 @@
+package gql
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+)
+
+// Represents an IPLD link. Links are generally but not necessarily implemented as CIDs
+type Link string
+
+func (l Link) String() string {
+	return string(l)
+}
+
+// UnmarshalGQLContext implements the graphql.ContextUnmarshaler interface
+func (l *Link) UnmarshalGQLContext(_ context.Context, v interface{}) error {
+	s, ok := v.(string)
+	if !ok {
+		return fmt.Errorf("Link must be a string")
+	}
+	*l = Link(s)
+	return nil
+}
+
+// MarshalGQLContext implements the graphql.ContextMarshaler interface
+func (l Link) MarshalGQLContext(_ context.Context, w io.Writer) error {
+	encodable := map[string]string{
+		"/": l.String(),
+	}
+	return json.NewEncoder(w).Encode(encodable)
+}

gql/util.go

@@ -2,15 +2,15 @@ package gql
 
 import (
 	"context"
-	"encoding/json"
+	"fmt" // #nosec G702
-	"fmt"
-	"reflect" // #nosec G702
 	"strconv"
 
 	auctiontypes "github.com/cerc-io/laconicd/x/auction/types"
 	bondtypes "github.com/cerc-io/laconicd/x/bond/types"
 	registrytypes "github.com/cerc-io/laconicd/x/registry/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ipld/go-ipld-prime"
+	"github.com/ipld/go-ipld-prime/codec/dagjson"
 )
 
 // OwnerAttributeName denotes the owner attribute name for a bond.
@@ -61,13 +61,21 @@ func getGQLRecord(ctx context.Context, resolver QueryResolver, record registryty
 		return nil, nil
 	}
 
-	recordType := record.ToRecordType()
+	node, err := ipld.Decode(record.Attributes, dagjson.Decode)
-	attributes, err := getAttributes(&recordType)
+	if err != nil {
+		return nil, err
+	}
+	if node.Kind() != ipld.Kind_Map {
+		return nil, fmt.Errorf("invalid record attributes")
+	}
+
+	var links []string
+	attributes, err := resolveIPLDNode(node, &links)
 	if err != nil {
 		return nil, err
 	}
 
-	references, err := getReferences(ctx, resolver, &recordType)
+	references, err := resolver.GetRecordsByIds(ctx, links)
 	if err != nil {
 		return nil, err
 	}
@@ -79,11 +87,96 @@ func getGQLRecord(ctx context.Context, resolver QueryResolver, record registryty
 		ExpiryTime: record.GetExpiryTime(),
 		Owners:     record.GetOwners(),
 		Names:      record.GetNames(),
-		Attributes: attributes,
+		Attributes: attributes.(MapValue).Value,
 		References: references,
 	}, nil
 }
 
+func resolveIPLDNode(node ipld.Node, links *[]string) (Value, error) {
+	switch node.Kind() {
+	case ipld.Kind_Map:
+		var entries []*Attribute
+		for itr := node.MapIterator(); !itr.Done(); {
+			k, v, err := itr.Next()
+			if err != nil {
+				return nil, err
+			}
+			if k.Kind() != ipld.Kind_String {
+				return nil, fmt.Errorf("invalid record attribute key type: %s", k.Kind())
+			}
+			s, err := k.AsString()
+			if err != nil {
+				return nil, err
+			}
+			val, err := resolveIPLDNode(v, links)
+			if err != nil {
+				return nil, err
+			}
+			entries = append(entries, &Attribute{
+				Key:   s,
+				Value: val,
+			})
+		}
+		return MapValue{entries}, nil
+	case ipld.Kind_List:
+		var values []Value
+		for itr := node.ListIterator(); !itr.Done(); {
+			_, v, err := itr.Next()
+			if err != nil {
+				return nil, err
+			}
+			val, err := resolveIPLDNode(v, links)
+			if err != nil {
+				return nil, err
+			}
+			values = append(values, val)
+		}
+		return ArrayValue{values}, nil
+	case ipld.Kind_Null:
+		return nil, nil
+	case ipld.Kind_Bool:
+		val, err := node.AsBool()
+		if err != nil {
+			return nil, err
+		}
+		return BooleanValue{val}, nil
+	case ipld.Kind_Int:
+		val, err := node.AsInt()
+		if err != nil {
+			return nil, err
+		}
+		// TODO: handle bigger ints
+		return IntValue{int(val)}, nil
+	case ipld.Kind_Float:
+		val, err := node.AsFloat()
+		if err != nil {
+			return nil, err
+		}
+		return FloatValue{val}, nil
+	case ipld.Kind_String:
+		val, err := node.AsString()
+		if err != nil {
+			return nil, err
+		}
+		return StringValue{val}, nil
+	case ipld.Kind_Bytes:
+		val, err := node.AsBytes()
+		if err != nil {
+			return nil, err
+		}
+		return BytesValue{string(val)}, nil
+	case ipld.Kind_Link:
+		val, err := node.AsLink()
+		if err != nil {
+			return nil, err
+		}
+		*links = append(*links, val.String())
+		return LinkValue{Link(val.String())}, nil
+	default:
+		return nil, fmt.Errorf("invalid node kind")
+	}
+}
+
 func getGQLNameRecord(record *registrytypes.NameRecord) (*NameRecord, error) {
 	if record == nil {
 		return nil, fmt.Errorf("got nil record")
@@ -163,136 +256,47 @@ func GetGQLAuction(auction *auctiontypes.Auction, bids []*auctiontypes.Bid) (*Au
 	return &gqlAuction, nil
 }
 
-func getReferences(ctx context.Context, resolver QueryResolver, r *registrytypes.RecordType) ([]*Record, error) {
+func toRPCValue(value *ValueInput) *registrytypes.QueryListRecordsRequest_ValueInput {
-	var ids []string
+	var rpcval registrytypes.QueryListRecordsRequest_ValueInput
 
-	// #nosec G705
+	switch {
-	for key := range r.Attributes {
+	case value == nil:
-		//nolint: all
+		return nil
-		switch r.Attributes[key].(type) {
+	case value.Int != nil:
-		case interface{}:
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_Int{Int: int64(*value.Int)}
-			if obj, ok := r.Attributes[key].(map[string]interface{}); ok {
+	case value.Float != nil:
-				if _, ok := obj["/"]; ok && len(obj) == 1 {
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_Float{Float: *value.Float}
-					if _, ok := obj["/"].(string); ok {
+	case value.String != nil:
-						ids = append(ids, obj["/"].(string))
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_String_{String_: *value.String}
-					}
+	case value.Boolean != nil:
-				}
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_Boolean{Boolean: *value.Boolean}
-			}
+	case value.Link != nil:
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_Link{Link: value.Link.String()}
+	case value.Array != nil:
+		var contents registrytypes.QueryListRecordsRequest_ArrayInput
+		for _, val := range value.Array {
+			contents.Values = append(contents.Values, toRPCValue(val))
 		}
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_Array{Array: &contents}
+	case value.Map != nil:
+		var contents registrytypes.QueryListRecordsRequest_MapInput
+		for _, kv := range value.Map {
+			contents.Values[kv.Key] = toRPCValue(kv.Value)
+		}
+		rpcval.Value = &registrytypes.QueryListRecordsRequest_ValueInput_Map{Map: &contents}
 	}
-
+	return &rpcval
-	return resolver.GetRecordsByIds(ctx, ids)
 }
 
-func getAttributes(r *registrytypes.RecordType) ([]*KeyValue, error) {
+func toRPCAttributes(attrs []*KeyValueInput) []*registrytypes.QueryListRecordsRequest_KeyValueInput {
-	return mapToKeyValuePairs(r.Attributes)
-}
-
-func mapToKeyValuePairs(attrs map[string]interface{}) ([]*KeyValue, error) {
-	kvPairs := []*KeyValue{}
-
-	trueVal := true
-	falseVal := false
-
-	// #nosec G705
-	for key, value := range attrs {
-		kvPair := &KeyValue{
-			Key:   key,
-			Value: &Value{},
-		}
-
-		switch val := value.(type) {
-		case nil:
-			kvPair.Value.Null = &trueVal
-		case int:
-			kvPair.Value.Int = &val
-		case float64:
-			kvPair.Value.Float = &val
-		case string:
-			kvPair.Value.String = &val
-		case bool:
-			kvPair.Value.Boolean = &val
-		case interface{}:
-			if obj, ok := value.(map[string]interface{}); ok {
-				if _, ok := obj["/"]; ok && len(obj) == 1 {
-					if _, ok := obj["/"].(string); ok {
-						kvPair.Value.Reference = &Reference{
-							ID: obj["/"].(string),
-						}
-					}
-				} else {
-					bytes, err := json.Marshal(obj)
-					if err != nil {
-						return nil, err
-					}
-
-					jsonStr := string(bytes)
-					kvPair.Value.JSON = &jsonStr
-				}
-			}
-		}
-
-		if kvPair.Value.Null == nil {
-			kvPair.Value.Null = &falseVal
-		}
-
-		valueType := reflect.ValueOf(value)
-		if valueType.Kind() == reflect.Slice {
-			bytes, err := json.Marshal(value)
-			if err != nil {
-				return nil, err
-			}
-
-			jsonStr := string(bytes)
-			kvPair.Value.JSON = &jsonStr
-		}
-
-		kvPairs = append(kvPairs, kvPair)
-	}
-
-	return kvPairs, nil
-}
-
-func parseRequestAttributes(attrs []*KeyValueInput) []*registrytypes.QueryListRecordsRequest_KeyValueInput {
 	kvPairs := []*registrytypes.QueryListRecordsRequest_KeyValueInput{}
 
 	for _, value := range attrs {
+		parsedValue := toRPCValue(value.Value)
 		kvPair := &registrytypes.QueryListRecordsRequest_KeyValueInput{
 			Key:   value.Key,
-			Value: &registrytypes.QueryListRecordsRequest_ValueInput{},
+			Value: parsedValue,
 		}
-
-		if value.Value.String != nil {
-			kvPair.Value.String_ = *value.Value.String
-			kvPair.Value.Type = "string"
-		}
-
-		if value.Value.Int != nil {
-			kvPair.Value.Int = int64(*value.Value.Int)
-			kvPair.Value.Type = "int"
-		}
-
-		if value.Value.Float != nil {
-			kvPair.Value.Float = *value.Value.Float
-			kvPair.Value.Type = "float"
-		}
-
-		if value.Value.Boolean != nil {
-			kvPair.Value.Boolean = *value.Value.Boolean
-			kvPair.Value.Type = "boolean"
-		}
-
-		if value.Value.Reference != nil {
-			reference := &registrytypes.QueryListRecordsRequest_ReferenceInput{
-				Id: value.Value.Reference.ID,
-			}
-
-			kvPair.Value.Reference = reference
-			kvPair.Value.Type = "reference"
-		}
-
-		// TODO: Handle arrays.
-
 		kvPairs = append(kvPairs, kvPair)
 	}
 

proto/vulcanize/registry/v1beta1/attributes.proto

@@ -1,131 +0,0 @@
-syntax = "proto3";
-package vulcanize.registry.v1beta1;
-
-import "gogoproto/gogo.proto";
-
-option go_package = "github.com/cerc-io/laconicd/x/registry/types";
-
-message ServiceProviderRegistration {
-  string bond_id    = 1 [(gogoproto.moretags) = "json:\"bondId\" yaml:\"bondId\""];
-  string laconic_id = 2 [(gogoproto.moretags) = "json:\"laconicId\" yaml:\"laconicId\""];
-  X500   x500       = 3 [(gogoproto.moretags) = "json:\"x500\" yaml:\"x500\""];
-  string type       = 4 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string version    = 6 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-}
-
-message X500 {
-  string common_name       = 1 [(gogoproto.moretags) = "json:\"commonName\" yaml:\"commonName\""];
-  string organization_unit = 2 [(gogoproto.moretags) = "json:\"organizationUnit\" yaml:\"organizationUnit\""];
-  string organization_name = 3 [(gogoproto.moretags) = "json:\"organizationName\" yaml:\"organizationName\""];
-  string locality_name     = 4 [(gogoproto.moretags) = "json:\"localityName\" yaml:\"localityName\""];
-  string state_name        = 5 [(gogoproto.moretags) = "json:\"stateName\" yaml:\"stateName\""];
-  string country           = 6 [(gogoproto.moretags) = "json:\"country\" yaml:\"country\""];
-}
-
-message WebsiteRegistrationRecord {
-  string url                          = 1 [(gogoproto.moretags) = "json:\"url\" yaml:\"url\""];
-  string repo_registration_record_cid = 2
-      [(gogoproto.moretags) = "json:\"repoRegistrationRecordCID\" yaml:\"repoRegistrationRecordCID\""];
-  string build_artifact_cid = 3 [(gogoproto.moretags) = "json:\"buildArtifactCID\" yaml:\"buildArtifactCID\""];
-  string tls_cert_cid       = 4 [(gogoproto.moretags) = "json:\"TLSCertCID\" yaml:\"TLSCertCID\""];
-  string type               = 5 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string version            = 6 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-}
-
-message ApplicationRecord {
-  string type                = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string name                = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""];
-  string description         = 3 [(gogoproto.moretags) = "json:\"description\" yaml:\"description\""];
-  string version             = 4 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string homepage            = 5 [(gogoproto.moretags) = "json:\"homepage\" yaml:\"homepage\""];
-  string license             = 6 [(gogoproto.moretags) = "json:\"license\" yaml:\"license\""];
-  string author              = 7 [(gogoproto.moretags) = "json:\"author\" yaml:\"author\""];
-  repeated string repository = 8 [(gogoproto.moretags) = "json:\"repository\" yaml:\"repository\""];
-  string repository_ref      = 9 [(gogoproto.moretags) = "json:\"repositoryRef\" yaml:\"repositoryRef\""];
-  string app_version         = 10 [(gogoproto.moretags) = "json:\"appVersion\" yaml:\"appVersion\""];
-  string app_type            = 11 [(gogoproto.moretags) = "json:\"appType\" yaml:\"appType\""];
-  string engines             = 12 [(gogoproto.moretags) = "json:\"engines\" yaml:\"engines\""];
-  repeated string os         = 13 [(gogoproto.moretags) = "json:\"os\" yaml:\"os\""];
-  repeated string cpu        = 14 [(gogoproto.moretags) = "json:\"cpu\" yaml:\"cpu\""];
-  string meta                = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags       = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message ApplicationArtifact {
-  string type                = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string name                = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""];
-  string description         = 4 [(gogoproto.moretags) = "json:\"description\" yaml:\"description\""];
-  string version             = 5 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string application         = 6 [(gogoproto.moretags) = "json:\"application\" yaml:\"application\""];
-  string content_type        = 7 [(gogoproto.moretags) = "json:\"contentType\" yaml:\"contentType\""];
-  string os                  = 8 [(gogoproto.moretags) = "json:\"os\" yaml:\"os\""];
-  string cpu                 = 9 [(gogoproto.moretags) = "json:\"cpu\" yaml:\"cpu\""];
-  repeated string uri        = 10 [(gogoproto.moretags) = "json:\"uri\" yaml:\"uri\""];
-  string meta                = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags       = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message DnsRecord {
-  string type           = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string name           = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""];
-  string version        = 3 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string resource_type  = 4 [(gogoproto.moretags) = "json:\"resourceType\" yaml:\"resourceType\""];
-  string value          = 5 [(gogoproto.moretags) = "json:\"value\" yaml:\"value\""];
-  string request        = 6 [(gogoproto.moretags) = "json:\"request\" yaml:\"request\""];
-  string meta           = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags  = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message ApplicationDeploymentRequest {
-  string type           = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string name           = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""];
-  string version        = 3 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string application    = 4 [(gogoproto.moretags) = "json:\"application\" yaml:\"application\""];
-  string dns            = 5 [(gogoproto.moretags) = "json:\"dns\" yaml:\"dns\""];
-  string config         = 6 [(gogoproto.moretags) = "json:\"config\" yaml:\"config\""];
-  string deployment     = 7 [(gogoproto.moretags) = "json:\"deployment\" yaml:\"deployment\""];
-  string meta           = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags  = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message ApplicationDeploymentRecord {
-  string type           = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string name           = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""];
-  string description    = 3 [(gogoproto.moretags) = "json:\"description\" yaml:\"description\""];
-  string version        = 4 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string application    = 5 [(gogoproto.moretags) = "json:\"application\" yaml:\"application\""];
-  string url            = 6 [(gogoproto.moretags) = "json:\"url\" yaml:\"url\""];
-  string dns            = 7 [(gogoproto.moretags) = "json:\"dns\" yaml:\"dns\""];
-  string request        = 8 [(gogoproto.moretags) = "json:\"request\" yaml:\"request\""];
-  string meta           = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags  = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message ApplicationDeploymentRemovalRequest {
-  string type           = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string version        = 2 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string deployment     = 3 [(gogoproto.moretags) = "json:\"deployment\" yaml:\"deployment\""];
-  string request        = 4 [(gogoproto.moretags) = "json:\"request\" yaml:\"request\""];
-  string meta           = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags  = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message ApplicationDeploymentRemovalRecord {
-  string type           = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string version        = 2 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string deployment     = 3 [(gogoproto.moretags) = "json:\"deployment\" yaml:\"deployment\""];
-  string request        = 4 [(gogoproto.moretags) = "json:\"request\" yaml:\"request\""];
-  string meta           = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags  = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}
-
-message GeneralRecord {
-  string type           = 1 [(gogoproto.moretags) = "json:\"type\" yaml:\"type\""];
-  string name           = 2 [(gogoproto.moretags) = "json:\"name\" yaml:\"name\""];
-  string description    = 3 [(gogoproto.moretags) = "json:\"description\" yaml:\"description\""];
-  string version        = 4 [(gogoproto.moretags) = "json:\"version\" yaml:\"version\""];
-  string category       = 5 [(gogoproto.moretags) = "json:\"category\" yaml:\"category\""];
-  string value          = 6 [(gogoproto.moretags) = "json:\"value\" yaml:\"value\""];
-  string meta           = 20 [(gogoproto.moretags) = "json:\"meta\" yaml:\"meta\""];
-  repeated string tags  = 21 [(gogoproto.moretags) = "json:\"tags\" yaml:\"tags\""];
-}

proto/vulcanize/registry/v1beta1/query.proto

@@ -67,17 +67,26 @@ message QueryParamsResponse {
 
 // QueryListRecordsRequest is request type for registry records list
 message QueryListRecordsRequest {
-  message ReferenceInput {
+  message LinkInput {
     string id = 1;
   }
+  message ArrayInput {
+    repeated ValueInput values = 1;
+  }
+  message MapInput {
+    map<string, ValueInput> values = 1;
+  }
   message ValueInput {
-    string type                   = 1;
+    // Type of record attribute value
-    string string                 = 2;
+    oneof value {
-    int64 int                     = 3;
+      string string    = 1;
-    double float                  = 4;
+      int64 int        = 2;
-    bool                boolean   = 5;
+      double float     = 3;
-    ReferenceInput      reference = 6;
+      bool boolean     = 4;
-    repeated ValueInput values    = 7;
+      string link      = 5;
+      ArrayInput array = 6;
+      MapInput map     = 7;
+    }
   }
   message KeyValueInput {
     string     key   = 1;

proto/vulcanize/registry/v1beta1/registry.proto

@@ -5,7 +5,6 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
-import "google/protobuf/any.proto";
 
 option go_package = "github.com/cerc-io/laconicd/x/registry/types";
 
@@ -64,7 +63,7 @@ message Record {
   string              expiry_time = 4 [(gogoproto.moretags) = "json:\"expiryTime\" yaml:\"expiryTime\""];
   bool                deleted     = 5;
   repeated string     owners      = 6 [(gogoproto.moretags) = "json:\"owners\" yaml:\"owners\""];
-  google.protobuf.Any attributes  = 7 [(gogoproto.moretags) = "json:\"attributes\" yaml:\"attributes\""];
+  bytes               attributes  = 7 [(gogoproto.moretags) = "json:\"attributes\" yaml:\"attributes\""];
   repeated string     names       = 8 [(gogoproto.moretags) = "json:\"names\" yaml:\"names\""];
   string              type        = 9 [(gogoproto.moretags) = "json:\"types\" yaml:\"types\""];
 }

proto/vulcanize/registry/v1beta1/tx.proto

@@ -7,13 +7,13 @@ import "vulcanize/registry/v1beta1/registry.proto";
 
 option go_package = "github.com/cerc-io/laconicd/x/registry/types";
 
-// Msg
+// Msg is a service which exposes the registry functionality
 service Msg {
-  // SetRecord will records a new record with given payload and bond id
+  // SetRecord records a new record with given payload and bond id
   rpc SetRecord(MsgSetRecord) returns (MsgSetRecordResponse) {
     option (google.api.http).post = "/vulcanize/registry/v1beta1/set_record";
   }
-  // Renew Record will renew the expire record
+  // Renew Record renews an expired record
   rpc RenewRecord(MsgRenewRecord) returns (MsgRenewRecordResponse) {
     option (google.api.http).post = "/vulcanize/registry/v1beta1/renew_record";
   }
@@ -66,8 +66,10 @@ message MsgSetRecordResponse {
 // Payload
 message Payload {
   Record             record     = 1;
-  repeated Signature signatures = 2
+  repeated Signature signatures = 2 [
-      [(gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"signatures\" yaml:\"signatures\""];
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "json:\"signatures\" yaml:\"signatures\""
+  ];
 }
 
 // MsgSetName
@@ -91,7 +93,7 @@ message MsgReserveAuthority {
 // MsgReserveNameResponse
 message MsgReserveAuthorityResponse {}
 
-// MsgSetAuthorityBond is SDK message for SetAuthorityBond
+// MsgSetAuthorityBond
 message MsgSetAuthorityBond {
   string name    = 1;
   string bond_id = 2 [(gogoproto.moretags) = "json:\"bondId\" yaml:\"bondId\""];
@@ -101,7 +103,7 @@ message MsgSetAuthorityBond {
 // MsgSetAuthorityBondResponse
 message MsgSetAuthorityBondResponse {}
 
-// MsgDeleteNameAuthority is SDK message for DeleteNameAuthority
+// MsgDeleteNameAuthority
 message MsgDeleteNameAuthority {
   string crn    = 1;
   string signer = 2;
@@ -110,7 +112,7 @@ message MsgDeleteNameAuthority {
 // MsgDeleteNameAuthorityResponse
 message MsgDeleteNameAuthorityResponse {}
 
-// MsgRenewRecord is SDK message for Renew a record
+// MsgRenewRecord
 message MsgRenewRecord {
   string record_id = 1 [(gogoproto.moretags) = "json:\"recordId\" yaml:\"recordId\""];
   string signer    = 2;
@@ -129,30 +131,30 @@ message MsgAssociateBond {
 // MsgAssociateBondResponse
 message MsgAssociateBondResponse {}
 
-// MsgDissociateBond is SDK message for Msg/DissociateBond
+// MsgDissociateBond
 message MsgDissociateBond {
   string record_id = 1 [(gogoproto.moretags) = "json:\"recordId\" yaml:\"recordId\""];
   string signer    = 2;
 }
 
-// MsgDissociateBondResponse is response type for MsgDissociateBond
+// MsgDissociateBondResponse
 message MsgDissociateBondResponse {}
 
-// MsgDissociateRecords is SDK message for Msg/DissociateRecords
+// MsgDissociateRecords
 message MsgDissociateRecords {
   string bond_id = 1 [(gogoproto.moretags) = "json:\"bondId\" yaml:\"bondId\""];
   string signer  = 2;
 }
 
-// MsgDissociateRecordsResponse is response type for MsgDissociateRecords
+// MsgDissociateRecordsResponse
 message MsgDissociateRecordsResponse {}
 
-// MsgReAssociateRecords is SDK message for Msg/ReAssociateRecords
+// MsgReAssociateRecords
 message MsgReAssociateRecords {
   string new_bond_id = 1 [(gogoproto.moretags) = "json:\"newBondId\" yaml:\"newBondId\""];
   string old_bond_id = 2 [(gogoproto.moretags) = "json:\"oldBondId\" yaml:\"oldBondId\""];
   string signer      = 3;
 }
 
-// MsgReAssociateRecordsResponse is response type for MsgReAssociateRecords
+// MsgReAssociateRecordsResponse
 message MsgReAssociateRecordsResponse {}

x/registry/client/cli/query.go

@@ -161,9 +161,9 @@ $ %s query %s list
 			}
 
 			recordsList := res.GetRecords()
-			records := make([]types.RecordType, len(recordsList))
+			records := make([]types.ReadableRecord, len(recordsList))
 			for i, record := range res.GetRecords() {
-				records[i] = record.ToRecordType()
+				records[i] = record.ToReadableRecord()
 			}
 			bytesResult, err := json.Marshal(records)
 			if err != nil {

x/registry/client/cli/tx.go

@@ -66,17 +66,10 @@ $ %s tx %s set [payload file path] [bond-id]
 				return err
 			}
 
-			payload, err := payloadType.ToPayload()
+			payload := payloadType.ToPayload()
-			if err != nil {
-				return err
-			}
 
 			msg := types.NewMsgSetRecord(payload, args[1], clientCtx.GetFromAddress())
-			err = msg.ValidateBasic()
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			if err != nil {
-				return err
-			}
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
 		},
 	}
 
@@ -269,7 +262,7 @@ $ %s tx %s set-name [crn] [cid]
 			if err != nil {
 				return err
 			}
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -377,8 +370,8 @@ $ %s tx %s delete-name [crn]
 }
 
 // GetPayloadFromFile  Load payload object from YAML file.
-func GetPayloadFromFile(filePath string) (*types.PayloadType, error) {
+func GetPayloadFromFile(filePath string) (*types.ReadablePayload, error) {
-	var payload types.PayloadType
+	var payload types.ReadablePayload
 
 	data, err := os.ReadFile(filePath) // #nosec G304
 	if err != nil {

x/registry/client/testutil/grpc.go

@@ -62,7 +62,7 @@ func (s *IntegrationTestSuite) TestGRPCQueryParams() {
 	}
 }
 
-//nolint: all
+//nolint:all
 func (s *IntegrationTestSuite) TestGRPCQueryWhoIs() {
 	val := s.network.Validators[0]
 	sr := s.Require()
@@ -182,7 +182,7 @@ func (s *IntegrationTestSuite) TestGRPCQueryLookup() {
 	}
 }
 
-//nolint: all
+//nolint:all
 func (s *IntegrationTestSuite) TestGRPCQueryRecordExpiryQueue() {
 	val := s.network.Validators[0]
 	sr := s.Require()
@@ -254,7 +254,7 @@ func (s *IntegrationTestSuite) TestGRPCQueryRecordExpiryQueue() {
 	}
 }
 
-//nolint: all
+//nolint:all
 func (s *IntegrationTestSuite) TestGRPCQueryAuthorityExpiryQueue() {
 	val := s.network.Validators[0]
 	sr := s.Require()
@@ -326,7 +326,7 @@ func (s *IntegrationTestSuite) TestGRPCQueryAuthorityExpiryQueue() {
 	}
 }
 
-//nolint: all
+//nolint:all
 func (s *IntegrationTestSuite) TestGRPCQueryListRecords() {
 	val := s.network.Validators[0]
 	sr := s.Require()
@@ -435,7 +435,7 @@ func (s *IntegrationTestSuite) TestGRPCQueryGetRecordByID() {
 				}
 				out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 				sr.NoError(err)
-				var records []nstypes.RecordType
+				var records []nstypes.ReadableRecord
 				err = json.Unmarshal(out.Bytes(), &records)
 				sr.NoError(err)
 				return records[0].ID

x/registry/client/testutil/query.go

@@ -114,7 +114,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryForRecords() {
 				sr.Error(err)
 			} else {
 				sr.NoError(err)
-				var records []types.RecordType
+				var records []types.ReadableRecord
 				err := json.Unmarshal(out.Bytes(), &records)
 				sr.NoError(err)
 				sr.Equal(tc.noOfRecords, len(records))

x/registry/client/testutil/tx.go

@@ -606,7 +606,7 @@ func (s *IntegrationTestSuite) TestGetCmdDissociateBond() {
 				cmd = cli.GetCmdList()
 				out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 				sr.NoError(err)
-				var records []nstypes.RecordType
+				var records []nstypes.ReadableRecord
 				err = json.Unmarshal(out.Bytes(), &records)
 				sr.NoError(err)
 				return records[0].ID
@@ -848,7 +848,7 @@ func (s *IntegrationTestSuite) TestGetCmdAssociateBond() {
 				cmd = cli.GetCmdList()
 				out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 				sr.NoError(err)
-				var records []nstypes.RecordType
+				var records []nstypes.ReadableRecord
 				err = json.Unmarshal(out.Bytes(), &records)
 				sr.NoError(err)
 

x/registry/helpers/helpers.go

@@ -47,24 +47,20 @@ func Int64ToBytes(num int64) []byte {
 	return buf.Bytes()
 }
 
-// MarshalMapToJSONBytes converts map[string]interface{} to bytes.
+func MustMarshalJSON[T any](val T) (bytes []byte) {
-func MarshalMapToJSONBytes(val map[string]interface{}) (bytes []byte) {
 	bytes, err := json.Marshal(val)
 	if err != nil {
-		panic("Marshal error.")
+		panic("JSON marshal error:" + err.Error())
 	}
-
 	return
 }
 
-// UnMarshalMapFromJSONBytes converts bytes to map[string]interface{}.
+func MustUnmarshalJSON[T any](bytes []byte) T {
-func UnMarshalMapFromJSONBytes(bytes []byte) map[string]interface{} {
+	var val T
-	var val map[string]interface{}
 	err := json.Unmarshal(bytes, &val)
 	if err != nil {
-		panic("Unmarshal error.")
+		panic("JSON unmarshal error:" + err.Error())
 	}
-
 	return val
 }
 

x/registry/keeper/grpc_query_test.go

@@ -3,12 +3,13 @@ package keeper_test
 import (
 	"context"
 	"fmt"
+	"os"
+	"reflect"
+
 	"github.com/cerc-io/laconicd/x/registry/client/cli"
 	"github.com/cerc-io/laconicd/x/registry/helpers"
 	"github.com/cerc-io/laconicd/x/registry/keeper"
 	registrytypes "github.com/cerc-io/laconicd/x/registry/types"
-	"os"
-	"reflect"
 )
 
 func (suite *KeeperTestSuite) TestGrpcQueryParams() {
@@ -69,26 +70,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 					{
 						Key: "type",
 						Value: &registrytypes.QueryListRecordsRequest_ValueInput{
-							Type:    "string",
+							Value: &registrytypes.QueryListRecordsRequest_ValueInput_String_{"WebsiteRegistrationRecord"},
-							String_: "WebsiteRegistrationRecord",
-						},
-					},
-				},
-				All: true,
-			},
-			true,
-			false,
-			1,
-		},
-		{
-			"Filter with tag (extant) (https://git.vdb.to/cerc-io/laconicd/issues/129)",
-			&registrytypes.QueryListRecordsRequest{
-				Attributes: []*registrytypes.QueryListRecordsRequest_KeyValueInput{
-					{
-						Key: "tags",
-						Value: &registrytypes.QueryListRecordsRequest_ValueInput{
-							Type:    "string",
-							String_: "tagA",
 						},
 					},
 				},
@@ -98,6 +80,35 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 			false,
 			1,
 		},
+		// Skip the following test as querying with recursive values not supported (PR https://git.vdb.to/cerc-io/laconicd/pulls/112)
+		// See function RecordsFromAttributes (QueryValueToJSON call) in the registry keeper implementation (x/registry/keeper/keeper.go)
+		// {
+		// 	"Filter with tag (extant) (https://git.vdb.to/cerc-io/laconicd/issues/129)",
+		// 	&registrytypes.QueryListRecordsRequest{
+		// 		Attributes: []*registrytypes.QueryListRecordsRequest_KeyValueInput{
+		// 			{
+		// 				Key: "tags",
+		// 				// Value: &registrytypes.QueryListRecordsRequest_ValueInput{
+		// 				// 	Value: &registrytypes.QueryListRecordsRequest_ValueInput_String_{"tagA"},
+		// 				// },
+		// 				Value: &registrytypes.QueryListRecordsRequest_ValueInput{
+		// 					Value: &registrytypes.QueryListRecordsRequest_ValueInput_Array{Array: &registrytypes.QueryListRecordsRequest_ArrayInput{
+		// 						Values: []*registrytypes.QueryListRecordsRequest_ValueInput{
+		// 							{
+		// 								Value: &registrytypes.QueryListRecordsRequest_ValueInput_String_{"tagA"},
+		// 							},
+		// 						},
+		// 					}},
+		// 				},
+		// 				// Throws: "Recursive query values are not supported"
+		// 			},
+		// 		},
+		// 		All: true,
+		// 	},
+		// 	true,
+		// 	false,
+		// 	1,
+		// },
 		{
 			"Filter with tag (non-existent) (https://git.vdb.to/cerc-io/laconicd/issues/129)",
 			&registrytypes.QueryListRecordsRequest{
@@ -105,8 +116,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 					{
 						Key: "tags",
 						Value: &registrytypes.QueryListRecordsRequest_ValueInput{
-							Type:    "string",
+							Value: &registrytypes.QueryListRecordsRequest_ValueInput_String_{"NOEXIST"},
-							String_: "NOEXIST",
 						},
 					},
 				},
@@ -123,8 +133,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 					{
 						Key: "typ",
 						Value: &registrytypes.QueryListRecordsRequest_ValueInput{
-							Type:    "string",
+							Value: &registrytypes.QueryListRecordsRequest_ValueInput_String_{"eWebsiteRegistrationRecord"},
-							String_: "eWebsiteRegistrationRecord",
 						},
 					},
 				},
@@ -141,8 +150,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 					{
 						Key: "x500state_name",
 						Value: &registrytypes.QueryListRecordsRequest_ValueInput{
-							Type:    "string",
+							Value: &registrytypes.QueryListRecordsRequest_ValueInput_String_{"california"},
-							String_: "california",
 						},
 					},
 				},
@@ -161,8 +169,7 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 					sr.NoError(err)
 					payloadType, err := cli.GetPayloadFromFile(fmt.Sprint(dir, example))
 					sr.NoError(err)
-					payload, err := payloadType.ToPayload()
+					payload := payloadType.ToPayload()
-					sr.NoError(err)
 					record, err := suite.app.RegistryKeeper.ProcessSetRecord(ctx, registrytypes.MsgSetRecord{
 						BondId:  suite.bond.GetId(),
 						Signer:  suite.accounts[0].String(),
@@ -184,11 +191,13 @@ func (suite *KeeperTestSuite) TestGrpcGetRecordLists() {
 					sr.Equal(resp.GetRecords()[0].GetBondId(), suite.bond.GetId())
 
 					for _, record := range resp.GetRecords() {
-						bz, err := registrytypes.GetJSONBytesFromAny(*record.Attributes)
+						recAttr := helpers.MustUnmarshalJSON[registrytypes.AttributeMap](record.Attributes)
-						sr.NoError(err)
+
-						recAttr := helpers.UnMarshalMapFromJSONBytes(bz)
 						for _, attr := range test.req.GetAttributes() {
-							av := keeper.GetAttributeValue(attr.Value)
+							enc, err := keeper.QueryValueToJSON(attr.Value)
+							sr.NoError(err)
+							av := helpers.MustUnmarshalJSON[any](enc)
+
 							if nil != av && nil != recAttr[attr.Key] &&
 								reflect.Slice == reflect.TypeOf(recAttr[attr.Key]).Kind() &&
 								reflect.Slice != reflect.TypeOf(av).Kind() {
@@ -328,8 +337,7 @@ func (suite *KeeperTestSuite) TestGrpcQueryRegistryModuleBalance() {
 				for _, example := range examples {
 					payloadType, err := cli.GetPayloadFromFile(fmt.Sprint(dir, example))
 					sr.NoError(err)
-					payload, err := payloadType.ToPayload()
+					payload := payloadType.ToPayload()
-					sr.NoError(err)
 					record, err := suite.app.RegistryKeeper.ProcessSetRecord(ctx, registrytypes.MsgSetRecord{
 						BondId:  suite.bond.GetId(),
 						Signer:  suite.accounts[0].String(),

x/registry/keeper/keeper.go

@@ -4,15 +4,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"reflect"
 	"sort"
 	"time"
 
 	errorsmod "cosmossdk.io/errors"
-	auctionkeeper "github.com/cerc-io/laconicd/x/auction/keeper"
-	bondkeeper "github.com/cerc-io/laconicd/x/bond/keeper"
-	"github.com/cerc-io/laconicd/x/registry/helpers"
-	"github.com/cerc-io/laconicd/x/registry/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -21,7 +16,18 @@ import (
 	auth "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/gibson042/canonicaljson-go"
+	cid "github.com/ipfs/go-cid"
+	"github.com/ipld/go-ipld-prime"
+	"github.com/ipld/go-ipld-prime/codec/dagjson"
+	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
+	basicnode "github.com/ipld/go-ipld-prime/node/basic"
 	"github.com/tendermint/tendermint/libs/log"
+
+	auctionkeeper "github.com/cerc-io/laconicd/x/auction/keeper"
+	bondkeeper "github.com/cerc-io/laconicd/x/bond/keeper"
+	"github.com/cerc-io/laconicd/x/registry/helpers"
+	"github.com/cerc-io/laconicd/x/registry/types"
 )
 
 var (
@@ -100,6 +106,10 @@ func NewKeeper(cdc codec.BinaryCodec, accountKeeper auth.AccountKeeper, bankKeep
 
 // Logger returns a module-specific logger.
 func (k Keeper) Logger(ctx sdk.Context) log.Logger {
+	return logger(ctx)
+}
+
+func logger(ctx sdk.Context) log.Logger {
 	return ctx.Logger().With("module", types.ModuleName)
 }
 
@@ -119,7 +129,8 @@ func (k Keeper) GetRecord(ctx sdk.Context, id string) (record types.Record) {
 	store := ctx.KVStore(k.storeKey)
 	result := store.Get(GetRecordIndexKey(id))
 	k.cdc.MustUnmarshal(result, &record)
-	return recordObjToRecord(store, record)
+	decodeRecordNames(store, &record)
+	return record
 }
 
 // ListRecords - get all records.
@@ -132,20 +143,25 @@ func (k Keeper) ListRecords(ctx sdk.Context) []types.Record {
 	for ; itr.Valid(); itr.Next() {
 		bz := store.Get(itr.Key())
 		if bz != nil {
-			var obj types.Record
+			var record types.Record
-			k.cdc.MustUnmarshal(bz, &obj)
+			k.cdc.MustUnmarshal(bz, &record)
-			records = append(records, recordObjToRecord(store, obj))
+			decodeRecordNames(store, &record)
+			records = append(records, record)
 		}
 	}
 
 	return records
 }
 
+// RecordsFromAttributes gets a list of records whose attributes match all provided values
 func (k Keeper) RecordsFromAttributes(ctx sdk.Context, attributes []*types.QueryListRecordsRequest_KeyValueInput, all bool) ([]types.Record, error) {
 	resultRecordIds := []string{}
 	for i, attr := range attributes {
-		val := GetAttributeValue(attr.Value)
+		suffix, err := QueryValueToJSON(attr.Value)
-		attributeIndex := GetAttributesIndexKey(attr.Key, val)
+		if err != nil {
+			return nil, err
+		}
+		attributeIndex := GetAttributesIndexKey(attr.Key, suffix)
 		recordIds, err := k.GetAttributeMapping(ctx, attributeIndex)
 		if err != nil {
 			return nil, err
@@ -164,32 +180,62 @@ func (k Keeper) RecordsFromAttributes(ctx sdk.Context, attributes []*types.Query
 			continue
 		}
 		store := ctx.KVStore(k.storeKey)
-		recordWithNames := recordObjToRecord(store, record)
+		decodeRecordNames(store, &record)
-		if !all && len(recordWithNames.Names) == 0 {
+		if !all && len(record.Names) == 0 {
 			continue
 		}
-		records = append(records, recordWithNames)
+		records = append(records, record)
 	}
 	return records, nil
 }
 
-func GetAttributeValue(input *types.QueryListRecordsRequest_ValueInput) interface{} {
+// TODO not recursive, and only should be if we want to support querying with whole sub-objects,
-	if input.Type == "int" {
+// which seems unnecessary.
-		return input.GetInt()
+func QueryValueToJSON(input *types.QueryListRecordsRequest_ValueInput) ([]byte, error) {
+	np := basicnode.Prototype.Any
+	nb := np.NewBuilder()
+
+	switch value := input.GetValue().(type) {
+	case *types.QueryListRecordsRequest_ValueInput_String_:
+		err := nb.AssignString(value.String_)
+		if err != nil {
+			return nil, err
+		}
+	case *types.QueryListRecordsRequest_ValueInput_Int:
+		err := nb.AssignInt(value.Int)
+		if err != nil {
+			return nil, err
+		}
+	case *types.QueryListRecordsRequest_ValueInput_Float:
+		err := nb.AssignFloat(value.Float)
+		if err != nil {
+			return nil, err
+		}
+	case *types.QueryListRecordsRequest_ValueInput_Boolean:
+		err := nb.AssignBool(value.Boolean)
+		if err != nil {
+			return nil, err
+		}
+	case *types.QueryListRecordsRequest_ValueInput_Link:
+		link := cidlink.Link{Cid: cid.MustParse(value.Link)}
+		err := nb.AssignLink(link)
+		if err != nil {
+			return nil, err
+		}
+	case *types.QueryListRecordsRequest_ValueInput_Array:
+		return nil, fmt.Errorf("recursive query values are not supported")
+	case *types.QueryListRecordsRequest_ValueInput_Map:
+		return nil, fmt.Errorf("recursive query values are not supported")
+	default:
+		return nil, fmt.Errorf("value has unexpected type %T", value)
 	}
-	if input.Type == "float" {
+
-		return input.GetFloat()
+	n := nb.Build()
+	var buf bytes.Buffer
+	if err := dagjson.Encode(n, &buf); err != nil {
+		return nil, fmt.Errorf("encoding value to JSON failed: %w", err)
 	}
-	if input.Type == "string" {
+	return buf.Bytes(), nil
-		return input.GetString_()
-	}
-	if input.Type == "boolean" {
-		return input.GetBoolean()
-	}
-	if input.Type == "reference" {
-		return input.GetReference().GetId()
-	}
-	return nil
 }
 
 func getIntersection(a []string, b []string) []string {
@@ -240,9 +286,9 @@ func (k Keeper) GetRecordExpiryQueue(ctx sdk.Context) []*types.ExpiryQueueRecord
 }
 
 // ProcessSetRecord creates a record.
-func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*types.RecordType, error) {
+func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*types.ReadableRecord, error) {
 	payload := msg.Payload.ToReadablePayload()
-	record := types.RecordType{Attributes: payload.Record, BondID: msg.BondId}
+	record := types.ReadableRecord{Attributes: payload.RecordAttributes, BondID: msg.BondId}
 
 	// Check signatures.
 	resourceSignBytes, _ := record.GetSignBytes()
@@ -262,14 +308,12 @@ func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*type
 	for _, sig := range payload.Signatures {
 		pubKey, err := legacy.PubKeyFromBytes(helpers.BytesFromBase64(sig.PubKey))
 		if err != nil {
-			fmt.Println("Error decoding pubKey from bytes: ", err)
+			return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, fmt.Sprint("Error decoding pubKey from bytes: ", err))
-			return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, "Invalid public key.")
 		}
 
 		sigOK := pubKey.VerifySignature(resourceSignBytes, helpers.BytesFromBase64(sig.Sig))
 		if !sigOK {
-			fmt.Println("Signature mismatch: ", sig.PubKey)
+			return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, fmt.Sprint("Signature mismatch: ", sig.PubKey))
-			return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, "Invalid signature.")
 		}
 		record.Owners = append(record.Owners, pubKey.Address().String())
 	}
@@ -283,11 +327,13 @@ func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*type
 	return &record, nil
 }
 
-func (k Keeper) processRecord(ctx sdk.Context, record *types.RecordType, isRenewal bool) error {
+func (k Keeper) processRecord(ctx sdk.Context, record *types.ReadableRecord, isRenewal bool) error {
 	params := k.GetParams(ctx)
 	rent := params.RecordRent
 
-	err := k.bondKeeper.TransferCoinsToModuleAccount(ctx, record.BondID, types.RecordRentModuleAccountName, sdk.NewCoins(rent))
+	err := k.bondKeeper.TransferCoinsToModuleAccount(
+		ctx, record.BondID, types.RecordRentModuleAccountName, sdk.NewCoins(rent),
+	)
 	if err != nil {
 		return err
 	}
@@ -302,7 +348,14 @@ func (k Keeper) processRecord(ctx sdk.Context, record *types.RecordType, isRenew
 	}
 	k.PutRecord(ctx, recordObj)
 
-	if err := k.ProcessAttributes(ctx, *record); err != nil {
+	// TODO look up/validate record type here
+
+	if err := k.processAttributes(ctx, record.Attributes, record.ID, ""); err != nil {
+		return err
+	}
+
+	expiryTimeKey := GetAttributesIndexKey(ExpiryTimeAttributeName, []byte(record.ExpiryTime))
+	if err := k.SetAttributeMapping(ctx, expiryTimeKey, record.ID); err != nil {
 		return err
 	}
 
@@ -323,65 +376,62 @@ func (k Keeper) PutRecord(ctx sdk.Context, record types.Record) {
 	k.updateBlockChangeSetForRecord(ctx, record.Id)
 }
 
-func (k Keeper) ProcessAttributes(ctx sdk.Context, record types.RecordType) error {
+func (k Keeper) processAttributes(ctx sdk.Context, attrs types.AttributeMap, id string, prefix string) error {
-	switch record.Attributes["type"] {
+	np := basicnode.Prototype.Map
-	case "ServiceProviderRegistration":
+	nb := np.NewBuilder()
-		{
+	encAttrs, err := canonicaljson.Marshal(attrs)
-			// #nosec G705
+	if err != nil {
-			for key := range record.Attributes {
-				if key == "x500" {
-					// #nosec G705
-					for x500Key, x500Val := range record.Attributes[key].(map[string]interface{}) {
-						indexKey := GetAttributesIndexKey(fmt.Sprintf("x500%s", x500Key), x500Val)
-						if err := k.SetAttributeMapping(ctx, indexKey, record.ID); err != nil {
-							return err
-						}
-					}
-				} else {
-					indexKey := GetAttributesIndexKey(key, record.Attributes[key])
-					if err := k.SetAttributeMapping(ctx, indexKey, record.ID); err != nil {
-						return err
-					}
-				}
-			}
-		}
-	case "WebsiteRegistrationRecord", "ApplicationRecord", "ApplicationDeploymentRequest",
-		"ApplicationDeploymentRecord", "ApplicationArtifact", "ApplicationDeploymentRemovalRequest",
-		"ApplicationDeploymentRemovalRecord", "DnsRecord", "GeneralRecord":
-		{
-			// #nosec G705
-			for key := range record.Attributes {
-				attr := record.Attributes[key]
-				if reflect.Slice == reflect.TypeOf(attr).Kind() {
-					av := attr.([]interface{})
-					for i := range av {
-						indexKey := GetAttributesIndexKey(key, av[i])
-						if err := k.SetAttributeMapping(ctx, indexKey, record.ID); err != nil {
-							return err
-						}
-					}
-				} else {
-					indexKey := GetAttributesIndexKey(key, attr)
-					if err := k.SetAttributeMapping(ctx, indexKey, record.ID); err != nil {
-						return err
-					}
-				}
-			}
-		}
-	default:
-		return fmt.Errorf("unsupported record type %s", record.Attributes["type"])
-	}
-
-	expiryTimeKey := GetAttributesIndexKey(ExpiryTimeAttributeName, record.ExpiryTime)
-	if err := k.SetAttributeMapping(ctx, expiryTimeKey, record.ID); err != nil {
 		return err
 	}
+	if len(attrs) == 0 {
+		encAttrs = []byte("{}")
+	}
+	err = dagjson.Decode(nb, bytes.NewReader(encAttrs))
+	if err != nil {
+		return fmt.Errorf("failed to decode attributes: %w", err)
+	}
+	n := nb.Build()
+	if n.Kind() != ipld.Kind_Map {
+		return fmt.Errorf("record attributes must be a map, not %T", n.Kind())
+	}
 
+	return k.processAttributeMap(ctx, n, id, prefix)
+}
+
+func (k Keeper) processAttributeMap(ctx sdk.Context, n ipld.Node, id string, prefix string) error {
+	for it := n.MapIterator(); !it.Done(); {
+		//nolint:misspell
+		keynode, valuenode, err := it.Next()
+		if err != nil {
+			return err
+		}
+		key, err := keynode.AsString()
+		if err != nil {
+			return err
+		}
+
+		if valuenode.Kind() == ipld.Kind_Map {
+			err := k.processAttributeMap(ctx, valuenode, id, key)
+			if err != nil {
+				return err
+			}
+		} else {
+			var buf bytes.Buffer
+			if err := dagjson.Encode(valuenode, &buf); err != nil {
+				return err
+			}
+			value := buf.Bytes()
+			indexKey := GetAttributesIndexKey(prefix+key, value)
+			if err := k.SetAttributeMapping(ctx, indexKey, id); err != nil {
+				return err
+			}
+		}
+	}
 	return nil
 }
 
-func GetAttributesIndexKey(key string, value interface{}) []byte {
+func GetAttributesIndexKey(key string, suffix []byte) []byte {
-	keyString := fmt.Sprintf("%s=%s", key, value)
+	keyString := fmt.Sprintf("%s=%s", key, suffix)
 	return append(PrefixAttributesIndex, []byte(keyString)...)
 }
 
@@ -393,8 +443,6 @@ func (k Keeper) SetAttributeMapping(ctx sdk.Context, key []byte, recordID string
 		if err != nil {
 			return fmt.Errorf("cannot unmarshal byte array, error, %w", err)
 		}
-	} else {
-		recordIds = []string{}
 	}
 	recordIds = append(recordIds, recordID)
 	bz, err := json.Marshal(recordIds)
@@ -415,7 +463,7 @@ func (k Keeper) GetAttributeMapping(ctx sdk.Context, key []byte) ([]string, erro
 
 	var recordIds []string
 	if err := json.Unmarshal(store.Get(key), &recordIds); err != nil {
-		return nil, fmt.Errorf("cannont unmarshal byte array, error, %w", err)
+		return nil, fmt.Errorf("cannot unmarshal byte array, error, %w", err)
 	}
 
 	return recordIds, nil
@@ -593,7 +641,7 @@ func (k Keeper) GetModuleBalances(ctx sdk.Context) []*types.AccountBalance {
 	return balances
 }
 
-func recordObjToRecord(store sdk.KVStore, record types.Record) types.Record {
+func decodeRecordNames(store sdk.KVStore, record *types.Record) {
 	reverseNameIndexKey := GetCIDToNamesIndexKey(record.Id)
 
 	if store.Has(reverseNameIndexKey) {
@@ -604,6 +652,4 @@ func recordObjToRecord(store sdk.KVStore, record types.Record) types.Record {
 
 		record.Names = names
 	}
-
-	return record
 }

x/registry/keeper/naming_keeper.go

@@ -611,7 +611,7 @@ func (k Keeper) ProcessAuthorityExpiryQueue(ctx sdk.Context) {
 			k.SetNameAuthority(ctx, name, &authority)
 			k.DeleteAuthorityExpiryQueue(ctx, name, authority)
 
-			ctx.Logger().Info(fmt.Sprintf("Marking authority expired as no bond present: %s", name))
+			k.Logger(ctx).Info(fmt.Sprintf("Marking authority expired as no bond present: %s", name))
 
 			return
 		}
@@ -672,7 +672,7 @@ func (k Keeper) AuthorityExpiryQueueIterator(ctx sdk.Context, endTime time.Time)
 
 // TryTakeAuthorityRent tries to take rent from the authority bond.
 func (k Keeper) TryTakeAuthorityRent(ctx sdk.Context, name string, authority types.NameAuthority) {
-	ctx.Logger().Info(fmt.Sprintf("Trying to take rent for authority: %s", name))
+	k.Logger(ctx).Info(fmt.Sprintf("Trying to take rent for authority: %s", name))
 
 	params := k.GetParams(ctx)
 	rent := params.AuthorityRent
@@ -684,7 +684,7 @@ func (k Keeper) TryTakeAuthorityRent(ctx sdk.Context, name string, authority typ
 		k.SetNameAuthority(ctx, name, &authority)
 		k.DeleteAuthorityExpiryQueue(ctx, name, authority)
 
-		ctx.Logger().Info(fmt.Sprintf("Insufficient funds in owner account to pay authority rent, marking as expired: %s", name))
+		k.Logger(ctx).Info(fmt.Sprintf("Insufficient funds in owner account to pay authority rent, marking as expired: %s", name))
 
 		return
 	}
@@ -699,7 +699,7 @@ func (k Keeper) TryTakeAuthorityRent(ctx sdk.Context, name string, authority typ
 	k.SetNameAuthority(ctx, name, &authority)
 	k.AddBondToAuthorityIndexEntry(ctx, authority.BondId, name)
 
-	ctx.Logger().Info(fmt.Sprintf("Authority rent paid successfully: %s", name))
+	k.Logger(ctx).Info(fmt.Sprintf("Authority rent paid successfully: %s", name))
 }
 
 // ListNameAuthorityRecords - get all name authority records.

x/registry/keeper/record_keeper.go

@@ -39,14 +39,14 @@ func (k RecordKeeper) OnAuctionWinnerSelected(ctx sdk.Context, auctionID string)
 	name := k.GetAuctionToAuthorityMapping(ctx, auctionID)
 	if name == "" {
 		// We don't know about this auction, ignore.
-		ctx.Logger().Info(fmt.Sprintf("Ignoring auction notification, name mapping not found: %s", auctionID))
+		logger(ctx).Info(fmt.Sprintf("Ignoring auction notification, name mapping not found: %s", auctionID))
 		return
 	}
 
 	store := ctx.KVStore(k.storeKey)
 	if !HasNameAuthority(store, name) {
 		// We don't know about this authority, ignore.
-		ctx.Logger().Info(fmt.Sprintf("Ignoring auction notification, authority not found: %s", auctionID))
+		logger(ctx).Info(fmt.Sprintf("Ignoring auction notification, authority not found: %s", auctionID))
 		return
 	}
 
@@ -71,12 +71,12 @@ func (k RecordKeeper) OnAuctionWinnerSelected(ctx sdk.Context, auctionID string)
 			// Can be used to check if names are older than the authority itself (stale names).
 			authority.Height = uint64(ctx.BlockHeight())
 
-			ctx.Logger().Info(fmt.Sprintf("Winner selected, marking authority as active: %s", name))
+			logger(ctx).Info(fmt.Sprintf("Winner selected, marking authority as active: %s", name))
 		} else {
 			// Mark as expired.
 			authority.Status = types.AuthorityExpired
 
-			ctx.Logger().Info(fmt.Sprintf("No winner, marking authority as expired: %s", name))
+			logger(ctx).Info(fmt.Sprintf("No winner, marking authority as expired: %s", name))
 		}
 
 		authority.AuctionId = ""
@@ -85,7 +85,7 @@ func (k RecordKeeper) OnAuctionWinnerSelected(ctx sdk.Context, auctionID string)
 		// Forget about this auction now, we no longer need it.
 		removeAuctionToAuthorityMapping(store, auctionID)
 	} else {
-		ctx.Logger().Info(fmt.Sprintf("Ignoring auction notification, status: %s", auctionObj.Status))
+		logger(ctx).Info(fmt.Sprintf("Ignoring auction notification, status: %s", auctionObj.Status))
 	}
 }
 
@@ -147,9 +147,10 @@ func (k RecordKeeper) QueryRecordsByBond(ctx sdk.Context, bondID string) []types
 		cid := itr.Key()[len(bondIDPrefix):]
 		bz := store.Get(append(PrefixCIDToRecordIndex, cid...))
 		if bz != nil {
-			var obj types.Record
+			var record types.Record
-			k.cdc.MustUnmarshal(bz, &obj)
+			k.cdc.MustUnmarshal(bz, &record)
-			records = append(records, recordObjToRecord(store, obj))
+			decodeRecordNames(store, &record)
+			records = append(records, record)
 		}
 	}
 
@@ -173,7 +174,7 @@ func (k Keeper) ProcessRenewRecord(ctx sdk.Context, msg types.MsgRenewRecord) er
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "Renewal not required.")
 	}
 
-	recordType := record.ToRecordType()
+	recordType := record.ToReadableRecord()
 	err = k.processRecord(ctx, &recordType, true)
 	if err != nil {
 		return err

x/registry/types/attributes.go

@@ -1,5 +0,0 @@
-package types
-
-type Attributes interface {
-	GetType() string
-}

x/registry/types/codec.go

@@ -39,65 +39,6 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 		&MsgReAssociateRecords{},
 	)
 
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ServiceProvideRegistration",
-		(*Attributes)(nil),
-		&ServiceProviderRegistration{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.WebsiteRegistrationRecord",
-		(*Attributes)(nil),
-		&WebsiteRegistrationRecord{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ApplicationRecord",
-		(*Attributes)(nil),
-		&ApplicationRecord{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ApplicationDeploymentRequest",
-		(*Attributes)(nil),
-		&ApplicationDeploymentRequest{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ApplicationDeploymentRecord",
-		(*Attributes)(nil),
-		&ApplicationDeploymentRecord{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ApplicationArtifact",
-		(*Attributes)(nil),
-		&ApplicationArtifact{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ApplicationDeploymentRemovalRequest",
-		(*Attributes)(nil),
-		&ApplicationDeploymentRemovalRequest{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.ApplicationDeploymentRemovalRecord",
-		(*Attributes)(nil),
-		&ApplicationDeploymentRemovalRecord{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.DnsRecord",
-		(*Attributes)(nil),
-		&DnsRecord{},
-	)
-
-	registry.RegisterInterface(
-		"vulcanize.registry.v1beta1.GeneralRecord",
-		(*Attributes)(nil),
-		&GeneralRecord{},
-	)
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }
 

x/registry/types/msg.go

@@ -16,8 +16,8 @@ var (
 )
 
 // NewMsgSetName is the constructor function for MsgSetName.
-func NewMsgSetName(crn string, cid string, signer sdk.AccAddress) MsgSetName {
+func NewMsgSetName(crn string, cid string, signer sdk.AccAddress) *MsgSetName {
-	return MsgSetName{
+	return &MsgSetName{
 		Crn:    crn,
 		Cid:    cid,
 		Signer: signer.String(),

x/registry/types/record_msg.go

@@ -2,7 +2,6 @@ package types
 
 import (
 	errorsmod "cosmossdk.io/errors"
-	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -14,13 +13,11 @@ var (
 	_ sdk.Msg = &MsgDissociateBond{}
 	_ sdk.Msg = &MsgDissociateRecords{}
 	_ sdk.Msg = &MsgReAssociateRecords{}
-
-	_ cdctypes.UnpackInterfacesMessage = &MsgSetRecord{}
 )
 
 // NewMsgSetRecord is the constructor function for MsgSetRecord.
-func NewMsgSetRecord(payload Payload, bondID string, signer sdk.AccAddress) MsgSetRecord {
+func NewMsgSetRecord(payload Payload, bondID string, signer sdk.AccAddress) *MsgSetRecord {
-	return MsgSetRecord{
+	return &MsgSetRecord{
 		Payload: payload,
 		BondId:  bondID,
 		Signer:  signer.String(),
@@ -61,12 +58,6 @@ func (msg MsgSetRecord) GetSignBytes() []byte {
 	return sdk.MustSortJSON(bz)
 }
 
-// UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces
-func (msg MsgSetRecord) UnpackInterfaces(unpacker cdctypes.AnyUnpacker) error {
-	var attr Attributes
-	return unpacker.UnpackAny(msg.Payload.Record.Attributes, &attr)
-}
-
 // NewMsgRenewRecord is the constructor function for MsgRenewRecord.
 func NewMsgRenewRecord(recordID string, signer sdk.AccAddress) MsgRenewRecord {
 	return MsgRenewRecord{

x/registry/types/registry.pb.go

@@ -5,7 +5,7 @@ package types
 
 import (
 	fmt "fmt"
-	types1 "github.com/cosmos/cosmos-sdk/codec/types"
+	_ "github.com/cosmos/cosmos-sdk/codec/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
@@ -155,17 +155,17 @@ func (m *Params) GetAuthorityAuctionMinimumBid() types.Coin {
 	return types.Coin{}
 }
 
-// Params defines the registry module records
+// Record defines a registry record
 type Record struct {
-	Id         string      `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" json:"id" yaml:"id"`
+	Id         string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" json:"id" yaml:"id"`
-	BondId     string      `protobuf:"bytes,2,opt,name=bond_id,json=bondId,proto3" json:"bond_id,omitempty" json:"bondId" yaml:"bondId"`
+	BondId     string   `protobuf:"bytes,2,opt,name=bond_id,json=bondId,proto3" json:"bond_id,omitempty" json:"bondId" yaml:"bondId"`
-	CreateTime string      `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty" json:"createTime" yaml:"createTime"`
+	CreateTime string   `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty" json:"createTime" yaml:"createTime"`
-	ExpiryTime string      `protobuf:"bytes,4,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty" json:"expiryTime" yaml:"expiryTime"`
+	ExpiryTime string   `protobuf:"bytes,4,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty" json:"expiryTime" yaml:"expiryTime"`
-	Deleted    bool        `protobuf:"varint,5,opt,name=deleted,proto3" json:"deleted,omitempty"`
+	Deleted    bool     `protobuf:"varint,5,opt,name=deleted,proto3" json:"deleted,omitempty"`
-	Owners     []string    `protobuf:"bytes,6,rep,name=owners,proto3" json:"owners,omitempty" json:"owners" yaml:"owners"`
+	Owners     []string `protobuf:"bytes,6,rep,name=owners,proto3" json:"owners,omitempty" json:"owners" yaml:"owners"`
-	Attributes *types1.Any `protobuf:"bytes,7,opt,name=attributes,proto3" json:"attributes,omitempty" json:"attributes" yaml:"attributes"`
+	Attributes []byte   `protobuf:"bytes,7,opt,name=attributes,proto3" json:"attributes,omitempty" json:"attributes" yaml:"attributes"`
-	Names      []string    `protobuf:"bytes,8,rep,name=names,proto3" json:"names,omitempty" json:"names" yaml:"names"`
+	Names      []string `protobuf:"bytes,8,rep,name=names,proto3" json:"names,omitempty" json:"names" yaml:"names"`
-	Type       string      `protobuf:"bytes,9,opt,name=type,proto3" json:"type,omitempty" json:"types" yaml:"types"`
+	Type       string   `protobuf:"bytes,9,opt,name=type,proto3" json:"type,omitempty" json:"types" yaml:"types"`
 }
 
 func (m *Record) Reset()         { *m = Record{} }
@@ -243,7 +243,7 @@ func (m *Record) GetOwners() []string {
 	return nil
 }
 
-func (m *Record) GetAttributes() *types1.Any {
+func (m *Record) GetAttributes() []byte {
 	if m != nil {
 		return m.Attributes
 	}
@@ -264,7 +264,7 @@ func (m *Record) GetType() string {
 	return ""
 }
 
-// AuthorityEntry defines the registry module AuthorityEntries
+// AuthorityEntry defines a registry authority
 type AuthorityEntry struct {
 	Name  string         `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Entry *NameAuthority `protobuf:"bytes,2,opt,name=entry,proto3" json:"entry,omitempty"`
@@ -466,7 +466,7 @@ func (m *NameEntry) GetEntry() *NameRecord {
 	return nil
 }
 
-// NameRecord
+// NameRecord defines a versioned name record
 type NameRecord struct {
 	Latest  *NameRecordEntry   `protobuf:"bytes,1,opt,name=latest,proto3" json:"latest,omitempty"`
 	History []*NameRecordEntry `protobuf:"bytes,2,rep,name=history,proto3" json:"history,omitempty"`
@@ -781,92 +781,91 @@ func init() {
 }
 
 var fileDescriptor_5ca0f65a0e7121be = []byte{
-	// 1347 bytes of a gzipped FileDescriptorProto
+	// 1344 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0xdd, 0x6e, 0x1b, 0x45,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0xdd, 0x6e, 0x1b, 0xc5,
-	0x14, 0xce, 0xc6, 0x89, 0x13, 0x9f, 0x34, 0x01, 0x0d, 0x69, 0xeb, 0x04, 0xea, 0x0d, 0x46, 0xa5,
+	0x17, 0xcf, 0xc6, 0x89, 0x13, 0x9f, 0x34, 0xf9, 0xff, 0x35, 0xa4, 0xad, 0x13, 0xa8, 0x37, 0x18,
-	0x0d, 0xa1, 0xb6, 0x4a, 0x2f, 0xca, 0xaf, 0x50, 0x36, 0x49, 0x4b, 0x84, 0x80, 0x30, 0xed, 0x0d,
+	0x95, 0x36, 0x84, 0xda, 0x2a, 0xbd, 0x28, 0x9f, 0x42, 0xd9, 0x24, 0x0d, 0x11, 0x02, 0xc2, 0xb4,
-	0x48, 0x95, 0x35, 0xbb, 0x3b, 0xb5, 0x87, 0x7a, 0x77, 0xad, 0xdd, 0xd9, 0x52, 0x73, 0xc7, 0x1b,
+	0x37, 0x20, 0x21, 0x6b, 0x76, 0x77, 0x6a, 0x0f, 0xf5, 0xee, 0x5a, 0xbb, 0xb3, 0xa5, 0xe6, 0x0e,
-	0xe4, 0xb2, 0x48, 0xbc, 0x01, 0x48, 0x3c, 0x06, 0xbd, 0xec, 0x25, 0x42, 0xc2, 0xa0, 0xe6, 0x0d,
+	0xf1, 0x02, 0xb9, 0xec, 0x05, 0x6f, 0x00, 0x12, 0x8f, 0x41, 0x2f, 0x7b, 0x89, 0x90, 0x30, 0xa8,
-	0xfc, 0x04, 0x68, 0xe7, 0x67, 0xff, 0x6c, 0xd7, 0x85, 0xde, 0xcd, 0xf9, 0xfb, 0xe6, 0x9b, 0x33,
+	0x79, 0x03, 0x3f, 0x01, 0xda, 0xf9, 0xd8, 0x2f, 0xdb, 0x75, 0xa1, 0x77, 0x73, 0xbe, 0x7e, 0xf3,
-	0xe7, 0x9c, 0xd9, 0x85, 0xdd, 0x87, 0x71, 0xdf, 0x21, 0x3e, 0xfb, 0x81, 0xb6, 0x43, 0xda, 0x65,
+	0x9b, 0x33, 0xe7, 0x9c, 0xd9, 0x85, 0xdd, 0x87, 0x71, 0xdf, 0x21, 0x3e, 0xfb, 0x9e, 0xb6, 0x43,
-	0x11, 0x0f, 0x87, 0xed, 0x87, 0xd7, 0x6d, 0xca, 0xc9, 0xf5, 0x54, 0xd1, 0x1a, 0x84, 0x01, 0x0f,
+	0xda, 0x65, 0x11, 0x0f, 0x87, 0xed, 0x87, 0x37, 0x6d, 0xca, 0xc9, 0xcd, 0x54, 0xd1, 0x1a, 0x84,
-	0xd0, 0x76, 0xea, 0xda, 0x4a, 0x2d, 0xca, 0x75, 0xbb, 0xd1, 0x0d, 0x82, 0x6e, 0x9f, 0xb6, 0x85,
+	0x01, 0x0f, 0xd0, 0x76, 0xea, 0xda, 0x4a, 0x2d, 0xca, 0x75, 0xbb, 0xd1, 0x0d, 0x82, 0x6e, 0x9f,
-	0xa7, 0x1d, 0xdf, 0x6f, 0xbb, 0x71, 0x48, 0x38, 0x0b, 0x7c, 0x19, 0xbb, 0x6d, 0x96, 0xed, 0x9c,
+	0xb6, 0x85, 0xa7, 0x1d, 0xdf, 0x6f, 0xbb, 0x71, 0x48, 0x38, 0x0b, 0x7c, 0x19, 0xbb, 0x6d, 0x96,
-	0x79, 0x34, 0xe2, 0xc4, 0x1b, 0x28, 0x87, 0xcd, 0x6e, 0xd0, 0x0d, 0xc4, 0xb2, 0x9d, 0xac, 0x94,
+	0xed, 0x9c, 0x79, 0x34, 0xe2, 0xc4, 0x1b, 0x28, 0x87, 0xcd, 0x6e, 0xd0, 0x0d, 0xc4, 0xb2, 0x9d,
-	0xb6, 0xe1, 0x04, 0x91, 0x17, 0x44, 0x6d, 0x9b, 0x44, 0x34, 0xa5, 0xe5, 0x04, 0x4c, 0xc3, 0x6e,
+	0xac, 0x94, 0xb6, 0xe1, 0x04, 0x91, 0x17, 0x44, 0x6d, 0x9b, 0x44, 0x34, 0xa5, 0xe5, 0x04, 0x4c,
-	0x95, 0x61, 0x89, 0xaf, 0xd8, 0x36, 0xff, 0x5a, 0x87, 0xea, 0x09, 0x09, 0x89, 0x17, 0x21, 0x06,
+	0xc3, 0x6e, 0x95, 0x61, 0x89, 0xaf, 0xd8, 0x36, 0xff, 0x5c, 0x87, 0xea, 0x29, 0x09, 0x89, 0x17,
-	0x6b, 0x21, 0x75, 0x82, 0xd0, 0xed, 0x84, 0xd4, 0xe7, 0x75, 0x63, 0xc7, 0xb8, 0xba, 0xf6, 0xde,
+	0x21, 0x06, 0x6b, 0x21, 0x75, 0x82, 0xd0, 0xed, 0x84, 0xd4, 0xe7, 0x75, 0x63, 0xc7, 0xb8, 0xbe,
-	0x56, 0x4b, 0x62, 0xb7, 0x12, 0x6c, 0x7d, 0x8e, 0xd6, 0x41, 0xc0, 0x7c, 0xeb, 0xda, 0x93, 0x91,
+	0xf6, 0xce, 0x56, 0x4b, 0x62, 0xb7, 0x12, 0x6c, 0x7d, 0x8e, 0xd6, 0x41, 0xc0, 0x7c, 0xeb, 0xc6,
-	0xb9, 0x30, 0x1e, 0x99, 0x97, 0xbf, 0x8b, 0x02, 0xff, 0xc3, 0x66, 0x2e, 0xb6, 0xb9, 0x33, 0x24,
+	0x93, 0x91, 0xb9, 0x30, 0x1e, 0x99, 0x57, 0xbf, 0x8d, 0x02, 0xff, 0xfd, 0x66, 0x2e, 0xb6, 0xb9,
-	0x5e, 0xbf, 0xa8, 0xc2, 0x20, 0x25, 0x4c, 0x7d, 0x8e, 0x4e, 0x0d, 0xd8, 0xcc, 0x19, 0x3b, 0x3a,
+	0x33, 0x24, 0x5e, 0xbf, 0xa8, 0xc2, 0x20, 0x25, 0x4c, 0x7d, 0x8e, 0xce, 0x0c, 0xd8, 0xcc, 0x19,
-	0x0d, 0xf5, 0x45, 0xb5, 0xa9, 0x24, 0xdc, 0xd2, 0x84, 0x5b, 0x87, 0xca, 0xc1, 0x3a, 0x50, 0x9b,
+	0x3b, 0x3a, 0x0d, 0xf5, 0x45, 0xb5, 0xa9, 0x24, 0xdc, 0xd2, 0x84, 0x5b, 0x87, 0xca, 0xc1, 0x3a,
-	0xde, 0x9c, 0xd8, 0x34, 0x05, 0x99, 0xb2, 0x7b, 0x66, 0x7b, 0xfc, 0xb7, 0x69, 0x60, 0x94, 0x51,
+	0x50, 0x9b, 0xde, 0x9e, 0xd8, 0x34, 0x05, 0x99, 0xb2, 0x7b, 0x66, 0x7b, 0xfc, 0x97, 0x69, 0x60,
-	0xd1, 0xc0, 0x28, 0x86, 0x0d, 0x12, 0xf3, 0x5e, 0x10, 0x32, 0x3e, 0x94, 0x09, 0xa8, 0xcc, 0x4b,
+	0x94, 0x51, 0xd1, 0xc0, 0x28, 0x86, 0x0d, 0x12, 0xf3, 0x5e, 0x10, 0x32, 0x3e, 0x94, 0x09, 0xa8,
-	0xc0, 0x0d, 0xc5, 0x65, 0x4f, 0x72, 0x29, 0x86, 0x6b, 0x16, 0x25, 0x2d, 0x5e, 0x4f, 0x15, 0x22,
+	0xcc, 0x4b, 0xc0, 0x2d, 0xc5, 0x65, 0x4f, 0x72, 0x29, 0x86, 0x6b, 0x16, 0x25, 0x2d, 0x5e, 0x4f,
-	0x13, 0x3f, 0x1b, 0x70, 0xb1, 0xe8, 0x92, 0x25, 0x63, 0x69, 0x5e, 0x32, 0x8e, 0x15, 0x81, 0x4f,
+	0x15, 0x22, 0x13, 0x3f, 0x19, 0x70, 0xb9, 0xe8, 0x92, 0x25, 0x63, 0x69, 0x5e, 0x32, 0x4e, 0x14,
-	0xa6, 0x11, 0x98, 0xc8, 0xc7, 0x2c, 0xb3, 0x48, 0xc9, 0xf9, 0x02, 0xad, 0x34, 0x2b, 0x8f, 0x0d,
+	0x81, 0x8f, 0xa6, 0x11, 0x98, 0xc8, 0xc7, 0x2c, 0xb3, 0x48, 0xc9, 0xc5, 0x02, 0xad, 0x34, 0x2b,
-	0xb8, 0x90, 0xc5, 0x75, 0x43, 0xe2, 0xd0, 0xce, 0x80, 0x86, 0x2c, 0x70, 0xeb, 0xcb, 0xf3, 0xd8,
+	0x8f, 0x0d, 0xb8, 0x94, 0xc5, 0x75, 0x43, 0xe2, 0xd0, 0xce, 0x80, 0x86, 0x2c, 0x70, 0xeb, 0xcb,
-	0xdd, 0x56, 0xec, 0x3e, 0x2a, 0xb3, 0xcb, 0xc3, 0x4c, 0x92, 0x2b, 0x58, 0x05, 0xb7, 0xcd, 0xd4,
+	0xf3, 0xd8, 0x1d, 0x2b, 0x76, 0x1f, 0x94, 0xd9, 0xe5, 0x61, 0x26, 0xc9, 0x15, 0xac, 0x82, 0xdb,
-	0x78, 0x3b, 0xb1, 0x9d, 0x08, 0x13, 0xfa, 0xd1, 0x80, 0xad, 0x2c, 0x8a, 0xc4, 0x4e, 0xb2, 0x69,
+	0x66, 0x6a, 0x3c, 0x4e, 0x6c, 0xa7, 0xc2, 0x84, 0x7e, 0x30, 0x60, 0x2b, 0x8b, 0x22, 0xb1, 0x93,
-	0x87, 0xfa, 0xc4, 0xee, 0x53, 0xb7, 0x5e, 0xdd, 0x31, 0xae, 0xae, 0x5a, 0x47, 0xe3, 0x91, 0xb9,
+	0x6c, 0xda, 0xa1, 0x3e, 0xb1, 0xfb, 0xd4, 0xad, 0x57, 0x77, 0x8c, 0xeb, 0xab, 0xd6, 0xd1, 0x78,
-	0x5f, 0xde, 0xbe, 0xe4, 0x3a, 0xc9, 0xa0, 0xec, 0x80, 0xb3, 0x1b, 0xda, 0x97, 0xa6, 0x23, 0x69,
+	0x64, 0xee, 0x97, 0xb7, 0x2f, 0xb9, 0x4e, 0x32, 0x28, 0x3b, 0xe0, 0xec, 0x86, 0xf6, 0xa5, 0xe9,
-	0x41, 0xbf, 0x1b, 0x30, 0x25, 0xce, 0x09, 0x3c, 0x8f, 0xf1, 0x28, 0xbb, 0xc8, 0x95, 0x79, 0xa9,
+	0x48, 0x5a, 0xd0, 0x6f, 0x06, 0x4c, 0x89, 0x73, 0x02, 0xcf, 0x63, 0x3c, 0xca, 0x2e, 0x72, 0x65,
-	0xea, 0xa8, 0x54, 0xdd, 0x99, 0xc5, 0xb5, 0x0c, 0x39, 0x9b, 0xf4, 0x84, 0xa7, 0x48, 0xa1, 0x59,
+	0x5e, 0xaa, 0x3a, 0x2a, 0x55, 0x77, 0x67, 0x71, 0x2d, 0x43, 0xce, 0x26, 0x3d, 0xe1, 0x29, 0x52,
-	0x3e, 0xc1, 0x81, 0x74, 0x4b, 0x2f, 0x7a, 0xfa, 0x49, 0x42, 0xfa, 0x90, 0x92, 0x7e, 0xee, 0x24,
+	0x68, 0x96, 0x4f, 0x70, 0x20, 0xdd, 0xd2, 0x8b, 0x9e, 0x7e, 0x92, 0x90, 0x3e, 0xa4, 0xa4, 0x9f,
-	0xab, 0x2f, 0x7d, 0x92, 0x32, 0xe4, 0xec, 0x93, 0x4c, 0x78, 0x4e, 0x3f, 0x09, 0x96, 0x6e, 0xe9,
+	0x3b, 0xc9, 0xea, 0x4b, 0x9f, 0xa4, 0x0c, 0x39, 0xfb, 0x24, 0x13, 0x9e, 0xd3, 0x4f, 0x82, 0xa5,
-	0x49, 0x7e, 0x31, 0xe0, 0x8d, 0x59, 0x69, 0xe9, 0xdc, 0xa7, 0xb4, 0x5e, 0x9b, 0xd7, 0xd7, 0x5f,
+	0x5b, 0x7a, 0x92, 0x9f, 0x0d, 0x78, 0x6d, 0x56, 0x5a, 0x3a, 0xf7, 0x29, 0xad, 0xd7, 0xe6, 0xf5,
-	0xa9, 0x33, 0xdc, 0x7e, 0xfe, 0x6d, 0x24, 0x60, 0xf3, 0xee, 0x41, 0xf8, 0xe0, 0xad, 0xe9, 0xd9,
+	0xf5, 0x17, 0xea, 0x0c, 0xc7, 0xcf, 0xbf, 0x8d, 0x04, 0x6c, 0xde, 0x3d, 0x08, 0x1f, 0xbc, 0x35,
-	0xbf, 0x45, 0xe9, 0x0c, 0xb6, 0xf2, 0xe8, 0x82, 0x2d, 0xbc, 0x34, 0xdb, 0x0c, 0x6c, 0x5e, 0xae,
+	0x3d, 0xfb, 0x77, 0x28, 0x9d, 0xc1, 0x56, 0x1e, 0x5d, 0xb0, 0x85, 0x97, 0x66, 0x9b, 0x81, 0xcd,
-	0x67, 0xb0, 0x95, 0x19, 0x4e, 0xd8, 0xfe, 0x66, 0xc0, 0xa5, 0xc9, 0x60, 0x8f, 0xf9, 0xcc, 0x8b,
+	0xcb, 0xf5, 0x0c, 0xb6, 0x32, 0xc3, 0x09, 0xdb, 0x5f, 0x0d, 0xb8, 0x32, 0x19, 0xec, 0x31, 0x9f,
-	0xbd, 0x8e, 0xcd, 0xdc, 0xfa, 0xda, 0x3c, 0xba, 0x5f, 0x2b, 0xba, 0xc7, 0xb3, 0xe8, 0xe6, 0xd0,
+	0x79, 0xb1, 0xd7, 0xb1, 0x99, 0x5b, 0x5f, 0x9b, 0x47, 0xf7, 0x4b, 0x45, 0xf7, 0x64, 0x16, 0xdd,
-	0x66, 0xf3, 0xcd, 0x3b, 0xe1, 0xed, 0x32, 0xe1, 0x2f, 0xa4, 0xd5, 0x62, 0x6e, 0xf3, 0xa7, 0x25,
+	0x1c, 0xda, 0x6c, 0xbe, 0x79, 0x27, 0xbc, 0x5d, 0x26, 0xfc, 0x99, 0xb4, 0x5a, 0xcc, 0x6d, 0xfe,
-	0xa8, 0x62, 0x31, 0xed, 0xd1, 0x15, 0x58, 0x64, 0xae, 0x78, 0xd6, 0x6a, 0xd6, 0xc5, 0xf1, 0xc8,
+	0xb8, 0x04, 0x55, 0x2c, 0xa6, 0x3d, 0xba, 0x06, 0x8b, 0xcc, 0x15, 0xcf, 0x5a, 0xcd, 0xba, 0x3c,
-	0x7c, 0x4d, 0x32, 0xc8, 0xb6, 0x49, 0xb0, 0x16, 0x99, 0x8b, 0xde, 0x87, 0x15, 0x3b, 0xf0, 0xdd,
+	0x1e, 0x99, 0xaf, 0x48, 0x06, 0xd9, 0x36, 0x09, 0xd6, 0x22, 0x73, 0xd1, 0xbb, 0xb0, 0x62, 0x07,
-	0x0e, 0x73, 0xc5, 0x7b, 0x54, 0xb3, 0xcc, 0xf1, 0xc8, 0x7c, 0x5d, 0x7a, 0x27, 0x86, 0xe3, 0x34,
+	0xbe, 0xdb, 0x61, 0xae, 0x78, 0x8f, 0x6a, 0x96, 0x39, 0x1e, 0x99, 0xaf, 0x4a, 0xef, 0xc4, 0x70,
-	0x42, 0x49, 0xb8, 0x2a, 0x17, 0xe8, 0x33, 0x58, 0x73, 0x42, 0x4a, 0x38, 0xed, 0x24, 0x0f, 0xb7,
+	0x92, 0x46, 0x28, 0x09, 0x57, 0xe5, 0x02, 0x7d, 0x02, 0x6b, 0x4e, 0x48, 0x09, 0xa7, 0x9d, 0xe4,
-	0x78, 0x41, 0x6a, 0xd6, 0x95, 0xf1, 0xc8, 0x7c, 0x4b, 0x46, 0x4b, 0xe3, 0x5d, 0xe6, 0xa5, 0x57,
+	0xe1, 0x16, 0x2f, 0x48, 0xcd, 0xba, 0x36, 0x1e, 0x99, 0x6f, 0xc8, 0x68, 0x69, 0xbc, 0xc7, 0xbc,
-	0x91, 0xd3, 0x60, 0xc8, 0x84, 0x04, 0x89, 0x3e, 0x1a, 0xb0, 0x70, 0x28, 0x91, 0x96, 0xca, 0x48,
+	0xf4, 0x2a, 0x72, 0x1a, 0x0c, 0x99, 0x90, 0x20, 0xd1, 0x47, 0x03, 0x16, 0x0e, 0x25, 0xd2, 0x52,
-	0xd2, 0x98, 0x47, 0xca, 0x69, 0x30, 0x64, 0x02, 0xaa, 0xc3, 0x8a, 0x4b, 0xfb, 0x94, 0x53, 0x39,
+	0x19, 0x49, 0x1a, 0xf3, 0x48, 0x39, 0x0d, 0x86, 0x4c, 0x40, 0x75, 0x58, 0x71, 0x69, 0x9f, 0x72,
-	0xb2, 0x57, 0xb1, 0x16, 0xd1, 0x4d, 0xa8, 0x06, 0xdf, 0xfb, 0x34, 0x8c, 0xea, 0xd5, 0x9d, 0x4a,
+	0x2a, 0x47, 0xf6, 0x2a, 0xd6, 0x22, 0xba, 0x0d, 0xd5, 0xe0, 0x3b, 0x9f, 0x86, 0x51, 0xbd, 0xba,
-	0xf1, 0x98, 0x52, 0xaf, 0xa1, 0x95, 0x84, 0x95, 0x3b, 0xba, 0x07, 0x40, 0x38, 0x0f, 0x99, 0x1d,
+	0x53, 0x29, 0x1e, 0x53, 0xea, 0x35, 0xb4, 0x92, 0xb0, 0x72, 0x47, 0xc7, 0x00, 0x84, 0xf3, 0x90,
-	0x73, 0x1a, 0xa9, 0xe9, 0xb6, 0x39, 0x31, 0x13, 0xf6, 0xfd, 0x61, 0x9e, 0x71, 0x16, 0x91, 0x5e,
+	0xd9, 0x31, 0xa7, 0x91, 0x98, 0x6e, 0x17, 0xf2, 0xdc, 0x32, 0x5b, 0x7a, 0x81, 0x99, 0x06, 0xe7,
-	0x6b, 0xa6, 0xc1, 0x39, 0x40, 0x74, 0x03, 0x96, 0x7d, 0xe2, 0xd1, 0xa8, 0xbe, 0x2a, 0x68, 0x5d,
+	0x42, 0xd1, 0x2d, 0x58, 0xf6, 0x89, 0x47, 0xa3, 0xfa, 0xaa, 0x20, 0x70, 0x65, 0x3c, 0x32, 0xb7,
-	0x1a, 0x8f, 0xcc, 0x2d, 0x89, 0x21, 0xd4, 0x3a, 0x5c, 0x0a, 0x58, 0xfa, 0xa2, 0xeb, 0xb0, 0xc4,
+	0x24, 0x86, 0x50, 0xeb, 0x70, 0x29, 0x60, 0xe9, 0x8b, 0x6e, 0xc2, 0x12, 0x1f, 0x0e, 0x64, 0x1f,
-	0x87, 0x03, 0xd9, 0xdd, 0x85, 0x98, 0x44, 0x9b, 0xc6, 0x48, 0x01, 0x0b, 0xd7, 0x26, 0x85, 0x8d,
+	0x17, 0x62, 0x12, 0x6d, 0x1a, 0x23, 0x05, 0x2c, 0x5c, 0x9b, 0x14, 0x36, 0xf6, 0x75, 0x8d, 0x1c,
-	0x7d, 0x5d, 0x39, 0x47, 0x3e, 0x0f, 0x87, 0x08, 0xc1, 0x52, 0x82, 0x26, 0x8b, 0x04, 0x8b, 0x35,
+	0xf9, 0x3c, 0x1c, 0x22, 0x04, 0x4b, 0x09, 0x9a, 0x2c, 0x07, 0x2c, 0xd6, 0xe8, 0x63, 0x58, 0xa6,
-	0xfa, 0x14, 0x96, 0x69, 0x62, 0x54, 0xdf, 0x26, 0xbb, 0xad, 0xd9, 0xdf, 0x77, 0xad, 0x2f, 0x89,
+	0x89, 0x51, 0x7d, 0x85, 0xec, 0xb6, 0x66, 0x7f, 0xc9, 0xb5, 0x3e, 0x27, 0x1e, 0x4d, 0x21, 0xb1,
-	0x47, 0x53, 0x48, 0x2c, 0xe3, 0x9a, 0x7f, 0x56, 0x60, 0xbd, 0x60, 0x40, 0xdf, 0xc0, 0xab, 0x22,
+	0x8c, 0x6b, 0xfe, 0x51, 0x81, 0xf5, 0x82, 0x01, 0x7d, 0x05, 0xff, 0x17, 0x39, 0xeb, 0x0c, 0x62,
-	0x93, 0x9d, 0x41, 0x6c, 0xf7, 0x99, 0xd3, 0x79, 0x40, 0x87, 0xaa, 0x2e, 0xdb, 0xd9, 0xe7, 0x84,
+	0xbb, 0xcf, 0x9c, 0xce, 0x03, 0x3a, 0x54, 0x15, 0xd8, 0xce, 0x3e, 0x1c, 0x84, 0xc7, 0xa9, 0x70,
-	0xf0, 0x38, 0x11, 0x0e, 0x9f, 0xd3, 0x61, 0xe1, 0x2a, 0x32, 0x2d, 0xde, 0x28, 0x2a, 0xd0, 0x09,
+	0xf8, 0x94, 0x0e, 0x0b, 0x49, 0xcf, 0xb4, 0x78, 0xa3, 0xa8, 0x40, 0xa7, 0xb0, 0x2e, 0xa1, 0x89,
-	0xac, 0x4b, 0x68, 0xe2, 0xba, 0x21, 0x8d, 0x22, 0x55, 0xc1, 0x7b, 0xe3, 0x91, 0x79, 0x25, 0x87,
+	0xeb, 0x86, 0x34, 0x8a, 0x54, 0xad, 0xee, 0x8d, 0x47, 0xe6, 0xb5, 0x1c, 0xee, 0xbe, 0xb4, 0x16,
-	0xbb, 0x2f, 0xad, 0x05, 0x54, 0xad, 0xc3, 0xe7, 0xf2, 0x22, 0xba, 0x00, 0xd5, 0x1e, 0x65, 0xdd,
+	0x50, 0xb5, 0x0e, 0x5f, 0xc8, 0x8b, 0xe8, 0x12, 0x54, 0x7b, 0x94, 0x75, 0x7b, 0xf2, 0xd3, 0x67,
-	0x9e, 0xfc, 0x20, 0x5a, 0xc2, 0x4a, 0x4a, 0xf4, 0x11, 0x27, 0x3c, 0x8e, 0x64, 0x71, 0x62, 0x25,
+	0x09, 0x2b, 0x29, 0xd1, 0x47, 0x9c, 0xf0, 0x38, 0x92, 0x65, 0x88, 0x95, 0x84, 0x0e, 0x01, 0x74,
-	0xa1, 0x43, 0x00, 0xdd, 0xa5, 0x4c, 0x96, 0x5c, 0xcd, 0xba, 0x3c, 0x1e, 0x99, 0x6f, 0xea, 0x86,
+	0x3f, 0x32, 0x59, 0x5c, 0x35, 0xeb, 0xea, 0x78, 0x64, 0xbe, 0xae, 0x5b, 0x5b, 0xd8, 0x4e, 0x0e,
-	0x17, 0xb6, 0xe3, 0xc3, 0xac, 0xb9, 0xb5, 0x02, 0xd7, 0xf4, 0xba, 0xd0, 0x83, 0xd5, 0xa9, 0x3d,
+	0xb3, 0x36, 0xd6, 0x0a, 0x5c, 0xd3, 0xeb, 0x42, 0xb7, 0x55, 0xa7, 0x76, 0xdb, 0x61, 0xa1, 0xdb,
-	0x78, 0x58, 0xe8, 0xc1, 0xc3, 0xac, 0x07, 0xfb, 0xc5, 0xce, 0x91, 0xd5, 0xb9, 0x3d, 0x51, 0x9d,
+	0x0e, 0xb3, 0x6e, 0xeb, 0x17, 0x7b, 0x44, 0xbe, 0xb2, 0xdb, 0x13, 0x6f, 0xd3, 0x3d, 0xfd, 0x0d,
-	0x77, 0xf5, 0x97, 0xb5, 0xd5, 0x56, 0x13, 0xe9, 0x45, 0x3a, 0xeb, 0x34, 0x79, 0x82, 0x72, 0xdd,
+	0x6d, 0xb5, 0xd5, 0xec, 0x79, 0x91, 0x1e, 0x3a, 0x4b, 0x1e, 0x9b, 0x5c, 0x1f, 0x35, 0xbf, 0x81,
-	0xd5, 0xbc, 0x07, 0xb5, 0xe4, 0x6e, 0x67, 0x97, 0xcf, 0xc7, 0xc5, 0xf2, 0x79, 0x7b, 0x5e, 0xf9,
+	0x5a, 0x72, 0xb7, 0xb3, 0xcb, 0xe7, 0xc3, 0x62, 0xf9, 0xbc, 0x39, 0xaf, 0x7c, 0xe4, 0x58, 0xd2,
-	0xc8, 0x61, 0xa5, 0x6b, 0xe7, 0xb1, 0x01, 0x90, 0x69, 0xd1, 0x01, 0x54, 0xfb, 0x84, 0xd3, 0x48,
+	0xb5, 0xf3, 0xd8, 0x00, 0xc8, 0xb4, 0xe8, 0x00, 0xaa, 0x7d, 0xc2, 0x69, 0xa4, 0xbf, 0xc3, 0xf7,
-	0x7f, 0x9d, 0xef, 0xbd, 0x18, 0x9a, 0x60, 0x87, 0x55, 0x28, 0x3a, 0x82, 0x95, 0x1e, 0x8b, 0x78,
+	0x5e, 0x0c, 0x4d, 0xb0, 0xc3, 0x2a, 0x14, 0x1d, 0xc1, 0x4a, 0x8f, 0x45, 0x3c, 0x10, 0x9c, 0x2a,
-	0x20, 0x38, 0x55, 0xfe, 0x2b, 0x8a, 0x8e, 0x6d, 0x7e, 0x00, 0xaf, 0x94, 0x6c, 0x68, 0x23, 0x9b,
+	0xff, 0x16, 0x45, 0xc7, 0x36, 0xdf, 0x83, 0xff, 0x95, 0x6c, 0x68, 0x23, 0x9b, 0xa5, 0x62, 0x64,
-	0xb0, 0x62, 0x90, 0x66, 0xa5, 0xb3, 0x98, 0x2f, 0x9d, 0x66, 0x08, 0xb5, 0x3b, 0xac, 0xeb, 0x13,
+	0x66, 0xa5, 0xb3, 0x98, 0x2f, 0x9d, 0x66, 0x08, 0xb5, 0xbb, 0xac, 0xeb, 0x13, 0x1e, 0x87, 0x14,
-	0x1e, 0x87, 0x14, 0xed, 0x41, 0x25, 0x62, 0x5d, 0x55, 0xff, 0x5b, 0xe3, 0x91, 0x79, 0x5e, 0xde,
+	0xed, 0x41, 0x25, 0x62, 0x5d, 0x55, 0xff, 0x5b, 0xe3, 0x91, 0x79, 0x51, 0xde, 0x43, 0xc4, 0xba,
-	0x43, 0xc4, 0xba, 0xfa, 0x02, 0x92, 0x25, 0x4e, 0xbc, 0x92, 0xb2, 0x18, 0xc4, 0xb6, 0x68, 0x98,
+	0xfa, 0x02, 0x92, 0x25, 0x4e, 0xbc, 0x92, 0xb2, 0x18, 0xc4, 0xb6, 0x68, 0x98, 0x89, 0x21, 0x3c,
-	0x89, 0xd1, 0x3c, 0x88, 0xed, 0x5c, 0xa3, 0x28, 0x09, 0x57, 0xd5, 0xe2, 0x74, 0x11, 0x36, 0xac,
+	0x88, 0xed, 0x5c, 0xa3, 0x28, 0x09, 0x57, 0xd5, 0xe2, 0x6c, 0x11, 0x36, 0xac, 0x7e, 0xe0, 0x3c,
-	0x7e, 0xe0, 0x3c, 0x38, 0xe8, 0x11, 0xbf, 0x4b, 0xef, 0x50, 0x9e, 0xa3, 0x97, 0x6c, 0x5e, 0x49,
+	0x38, 0xe8, 0x11, 0xbf, 0x4b, 0xef, 0x52, 0x9e, 0xa3, 0x97, 0x6c, 0x5e, 0x49, 0x2b, 0xbb, 0x0e,
-	0x2b, 0xbb, 0x0e, 0x2b, 0xf2, 0x07, 0x21, 0x12, 0x09, 0xaa, 0x61, 0x2d, 0xa2, 0x6d, 0x58, 0x55,
+	0x2b, 0xf2, 0x57, 0x20, 0x12, 0x09, 0xaa, 0x61, 0x2d, 0xa2, 0x6d, 0x58, 0x55, 0x25, 0x1a, 0xd5,
-	0x25, 0x1a, 0xd5, 0x2b, 0xc2, 0x94, 0xca, 0xe8, 0x11, 0x9c, 0xd3, 0x75, 0x6f, 0x33, 0x37, 0xe9,
+	0x2b, 0xc2, 0x94, 0xca, 0xe8, 0x11, 0x5c, 0xd0, 0x75, 0x6f, 0x33, 0x37, 0xe9, 0x8a, 0x24, 0xb7,
-	0x8a, 0x24, 0xb7, 0xef, 0x3c, 0x2f, 0xb7, 0xea, 0xb9, 0xb2, 0x98, 0x7b, 0xec, 0xdf, 0x0f, 0xac,
+	0x6f, 0x3d, 0x2f, 0xb7, 0xea, 0x61, 0xb2, 0x98, 0x7b, 0xe2, 0xdf, 0x0f, 0xac, 0xdd, 0xec, 0xb7,
-	0xdd, 0xec, 0x67, 0x8a, 0xa4, 0x96, 0xa8, 0xd4, 0x27, 0x42, 0x85, 0xd7, 0x72, 0x12, 0xda, 0x81,
+	0x89, 0xa4, 0x96, 0xa8, 0xd4, 0x27, 0x42, 0x85, 0xd7, 0x72, 0x12, 0xda, 0x81, 0x35, 0xfd, 0xd6,
-	0x35, 0xfd, 0x02, 0x32, 0x1a, 0xd5, 0x97, 0x05, 0xb1, 0xbc, 0x0a, 0x6d, 0xea, 0x89, 0x2a, 0x06,
+	0x31, 0x1a, 0xd5, 0x97, 0x05, 0xb1, 0xbc, 0x0a, 0x6d, 0xea, 0x89, 0x2a, 0x46, 0xba, 0x1a, 0x99,
-	0xbd, 0x1a, 0x99, 0xcd, 0x5f, 0x8d, 0x64, 0x00, 0xe6, 0x29, 0x94, 0x9a, 0xd7, 0xf8, 0x9f, 0xcd,
+	0xcd, 0x5f, 0x8c, 0x64, 0x00, 0xe6, 0x29, 0x94, 0x9a, 0xd7, 0xf8, 0x8f, 0xcd, 0x7b, 0x0f, 0x36,
-	0x7b, 0x17, 0x36, 0x6c, 0xe6, 0xba, 0x13, 0x53, 0xe8, 0xda, 0x78, 0x64, 0xee, 0xaa, 0x1e, 0x16,
+	0x6c, 0xe6, 0xba, 0x13, 0x53, 0xe8, 0xc6, 0x78, 0x64, 0xee, 0xaa, 0x1e, 0x16, 0xf6, 0xd2, 0x18,
-	0xf6, 0xd2, 0x18, 0x2a, 0x2a, 0xf1, 0x7a, 0x41, 0xb6, 0x6e, 0x3d, 0x79, 0xd6, 0x30, 0x9e, 0x3e,
+	0x2a, 0x2a, 0xf1, 0x7a, 0x41, 0xb6, 0xee, 0x3c, 0x79, 0xd6, 0x30, 0x9e, 0x3e, 0x6b, 0x18, 0x7f,
-	0x6b, 0x18, 0xff, 0x3c, 0x6b, 0x18, 0xa7, 0x67, 0x8d, 0x85, 0xa7, 0x67, 0x8d, 0x85, 0x3f, 0xce,
+	0x3f, 0x6b, 0x18, 0x67, 0xe7, 0x8d, 0x85, 0xa7, 0xe7, 0x8d, 0x85, 0xdf, 0xcf, 0x1b, 0x0b, 0x5f,
-	0x1a, 0x0b, 0xdf, 0xbe, 0xdb, 0x65, 0xbc, 0x17, 0xdb, 0x2d, 0x27, 0xf0, 0xda, 0x0e, 0x0d, 0x9d,
+	0xbf, 0xdd, 0x65, 0xbc, 0x17, 0xdb, 0x2d, 0x27, 0xf0, 0xda, 0x0e, 0x0d, 0x9d, 0x1b, 0x2c, 0x68,
-	0x6b, 0x2c, 0x68, 0xf7, 0x89, 0x13, 0xf8, 0xcc, 0x71, 0xdb, 0x8f, 0xb2, 0x3f, 0x76, 0x31, 0xfd,
+	0xf7, 0x89, 0x13, 0xf8, 0xcc, 0x71, 0xdb, 0x8f, 0xb2, 0x7f, 0x73, 0x31, 0xfd, 0xed, 0xaa, 0x98,
-	0xed, 0xaa, 0x98, 0x01, 0x37, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x03, 0x2e, 0xc4, 0xd4,
+	0x01, 0xb7, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x03, 0x19, 0xcc, 0xfc, 0xbe, 0x0f, 0x00, 0x00,
-	0x0f, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
@@ -1028,15 +1027,10 @@ func (m *Record) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0x42
 		}
 	}
-	if m.Attributes != nil {
+	if len(m.Attributes) > 0 {
-		{
+		i -= len(m.Attributes)
-			size, err := m.Attributes.MarshalToSizedBuffer(dAtA[:i])
+		copy(dAtA[i:], m.Attributes)
-			if err != nil {
+		i = encodeVarintRegistry(dAtA, i, uint64(len(m.Attributes)))
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintRegistry(dAtA, i, uint64(size))
-		}
 		i--
 		dAtA[i] = 0x3a
 	}
@@ -1152,12 +1146,12 @@ func (m *NameAuthority) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	n13, err13 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExpiryTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExpiryTime):])
+	n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExpiryTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExpiryTime):])
-	if err13 != nil {
+	if err12 != nil {
-		return 0, err13
+		return 0, err12
 	}
-	i -= n13
+	i -= n12
-	i = encodeVarintRegistry(dAtA, i, uint64(n13))
+	i = encodeVarintRegistry(dAtA, i, uint64(n12))
 	i--
 	dAtA[i] = 0x3a
 	if len(m.BondId) > 0 {
@@ -1555,8 +1549,8 @@ func (m *Record) Size() (n int) {
 			n += 1 + l + sovRegistry(uint64(l))
 		}
 	}
-	if m.Attributes != nil {
+	l = len(m.Attributes)
-		l = m.Attributes.Size()
+	if l > 0 {
 		n += 1 + l + sovRegistry(uint64(l))
 	}
 	if len(m.Names) > 0 {
@@ -2370,7 +2364,7 @@ func (m *Record) Unmarshal(dAtA []byte) error {
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Attributes", wireType)
 			}
-			var msglen int
+			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowRegistry
@@ -2380,26 +2374,24 @@ func (m *Record) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= int(b&0x7F) << shift
+				byteLen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			if msglen < 0 {
+			if byteLen < 0 {
 				return ErrInvalidLengthRegistry
 			}
-			postIndex := iNdEx + msglen
+			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
 				return ErrInvalidLengthRegistry
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
+			m.Attributes = append(m.Attributes[:0], dAtA[iNdEx:postIndex]...)
 			if m.Attributes == nil {
-				m.Attributes = &types1.Any{}
+				m.Attributes = []byte{}
-			}
-			if err := m.Attributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
 			}
 			iNdEx = postIndex
 		case 8:

x/registry/types/tx.pb.go

@@ -385,7 +385,7 @@ func (m *MsgReserveAuthorityResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgReserveAuthorityResponse proto.InternalMessageInfo
 
-// MsgSetAuthorityBond is SDK message for SetAuthorityBond
+// MsgSetAuthorityBond
 type MsgSetAuthorityBond struct {
 	Name   string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	BondId string `protobuf:"bytes,2,opt,name=bond_id,json=bondId,proto3" json:"bond_id,omitempty" json:"bondId" yaml:"bondId"`
@@ -483,7 +483,7 @@ func (m *MsgSetAuthorityBondResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgSetAuthorityBondResponse proto.InternalMessageInfo
 
-// MsgDeleteNameAuthority is SDK message for DeleteNameAuthority
+// MsgDeleteNameAuthority
 type MsgDeleteNameAuthority struct {
 	Crn    string `protobuf:"bytes,1,opt,name=crn,proto3" json:"crn,omitempty"`
 	Signer string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty"`
@@ -573,7 +573,7 @@ func (m *MsgDeleteNameAuthorityResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgDeleteNameAuthorityResponse proto.InternalMessageInfo
 
-// MsgRenewRecord is SDK message for Renew a record
+// MsgRenewRecord
 type MsgRenewRecord struct {
 	RecordId string `protobuf:"bytes,1,opt,name=record_id,json=recordId,proto3" json:"record_id,omitempty" json:"recordId" yaml:"recordId"`
 	Signer   string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty"`
@@ -761,7 +761,7 @@ func (m *MsgAssociateBondResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgAssociateBondResponse proto.InternalMessageInfo
 
-// MsgDissociateBond is SDK message for Msg/DissociateBond
+// MsgDissociateBond
 type MsgDissociateBond struct {
 	RecordId string `protobuf:"bytes,1,opt,name=record_id,json=recordId,proto3" json:"record_id,omitempty" json:"recordId" yaml:"recordId"`
 	Signer   string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty"`
@@ -814,7 +814,7 @@ func (m *MsgDissociateBond) GetSigner() string {
 	return ""
 }
 
-// MsgDissociateBondResponse is response type for MsgDissociateBond
+// MsgDissociateBondResponse
 type MsgDissociateBondResponse struct {
 }
 
@@ -851,7 +851,7 @@ func (m *MsgDissociateBondResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgDissociateBondResponse proto.InternalMessageInfo
 
-// MsgDissociateRecords is SDK message for Msg/DissociateRecords
+// MsgDissociateRecords
 type MsgDissociateRecords struct {
 	BondId string `protobuf:"bytes,1,opt,name=bond_id,json=bondId,proto3" json:"bond_id,omitempty" json:"bondId" yaml:"bondId"`
 	Signer string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty"`
@@ -904,7 +904,7 @@ func (m *MsgDissociateRecords) GetSigner() string {
 	return ""
 }
 
-// MsgDissociateRecordsResponse is response type for MsgDissociateRecords
+// MsgDissociateRecordsResponse
 type MsgDissociateRecordsResponse struct {
 }
 
@@ -941,7 +941,7 @@ func (m *MsgDissociateRecordsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgDissociateRecordsResponse proto.InternalMessageInfo
 
-// MsgReAssociateRecords is SDK message for Msg/ReAssociateRecords
+// MsgReAssociateRecords
 type MsgReAssociateRecords struct {
 	NewBondId string `protobuf:"bytes,1,opt,name=new_bond_id,json=newBondId,proto3" json:"new_bond_id,omitempty" json:"newBondId" yaml:"newBondId"`
 	OldBondId string `protobuf:"bytes,2,opt,name=old_bond_id,json=oldBondId,proto3" json:"old_bond_id,omitempty" json:"oldBondId" yaml:"oldBondId"`
@@ -1002,7 +1002,7 @@ func (m *MsgReAssociateRecords) GetSigner() string {
 	return ""
 }
 
-// MsgReAssociateRecordsResponse is response type for MsgReAssociateRecords
+// MsgReAssociateRecordsResponse
 type MsgReAssociateRecordsResponse struct {
 }
 
@@ -1147,9 +1147,9 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MsgClient interface {
-	// SetRecord will records a new record with given payload and bond id
+	// SetRecord records a new record with given payload and bond id
 	SetRecord(ctx context.Context, in *MsgSetRecord, opts ...grpc.CallOption) (*MsgSetRecordResponse, error)
-	// Renew Record will renew the expire record
+	// Renew Record renews an expired record
 	RenewRecord(ctx context.Context, in *MsgRenewRecord, opts ...grpc.CallOption) (*MsgRenewRecordResponse, error)
 	// AssociateBond
 	AssociateBond(ctx context.Context, in *MsgAssociateBond, opts ...grpc.CallOption) (*MsgAssociateBondResponse, error)
@@ -1269,9 +1269,9 @@ func (c *msgClient) SetAuthorityBond(ctx context.Context, in *MsgSetAuthorityBon
 
 // MsgServer is the server API for Msg service.
 type MsgServer interface {
-	// SetRecord will records a new record with given payload and bond id
+	// SetRecord records a new record with given payload and bond id
 	SetRecord(context.Context, *MsgSetRecord) (*MsgSetRecordResponse, error)
-	// Renew Record will renew the expire record
+	// Renew Record renews an expired record
 	RenewRecord(context.Context, *MsgRenewRecord) (*MsgRenewRecordResponse, error)
 	// AssociateBond
 	AssociateBond(context.Context, *MsgAssociateBond) (*MsgAssociateBondResponse, error)

x/registry/types/types.go

@@ -2,14 +2,9 @@ package types
 
 import (
 	"crypto/sha256"
-	"encoding/json"
-	"fmt"
-	"strings"
 
 	"github.com/cerc-io/laconicd/x/registry/helpers"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	"github.com/gibson042/canonicaljson-go"
-	canonicalJson "github.com/gibson042/canonicaljson-go"
-	"github.com/gogo/protobuf/proto"
 )
 
 const (
@@ -18,331 +13,59 @@ const (
 	AuthorityUnderAuction = "auction"
 )
 
-// PayloadType represents a signed record payload that can be serialized from/to YAML.
+// TODO if schema records are to be more permissive than allowing a map of fields, this type will
-type PayloadType struct {
+// become specific to content records. schema records will either occupy a new message or have new
-	Record     map[string]interface{} `json:"record"`
+// more general purpose helper types.
-	Signatures []Signature            `json:"signatures"`
+
+type AttributeMap map[string]interface{}
+
+// ReadablePayload represents a signed record payload that can be serialized from/to YAML.
+type ReadablePayload struct {
+	RecordAttributes AttributeMap `json:"record" yaml:"record"`
+	Signatures       []Signature  `json:"signatures" yaml:"signatures"`
 }
 
-// ToPayload converts PayloadType to Payload object.
+// ReadableRecord represents a WNS record.
+type ReadableRecord struct {
+	ID         string       `json:"id,omitempty"`
+	Names      []string     `json:"names,omitempty"`
+	BondID     string       `json:"bondId,omitempty"`
+	CreateTime string       `json:"createTime,omitempty"`
+	ExpiryTime string       `json:"expiryTime,omitempty"`
+	Deleted    bool         `json:"deleted,omitempty"`
+	Owners     []string     `json:"owners,omitempty"`
+	Attributes AttributeMap `json:"attributes,omitempty"`
+}
+
+// ToPayload converts PayloadEncodable to Payload object.
 // Why? Because go-amino can't handle maps: https://github.com/tendermint/go-amino/issues/4.
-func (payloadObj *PayloadType) ToPayload() (Payload, error) {
+func (payloadObj *ReadablePayload) ToPayload() Payload {
-	attributes, err := payLoadAttributes(payloadObj.Record)
+	// Note: record directly contains the attributes here
-	if err != nil {
+	attributes := payloadObj.RecordAttributes
-		return Payload{}, err
-	}
 	payload := Payload{
 		Record: &Record{
 			Deleted:    false,
 			Owners:     nil,
-			Attributes: attributes,
+			Attributes: helpers.MustMarshalJSON(attributes),
 		},
 		Signatures: payloadObj.Signatures,
 	}
-	return payload, nil
+	return payload
 }
 
-func payLoadAttributes(recordPayLoad map[string]interface{}) (*codectypes.Any, error) {
+// ToReadablePayload converts Payload to a serializable object
-	recordType, ok := recordPayLoad["type"]
+func (payload Payload) ToReadablePayload() ReadablePayload {
-	if !ok {
+	var encodable ReadablePayload
-		return &codectypes.Any{}, fmt.Errorf("cannot get type from payload")
-	}
-	bz := helpers.MarshalMapToJSONBytes(recordPayLoad)
 
-	switch recordType.(string) {
+	encodable.RecordAttributes = helpers.MustUnmarshalJSON[AttributeMap](payload.Record.Attributes)
-	case "ServiceProviderRegistration":
+	encodable.Signatures = payload.Signatures
-		{
-			var attributes ServiceProviderRegistration
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "WebsiteRegistrationRecord":
-		{
-			var attributes WebsiteRegistrationRecord
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "ApplicationRecord":
-		{
-			var attributes ApplicationRecord
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "ApplicationDeploymentRequest":
-		{
-			var attributes ApplicationDeploymentRequest
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "ApplicationDeploymentRecord":
-		{
-			var attributes ApplicationDeploymentRecord
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "ApplicationDeploymentRemovalRequest":
-		{
-			var attributes ApplicationDeploymentRemovalRequest
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "ApplicationDeploymentRemovalRecord":
-		{
-			var attributes ApplicationDeploymentRemovalRecord
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "ApplicationArtifact":
-		{
-			var attributes ApplicationArtifact
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "DnsRecord":
-		{
-			var attributes DnsRecord
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	case "GeneralRecord":
-		{
-			var attributes GeneralRecord
-			err := json.Unmarshal(bz, &attributes)
-			if err != nil {
-				return &codectypes.Any{}, err
-			}
-			return codectypes.NewAnyWithValue(&attributes)
-		}
-	default:
-		return &codectypes.Any{}, fmt.Errorf("unsupported record type %s", recordType.(string))
-	}
-}
 
-// ToReadablePayload converts Payload to PayloadType
+	return encodable
-// It will unmarshal with record attributes
-func (payload Payload) ToReadablePayload() PayloadType {
-	var payloadType PayloadType
-	bz, err := GetJSONBytesFromAny(*payload.Record.Attributes)
-	if err != nil {
-		panic(err)
-	}
-
-	payloadType.Record = helpers.UnMarshalMapFromJSONBytes(bz)
-	payloadType.Signatures = payload.Signatures
-
-	return payloadType
-}
-
-// Record to Record Type for human-readable attributes
-
-func (r *Record) ToRecordType() RecordType {
-	var resourceObj RecordType
-
-	resourceObj.ID = r.Id
-	resourceObj.BondID = r.BondId
-	resourceObj.CreateTime = r.CreateTime
-	resourceObj.ExpiryTime = r.ExpiryTime
-	resourceObj.Deleted = r.Deleted
-	resourceObj.Owners = r.Owners
-	resourceObj.Names = r.Names
-
-	bz, err := GetJSONBytesFromAny(*r.Attributes)
-	if err != nil {
-		panic(err)
-	}
-	resourceObj.Attributes = helpers.UnMarshalMapFromJSONBytes(bz)
-
-	return resourceObj
-}
-
-func GetJSONBytesFromAny(any codectypes.Any) ([]byte, error) {
-	var bz []byte
-	s := strings.Split(any.TypeUrl, ".")
-	switch s[len(s)-1] {
-	case "ServiceProviderRegistration":
-		{
-			var attributes ServiceProviderRegistration
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "WebsiteRegistrationRecord":
-		{
-			var attributes WebsiteRegistrationRecord
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "ApplicationRecord":
-		{
-			var attributes ApplicationRecord
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "ApplicationDeploymentRequest":
-		{
-			var attributes ApplicationDeploymentRequest
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "ApplicationDeploymentRecord":
-		{
-			var attributes ApplicationDeploymentRecord
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "ApplicationDeploymentRemovalRequest":
-		{
-			var attributes ApplicationDeploymentRemovalRequest
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "ApplicationDeploymentRemovalRecord":
-		{
-			var attributes ApplicationDeploymentRemovalRecord
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "ApplicationArtifact":
-		{
-			var attributes ApplicationArtifact
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "DnsRecord":
-		{
-			var attributes DnsRecord
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	case "GeneralRecord":
-		{
-			var attributes GeneralRecord
-			err := proto.Unmarshal(any.Value, &attributes)
-			if err != nil {
-				panic("Proto unmarshal error")
-			}
-
-			bz, err = json.Marshal(attributes)
-			if err != nil {
-				panic("JSON marshal error")
-			}
-		}
-	default:
-		return nil, fmt.Errorf("unsupported type %s", s[len(s)-1])
-	}
-
-	return bz, nil
-}
-
-// RecordType represents a WNS record.
-type RecordType struct {
-	ID         string                 `json:"id,omitempty"`
-	Names      []string               `json:"names,omitempty"`
-	BondID     string                 `json:"bondId,omitempty"`
-	CreateTime string                 `json:"createTime,omitempty"`
-	ExpiryTime string                 `json:"expiryTime,omitempty"`
-	Deleted    bool                   `json:"deleted,omitempty"`
-	Owners     []string               `json:"owners,omitempty"`
-	Attributes map[string]interface{} `json:"attributes,omitempty"`
 }
 
 // ToRecordObj converts Record to RecordObj.
 // Why? Because go-amino can't handle maps: https://github.com/tendermint/go-amino/issues/4.
-func (r *RecordType) ToRecordObj() (Record, error) {
+func (r *ReadableRecord) ToRecordObj() (Record, error) {
-	attributes, err := payLoadAttributes(r.Attributes)
-	if err != nil {
-		return Record{}, err
-	}
-
 	var resourceObj Record
 
 	resourceObj.Id = r.ID
@@ -351,23 +74,39 @@ func (r *RecordType) ToRecordObj() (Record, error) {
 	resourceObj.ExpiryTime = r.ExpiryTime
 	resourceObj.Deleted = r.Deleted
 	resourceObj.Owners = r.Owners
-	resourceObj.Attributes = attributes
+	resourceObj.Attributes = helpers.MustMarshalJSON(r.Attributes)
 
 	return resourceObj, nil
 }
 
+// ToReadableRecord converts Record to a serializable object
+func (r *Record) ToReadableRecord() ReadableRecord {
+	var resourceObj ReadableRecord
+
+	resourceObj.ID = r.Id
+	resourceObj.BondID = r.BondId
+	resourceObj.CreateTime = r.CreateTime
+	resourceObj.ExpiryTime = r.ExpiryTime
+	resourceObj.Deleted = r.Deleted
+	resourceObj.Owners = r.Owners
+	resourceObj.Names = r.Names
+	resourceObj.Attributes = helpers.MustUnmarshalJSON[AttributeMap](r.Attributes)
+
+	return resourceObj
+}
+
 // CanonicalJSON returns the canonical JSON representation of the record.
-func (r *RecordType) CanonicalJSON() []byte {
+func (r *ReadableRecord) CanonicalJSON() []byte {
-	bytes, err := canonicalJson.Marshal(r.Attributes)
+	bytes, err := canonicaljson.Marshal(r.Attributes)
 	if err != nil {
-		panic("Record marshal error.")
+		panic("error marshaling record: " + err.Error())
 	}
 
 	return bytes
 }
 
 // GetSignBytes generates a record hash to be signed.
-func (r *RecordType) GetSignBytes() ([]byte, []byte) {
+func (r *ReadableRecord) GetSignBytes() ([]byte, []byte) {
 	// Double SHA256 hash.
 
 	// Input to the first round of hashing.
@@ -387,7 +126,7 @@ func (r *RecordType) GetSignBytes() ([]byte, []byte) {
 }
 
 // GetCID gets the record CID.
-func (r *RecordType) GetCID() (string, error) {
+func (r *ReadableRecord) GetCID() (string, error) {
 	id, err := helpers.GetCid(r.CanonicalJSON())
 	if err != nil {
 		return "", err