WIP: Send eth tx wrapped in cosmos tx message

Fix protoc-gen-ts error with updated typescript
2023-03-08 20:30:11 +05:30 · 2023-03-08 20:27:59 +05:30
63 changed files with 10390 additions and 2011 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +0,0 @@
-Dockerfile
-node_modules
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@ -1,36 +0,0 @@
-name: Publish npm package to gitea
-on:
-  release:
-    types: [published]
-jobs:
-  npm_publish:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 18.x ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Download yarn
-        run: |
-          curl -fsSL -o /usr/local/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.21/yarn-1.22.21.js
-          chmod +x /usr/local/bin/yarn
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: yarn
-      - name: Run yarn build
-        run: |
-          yarn build
-      - name: Configure git.vdb.to npm registry
-        run: |
-          npm config set registry https://git.vdb.to/api/packages/cerc-io/npm/
-      - name: Authenticate to git.vdb.to registry
-        run: |
-          npm config set -- '//git.vdb.to/api/packages/cerc-io/npm/:_authToken' "${{ secrets.CICD_PUBLISH_TOKEN }}"
-      - name: npm publish
-        run: |
-          npm publish
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@ -1,63 +0,0 @@
-name: Tests
-on:
-  pull_request:
-    branches:
-      - '*'
-  push:
-    branches:
-      - main
-      - release/**
-
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-jobs:
-  sdk_tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Checkout laconicd
-        uses: actions/checkout@v3
-        with:
-          path: "./laconicd/"
-          repository: cerc-io/laconicd
-          fetch-depth: 0
-          ref: main
-      - name: Environment
-        run: ls -tlh && env
-
-      - name: Start dockerd
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-
-      - name: Build laconicd container
-        working-directory: laconicd/tests/sdk_tests
-        run: ./build-laconicd-container.sh
-      - name: Build laconic-sdk container
-        run: ./scripts/build-sdk-test-container.sh
-
-      - name: Start containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose up -d
-      - name: Run tests
-        working-directory: laconicd/tests/sdk_tests
-        run: ./run-tests.sh
-
-      - name: Start containers (auctions enabled)
-        working-directory: laconicd/tests/sdk_tests
-        env:
-          TEST_AUCTION_ENABLED: true
-        run: docker compose up -d
-      - name: Run auction tests
-        working-directory: laconicd/tests/sdk_tests
-        run: ./run-tests.sh test:auctions
-
-      - name: Start containers (expiry enabled)
-        working-directory: laconicd/tests/sdk_tests
-        env:
-          TEST_REGISTRY_EXPIRY: true
-        run: docker compose up -d
-      - name: Run nameservice expiry tests
-        working-directory: laconicd/tests/sdk_tests
-        run: ./run-tests.sh test:nameservice-expiry
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -20,34 +20,53 @@ jobs:
          ref: main
      - name: Environment
        run: ls -tlh && env
-
-      - name: Build laconicd container
+      - name: build containers scripts
        working-directory: laconicd/tests/sdk_tests
        run: ./build-laconicd-container.sh
-      - name: Build laconic-sdk container
-        run: ./scripts/build-sdk-test-container.sh
-
-      - name: Start containers
+      - name: build test-container
+        run: docker build -t cerc-io/laconic-sdk-tester:local-test -f laconicd/tests/sdk_tests/Dockerfile-sdk .
+      - name: start containers
        working-directory: laconicd/tests/sdk_tests
        run: docker compose up -d
-      - name: Run tests
+      - name: run basic tests
        working-directory: laconicd/tests/sdk_tests
-        run: ./run-tests.sh
-
-      - name: Start containers (auctions enabled)
+        run: |
+          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
+          cosmos_chain_id=laconic_9000-1
+          laconicd_rest_endpoint=http://laconicd:1317
+          laconicd_gql_endpoint=http://laconicd:9473/api
+          sleep 30s
+          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test"
+      - name: stop containers
        working-directory: laconicd/tests/sdk_tests
-        env:
-          TEST_AUCTION_ENABLED: true
-        run: docker compose up -d
-      - name: Run auction tests
+        run: docker compose down
+      - name: start auction containers
        working-directory: laconicd/tests/sdk_tests
-        run: ./run-tests.sh test:auctions
-
-      - name: Start containers (expiry enabled)
+        run: docker compose -f docker-compose-auctions.yml up -d
+      - name: run auction tests
        working-directory: laconicd/tests/sdk_tests
-        env:
-          TEST_REGISTRY_EXPIRY: true
-        run: docker compose up -d
-      - name: Run nameservice expiry tests
+        run: |
+          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
+          cosmos_chain_id=laconic_9000-1
+          laconicd_rest_endpoint=http://laconicd:1317
+          laconicd_gql_endpoint=http://laconicd:9473/api
+          sleep 30s
+          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test:auctions"
+      - name: start containers
        working-directory: laconicd/tests/sdk_tests
-        run: ./run-tests.sh test:nameservice-expiry
+        run: docker compose down
+      - name: start containers
+        working-directory: laconicd/tests/sdk_tests
+        run: docker compose -f docker-compose-nameservice.yml up -d
+      - name: run nameservice expiry tests
+        working-directory: laconicd/tests/sdk_tests
+        run: |
+          laconicd_key=$( docker compose exec laconicd echo y | docker compose exec laconicd laconicd keys export mykey --unarmored-hex --unsafe )
+          cosmos_chain_id=laconic_9000-1
+          laconicd_rest_endpoint=http://laconicd:1317
+          laconicd_gql_endpoint=http://laconicd:9473/api
+          sleep 30s
+          docker compose exec sdk-test-runner sh -c "COSMOS_CHAIN_ID=${cosmos_chain_id} LACONICD_REST_ENDPOINT=${laconicd_rest_endpoint} LACONICD_GQL_ENDPOINT=${laconicd_gql_endpoint} PRIVATE_KEY=${laconicd_key} yarn test:nameservice-expiry"
+      - name: stop nameservice containers
+        working-directory: laconicd/tests/sdk_tests
+        run: docker compose down
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@ -12,5 +12,13 @@ Run following scripts when [proto files](./proto/) are updated.
 2. Generate typescript code for the proto files

    ```bash
-    ./scripts/proto-gen.sh
+    ./scripts/create-proto-files.sh
    ```
+
+3. Remove GRPC code from generated code
+
+    ```bash
+    ./scripts/remove-grpc.sh
+    ```
+
+    Reference: https://github.com/tharsis/evmosjs/tree/main/packages/proto#note
--- a/26
+++ b/26
@ -21,18 +21,34 @@ RUN \
    && npm config -g set prefix ${NPM_GLOBAL} \
    && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \
    # Install eslint
-    && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
+    && su ${USERNAME} -c "umask 0002 && npm install -g eslint lerna jest" \
    && npm cache clean --force > /dev/null 2>&1

+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment if you want to install an additional version of node using nvm
+# ARG EXTRA_NODE_VERSION=10
+# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
+
+# [Optional] Uncomment if you want to install more global node modules
+# RUN su node -c "npm install -g <your-package-list-here>"
+
 WORKDIR /
+RUN mkdir node_modules && mkdir proto && mkdir scripts && mkdir src
+COPY node_modules ./node_modules/
+COPY proto . ./proto/
+COPY scripts ./scripts/
+COPY src ./src/
 COPY entrypoint.sh .
 ENTRYPOINT ["/entrypoint.sh"]
+# Placeholder CMD : generally this will be overridden at run time like :
+# docker run -it -v /home/builder/cerc/laconic-sdk:/workspace cerc/builder-js sh -c 'cd /workspace && yarn && yarn build'
 CMD node --version

-WORKDIR /app/laconic-sdk
-
-COPY package*.json .
+# Temp hack, clone the laconic-sdk repo here
+WORKDIR /app
 RUN yarn install
-COPY . .

 WORKDIR /app/laconic-sdk
--- a/README.md
+++ b/README.md
@ -34,12 +34,6 @@ Follow these steps to run the tests:

 - Run the tests with auctions enabled

-  - Remove laconicd data from previous run
-
-    ```bash
-    rm -rf ~/.laconicd
-    ```
-
  - In laconicd repo run:

    ```bash
@ -60,12 +54,6 @@ Follow these steps to run the tests:

 - Run the tests for record and authority expiry

-  - Remove laconicd data from previous run
-
-    ```bash
-    rm -rf ~/.laconicd
-    ```
-
  - In laconicd repo run:

    ```bash
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@cerc-io/laconic-sdk",
-  "version": "0.1.16",
+  "version": "0.1.6",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "repository": "git@github.com:cerc-io/laconic-sdk.git",
@ -14,7 +14,7 @@
    "dotenv": "^16.0.0",
    "google-protobuf": "^3.21.0",
    "jest": "29.0.0",
-    "protoc-gen-ts": "^0.8.7",
+    "protoc-gen-ts": "^0.8.6-rc1",
    "ts-jest": "^29.0.2",
    "typescript": "^4.6.2"
  },
@ -48,7 +48,7 @@
    "tiny-secp256k1": "^1.1.6"
  },
  "scripts": {
-    "test": "jest --runInBand --verbose --testPathPattern=src",
+    "test": "jest --runInBand --verbose",
    "test:auctions": "TEST_AUCTIONS_ENABLED=1 jest --runInBand --verbose src/auction.test.ts",
    "test:nameservice-expiry": "TEST_NAMESERVICE_EXPIRY=1 jest --runInBand --verbose src/nameservice-expiry.test.ts",
    "build": "tsc"
--- a/proto/cosmos_proto/cosmos.proto
+++ b/proto/cosmos_proto/cosmos.proto
@ -0,0 +1,97 @@
+syntax = "proto3";
+package cosmos_proto;
+
+import "google/protobuf/descriptor.proto";
+
+option go_package = "github.com/cosmos/cosmos-proto;cosmos_proto";
+
+extend google.protobuf.MessageOptions {
+
+    // implements_interface is used to indicate the type name of the interface
+    // that a message implements so that it can be used in google.protobuf.Any
+    // fields that accept that interface. A message can implement multiple
+    // interfaces. Interfaces should be declared using a declare_interface
+    // file option.
+    repeated string implements_interface = 93001;
+}
+
+extend google.protobuf.FieldOptions {
+
+    // accepts_interface is used to annotate that a google.protobuf.Any
+    // field accepts messages that implement the specified interface.
+    // Interfaces should be declared using a declare_interface file option.
+    string accepts_interface = 93001;
+
+    // scalar is used to indicate that this field follows the formatting defined
+    // by the named scalar which should be declared with declare_scalar. Code
+    // generators may choose to use this information to map this field to a
+    // language-specific type representing the scalar.
+    string scalar = 93002;
+}
+
+extend google.protobuf.FileOptions {
+
+    // declare_interface declares an interface type to be used with
+    // accepts_interface and implements_interface. Interface names are
+    // expected to follow the following convention such that their declaration
+    // can be discovered by tools: for a given interface type a.b.C, it is
+    // expected that the declaration will be found in a protobuf file named
+    // a/b/interfaces.proto in the file descriptor set.
+    repeated InterfaceDescriptor declare_interface = 793021;
+
+    // declare_scalar declares a scalar type to be used with
+    // the scalar field option. Scalar names are
+    // expected to follow the following convention such that their declaration
+    // can be discovered by tools: for a given scalar type a.b.C, it is
+    // expected that the declaration will be found in a protobuf file named
+    // a/b/scalars.proto in the file descriptor set.
+    repeated ScalarDescriptor declare_scalar = 793022;
+}
+
+// InterfaceDescriptor describes an interface type to be used with
+// accepts_interface and implements_interface and declared by declare_interface.
+message InterfaceDescriptor {
+
+    // name is the name of the interface. It should be a short-name (without
+    // a period) such that the fully qualified name of the interface will be
+    // package.name, ex. for the package a.b and interface named C, the
+    // fully-qualified name will be a.b.C.
+    string name = 1;
+
+    // description is a human-readable description of the interface and its
+    // purpose.
+    string description = 2;
+}
+
+// ScalarDescriptor describes an scalar type to be used with
+// the scalar field option and declared by declare_scalar.
+// Scalars extend simple protobuf built-in types with additional
+// syntax and semantics, for instance to represent big integers.
+// Scalars should ideally define an encoding such that there is only one
+// valid syntactical representation for a given semantic meaning,
+// i.e. the encoding should be deterministic.
+message ScalarDescriptor {
+
+    // name is the name of the scalar. It should be a short-name (without
+    // a period) such that the fully qualified name of the scalar will be
+    // package.name, ex. for the package a.b and scalar named C, the
+    // fully-qualified name will be a.b.C.
+    string name = 1;
+
+    // description is a human-readable description of the scalar and its
+    // encoding format. For instance a big integer or decimal scalar should
+    // specify precisely the expected encoding format.
+    string description = 2;
+
+    // field_type is the type of field with which this scalar can be used.
+    // Scalars can be used with one and only one type of field so that
+    // encoding standards and simple and clear. Currently only string and
+    // bytes fields are supported for scalars.
+    repeated ScalarType field_type = 3;
+}
+
+enum ScalarType {
+    SCALAR_TYPE_UNSPECIFIED = 0;
+    SCALAR_TYPE_STRING = 1;
+    SCALAR_TYPE_BYTES = 2;
+}
--- a/proto/ethermint/evm/v1/evm.proto
+++ b/proto/ethermint/evm/v1/evm.proto
@ -0,0 +1,243 @@
+syntax = "proto3";
+package ethermint.evm.v1;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/cerc-io/laconicd/x/evm/types";
+
+// Params defines the EVM module parameters
+message Params {
+  // evm_denom represents the token denomination used to run the EVM state
+  // transitions.
+  string evm_denom = 1 [(gogoproto.moretags) = "yaml:\"evm_denom\""];
+  // enable_create toggles state transitions that use the vm.Create function
+  bool enable_create = 2 [(gogoproto.moretags) = "yaml:\"enable_create\""];
+  // enable_call toggles state transitions that use the vm.Call function
+  bool enable_call = 3 [(gogoproto.moretags) = "yaml:\"enable_call\""];
+  // extra_eips defines the additional EIPs for the vm.Config
+  repeated int64 extra_eips = 4 [(gogoproto.customname) = "ExtraEIPs", (gogoproto.moretags) = "yaml:\"extra_eips\""];
+  // chain_config defines the EVM chain configuration parameters
+  ChainConfig chain_config = 5 [(gogoproto.moretags) = "yaml:\"chain_config\"", (gogoproto.nullable) = false];
+  // allow_unprotected_txs defines if replay-protected (i.e non EIP155
+  // signed) transactions can be executed on the state machine.
+  bool allow_unprotected_txs = 6;
+}
+
+// ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int values
+// instead of *big.Int.
+message ChainConfig {
+  // homestead_block switch (nil no fork, 0 = already homestead)
+  string homestead_block = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"homestead_block\""
+  ];
+  // dao_fork_block corresponds to TheDAO hard-fork switch block (nil no fork)
+  string dao_fork_block = 2 [
+    (gogoproto.customname) = "DAOForkBlock",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"dao_fork_block\""
+  ];
+  // dao_fork_support defines whether the nodes supports or opposes the DAO hard-fork
+  bool dao_fork_support = 3
+  [(gogoproto.customname) = "DAOForkSupport", (gogoproto.moretags) = "yaml:\"dao_fork_support\""];
+  // eip150_block: EIP150 implements the Gas price changes
+  // (https://github.com/ethereum/EIPs/issues/150) EIP150 HF block (nil no fork)
+  string eip150_block = 4 [
+    (gogoproto.customname) = "EIP150Block",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"eip150_block\""
+  ];
+  // eip150_hash: EIP150 HF hash (needed for header only clients as only gas pricing changed)
+  string eip150_hash = 5 [(gogoproto.customname) = "EIP150Hash", (gogoproto.moretags) = "yaml:\"byzantium_block\""];
+  // eip155_block: EIP155Block HF block
+  string eip155_block = 6 [
+    (gogoproto.customname) = "EIP155Block",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"eip155_block\""
+  ];
+  // eip158_block: EIP158 HF block
+  string eip158_block = 7 [
+    (gogoproto.customname) = "EIP158Block",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"eip158_block\""
+  ];
+  // byzantium_block: Byzantium switch block (nil no fork, 0 = already on byzantium)
+  string byzantium_block = 8 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"byzantium_block\""
+  ];
+  // constantinople_block: Constantinople switch block (nil no fork, 0 = already activated)
+  string constantinople_block = 9 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"constantinople_block\""
+  ];
+  // petersburg_block: Petersburg switch block (nil same as Constantinople)
+  string petersburg_block = 10 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"petersburg_block\""
+  ];
+  // istanbul_block: Istanbul switch block (nil no fork, 0 = already on istanbul)
+  string istanbul_block = 11 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"istanbul_block\""
+  ];
+  // muir_glacier_block: Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
+  string muir_glacier_block = 12 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"muir_glacier_block\""
+  ];
+  // berlin_block: Berlin switch block (nil = no fork, 0 = already on berlin)
+  string berlin_block = 13 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"berlin_block\""
+  ];
+  // DEPRECATED: EWASM, YOLOV3 and Catalyst block have been deprecated
+  reserved 14, 15, 16;
+  reserved "yolo_v3_block", "ewasm_block", "catalyst_block";
+  // london_block: London switch block (nil = no fork, 0 = already on london)
+  string london_block = 17 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"london_block\""
+  ];
+  // arrow_glacier_block: Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
+  string arrow_glacier_block = 18 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags)   = "yaml:\"arrow_glacier_block\""
+  ];
+  // DEPRECATED: merge fork block was deprecated: https://github.com/ethereum/go-ethereum/pull/24904
+  reserved 19;
+  reserved "merge_fork_block";
+  // gray_glacier_block: EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already activated)
+  string gray_glacier_block = 20 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags) = "yaml:\"gray_glacier_block\""
+  ];
+  // merge_netsplit_block: Virtual fork after The Merge to use as a network splitter
+  string merge_netsplit_block = 21 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags) = "yaml:\"merge_netsplit_block\""
+  ];
+  // shanghai_block switch block (nil = no fork, 0 = already on shanghai)
+  string shanghai_block = 22 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags) = "yaml:\"shanghai_block\""
+  ];
+  // cancun_block switch block (nil = no fork, 0 = already on cancun)
+  string cancun_block = 23 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.moretags) = "yaml:\"cancun_block\""
+  ];
+
+}
+
+// State represents a single Storage key value pair item.
+message State {
+  // key is the stored key
+  string key = 1;
+  // value is the stored value for the given key
+  string value = 2;
+}
+
+// TransactionLogs define the logs generated from a transaction execution
+// with a given hash. It it used for import/export data as transactions are not
+// persisted on blockchain state after an upgrade.
+message TransactionLogs {
+  // hash of the transaction
+  string hash = 1;
+  // logs is an array of Logs for the given transaction hash
+  repeated Log logs = 2;
+}
+
+// Log represents an protobuf compatible Ethereum Log that defines a contract
+// log event. These events are generated by the LOG opcode and stored/indexed by
+// the node.
+//
+// NOTE: address, topics and data are consensus fields. The rest of the fields
+// are derived, i.e. filled in by the nodes, but not secured by consensus.
+message Log {
+  // address of the contract that generated the event
+  string address = 1;
+  // topics is a list of topics provided by the contract.
+  repeated string topics = 2;
+  // data which is supplied by the contract, usually ABI-encoded
+  bytes data = 3;
+
+  // block_number of the block in which the transaction was included
+  uint64 block_number = 4 [(gogoproto.jsontag) = "blockNumber"];
+  // tx_hash is the transaction hash
+  string tx_hash = 5 [(gogoproto.jsontag) = "transactionHash"];
+  // tx_index of the transaction in the block
+  uint64 tx_index = 6 [(gogoproto.jsontag) = "transactionIndex"];
+  // block_hash of the block in which the transaction was included
+  string block_hash = 7 [(gogoproto.jsontag) = "blockHash"];
+  // index of the log in the block
+  uint64 index = 8 [(gogoproto.jsontag) = "logIndex"];
+
+  // removed is true if this log was reverted due to a chain
+  // reorganisation. You must pay attention to this field if you receive logs
+  // through a filter query.
+  bool removed = 9;
+}
+
+// TxResult stores results of Tx execution.
+message TxResult {
+  option (gogoproto.goproto_getters) = false;
+
+  // contract_address contains the ethereum address of the created contract (if
+  // any). If the state transition is an evm.Call, the contract address will be
+  // empty.
+  string contract_address = 1 [(gogoproto.moretags) = "yaml:\"contract_address\""];
+  // bloom represents the bloom filter bytes
+  bytes bloom = 2;
+  // tx_logs contains the transaction hash and the proto-compatible ethereum
+  // logs.
+  TransactionLogs tx_logs = 3 [(gogoproto.moretags) = "yaml:\"tx_logs\"", (gogoproto.nullable) = false];
+  // ret defines the bytes from the execution.
+  bytes ret = 4;
+  // reverted flag is set to true when the call has been reverted
+  bool reverted = 5;
+  // gas_used notes the amount of gas consumed while execution
+  uint64 gas_used = 6;
+}
+
+// AccessTuple is the element type of an access list.
+message AccessTuple {
+  option (gogoproto.goproto_getters) = false;
+
+  // address is a hex formatted ethereum address
+  string address = 1;
+  // storage_keys are hex formatted hashes of the storage keys
+  repeated string storage_keys = 2 [(gogoproto.jsontag) = "storageKeys"];
+}
+
+// TraceConfig holds extra parameters to trace functions.
+message TraceConfig {
+  // DEPRECATED: DisableMemory and DisableReturnData have been renamed to
+  // Enable*.
+  reserved 4, 7;
+  reserved "disable_memory", "disable_return_data";
+
+  // tracer is a custom javascript tracer
+  string tracer = 1;
+  // timeout overrides the default timeout of 5 seconds for JavaScript-based tracing
+  // calls
+  string timeout = 2;
+  // reexec defines the number of blocks the tracer is willing to go back
+  uint64 reexec = 3;
+  // disable_stack switches stack capture
+  bool disable_stack = 5 [(gogoproto.jsontag) = "disableStack"];
+  // disable_storage switches storage capture
+  bool disable_storage = 6 [(gogoproto.jsontag) = "disableStorage"];
+  // debug can be used to print output during capture end
+  bool debug = 8;
+  // limit defines the maximum length of output, but zero means unlimited
+  int32 limit = 9;
+  // overrides can be used to execute a trace using future fork rules
+  ChainConfig overrides = 10;
+  // enable_memory switches memory capture
+  bool enable_memory = 11 [(gogoproto.jsontag) = "enableMemory"];
+  // enable_return_data switches the capture of return data
+  bool enable_return_data = 12 [(gogoproto.jsontag) = "enableReturnData"];
+  // tracer_json_config configures the tracer using a JSON string
+  string tracer_json_config = 13 [(gogoproto.jsontag) = "tracerConfig"];
+}
--- a/proto/ethermint/evm/v1/genesis.proto
+++ b/proto/ethermint/evm/v1/genesis.proto
@ -0,0 +1,27 @@
+syntax = "proto3";
+package ethermint.evm.v1;
+
+import "ethermint/evm/v1/evm.proto";
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/cerc-io/laconicd/x/evm/types";
+
+// GenesisState defines the evm module's genesis state.
+message GenesisState {
+  // accounts is an array containing the ethereum genesis accounts.
+  repeated GenesisAccount accounts = 1 [(gogoproto.nullable) = false];
+  // params defines all the parameters of the module.
+  Params params = 2 [(gogoproto.nullable) = false];
+}
+
+// GenesisAccount defines an account to be initialized in the genesis state.
+// Its main difference between with Geth's GenesisAccount is that it uses a
+// custom storage type and that it doesn't contain the private key field.
+message GenesisAccount {
+  // address defines an ethereum hex formated address of an account
+  string address = 1;
+  // code defines the hex bytes of the account code.
+  string code = 2;
+  // storage defines the set of state key values for the account.
+  repeated State storage = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "Storage"];
+}
--- a/proto/ethermint/evm/v1/query.proto
+++ b/proto/ethermint/evm/v1/query.proto
@ -0,0 +1,298 @@
+syntax = "proto3";
+package ethermint.evm.v1;
+
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ethermint/evm/v1/evm.proto";
+import "ethermint/evm/v1/tx.proto";
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/cerc-io/laconicd/x/evm/types";
+
+// Query defines the gRPC querier service.
+service Query {
+  // Account queries an Ethereum account.
+  rpc Account(QueryAccountRequest) returns (QueryAccountResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/account/{address}";
+  }
+
+  // CosmosAccount queries an Ethereum account's Cosmos Address.
+  rpc CosmosAccount(QueryCosmosAccountRequest) returns (QueryCosmosAccountResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/cosmos_account/{address}";
+  }
+
+  // ValidatorAccount queries an Ethereum account's from a validator consensus
+  // Address.
+  rpc ValidatorAccount(QueryValidatorAccountRequest) returns (QueryValidatorAccountResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/validator_account/{cons_address}";
+  }
+
+  // Balance queries the balance of a the EVM denomination for a single
+  // EthAccount.
+  rpc Balance(QueryBalanceRequest) returns (QueryBalanceResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/balances/{address}";
+  }
+
+  // Storage queries the balance of all coins for a single account.
+  rpc Storage(QueryStorageRequest) returns (QueryStorageResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/storage/{address}/{key}";
+  }
+
+  // Code queries the balance of all coins for a single account.
+  rpc Code(QueryCodeRequest) returns (QueryCodeResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/codes/{address}";
+  }
+
+  // Params queries the parameters of x/evm module.
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/params";
+  }
+
+  // EthCall implements the `eth_call` rpc api
+  rpc EthCall(EthCallRequest) returns (MsgEthereumTxResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/eth_call";
+  }
+
+  // EstimateGas implements the `eth_estimateGas` rpc api
+  rpc EstimateGas(EthCallRequest) returns (EstimateGasResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/estimate_gas";
+  }
+
+  // TraceTx implements the `debug_traceTransaction` rpc api
+  rpc TraceTx(QueryTraceTxRequest) returns (QueryTraceTxResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/trace_tx";
+  }
+
+  // TraceBlock implements the `debug_traceBlockByNumber` and `debug_traceBlockByHash` rpc api
+  rpc TraceBlock(QueryTraceBlockRequest) returns (QueryTraceBlockResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/trace_block";
+  }
+
+  // BaseFee queries the base fee of the parent block of the current block,
+  // it's similar to feemarket module's method, but also checks london hardfork status.
+  rpc BaseFee(QueryBaseFeeRequest) returns (QueryBaseFeeResponse) {
+    option (google.api.http).get = "/ethermint/evm/v1/base_fee";
+  }
+}
+
+// QueryAccountRequest is the request type for the Query/Account RPC method.
+message QueryAccountRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // address is the ethereum hex address to query the account for.
+  string address = 1;
+}
+
+// QueryAccountResponse is the response type for the Query/Account RPC method.
+message QueryAccountResponse {
+  // balance is the balance of the EVM denomination.
+  string balance = 1;
+  // code_hash is the hex-formatted code bytes from the EOA.
+  string code_hash = 2;
+  // nonce is the account's sequence number.
+  uint64 nonce = 3;
+}
+
+// QueryCosmosAccountRequest is the request type for the Query/CosmosAccount RPC
+// method.
+message QueryCosmosAccountRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // address is the ethereum hex address to query the account for.
+  string address = 1;
+}
+
+// QueryCosmosAccountResponse is the response type for the Query/CosmosAccount
+// RPC method.
+message QueryCosmosAccountResponse {
+  // cosmos_address is the cosmos address of the account.
+  string cosmos_address = 1;
+  // sequence is the account's sequence number.
+  uint64 sequence = 2;
+  // account_number is the account number
+  uint64 account_number = 3;
+}
+
+// QueryValidatorAccountRequest is the request type for the
+// Query/ValidatorAccount RPC method.
+message QueryValidatorAccountRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // cons_address is the validator cons address to query the account for.
+  string cons_address = 1;
+}
+
+// QueryValidatorAccountResponse is the response type for the
+// Query/ValidatorAccount RPC method.
+message QueryValidatorAccountResponse {
+  // account_address is the cosmos address of the account in bech32 format.
+  string account_address = 1;
+  // sequence is the account's sequence number.
+  uint64 sequence = 2;
+  // account_number is the account number
+  uint64 account_number = 3;
+}
+
+// QueryBalanceRequest is the request type for the Query/Balance RPC method.
+message QueryBalanceRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // address is the ethereum hex address to query the balance for.
+  string address = 1;
+}
+
+// QueryBalanceResponse is the response type for the Query/Balance RPC method.
+message QueryBalanceResponse {
+  // balance is the balance of the EVM denomination.
+  string balance = 1;
+}
+
+// QueryStorageRequest is the request type for the Query/Storage RPC method.
+message QueryStorageRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // address is the ethereum hex address to query the storage state for.
+  string address = 1;
+
+  // key defines the key of the storage state
+  string key = 2;
+}
+
+// QueryStorageResponse is the response type for the Query/Storage RPC
+// method.
+message QueryStorageResponse {
+  // value defines the storage state value hash associated with the given key.
+  string value = 1;
+}
+
+// QueryCodeRequest is the request type for the Query/Code RPC method.
+message QueryCodeRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // address is the ethereum hex address to query the code for.
+  string address = 1;
+}
+
+// QueryCodeResponse is the response type for the Query/Code RPC
+// method.
+message QueryCodeResponse {
+  // code represents the code bytes from an ethereum address.
+  bytes code = 1;
+}
+
+// QueryTxLogsRequest is the request type for the Query/TxLogs RPC method.
+message QueryTxLogsRequest {
+  option (gogoproto.equal)           = false;
+  option (gogoproto.goproto_getters) = false;
+
+  // hash is the ethereum transaction hex hash to query the logs for.
+  string hash = 1;
+  // pagination defines an optional pagination for the request.
+  cosmos.base.query.v1beta1.PageRequest pagination = 2;
+}
+
+// QueryTxLogsResponse is the response type for the Query/TxLogs RPC method.
+message QueryTxLogsResponse {
+  // logs represents the ethereum logs generated from the given transaction.
+  repeated Log logs = 1;
+  // pagination defines the pagination in the response.
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+// QueryParamsRequest defines the request type for querying x/evm parameters.
+message QueryParamsRequest {}
+
+// QueryParamsResponse defines the response type for querying x/evm parameters.
+message QueryParamsResponse {
+  // params define the evm module parameters.
+  Params params = 1 [(gogoproto.nullable) = false];
+}
+
+// EthCallRequest defines EthCall request
+message EthCallRequest {
+  // args uses the same json format as the json rpc api.
+  bytes args = 1;
+  // gas_cap defines the default gas cap to be used
+  uint64 gas_cap = 2;
+  // proposer_address of the requested block in hex format
+  bytes proposer_address = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
+  // chain_id is the eip155 chain id parsed from the requested block header
+  int64 chain_id = 4;
+}
+
+// EstimateGasResponse defines EstimateGas response
+message EstimateGasResponse {
+  // gas returns the estimated gas
+  uint64 gas = 1;
+}
+
+// QueryTraceTxRequest defines TraceTx request
+message QueryTraceTxRequest {
+  // msg is the MsgEthereumTx for the requested transaction
+  MsgEthereumTx msg = 1;
+  // tx_index is not necessary anymore
+  reserved 2;
+  reserved "tx_index";
+  // trace_config holds extra parameters to trace functions.
+  TraceConfig trace_config = 3;
+  // predecessors is an array of transactions included in the same block
+  // need to be replayed first to get correct context for tracing.
+  repeated MsgEthereumTx predecessors = 4;
+  // block_number of requested transaction
+  int64 block_number = 5;
+  // block_hash of requested transaction
+  string block_hash = 6;
+  // block_time of requested transaction
+  google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+  // proposer_address is the proposer of the requested block
+  bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
+  // chain_id is the the eip155 chain id parsed from the requested block header
+  int64 chain_id = 9;
+}
+
+// QueryTraceTxResponse defines TraceTx response
+message QueryTraceTxResponse {
+  // data is the response serialized in bytes
+  bytes data = 1;
+}
+
+// QueryTraceBlockRequest defines TraceTx request
+message QueryTraceBlockRequest {
+  // txs is an array of messages in the block
+  repeated MsgEthereumTx txs = 1;
+  // trace_config holds extra parameters to trace functions.
+  TraceConfig trace_config = 3;
+  // block_number of the traced block
+  int64 block_number = 5;
+  // block_hash (hex) of the traced block
+  string block_hash = 6;
+  // block_time of the traced block
+  google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+  // proposer_address is the address of the requested block
+  bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
+  // chain_id is the eip155 chain id parsed from the requested block header
+  int64 chain_id = 9;
+}
+
+// QueryTraceBlockResponse defines TraceBlock response
+message QueryTraceBlockResponse {
+  // data is the response serialized in bytes
+  bytes data = 1;
+}
+
+// QueryBaseFeeRequest defines the request type for querying the EIP1559 base
+// fee.
+message QueryBaseFeeRequest {}
+
+// QueryBaseFeeResponse returns the EIP1559 base fee.
+message QueryBaseFeeResponse {
+  // base_fee is the EIP1559 base fee
+  string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
+}
--- a/proto/ethermint/evm/v1/tx.proto
+++ b/proto/ethermint/evm/v1/tx.proto
@ -0,0 +1,160 @@
+syntax = "proto3";
+package ethermint.evm.v1;
+
+import "cosmos_proto/cosmos.proto";
+import "ethermint/evm/v1/evm.proto";
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "google/protobuf/any.proto";
+
+option go_package = "github.com/cerc-io/laconicd/x/evm/types";
+
+// Msg defines the evm Msg service.
+service Msg {
+  // EthereumTx defines a method submitting Ethereum transactions.
+  rpc EthereumTx(MsgEthereumTx) returns (MsgEthereumTxResponse) {
+    option (google.api.http).post = "/ethermint/evm/v1/ethereum_tx";
+  };
+}
+
+// MsgEthereumTx encapsulates an Ethereum transaction as an SDK message.
+message MsgEthereumTx {
+  option (gogoproto.goproto_getters) = false;
+
+  // data is inner transaction data of the Ethereum transaction
+  google.protobuf.Any data = 1;
+
+  // size is the encoded storage size of the transaction (DEPRECATED)
+  double size = 2 [(gogoproto.jsontag) = "-"];
+  // hash of the transaction in hex format
+  string hash = 3 [(gogoproto.moretags) = "rlp:\"-\""];
+  // from is the ethereum signer address in hex format. This address value is checked
+  // against the address derived from the signature (V, R, S) using the
+  // secp256k1 elliptic curve
+  string from = 4;
+}
+
+// LegacyTx is the transaction data of regular Ethereum transactions.
+// NOTE: All non-protected transactions (i.e non EIP155 signed) will fail if the
+// AllowUnprotectedTxs parameter is disabled.
+message LegacyTx {
+  option (gogoproto.goproto_getters)         = false;
+  option (cosmos_proto.implements_interface) = "TxData";
+
+  // nonce corresponds to the account nonce (transaction sequence).
+  uint64 nonce = 1;
+  // gas_price defines the value for each gas unit
+  string gas_price = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
+  // gas defines the gas limit defined for the transaction.
+  uint64 gas = 3 [(gogoproto.customname) = "GasLimit"];
+  // to is the hex formatted address of the recipient
+  string to = 4;
+  // value defines the unsigned integer value of the transaction amount.
+  string value = 5
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
+  // data is the data payload bytes of the transaction.
+  bytes data = 6;
+  // v defines the signature value
+  bytes v = 7;
+  // r defines the signature value
+  bytes r = 8;
+  // s define the signature value
+  bytes s = 9;
+}
+
+// AccessListTx is the data of EIP-2930 access list transactions.
+message AccessListTx {
+  option (gogoproto.goproto_getters)         = false;
+  option (cosmos_proto.implements_interface) = "TxData";
+
+  // chain_id of the destination EVM chain
+  string chain_id = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.jsontag)    = "chainID"
+  ];
+  // nonce corresponds to the account nonce (transaction sequence).
+  uint64 nonce = 2;
+  // gas_price defines the value for each gas unit
+  string gas_price = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
+  // gas defines the gas limit defined for the transaction.
+  uint64 gas = 4 [(gogoproto.customname) = "GasLimit"];
+  // to is the recipient address in hex format
+  string to = 5;
+  // value defines the unsigned integer value of the transaction amount.
+  string value = 6
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
+  // data is the data payload bytes of the transaction.
+  bytes data = 7;
+  // accesses is an array of access tuples
+  repeated AccessTuple accesses = 8
+      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
+  // v defines the signature value
+  bytes v = 9;
+  // r defines the signature value
+  bytes r = 10;
+  // s define the signature value
+  bytes s = 11;
+}
+
+// DynamicFeeTx is the data of EIP-1559 dinamic fee transactions.
+message DynamicFeeTx {
+  option (gogoproto.goproto_getters)         = false;
+  option (cosmos_proto.implements_interface) = "TxData";
+
+  // chain_id of the destination EVM chain
+  string chain_id = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.jsontag)    = "chainID"
+  ];
+  // nonce corresponds to the account nonce (transaction sequence).
+  uint64 nonce = 2;
+  // gas_tip_cap defines the max value for the gas tip
+  string gas_tip_cap = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
+  // gas_fee_cap defines the max value for the gas fee
+  string gas_fee_cap = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
+  // gas defines the gas limit defined for the transaction.
+  uint64 gas = 5 [(gogoproto.customname) = "GasLimit"];
+  // to is the hex formatted address of the recipient
+  string to = 6;
+  // value defines the the transaction amount.
+  string value = 7
+      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
+  // data is the data payload bytes of the transaction.
+  bytes data = 8;
+  // accesses is an array of access tuples
+  repeated AccessTuple accesses = 9
+      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
+  // v defines the signature value
+  bytes v = 10;
+  // r defines the signature value
+  bytes r = 11;
+  // s define the signature value
+  bytes s = 12;
+}
+
+// ExtensionOptionsEthereumTx is an extension option for ethereum transactions
+message ExtensionOptionsEthereumTx {
+  option (gogoproto.goproto_getters) = false;
+}
+
+// MsgEthereumTxResponse defines the Msg/EthereumTx response type.
+message MsgEthereumTxResponse {
+  option (gogoproto.goproto_getters) = false;
+
+  // hash of the ethereum transaction in hex format. This hash differs from the
+  // Tendermint sha256 hash of the transaction bytes. See
+  // https://github.com/tendermint/tendermint/issues/6539 for reference
+  string hash = 1;
+  // logs contains the transaction hash and the proto-compatible ethereum
+  // logs.
+  repeated Log logs = 2;
+  // ret is the returned data from evm function (result or data supplied with revert
+  // opcode)
+  bytes ret = 3;
+  // vm_error is the error returned by vm execution
+  string vm_error = 4;
+  // gas_used specifies how much gas was consumed by the transaction
+  uint64 gas_used = 5;
+}
--- a/proto/google/protobuf/duration.proto
+++ b/proto/google/protobuf/duration.proto
@ -1,115 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/durationpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DurationProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-
-// A Duration represents a signed, fixed-length span of time represented
-// as a count of seconds and fractions of seconds at nanosecond
-// resolution. It is independent of any calendar and concepts like "day"
-// or "month". It is related to Timestamp in that the difference between
-// two Timestamp values is a Duration and it can be added or subtracted
-// from a Timestamp. Range is approximately +-10,000 years.
-//
-// # Examples
-//
-// Example 1: Compute Duration from two Timestamps in pseudo code.
-//
-//     Timestamp start = ...;
-//     Timestamp end = ...;
-//     Duration duration = ...;
-//
-//     duration.seconds = end.seconds - start.seconds;
-//     duration.nanos = end.nanos - start.nanos;
-//
-//     if (duration.seconds < 0 && duration.nanos > 0) {
-//       duration.seconds += 1;
-//       duration.nanos -= 1000000000;
-//     } else if (duration.seconds > 0 && duration.nanos < 0) {
-//       duration.seconds -= 1;
-//       duration.nanos += 1000000000;
-//     }
-//
-// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
-//
-//     Timestamp start = ...;
-//     Duration duration = ...;
-//     Timestamp end = ...;
-//
-//     end.seconds = start.seconds + duration.seconds;
-//     end.nanos = start.nanos + duration.nanos;
-//
-//     if (end.nanos < 0) {
-//       end.seconds -= 1;
-//       end.nanos += 1000000000;
-//     } else if (end.nanos >= 1000000000) {
-//       end.seconds += 1;
-//       end.nanos -= 1000000000;
-//     }
-//
-// Example 3: Compute Duration from datetime.timedelta in Python.
-//
-//     td = datetime.timedelta(days=3, minutes=10)
-//     duration = Duration()
-//     duration.FromTimedelta(td)
-//
-// # JSON Mapping
-//
-// In JSON format, the Duration type is encoded as a string rather than an
-// object, where the string ends in the suffix "s" (indicating seconds) and
-// is preceded by the number of seconds, with nanoseconds expressed as
-// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
-// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
-// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
-// microsecond should be expressed in JSON format as "3.000001s".
-//
-message Duration {
-  // Signed seconds of the span of time. Must be from -315,576,000,000
-  // to +315,576,000,000 inclusive. Note: these bounds are computed from:
-  // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-  int64 seconds = 1;
-
-  // Signed fractions of a second at nanosecond resolution of the span
-  // of time. Durations less than one second are represented with a 0
-  // `seconds` field and a positive or negative `nanos` field. For durations
-  // of one second or more, a non-zero value for the `nanos` field must be
-  // of the same sign as the `seconds` field. Must be from -999,999,999
-  // to +999,999,999 inclusive.
-  int32 nanos = 2;
-}
--- a/proto/google/protobuf/timestamp.proto
+++ b/proto/google/protobuf/timestamp.proto
@ -1,144 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/timestamppb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "TimestampProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-
-// A Timestamp represents a point in time independent of any time zone or local
-// calendar, encoded as a count of seconds and fractions of seconds at
-// nanosecond resolution. The count is relative to an epoch at UTC midnight on
-// January 1, 1970, in the proleptic Gregorian calendar which extends the
-// Gregorian calendar backwards to year one.
-//
-// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
-// second table is needed for interpretation, using a [24-hour linear
-// smear](https://developers.google.com/time/smear).
-//
-// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
-// restricting to that range, we ensure that we can convert to and from [RFC
-// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
-//
-// # Examples
-//
-// Example 1: Compute Timestamp from POSIX `time()`.
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(time(NULL));
-//     timestamp.set_nanos(0);
-//
-// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-//
-//     struct timeval tv;
-//     gettimeofday(&tv, NULL);
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(tv.tv_sec);
-//     timestamp.set_nanos(tv.tv_usec * 1000);
-//
-// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-//
-//     FILETIME ft;
-//     GetSystemTimeAsFileTime(&ft);
-//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
-//
-//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-//     Timestamp timestamp;
-//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-//
-// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-//
-//     long millis = System.currentTimeMillis();
-//
-//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-//         .setNanos((int) ((millis % 1000) * 1000000)).build();
-//
-// Example 5: Compute Timestamp from Java `Instant.now()`.
-//
-//     Instant now = Instant.now();
-//
-//     Timestamp timestamp =
-//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
-//             .setNanos(now.getNano()).build();
-//
-// Example 6: Compute Timestamp from current time in Python.
-//
-//     timestamp = Timestamp()
-//     timestamp.GetCurrentTime()
-//
-// # JSON Mapping
-//
-// In JSON format, the Timestamp type is encoded as a string in the
-// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
-// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
-// where {year} is always expressed using four digits while {month}, {day},
-// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-// is required. A proto3 JSON serializer should always use UTC (as indicated by
-// "Z") when printing the Timestamp type and a proto3 JSON parser should be
-// able to accept both UTC and other timezones (as indicated by an offset).
-//
-// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-// 01:30 UTC on January 15, 2017.
-//
-// In JavaScript, one can convert a Date object to this format using the
-// standard
-// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using
-// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
-// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
-// the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
-// ) to obtain a formatter capable of generating timestamps in this format.
-//
-message Timestamp {
-  // Represents seconds of UTC time since Unix epoch
-  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-  // 9999-12-31T23:59:59Z inclusive.
-  int64 seconds = 1;
-
-  // Non-negative fractions of a second at nanosecond resolution. Negative
-  // second values with fractions must still have non-negative nanos values
-  // that count forward in time. Must be from 0 to 999,999,999
-  // inclusive.
-  int32 nanos = 2;
-}
--- a/proto/vulcanize/registry/v1beta1/attributes.proto
+++ b/proto/vulcanize/registry/v1beta1/attributes.proto
@ -0,0 +1,33 @@
+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\""];
+}
--- a/proto/vulcanize/registry/v1beta1/query.proto
+++ b/proto/vulcanize/registry/v1beta1/query.proto
@ -67,25 +67,17 @@ message QueryParamsResponse {

 // QueryListRecordsRequest is request type for registry records list
 message QueryListRecordsRequest {
-  message LinkInput {
+  message ReferenceInput {
    string id = 1;
  }
-  message ArrayInput {
-    repeated ValueInput values = 1;
-  }
-  message MapInput {
-    map<string, ValueInput> values = 1;
-  }
  message ValueInput {
-    oneof value {
-      string string    = 1;
-      int64 int        = 2;
-      double float     = 3;
-      bool boolean     = 4;
-      string link      = 5;
-      ArrayInput array = 6;
-      MapInput map     = 7;
-    }
+    string type                   = 1;
+    string string                 = 2;
+    int64 int                     = 3;
+    double float                  = 4;
+    bool                boolean   = 5;
+    ReferenceInput      reference = 6;
+    repeated ValueInput values    = 7;
  }
  message KeyValueInput {
    string     key   = 1;
--- a/proto/vulcanize/registry/v1beta1/registry.proto
+++ b/proto/vulcanize/registry/v1beta1/registry.proto
@ -5,6 +5,7 @@ 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";

@ -57,15 +58,15 @@ message Params {

 // Params defines the registry module records
 message Record {
-  string          id          = 1 [(gogoproto.moretags) = "json:\"id\" yaml:\"id\""];
-  string          bond_id     = 2 [(gogoproto.moretags) = "json:\"bondId\" yaml:\"bondId\""];
-  string          create_time = 3 [(gogoproto.moretags) = "json:\"createTime\" yaml:\"createTime\""];
-  string          expiry_time = 4 [(gogoproto.moretags) = "json:\"expiryTime\" yaml:\"expiryTime\""];
-  bool            deleted     = 5;
-  repeated string owners      = 6 [(gogoproto.moretags) = "json:\"owners\" yaml:\"owners\""];
-  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\""];
+  string              id          = 1 [(gogoproto.moretags) = "json:\"id\" yaml:\"id\""];
+  string              bond_id     = 2 [(gogoproto.moretags) = "json:\"bondId\" yaml:\"bondId\""];
+  string              create_time = 3 [(gogoproto.moretags) = "json:\"createTime\" yaml:\"createTime\""];
+  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\""];
+  repeated string     names       = 8 [(gogoproto.moretags) = "json:\"names\" yaml:\"names\""];
+  string              type        = 9 [(gogoproto.moretags) = "json:\"types\" yaml:\"types\""];
 }

 // AuthorityEntry defines the registry module AuthorityEntries
@ -130,4 +131,4 @@ message BlockChangeSet {
 message AuctionBidInfo {
  string auction_id     = 1 [(gogoproto.moretags) = "json:\"auctionID\" yaml:\"auctionID\""];
  string bidder_address = 2 [(gogoproto.moretags) = "json:\"bidderAddress\" yaml:\"bidderAddress\""];
-}
+}
--- a/scripts/build-sdk-test-container.sh
+++ b/scripts/build-sdk-test-container.sh
@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-docker build -t cerc/laconic-sdk-tester:local -f Dockerfile .
--- a/scripts/create-proto-files.sh
+++ b/scripts/create-proto-files.sh
@ -0,0 +1,12 @@
+#!/bin/bash
+# NOTE: protoc is required
+
+I=$(pwd)/proto
+DEST_TS=$(pwd)/src/proto/
+mkdir -p $DEST_TS
+
+protoc \
+--plugin=protoc-gen-ts=./node_modules/.bin/protoc-gen-ts \
+--ts_out=$DEST_TS \
+--proto_path=$I \
+$(find $(pwd)/proto/vulcanize $(pwd)/proto/ethermint -iname "*.proto")
--- a/scripts/proto-gen.sh
+++ b/scripts/proto-gen.sh
@ -1,40 +0,0 @@
-#!/bin/bash
-# NOTE: protoc is required
-
-set -e
-
-REPO_ROOT=$(pwd)
-I=$REPO_ROOT/proto
-DEST_TS=$REPO_ROOT/src/proto/
-
-echo "Generating protobuf files"
-
-mkdir -p $DEST_TS
-
-protoc \
-  --plugin=protoc-gen-ts=$REPO_ROOT/node_modules/.bin/protoc-gen-ts \
-  --ts_out=$DEST_TS \
-  --proto_path=$I \
-  $(find $REPO_ROOT/proto/vulcanize -iname "*.proto")
-
-SED='sed -i'
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  SED='sed -i ""'
-fi
-
-echo "Removing gRPC references..."
-# https://github.com/tharsis/evmosjs/tree/main/packages/proto#note
-
-for file in $(find $REPO_ROOT/src/proto -type f)
-do
-  line=$(grep -n '@grpc/grpc-js' $file | cut -f1 -d':')
-  if [[ -n "$line" ]] && [[ "$line" -gt 0 ]]; then
-    echo "Processing file: $file"
-    $SED "${line}d" ${file}
-    functions=$(grep -n 'interface GrpcUnaryServiceInterface' $file | cut -f1 -d':')
-    $SED "${functions},\$d" ${file}
-    echo '}' >> $file
-  fi
-  $SED '1s#^#/* eslint-disable */\n#' $file
-  $SED '1s#^#// @ts-nocheck\n#' $file
-done
--- a/scripts/remove-grpc.sh
+++ b/scripts/remove-grpc.sh
@ -0,0 +1,16 @@
+#!/bin/bash
+echo $PWD
+for file in $(find src/proto -type f)
+do
+    line=$(grep -n '@grpc/grpc-js' $file | cut -f1 -d':')
+    if [[ $line -gt 0 ]];
+    then
+        echo "Processing file... $file"
+        sed -i "${line}d" ${file}
+        functions=$(grep -n 'interface GrpcUnaryServiceInterface' $file | cut -f1 -d':')
+        sed -i "${functions},\$d" ${file}
+        echo '}' >> $file
+    fi
+    sed -i '1s#^#/* eslint-disable */\n#' $file
+    sed -i '1s#^#// @ts-nocheck\n#' $file
+done
--- a/src/account.ts
+++ b/src/account.ts
@ -166,6 +166,10 @@ export class Account {
    assert(message);
    const eipMessageDomain: any = message.eipToSign.domain;

+    if(message.eipToSign.message.msgs[0].value.payload!=null){
+      message.eipToSign.message.msgs[0].value.payload.record.attributes.value=Array.from(message.eipToSign.message.msgs[0].value.payload.record.attributes.value)
+    }
+
    const signature = signTypedData({
      data: {
        types: message.eipToSign.types as MessageTypes,
--- a/src/artifacts/PhisherRegistry.json
+++ b/src/artifacts/PhisherRegistry.json
--- a/src/bond.test.ts
+++ b/src/bond.test.ts
@ -12,10 +12,20 @@ jest.setTimeout(90 * 1000);
 const bondTests = () => {
  let registry: Registry;

+  let watcher: any;
+
+  let version1: string;
+  let version2: string;
+
+  let bondId1: string;
+  let bondId2: string;
+
+  let bondOwner: string;
+
  const publishNewWatcherVersion = async (bondId: string) => {
-    let watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
+    watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
    await registry.setRecord({ privateKey, record: watcher.record, bondId }, privateKey, fee);
-    return watcher;
+    return watcher.record.version;
  };

  beforeAll(async () => {
@ -23,119 +33,93 @@ const bondTests = () => {
  });

  test('Create bond.', async () => {
-    let bondId = await registry.getNextBondId(privateKey);
-    expect(bondId).toBeDefined();
+    bondId1 = await registry.getNextBondId(privateKey);
+    expect(bondId1).toBeDefined();
    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
+  })
+
+  test('Get bond by ID.', async () => {
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond).toBeDefined();
+    expect(bond.id).toBe(bondId1);
+    expect(bond.balance).toHaveLength(1);
+    expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
+    bondOwner = bond.owner;
  });

-  describe('With bond created', () => {
-    let bond1: any
+  test('Query bonds.', async () => {
+    const bonds = await registry.queryBonds();
+    expect(bonds).toBeDefined();
+    const bond = bonds.filter((bond: any) => bond.id === bondId1);
+    expect(bond).toBeDefined();
+  });

-    beforeAll(async () => {
-      let bondId1 = await registry.getNextBondId(privateKey);
-      expect(bondId1).toBeDefined();
-      await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
+  test('Query bonds by owner.', async () => {
+    const bonds = await registry.queryBonds({ owner: bondOwner });
+    expect(bonds).toBeDefined();
+    const bond = bonds.filter((bond: any) => bond.id === bondId1);
+    expect(bond).toBeDefined();
+  });

-      [bond1] = await registry.getBondsByIds([bondId1]);
-      expect(bond1).toBeDefined();
-      expect(bond1.id).toEqual(bondId1);
-    });
+  test('Refill bond.', async () => {
+    await registry.refillBond({ id: bondId1, denom: 'aphoton', amount: '500' }, privateKey, fee);

-    test('Get bond by ID.', async () => {
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond).toBeDefined();
-      expect(bond.id).toBe(bond1.id);
-      expect(bond.balance).toHaveLength(1);
-      expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
-    });
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond).toBeDefined();
+    expect(bond.id).toBe(bondId1);
+    expect(bond.balance).toHaveLength(1);
+    expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000500' });
+  });

-    test('Query bonds.', async () => {
-      const bonds = await registry.queryBonds();
-      expect(bonds).toBeDefined();
-      const bond = bonds.filter((bond: any) => bond.id === bond1.id);
-      expect(bond).toBeDefined();
-    });
+  test('Withdraw bond.', async () => {
+    await registry.withdrawBond({ id: bondId1, denom: 'aphoton', amount: '500' }, privateKey, fee);

-    test('Query bonds by owner.', async () => {
-      const bonds = await registry.queryBonds({ owner: bond1.owner });
-      expect(bonds).toBeDefined();
-      const bond = bonds.filter((bond: any) => bond.id === bond1.id);
-      expect(bond).toBeDefined();
-    });
+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond).toBeDefined();
+    expect(bond.id).toBe(bondId1);
+    expect(bond.balance).toHaveLength(1);
+    expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
+  });

-    test('Refill bond.', async () => {
-      await registry.refillBond({ id: bond1.id, denom: 'aphoton', amount: '500' }, privateKey, fee);
-
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond).toBeDefined();
-      expect(bond.id).toBe(bond1.id);
-      expect(bond.balance).toHaveLength(1);
-      expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000500' });
-    });
-
-    test('Withdraw bond.', async () => {
-      await registry.withdrawBond({ id: bond1.id, denom: 'aphoton', amount: '500' }, privateKey, fee);
-
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond).toBeDefined();
-      expect(bond.id).toBe(bond1.id);
-      expect(bond.balance).toHaveLength(1);
-      expect(bond.balance[0]).toEqual({ type: 'aphoton', quantity: '1000000000' });
-    });
-
-    test('Cancel bond.', async () => {
-      await registry.cancelBond({ id: bond1.id }, privateKey, fee);
-
-      const [bond] = await registry.getBondsByIds([bond1.id]);
-      expect(bond.id).toBe("");
-      expect(bond.owner).toBe("");
-      expect(bond.balance).toHaveLength(0);
-    });
+  test('Cancel bond.', async () => {
+    await registry.cancelBond({ id: bondId1 }, privateKey, fee);

+    const [bond] = await registry.getBondsByIds([bondId1]);
+    expect(bond.id).toBe("");
+    expect(bond.owner).toBe("");
+    expect(bond.balance).toHaveLength(0);
  });

  test('Associate/Dissociate bond.', async () => {
-    let bondId1: string;
-
    bondId1 = await registry.getNextBondId(privateKey);
    expect(bondId1).toBeDefined();
    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);

    // Create a new record.
-    let watcher = await publishNewWatcherVersion(bondId1);
-    let query = { type: watcher.record.type, url: watcher.record.url, version: watcher.record.version };
-    let [record1] = await registry.queryRecords(query, true);
+    version1 = await publishNewWatcherVersion(bondId1);
+    let [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
    expect(record1.bondId).toBe(bondId1);

    // Dissociate record, query and confirm.
    await registry.dissociateBond({ recordId: record1.id }, privateKey, fee);
-    [record1] = await registry.queryRecords(query, true);
+    [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
    expect(record1.bondId).toBe('');

    // Associate record with bond, query and confirm.
    await registry.associateBond({ recordId: record1.id, bondId: bondId1 }, privateKey, fee);
-    [record1] = await registry.queryRecords(query, true);
+    [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
    expect(record1.bondId).toBe(bondId1);
  });

  test('Reassociate/Dissociate records.', async () => {
-    let bondId1: string;
-    let bondId2: string;
-
-    bondId1 = await registry.getNextBondId(privateKey);
-    expect(bondId1).toBeDefined();
-    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
-
    // Create a new record version.
-    let watcher = await publishNewWatcherVersion(bondId1);
-    let queryv1 = { type: watcher.record.type, url: watcher.record.url, version: watcher.record.version };
-    let queryv2 = { type: watcher.record.type, url: watcher.record.url, version: watcher.record.version };
+    version2 = await publishNewWatcherVersion(bondId1);

    // Check version1, version2 as associated with bondId1.
    let records;
-    records = await registry.queryRecords(queryv1, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
    expect(records[0].bondId).toBe(bondId1);
-    records = await registry.queryRecords(queryv2, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
    expect(records[0].bondId).toBe(bondId1);

    // Create another bond.
@ -147,16 +131,16 @@ const bondTests = () => {

    // Reassociate records from bondId1 to bondId2, verify change.
    await registry.reassociateRecords({ oldBondId: bondId1, newBondId: bondId2 }, privateKey, fee);
-    records = await registry.queryRecords(queryv1, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
    expect(records[0].bondId).toBe(bondId2);
-    records = await registry.queryRecords(queryv2, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
    expect(records[0].bondId).toBe(bondId2);

    // Dissociate all records from bond, verify change.
    await registry.dissociateRecords({ bondId: bondId2 }, privateKey, fee);
-    records = await registry.queryRecords(queryv1, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
    expect(records[0].bondId).toBe('');
-    records = await registry.queryRecords(queryv2, true);
+    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
    expect(records[0].bondId).toBe('');
  });
 };
--- a/src/evm.test.ts
+++ b/src/evm.test.ts
@ -0,0 +1,51 @@
+import { ethers } from 'ethers';
+
+import { Account } from './account';
+import { Registry } from './index';
+import { getConfig } from './testing/helper';
+import { abi } from './artifacts/PhisherRegistry.json'
+
+const { chainId, restEndpoint, gqlEndpoint, privateKey, fee } = getConfig();
+
+jest.setTimeout(90 * 1000);
+
+const CONTRACT_ADDRESS = "0xD035Adc6d41f9136C9C19434E0500F7706664e66"
+const ETH_RPC_ENDPOINT = "http://localhost:8545"
+
+const evmTests = () => {
+  let registry: Registry;
+
+  beforeAll(async () => {
+    registry = new Registry(gqlEndpoint, restEndpoint, chainId);
+
+  });
+
+  test.only('Send eth tx for contract method.', async() => {
+    // TODO: Refactor inside sendEthTx?
+    const provider = new ethers.providers.JsonRpcProvider(ETH_RPC_ENDPOINT)
+    const signer = new ethers.Wallet(privateKey, provider)
+    const contract = new ethers.Contract(CONTRACT_ADDRESS, abi, signer);
+    
+    const populatedTx = await contract.populateTransaction
+      .claimIfPhisher('phisher1', true);
+    
+    const signerPopulatedTx = await signer.populateTransaction(populatedTx);
+    const signedTxString = await signer.signTransaction(signerPopulatedTx);
+    const tx = ethers.utils.parseTransaction(signedTxString);
+
+    // TODO: Use laconicd queries in evm module
+    tx.gasLimit = await provider.estimateGas(signerPopulatedTx);
+    console.log('tx', tx)
+
+    await registry.sendEthTx(
+      {
+        tx,
+        from: signer.address
+      },
+      privateKey,
+      fee
+    );
+  })
+}
+
+describe('evm', evmTests);
--- a/src/index.ts
+++ b/src/index.ts
@ -7,11 +7,12 @@ import {
  createMessageSend,
  MessageSendParams
 } from '@tharsis/transactions'
+import { ethers } from 'ethers';

 import { RegistryClient } from "./registry-client";
 import { Account } from "./account";
 import { createTransaction } from "./txbuilder";
-import { Payload, Record } from './types';
+import { EthereumTxData, Payload, Record } from './types';
 import { Util } from './util';
 import {
  createTxMsgAssociateBond,
@ -51,10 +52,11 @@ import {
  MessageMsgCommitBid,
  MessageMsgRevealBid
 } from './messages/auction';
+import { createTxMsgEthereumTx, MessageMsgEthereumTx } from './messages/evm';

 export const DEFAULT_CHAIN_ID = 'laconic_9000-1';

-const DEFAULT_WRITE_ERROR = 'Unable to write to laconicd';
+const DEFAULT_WRITE_ERROR = 'Unable to write to laconicd.';

 // Parse Tx response from cosmos-sdk.
 export const parseTxResponse = (result: any, parseResponse?: (data: string) => any) => {
@ -117,8 +119,7 @@ export class Registry {
      console.error(error)
    }

-    const [lastErrorLine] = error.split("\n").slice(-1);
-    return `${errorMessage || DEFAULT_WRITE_ERROR}: ${lastErrorLine}`;
+    return errorMessage || DEFAULT_WRITE_ERROR;
  }

  constructor(gqlUrl: string, restUrl: string = "", chainId: string = DEFAULT_CHAIN_ID) {
@ -181,9 +182,9 @@ export class Registry {
  }

  /**
-   * Publish record.
-   * @param transactionPrivateKey - private key in HEX to sign transaction.
-   */
+ * Publish record.
+ * @param transactionPrivateKey - private key in HEX to sign transaction.
+ */
  async setRecord(
    params: { privateKey: string, record: any, bondId: string },
    transactionPrivateKey: string,
@ -463,6 +464,31 @@ export class Registry {
    return parseTxResponse(result);
  }

+  /**
+   * Send ethereum transaction.
+   */
+  async sendEthTx(
+    { tx, from }: { tx: ethers.Transaction, from: string },
+    privateKey: string,
+    fee: Fee
+  ) {
+    let result;
+    const account = new Account(Buffer.from(privateKey, 'hex'));
+    console.log('account.registryAddress', account.registryAddress);
+    const sender = await this._getSender(account);
+
+    const msgParams = {
+      data: new EthereumTxData(tx),
+      hash: tx.hash!,
+      from
+    }
+
+    const msg = createTxMsgEthereumTx(this._chain, sender, fee, '', msgParams)
+    result = await this._submitTx(msg, privateKey, sender);
+
+    return parseTxResponse(result);
+  }
+
  /**
   * Submit record transaction.
   * @param privateKey - private key in HEX to sign message.
--- a/src/messages/evm.ts
+++ b/src/messages/evm.ts
@ -0,0 +1,87 @@
+import {
+  generateTypes,
+} from '@tharsis/eip712'
+import {
+  Chain,
+  Sender,
+  Fee,
+} from '@tharsis/transactions'
+
+import * as evmTx from '../proto/ethermint/evm/v1/tx'
+import * as registry from '../proto/vulcanize/registry/v1beta1/registry'
+import { EthereumTxData } from '../types'
+import { createTx } from './util'
+
+const MSG_ETHEREUM_TX_TYPES = {
+  MsgValue: [
+    { name: 'data', type: 'TypeData' },
+    { name: 'hash', type: 'string' },
+    { name: 'from', type: 'string' }
+  ],
+  TypeData: [
+    { name: 'type_url', type: 'string' },
+    { name: 'value', type: 'uint8[]' },
+  ],
+}
+
+export interface MessageMsgEthereumTx {
+  data: EthereumTxData,
+  hash: string,
+  from: string
+}
+
+export function createTxMsgEthereumTx(
+  chain: Chain,
+  sender: Sender,
+  fee: Fee,
+  memo: string,
+  params: MessageMsgEthereumTx,
+) {
+  const types = generateTypes(MSG_ETHEREUM_TX_TYPES)
+
+  const msg = createMsgEthereumTx(
+    params.data,
+    params.hash,
+    params.from
+  )
+
+  const msgCosmos = protoCreateMsgEthereumTx(
+    params.data,
+    params.hash,
+    params.from
+  )
+
+  return createTx(chain, sender, fee, memo, types, msg, msgCosmos)
+}
+
+function createMsgEthereumTx(
+  data: EthereumTxData,
+  hash: string,
+  from: string
+) {
+  return {
+    type: 'evm/EthereumTx',
+    value: {
+      data: data.serialize(),
+      hash,
+      from
+    },
+  }
+}
+
+const protoCreateMsgEthereumTx = (
+  data: EthereumTxData,
+  hash: string,
+  from: string
+) => {
+  const ethereumTxMessage = new evmTx.ethermint.evm.v1.MsgEthereumTx({
+    data: data.serialize(),
+    hash,
+    from,
+  })
+
+  return {
+    message: ethereumTxMessage,
+    path: 'ethermint.evm.v1.MsgEthereumTx',
+  }
+}
--- a/src/messages/registry.ts
+++ b/src/messages/registry.ts
@ -44,7 +44,11 @@ const MSG_SET_RECORD_TYPES = {
    { name: 'create_time', type: 'string' },
    { name: 'expiry_time', type: 'string' },
    { name: 'deleted', type: 'bool' },
-    { name: 'attributes', type: 'bytes' },
+    { name: 'attributes', type: 'TypePayloadRecordAttributes' },
+  ],
+  TypePayloadRecordAttributes: [
+    { name: 'type_url', type: 'string' },
+    { name: 'value', type: 'uint8[]' },
  ],
  TypePayloadSignatures: [
    { name: 'sig', type: 'string' },
@ -81,10 +85,10 @@ export const parseMsgSetRecordResponse = (data: string) => {
 }

 export const NAMESERVICE_ERRORS = [
-  'Name already reserved',
-  'Authority bond not found',
-  'Name authority not found',
-  'Access denied',
+  'Name already reserved.',
+  'Authority bond not found.',
+  'Name authority not found.',
+  'Access denied.',
 ]

 export interface MessageMsgReserveAuthority {
--- a/src/naming.test.ts
+++ b/src/naming.test.ts
@ -7,7 +7,7 @@ import { ensureUpdatedConfig, getConfig } from './testing/helper';

 const WATCHER_YML_PATH = path.join(__dirname, './testing/data/watcher.yml');

-jest.setTimeout(5 * 60 * 1000);
+jest.setTimeout(120 * 1000);

 const { chainId, restEndpoint, gqlEndpoint, privateKey, fee } = getConfig();

@ -18,6 +18,12 @@ const namingTests = () => {
  let watcher: any;
  let watcherId: string;

+  let authorityName: string;
+  let otherAuthorityName: string;
+  let otherPrivateKey: string;
+
+  let crn: string;
+
  beforeAll(async () => {
    registry = new Registry(gqlEndpoint, restEndpoint, chainId);

@ -40,272 +46,221 @@ const namingTests = () => {
    watcherId = result.data.id;
  });

-  describe('Authority tests', () => {
-    test('Reserve authority.', async () => {
-      const authorityName = `laconic-${Date.now()}`;
-
-      await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
-    });
-
-    describe('With authority reserved', () => {
-      let authorityName: string;
-      let crn: string;
-
-      beforeAll(async () => {
-
-        authorityName = `laconic-${Date.now()}`;
-        crn = `crn://${authorityName}/app/test`;
-
-        await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
-      })
-
-      test('Lookup authority.', async () => {
-        const [record] = await registry.lookupAuthorities([authorityName]);
-
-        expect(record).toBeDefined();
-        expect(record.ownerAddress).not.toBe('');
-        expect(record.ownerPublicKey).not.toBe('');
-        expect(Number(record.height)).toBeGreaterThan(0);
-      });
-
-      test('Lookup non existing authority', async () => {
-        const [record] = await registry.lookupAuthorities(['does-not-exist']);
-
-        expect(record.ownerAddress).toBe('');
-        expect(record.ownerPublicKey).toBe('');
-        expect(Number(record.height)).toBe(0);
-      });
-
-      test('Reserve already reserved authority', async () => {
-        await expect(registry.reserveAuthority({ name: authorityName }, privateKey, fee)).
-          rejects.toThrow('Name already reserved.');
-      });
-
-      test('Reserve sub-authority.', async () => {
-        const subAuthority = `echo.${authorityName}`;
-        await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);
-
-        const [record] = await registry.lookupAuthorities([subAuthority]);
-        expect(record).toBeDefined();
-        expect(record.ownerAddress).not.toBe('');
-        expect(record.ownerPublicKey).not.toBe('');
-        expect(Number(record.height)).toBeGreaterThan(0);
-      });
-
-      test('Reserve sub-authority with different owner.', async () => {
-        // Create another account, send tx to set public key on the account.
-        const mnenonic1 = Account.generateMnemonic();
-        const otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
-        await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount1.formattedCosmosAddress }, privateKey, fee);
-
-        const mnenonic2 = Account.generateMnemonic();
-        const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
-        await registry.sendCoins({ denom: 'aphoton', amount: '10', destinationAddress: otherAccount2.formattedCosmosAddress }, otherAccount1.getPrivateKey(), fee);
-
-        const subAuthority = `halo.${authorityName}`;
-        await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.formattedCosmosAddress }, privateKey, fee);
-
-        const [record] = await registry.lookupAuthorities([subAuthority]);
-        expect(record).toBeDefined();
-        expect(record.ownerAddress).toBeDefined();
-        expect(record.ownerAddress).toBe(otherAccount1.getCosmosAddress());
-        expect(record.ownerPublicKey).toBeDefined();
-        expect(Number(record.height)).toBeGreaterThan(0);
-      });
-
-      test('Set name for unbonded authority', async () => {
-        assert(watcherId)
-        await expect(registry.setName({ crn, cid: watcherId }, privateKey, fee)).
-          rejects.toThrow('Authority bond not found.');
-      });
-
-      test('Set authority bond', async () => {
-        await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
-      });
-    });
+  test('Reserve authority.', async () => {
+    authorityName = `laconic-${Date.now()}`;
+    await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
  });

-  describe('Naming tests', () => {
-    let authorityName: string;
-    let otherAuthorityName: string;
-    let otherPrivateKey: string;
-    let otherAccount: Account;
+  test('Lookup authority.', async () => {
+    const [record] = await registry.lookupAuthorities([authorityName]);

-    beforeAll(async () => {
-      authorityName = `laconic-${Date.now()}`;
+    expect(record).toBeDefined();
+    expect(record.ownerAddress).not.toBe('');
+    expect(record.ownerPublicKey).not.toBe('');
+    expect(Number(record.height)).toBeGreaterThan(0);
+  });

-      await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
-      await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
+  test('Lookup non existing authority', async () => {
+    const [record] = await registry.lookupAuthorities(['does-not-exist']);

-      // Create another account.
-      const mnenonic = Account.generateMnemonic();
-      otherAccount = await Account.generateFromMnemonic(mnenonic);
-      await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
+    expect(record.ownerAddress).toBe('');
+    expect(record.ownerPublicKey).toBe('');
+    expect(Number(record.height)).toBe(0);
+  });

-      otherAuthorityName = `other-${Date.now()}`;
-      otherPrivateKey = otherAccount.privateKey.toString('hex');
-    });
+  test('Reserve already reserved authority', async () => {
+    await expect(registry.reserveAuthority({ name: authorityName }, privateKey, fee)).rejects.toThrow('Name already reserved.');
+  });

-    test('Set name', async () => {
-      const crn = `crn://${authorityName}/app/test1`;
+  test('Reserve sub-authority.', async () => {
+    const subAuthority = `echo.${authorityName}`;
+    await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);

-      await registry.setName({ crn, cid: watcherId }, privateKey, fee);
+    const [record] = await registry.lookupAuthorities([subAuthority]);
+    expect(record).toBeDefined();
+    expect(record.ownerAddress).not.toBe('');
+    expect(record.ownerPublicKey).not.toBe('');
+    expect(Number(record.height)).toBeGreaterThan(0);
+  });

-      // Query records should return it (some CRN points to it).
-      const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
-      expect(record).toBeDefined();
-      expect(record.names).toHaveLength(1);
+  test('Reserve sub-authority with different owner.', async () => {
+    // Create another account, send tx to set public key on the account.
+    const mnenonic1 = Account.generateMnemonic();
+    const otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
+    await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount1.formattedCosmosAddress }, privateKey, fee);

-      await registry.deleteName({ crn }, privateKey, fee);
-    });
+    const mnenonic2 = Account.generateMnemonic();
+    const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
+    await registry.sendCoins({ denom: 'aphoton', amount: '10', destinationAddress: otherAccount2.formattedCosmosAddress }, otherAccount1.getPrivateKey(), fee);

-    describe('With name set', () => {
-      let crn: string;
+    const subAuthority = `halo.${authorityName}`;
+    await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.formattedCosmosAddress }, privateKey, fee);

-      beforeAll(async () => {
-        crn = `crn://${authorityName}/app/test2`;
-        await registry.setName({ crn, cid: watcherId }, privateKey, fee);
-      });
+    const [record] = await registry.lookupAuthorities([subAuthority]);
+    expect(record).toBeDefined();
+    expect(record.ownerAddress).toBeDefined();
+    expect(record.ownerAddress).toBe(otherAccount1.getCosmosAddress());
+    expect(record.ownerPublicKey).toBeDefined();
+    expect(Number(record.height)).toBeGreaterThan(0);
+  });

-      afterAll(async () => {
-        await registry.deleteName({ crn }, privateKey, fee);
-      });
+  test('Set name for unbonded authority', async () => {
+    crn = `crn://${authorityName}/app/test`;
+    assert(watcherId)
+    await expect(registry.setName({ crn, cid: watcherId }, privateKey, fee)).rejects.toThrow('Authority bond not found.');
+  });

-      test('Lookup name', async () => {
-        const records = await registry.lookupNames([crn]);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+  test('Set authority bond', async () => {
+    await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
+  });

-        const [{ latest, history }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe(watcherId);
-        expect(latest.height).toBeDefined();
-        expect(history).toBeUndefined();
-      });
+  test('Set name', async () => {
+    crn = `crn://${authorityName}/app/test`;
+    await registry.setName({ crn, cid: watcherId }, privateKey, fee);

-      test('Resolve name', async () => {
-        const records = await registry.resolveNames([crn]);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+    // Query records should return it (some CRN points to it).
+    const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+  });

-        const [{ attributes }] = records;
-        expect(attributes).toEqual(watcher.record);
-      });
+  test('Lookup name', async () => {
+    const records = await registry.lookupNames([crn]);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);

-      test('Lookup name with history', async () => {
-        const updatedWatcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
-        const result = await registry.setRecord(
-          {
-            privateKey,
-            bondId,
-            record: updatedWatcher.record
-          },
-          privateKey,
-          fee
-        )
+    const [{ latest, history }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe(watcherId);
+    expect(latest.height).toBeDefined();
+    expect(history).toBeUndefined();
+  });

-        const updatedWatcherId = result.data.id;
-        await registry.setName({ crn, cid: updatedWatcherId }, privateKey, fee);
+  test('Resolve name', async () => {
+    const records = await registry.resolveNames([crn]);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);

-        const records = await registry.lookupNames([crn], true);
-        expect(records).toHaveLength(1);
+    const [{ attributes }] = records;
+    expect(attributes).toEqual(watcher.record);
+  });

-        const [{ latest, history }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe(updatedWatcherId);
-        expect(latest.height).toBeDefined();
-        expect(history).toBeDefined();
-        expect(history).toHaveLength(1);
+  test('Lookup name with history', async () => {
+    const updatedWatcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
+    const result = await registry.setRecord(
+      {
+        privateKey,
+        bondId,
+        record: updatedWatcher.record
+      },
+      privateKey,
+      fee
+    )

-        const [oldRecord] = history;
-        expect(oldRecord).toBeDefined();
-        expect(oldRecord.id).toBeDefined();
-        expect(oldRecord.id).toBe(watcherId);
-        expect(oldRecord.height).toBeDefined();
-      });
+    const updatedWatcherId = result.data.id;
+    await registry.setName({ crn, cid: updatedWatcherId }, privateKey, fee);

-      test('Delete name', async () => {
-        await registry.deleteName({ crn }, privateKey, fee);
+    const records = await registry.lookupNames([crn], true);
+    expect(records).toHaveLength(1);

-        let records = await registry.lookupNames([crn], true);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+    const [{ latest, history }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe(updatedWatcherId);
+    expect(latest.height).toBeDefined();
+    expect(history).toBeDefined();
+    expect(history).toHaveLength(1);

-        const [{ latest }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe('');
-        expect(latest.height).toBeDefined();
+    const [oldRecord] = history;
+    expect(oldRecord).toBeDefined();
+    expect(oldRecord.id).toBeDefined();
+    expect(oldRecord.id).toBe(watcherId);
+    expect(oldRecord.height).toBeDefined();
+  });

-        // Query records should NOT return it (no CRN points to it).
-        records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(0);
+  test('Set name without reserving authority', async () => {
+    await expect(registry.setName({ crn: 'crn://not-reserved/app/test', cid: watcherId }, privateKey, fee))
+      .rejects.toThrow('Name authority not found.');
+  });

-        // Query all records should return it (all: true).
-        records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
-      });
+  test('Set name for non-owned authority', async () => {
+    // Create another account.
+    const mnenonic = Account.generateMnemonic();
+    const otherAccount = await Account.generateFromMnemonic(mnenonic);
+    await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);

-      test('Delete already deleted name', async () => {
-        await registry.deleteName({ crn }, privateKey, fee);
-        await registry.deleteName({ crn }, privateKey, fee);
+    // Other account reserves an authority.
+    otherAuthorityName = `other-${Date.now()}`;
+    otherPrivateKey = otherAccount.privateKey.toString('hex');
+    await registry.reserveAuthority({ name: otherAuthorityName }, otherPrivateKey, fee);

-        const records = await registry.lookupNames([crn], true);
-        expect(records).toBeDefined();
-        expect(records).toHaveLength(1);
+    // Try setting name under other authority.
+    await expect(registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, privateKey, fee)).rejects.toThrow('Access denied.');
+  });

-        const [{ latest }] = records;
-        expect(latest).toBeDefined();
-        expect(latest.id).toBeDefined();
-        expect(latest.id).toBe('');
-        expect(latest.height).toBeDefined();
-      });
-    });
+  test('Lookup non existing name', async () => {
+    const records = await registry.lookupNames(['crn://not-reserved/app/test']);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+    const [record] = records;
+    expect(record).toBeNull();
+  });

-    test('Set name without reserving authority', async () => {
-      await expect(registry.setName({ crn: 'crn://not-reserved/app/test', cid: watcherId }, privateKey, fee))
-        .rejects.toThrow('Name authority not found.');
-    });
+  test('Resolve non existing name', async () => {
+    const records = await registry.resolveNames(['crn://not-reserved/app/test']);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+    const [record] = records;
+    expect(record).toBeNull();
+  });

-    test('Set name for non-owned authority', async () => {
-      await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
+  test('Delete name', async () => {
+    await registry.deleteName({ crn }, privateKey, fee);

-      // Other account reserves an authority.
-      await registry.reserveAuthority({ name: otherAuthorityName }, otherPrivateKey, fee);
+    let records = await registry.lookupNames([crn], true);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);

-      // Try setting name under other authority.
-      await expect(registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, privateKey, fee)).rejects.toThrow('Access denied.');
-    });
+    const [{ latest }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe('');
+    expect(latest.height).toBeDefined();

-    test('Delete name for non-owned authority.', async () => {
-      const otherBondId = await registry.getNextBondId(otherPrivateKey);
-      await registry.createBond({ denom: 'aphoton', amount: '10000' }, otherPrivateKey, fee);
-      await registry.setAuthorityBond({ name: otherAuthorityName, bondId: otherBondId }, otherPrivateKey, fee);
-      await registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, otherPrivateKey, fee);
+    // Query records should NOT return it (no CRN points to it).
+    records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(0);

-      // Try deleting name under other authority.
-      await expect(registry.deleteName({ crn: `crn://${otherAuthorityName}/app/test` }, privateKey, fee)).rejects.toThrow('Access denied.');
-    });
+    // Query all records should return it (all: true).
+    records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+  });

-    test('Lookup non existing name', async () => {
-      const records = await registry.lookupNames(['crn://not-reserved/app/test']);
-      expect(records).toBeDefined();
-      expect(records).toHaveLength(1);
-      const [record] = records;
-      expect(record).toBeNull();
-    });
+  test('Delete already deleted name', async () => {
+    await registry.deleteName({ crn }, privateKey, fee);

-    test('Resolve non existing name', async () => {
-      const records = await registry.resolveNames(['crn://not-reserved/app/test']);
-      expect(records).toBeDefined();
-      expect(records).toHaveLength(1);
-      const [record] = records;
-      expect(record).toBeNull();
-    });
+    const records = await registry.lookupNames([crn], true);
+    expect(records).toBeDefined();
+    expect(records).toHaveLength(1);
+
+    const [{ latest }] = records;
+    expect(latest).toBeDefined();
+    expect(latest.id).toBeDefined();
+    expect(latest.id).toBe('');
+    expect(latest.height).toBeDefined();
+  });
+
+  test('Delete name for non-owned authority.', async () => {
+    const otherBondId = await registry.getNextBondId(otherPrivateKey);
+    await registry.createBond({ denom: 'aphoton', amount: '10000' }, otherPrivateKey, fee);
+    await registry.setAuthorityBond({ name: otherAuthorityName, bondId: otherBondId }, otherPrivateKey, fee);
+    await registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, otherPrivateKey, fee);
+
+    // Try deleting name under other authority.
+    await expect(registry.deleteName({ crn: `crn://${otherAuthorityName}/app/test` }, privateKey, fee)).rejects.toThrow('Access denied.');
  });
 };

--- a/src/proto/cosmos/base/query/v1beta1/pagination.ts
+++ b/src/proto/cosmos/base/query/v1beta1/pagination.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: cosmos/base/query/v1beta1/pagination.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
--- a/src/proto/cosmos/base/v1beta1/coin.ts
+++ b/src/proto/cosmos/base/v1beta1/coin.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: cosmos/base/v1beta1/coin.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/cosmos_proto/cosmos.ts
+++ b/src/proto/cosmos_proto/cosmos.ts
@ -0,0 +1,219 @@
+// @ts-nocheck
+/* eslint-disable */
+/**
+ * Generated by the protoc-gen-ts.  DO NOT EDIT!
+ * compiler version: 3.12.4
+ * source: cosmos_proto/cosmos.proto
+ * git: https://github.com/thesayyn/protoc-gen-ts */
+import * as dependency_1 from "./../google/protobuf/descriptor";
+import * as pb_1 from "google-protobuf";
+export namespace cosmos_proto {
+    export enum ScalarType {
+        SCALAR_TYPE_UNSPECIFIED = 0,
+        SCALAR_TYPE_STRING = 1,
+        SCALAR_TYPE_BYTES = 2
+    }
+    export class InterfaceDescriptor extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            name?: string;
+            description?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("name" in data && data.name != undefined) {
+                    this.name = data.name;
+                }
+                if ("description" in data && data.description != undefined) {
+                    this.description = data.description;
+                }
+            }
+        }
+        get name() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set name(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get description() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set description(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        static fromObject(data: {
+            name?: string;
+            description?: string;
+        }): InterfaceDescriptor {
+            const message = new InterfaceDescriptor({});
+            if (data.name != null) {
+                message.name = data.name;
+            }
+            if (data.description != null) {
+                message.description = data.description;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                name?: string;
+                description?: string;
+            } = {};
+            if (this.name != null) {
+                data.name = this.name;
+            }
+            if (this.description != null) {
+                data.description = this.description;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.name.length)
+                writer.writeString(1, this.name);
+            if (this.description.length)
+                writer.writeString(2, this.description);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): InterfaceDescriptor {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new InterfaceDescriptor();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.name = reader.readString();
+                        break;
+                    case 2:
+                        message.description = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): InterfaceDescriptor {
+            return InterfaceDescriptor.deserialize(bytes);
+        }
+    }
+    export class ScalarDescriptor extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            name?: string;
+            description?: string;
+            field_type?: ScalarType[];
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("name" in data && data.name != undefined) {
+                    this.name = data.name;
+                }
+                if ("description" in data && data.description != undefined) {
+                    this.description = data.description;
+                }
+                if ("field_type" in data && data.field_type != undefined) {
+                    this.field_type = data.field_type;
+                }
+            }
+        }
+        get name() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set name(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get description() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set description(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get field_type() {
+            return pb_1.Message.getFieldWithDefault(this, 3, []) as ScalarType[];
+        }
+        set field_type(value: ScalarType[]) {
+            pb_1.Message.setField(this, 3, value);
+        }
+        static fromObject(data: {
+            name?: string;
+            description?: string;
+            field_type?: ScalarType[];
+        }): ScalarDescriptor {
+            const message = new ScalarDescriptor({});
+            if (data.name != null) {
+                message.name = data.name;
+            }
+            if (data.description != null) {
+                message.description = data.description;
+            }
+            if (data.field_type != null) {
+                message.field_type = data.field_type;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                name?: string;
+                description?: string;
+                field_type?: ScalarType[];
+            } = {};
+            if (this.name != null) {
+                data.name = this.name;
+            }
+            if (this.description != null) {
+                data.description = this.description;
+            }
+            if (this.field_type != null) {
+                data.field_type = this.field_type;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.name.length)
+                writer.writeString(1, this.name);
+            if (this.description.length)
+                writer.writeString(2, this.description);
+            if (this.field_type.length)
+                writer.writePackedEnum(3, this.field_type);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ScalarDescriptor {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ScalarDescriptor();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.name = reader.readString();
+                        break;
+                    case 2:
+                        message.description = reader.readString();
+                        break;
+                    case 3:
+                        message.field_type = reader.readPackedEnum();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): ScalarDescriptor {
+            return ScalarDescriptor.deserialize(bytes);
+        }
+    }
+}
--- a/src/proto/ethermint/evm/v1/evm.ts
+++ b/src/proto/ethermint/evm/v1/evm.ts
--- a/src/proto/ethermint/evm/v1/genesis.ts
+++ b/src/proto/ethermint/evm/v1/genesis.ts
@ -0,0 +1,218 @@
+// @ts-nocheck
+/* eslint-disable */
+/**
+ * Generated by the protoc-gen-ts.  DO NOT EDIT!
+ * compiler version: 3.12.4
+ * source: ethermint/evm/v1/genesis.proto
+ * git: https://github.com/thesayyn/protoc-gen-ts */
+import * as dependency_1 from "./evm";
+import * as dependency_2 from "./../../../gogoproto/gogo";
+import * as pb_1 from "google-protobuf";
+export namespace ethermint.evm.v1 {
+    export class GenesisState extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            accounts?: GenesisAccount[];
+            params?: dependency_1.ethermint.evm.v1.Params;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("accounts" in data && data.accounts != undefined) {
+                    this.accounts = data.accounts;
+                }
+                if ("params" in data && data.params != undefined) {
+                    this.params = data.params;
+                }
+            }
+        }
+        get accounts() {
+            return pb_1.Message.getRepeatedWrapperField(this, GenesisAccount, 1) as GenesisAccount[];
+        }
+        set accounts(value: GenesisAccount[]) {
+            pb_1.Message.setRepeatedWrapperField(this, 1, value);
+        }
+        get params() {
+            return pb_1.Message.getWrapperField(this, dependency_1.ethermint.evm.v1.Params, 2) as dependency_1.ethermint.evm.v1.Params;
+        }
+        set params(value: dependency_1.ethermint.evm.v1.Params) {
+            pb_1.Message.setWrapperField(this, 2, value);
+        }
+        get has_params() {
+            return pb_1.Message.getField(this, 2) != null;
+        }
+        static fromObject(data: {
+            accounts?: ReturnType<typeof GenesisAccount.prototype.toObject>[];
+            params?: ReturnType<typeof dependency_1.ethermint.evm.v1.Params.prototype.toObject>;
+        }): GenesisState {
+            const message = new GenesisState({});
+            if (data.accounts != null) {
+                message.accounts = data.accounts.map(item => GenesisAccount.fromObject(item));
+            }
+            if (data.params != null) {
+                message.params = dependency_1.ethermint.evm.v1.Params.fromObject(data.params);
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                accounts?: ReturnType<typeof GenesisAccount.prototype.toObject>[];
+                params?: ReturnType<typeof dependency_1.ethermint.evm.v1.Params.prototype.toObject>;
+            } = {};
+            if (this.accounts != null) {
+                data.accounts = this.accounts.map((item: GenesisAccount) => item.toObject());
+            }
+            if (this.params != null) {
+                data.params = this.params.toObject();
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.accounts.length)
+                writer.writeRepeatedMessage(1, this.accounts, (item: GenesisAccount) => item.serialize(writer));
+            if (this.has_params)
+                writer.writeMessage(2, this.params, () => this.params.serialize(writer));
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): GenesisState {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new GenesisState();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        reader.readMessage(message.accounts, () => pb_1.Message.addToRepeatedWrapperField(message, 1, GenesisAccount.deserialize(reader), GenesisAccount));
+                        break;
+                    case 2:
+                        reader.readMessage(message.params, () => message.params = dependency_1.ethermint.evm.v1.Params.deserialize(reader));
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): GenesisState {
+            return GenesisState.deserialize(bytes);
+        }
+    }
+    export class GenesisAccount extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            address?: string;
+            code?: string;
+            storage?: dependency_1.ethermint.evm.v1.State[];
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("address" in data && data.address != undefined) {
+                    this.address = data.address;
+                }
+                if ("code" in data && data.code != undefined) {
+                    this.code = data.code;
+                }
+                if ("storage" in data && data.storage != undefined) {
+                    this.storage = data.storage;
+                }
+            }
+        }
+        get address() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set address(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get code() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set code(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get storage() {
+            return pb_1.Message.getRepeatedWrapperField(this, dependency_1.ethermint.evm.v1.State, 3) as dependency_1.ethermint.evm.v1.State[];
+        }
+        set storage(value: dependency_1.ethermint.evm.v1.State[]) {
+            pb_1.Message.setRepeatedWrapperField(this, 3, value);
+        }
+        static fromObject(data: {
+            address?: string;
+            code?: string;
+            storage?: ReturnType<typeof dependency_1.ethermint.evm.v1.State.prototype.toObject>[];
+        }): GenesisAccount {
+            const message = new GenesisAccount({});
+            if (data.address != null) {
+                message.address = data.address;
+            }
+            if (data.code != null) {
+                message.code = data.code;
+            }
+            if (data.storage != null) {
+                message.storage = data.storage.map(item => dependency_1.ethermint.evm.v1.State.fromObject(item));
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                address?: string;
+                code?: string;
+                storage?: ReturnType<typeof dependency_1.ethermint.evm.v1.State.prototype.toObject>[];
+            } = {};
+            if (this.address != null) {
+                data.address = this.address;
+            }
+            if (this.code != null) {
+                data.code = this.code;
+            }
+            if (this.storage != null) {
+                data.storage = this.storage.map((item: dependency_1.ethermint.evm.v1.State) => item.toObject());
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.address.length)
+                writer.writeString(1, this.address);
+            if (this.code.length)
+                writer.writeString(2, this.code);
+            if (this.storage.length)
+                writer.writeRepeatedMessage(3, this.storage, (item: dependency_1.ethermint.evm.v1.State) => item.serialize(writer));
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): GenesisAccount {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new GenesisAccount();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.address = reader.readString();
+                        break;
+                    case 2:
+                        message.code = reader.readString();
+                        break;
+                    case 3:
+                        reader.readMessage(message.storage, () => pb_1.Message.addToRepeatedWrapperField(message, 3, dependency_1.ethermint.evm.v1.State.deserialize(reader), dependency_1.ethermint.evm.v1.State));
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): GenesisAccount {
+            return GenesisAccount.deserialize(bytes);
+        }
+    }
+}
--- a/src/proto/ethermint/evm/v1/query.ts
+++ b/src/proto/ethermint/evm/v1/query.ts
--- a/src/proto/ethermint/evm/v1/tx.ts
+++ b/src/proto/ethermint/evm/v1/tx.ts
--- a/src/proto/gogoproto/gogo.ts
+++ b/src/proto/gogoproto/gogo.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: gogoproto/gogo.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../google/protobuf/descriptor";
--- a/src/proto/google/api/annotations.ts
+++ b/src/proto/google/api/annotations.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: google/api/annotations.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./http";
--- a/src/proto/google/api/http.ts
+++ b/src/proto/google/api/http.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: google/api/http.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
--- a/src/proto/google/protobuf/any.ts
+++ b/src/proto/google/protobuf/any.ts
@ -0,0 +1,101 @@
+// @ts-nocheck
+/* eslint-disable */
+/**
+ * Generated by the protoc-gen-ts.  DO NOT EDIT!
+ * compiler version: 3.12.4
+ * source: google/protobuf/any.proto
+ * git: https://github.com/thesayyn/protoc-gen-ts */
+import * as dependency_1 from "./../../gogoproto/gogo";
+import * as pb_1 from "google-protobuf";
+export namespace google.protobuf {
+    export class Any extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            type_url?: string;
+            value?: Uint8Array;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("type_url" in data && data.type_url != undefined) {
+                    this.type_url = data.type_url;
+                }
+                if ("value" in data && data.value != undefined) {
+                    this.value = data.value;
+                }
+            }
+        }
+        get type_url() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set type_url(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get value() {
+            return pb_1.Message.getFieldWithDefault(this, 2, new Uint8Array(0)) as Uint8Array;
+        }
+        set value(value: Uint8Array) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        static fromObject(data: {
+            type_url?: string;
+            value?: Uint8Array;
+        }): Any {
+            const message = new Any({});
+            if (data.type_url != null) {
+                message.type_url = data.type_url;
+            }
+            if (data.value != null) {
+                message.value = data.value;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                type_url?: string;
+                value?: Uint8Array;
+            } = {};
+            if (this.type_url != null) {
+                data.type_url = this.type_url;
+            }
+            if (this.value != null) {
+                data.value = this.value;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.type_url.length)
+                writer.writeString(1, this.type_url);
+            if (this.value.length)
+                writer.writeBytes(2, this.value);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): Any {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new Any();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.type_url = reader.readString();
+                        break;
+                    case 2:
+                        message.value = reader.readBytes();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): Any {
+            return Any.deserialize(bytes);
+        }
+    }
+}
--- a/src/proto/google/protobuf/descriptor.ts
+++ b/src/proto/google/protobuf/descriptor.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: google/protobuf/descriptor.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
--- a/src/proto/google/protobuf/duration.ts
+++ b/src/proto/google/protobuf/duration.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: google/protobuf/duration.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
--- a/src/proto/google/protobuf/timestamp.ts
+++ b/src/proto/google/protobuf/timestamp.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: google/protobuf/timestamp.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
--- a/src/proto/vulcanize/auction/v1beta1/genesis.ts
+++ b/src/proto/vulcanize/auction/v1beta1/genesis.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/auction/v1beta1/genesis.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/auction/v1beta1/query.ts
+++ b/src/proto/vulcanize/auction/v1beta1/query.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/auction/v1beta1/query.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/auction/v1beta1/tx.ts
+++ b/src/proto/vulcanize/auction/v1beta1/tx.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/auction/v1beta1/tx.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/auction/v1beta1/types.ts
+++ b/src/proto/vulcanize/auction/v1beta1/types.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/auction/v1beta1/types.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/bond/v1beta1/bond.ts
+++ b/src/proto/vulcanize/bond/v1beta1/bond.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/bond/v1beta1/bond.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/bond/v1beta1/genesis.ts
+++ b/src/proto/vulcanize/bond/v1beta1/genesis.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/bond/v1beta1/genesis.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/bond/v1beta1/query.ts
+++ b/src/proto/vulcanize/bond/v1beta1/query.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/bond/v1beta1/query.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/bond/v1beta1/tx.ts
+++ b/src/proto/vulcanize/bond/v1beta1/tx.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/bond/v1beta1/tx.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/registry/v1beta1/attributes.ts
+++ b/src/proto/vulcanize/registry/v1beta1/attributes.ts
@ -0,0 +1,537 @@
+// @ts-nocheck
+/* eslint-disable */
+/**
+ * Generated by the protoc-gen-ts.  DO NOT EDIT!
+ * compiler version: 3.12.4
+ * source: vulcanize/registry/v1beta1/attributes.proto
+ * git: https://github.com/thesayyn/protoc-gen-ts */
+import * as dependency_1 from "./../../../gogoproto/gogo";
+import * as pb_1 from "google-protobuf";
+export namespace vulcanize.registry.v1beta1 {
+    export class ServiceProviderRegistration extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            bond_id?: string;
+            laconic_id?: string;
+            x500?: X500;
+            type?: string;
+            version?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("bond_id" in data && data.bond_id != undefined) {
+                    this.bond_id = data.bond_id;
+                }
+                if ("laconic_id" in data && data.laconic_id != undefined) {
+                    this.laconic_id = data.laconic_id;
+                }
+                if ("x500" in data && data.x500 != undefined) {
+                    this.x500 = data.x500;
+                }
+                if ("type" in data && data.type != undefined) {
+                    this.type = data.type;
+                }
+                if ("version" in data && data.version != undefined) {
+                    this.version = data.version;
+                }
+            }
+        }
+        get bond_id() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set bond_id(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get laconic_id() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set laconic_id(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get x500() {
+            return pb_1.Message.getWrapperField(this, X500, 3) as X500;
+        }
+        set x500(value: X500) {
+            pb_1.Message.setWrapperField(this, 3, value);
+        }
+        get has_x500() {
+            return pb_1.Message.getField(this, 3) != null;
+        }
+        get type() {
+            return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
+        }
+        set type(value: string) {
+            pb_1.Message.setField(this, 4, value);
+        }
+        get version() {
+            return pb_1.Message.getFieldWithDefault(this, 6, "") as string;
+        }
+        set version(value: string) {
+            pb_1.Message.setField(this, 6, value);
+        }
+        static fromObject(data: {
+            bond_id?: string;
+            laconic_id?: string;
+            x500?: ReturnType<typeof X500.prototype.toObject>;
+            type?: string;
+            version?: string;
+        }): ServiceProviderRegistration {
+            const message = new ServiceProviderRegistration({});
+            if (data.bond_id != null) {
+                message.bond_id = data.bond_id;
+            }
+            if (data.laconic_id != null) {
+                message.laconic_id = data.laconic_id;
+            }
+            if (data.x500 != null) {
+                message.x500 = X500.fromObject(data.x500);
+            }
+            if (data.type != null) {
+                message.type = data.type;
+            }
+            if (data.version != null) {
+                message.version = data.version;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                bond_id?: string;
+                laconic_id?: string;
+                x500?: ReturnType<typeof X500.prototype.toObject>;
+                type?: string;
+                version?: string;
+            } = {};
+            if (this.bond_id != null) {
+                data.bond_id = this.bond_id;
+            }
+            if (this.laconic_id != null) {
+                data.laconic_id = this.laconic_id;
+            }
+            if (this.x500 != null) {
+                data.x500 = this.x500.toObject();
+            }
+            if (this.type != null) {
+                data.type = this.type;
+            }
+            if (this.version != null) {
+                data.version = this.version;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.bond_id.length)
+                writer.writeString(1, this.bond_id);
+            if (this.laconic_id.length)
+                writer.writeString(2, this.laconic_id);
+            if (this.has_x500)
+                writer.writeMessage(3, this.x500, () => this.x500.serialize(writer));
+            if (this.type.length)
+                writer.writeString(4, this.type);
+            if (this.version.length)
+                writer.writeString(6, this.version);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ServiceProviderRegistration {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ServiceProviderRegistration();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.bond_id = reader.readString();
+                        break;
+                    case 2:
+                        message.laconic_id = reader.readString();
+                        break;
+                    case 3:
+                        reader.readMessage(message.x500, () => message.x500 = X500.deserialize(reader));
+                        break;
+                    case 4:
+                        message.type = reader.readString();
+                        break;
+                    case 6:
+                        message.version = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): ServiceProviderRegistration {
+            return ServiceProviderRegistration.deserialize(bytes);
+        }
+    }
+    export class X500 extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            common_name?: string;
+            organization_unit?: string;
+            organization_name?: string;
+            locality_name?: string;
+            state_name?: string;
+            country?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("common_name" in data && data.common_name != undefined) {
+                    this.common_name = data.common_name;
+                }
+                if ("organization_unit" in data && data.organization_unit != undefined) {
+                    this.organization_unit = data.organization_unit;
+                }
+                if ("organization_name" in data && data.organization_name != undefined) {
+                    this.organization_name = data.organization_name;
+                }
+                if ("locality_name" in data && data.locality_name != undefined) {
+                    this.locality_name = data.locality_name;
+                }
+                if ("state_name" in data && data.state_name != undefined) {
+                    this.state_name = data.state_name;
+                }
+                if ("country" in data && data.country != undefined) {
+                    this.country = data.country;
+                }
+            }
+        }
+        get common_name() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set common_name(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get organization_unit() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set organization_unit(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get organization_name() {
+            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
+        }
+        set organization_name(value: string) {
+            pb_1.Message.setField(this, 3, value);
+        }
+        get locality_name() {
+            return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
+        }
+        set locality_name(value: string) {
+            pb_1.Message.setField(this, 4, value);
+        }
+        get state_name() {
+            return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
+        }
+        set state_name(value: string) {
+            pb_1.Message.setField(this, 5, value);
+        }
+        get country() {
+            return pb_1.Message.getFieldWithDefault(this, 6, "") as string;
+        }
+        set country(value: string) {
+            pb_1.Message.setField(this, 6, value);
+        }
+        static fromObject(data: {
+            common_name?: string;
+            organization_unit?: string;
+            organization_name?: string;
+            locality_name?: string;
+            state_name?: string;
+            country?: string;
+        }): X500 {
+            const message = new X500({});
+            if (data.common_name != null) {
+                message.common_name = data.common_name;
+            }
+            if (data.organization_unit != null) {
+                message.organization_unit = data.organization_unit;
+            }
+            if (data.organization_name != null) {
+                message.organization_name = data.organization_name;
+            }
+            if (data.locality_name != null) {
+                message.locality_name = data.locality_name;
+            }
+            if (data.state_name != null) {
+                message.state_name = data.state_name;
+            }
+            if (data.country != null) {
+                message.country = data.country;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                common_name?: string;
+                organization_unit?: string;
+                organization_name?: string;
+                locality_name?: string;
+                state_name?: string;
+                country?: string;
+            } = {};
+            if (this.common_name != null) {
+                data.common_name = this.common_name;
+            }
+            if (this.organization_unit != null) {
+                data.organization_unit = this.organization_unit;
+            }
+            if (this.organization_name != null) {
+                data.organization_name = this.organization_name;
+            }
+            if (this.locality_name != null) {
+                data.locality_name = this.locality_name;
+            }
+            if (this.state_name != null) {
+                data.state_name = this.state_name;
+            }
+            if (this.country != null) {
+                data.country = this.country;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.common_name.length)
+                writer.writeString(1, this.common_name);
+            if (this.organization_unit.length)
+                writer.writeString(2, this.organization_unit);
+            if (this.organization_name.length)
+                writer.writeString(3, this.organization_name);
+            if (this.locality_name.length)
+                writer.writeString(4, this.locality_name);
+            if (this.state_name.length)
+                writer.writeString(5, this.state_name);
+            if (this.country.length)
+                writer.writeString(6, this.country);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): X500 {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new X500();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.common_name = reader.readString();
+                        break;
+                    case 2:
+                        message.organization_unit = reader.readString();
+                        break;
+                    case 3:
+                        message.organization_name = reader.readString();
+                        break;
+                    case 4:
+                        message.locality_name = reader.readString();
+                        break;
+                    case 5:
+                        message.state_name = reader.readString();
+                        break;
+                    case 6:
+                        message.country = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): X500 {
+            return X500.deserialize(bytes);
+        }
+    }
+    export class WebsiteRegistrationRecord extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            url?: string;
+            repo_registration_record_cid?: string;
+            build_artifact_cid?: string;
+            tls_cert_cid?: string;
+            type?: string;
+            version?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("url" in data && data.url != undefined) {
+                    this.url = data.url;
+                }
+                if ("repo_registration_record_cid" in data && data.repo_registration_record_cid != undefined) {
+                    this.repo_registration_record_cid = data.repo_registration_record_cid;
+                }
+                if ("build_artifact_cid" in data && data.build_artifact_cid != undefined) {
+                    this.build_artifact_cid = data.build_artifact_cid;
+                }
+                if ("tls_cert_cid" in data && data.tls_cert_cid != undefined) {
+                    this.tls_cert_cid = data.tls_cert_cid;
+                }
+                if ("type" in data && data.type != undefined) {
+                    this.type = data.type;
+                }
+                if ("version" in data && data.version != undefined) {
+                    this.version = data.version;
+                }
+            }
+        }
+        get url() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set url(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get repo_registration_record_cid() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set repo_registration_record_cid(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        get build_artifact_cid() {
+            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
+        }
+        set build_artifact_cid(value: string) {
+            pb_1.Message.setField(this, 3, value);
+        }
+        get tls_cert_cid() {
+            return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
+        }
+        set tls_cert_cid(value: string) {
+            pb_1.Message.setField(this, 4, value);
+        }
+        get type() {
+            return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
+        }
+        set type(value: string) {
+            pb_1.Message.setField(this, 5, value);
+        }
+        get version() {
+            return pb_1.Message.getFieldWithDefault(this, 6, "") as string;
+        }
+        set version(value: string) {
+            pb_1.Message.setField(this, 6, value);
+        }
+        static fromObject(data: {
+            url?: string;
+            repo_registration_record_cid?: string;
+            build_artifact_cid?: string;
+            tls_cert_cid?: string;
+            type?: string;
+            version?: string;
+        }): WebsiteRegistrationRecord {
+            const message = new WebsiteRegistrationRecord({});
+            if (data.url != null) {
+                message.url = data.url;
+            }
+            if (data.repo_registration_record_cid != null) {
+                message.repo_registration_record_cid = data.repo_registration_record_cid;
+            }
+            if (data.build_artifact_cid != null) {
+                message.build_artifact_cid = data.build_artifact_cid;
+            }
+            if (data.tls_cert_cid != null) {
+                message.tls_cert_cid = data.tls_cert_cid;
+            }
+            if (data.type != null) {
+                message.type = data.type;
+            }
+            if (data.version != null) {
+                message.version = data.version;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                url?: string;
+                repo_registration_record_cid?: string;
+                build_artifact_cid?: string;
+                tls_cert_cid?: string;
+                type?: string;
+                version?: string;
+            } = {};
+            if (this.url != null) {
+                data.url = this.url;
+            }
+            if (this.repo_registration_record_cid != null) {
+                data.repo_registration_record_cid = this.repo_registration_record_cid;
+            }
+            if (this.build_artifact_cid != null) {
+                data.build_artifact_cid = this.build_artifact_cid;
+            }
+            if (this.tls_cert_cid != null) {
+                data.tls_cert_cid = this.tls_cert_cid;
+            }
+            if (this.type != null) {
+                data.type = this.type;
+            }
+            if (this.version != null) {
+                data.version = this.version;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.url.length)
+                writer.writeString(1, this.url);
+            if (this.repo_registration_record_cid.length)
+                writer.writeString(2, this.repo_registration_record_cid);
+            if (this.build_artifact_cid.length)
+                writer.writeString(3, this.build_artifact_cid);
+            if (this.tls_cert_cid.length)
+                writer.writeString(4, this.tls_cert_cid);
+            if (this.type.length)
+                writer.writeString(5, this.type);
+            if (this.version.length)
+                writer.writeString(6, this.version);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): WebsiteRegistrationRecord {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new WebsiteRegistrationRecord();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.url = reader.readString();
+                        break;
+                    case 2:
+                        message.repo_registration_record_cid = reader.readString();
+                        break;
+                    case 3:
+                        message.build_artifact_cid = reader.readString();
+                        break;
+                    case 4:
+                        message.tls_cert_cid = reader.readString();
+                        break;
+                    case 5:
+                        message.type = reader.readString();
+                        break;
+                    case 6:
+                        message.version = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): WebsiteRegistrationRecord {
+            return WebsiteRegistrationRecord.deserialize(bytes);
+        }
+    }
+}
--- a/src/proto/vulcanize/registry/v1beta1/genesis.ts
+++ b/src/proto/vulcanize/registry/v1beta1/genesis.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/registry/v1beta1/genesis.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/proto/vulcanize/registry/v1beta1/query.ts
+++ b/src/proto/vulcanize/registry/v1beta1/query.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/registry/v1beta1/query.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./registry";
@ -239,7 +239,7 @@ export namespace vulcanize.registry.v1beta1 {
        }
    }
    export namespace QueryListRecordsRequest {
-        export class LinkInput extends pb_1.Message {
+        export class ReferenceInput extends pb_1.Message {
            #one_of_decls: number[][] = [];
            constructor(data?: any[] | {
                id?: string;
@ -260,8 +260,8 @@ export namespace vulcanize.registry.v1beta1 {
            }
            static fromObject(data: {
                id?: string;
-            }): LinkInput {
-                const message = new LinkInput({});
+            }): ReferenceInput {
+                const message = new ReferenceInput({});
                if (data.id != null) {
                    message.id = data.id;
                }
@ -285,8 +285,8 @@ export namespace vulcanize.registry.v1beta1 {
                if (!w)
                    return writer.getResultBuffer();
            }
-            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): LinkInput {
-                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new LinkInput();
+            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ReferenceInput {
+                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ReferenceInput();
                while (reader.nextField()) {
                    if (reader.isEndGroup())
                        break;
@ -302,220 +302,27 @@ export namespace vulcanize.registry.v1beta1 {
            serializeBinary(): Uint8Array {
                return this.serialize();
            }
-            static deserializeBinary(bytes: Uint8Array): LinkInput {
-                return LinkInput.deserialize(bytes);
-            }
-        }
-        export class ArrayInput extends pb_1.Message {
-            #one_of_decls: number[][] = [];
-            constructor(data?: any[] | {
-                values?: QueryListRecordsRequest.ValueInput[];
-            }) {
-                super();
-                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1], this.#one_of_decls);
-                if (!Array.isArray(data) && typeof data == "object") {
-                    if ("values" in data && data.values != undefined) {
-                        this.values = data.values;
-                    }
-                }
-            }
-            get values() {
-                return pb_1.Message.getRepeatedWrapperField(this, QueryListRecordsRequest.ValueInput, 1) as QueryListRecordsRequest.ValueInput[];
-            }
-            set values(value: QueryListRecordsRequest.ValueInput[]) {
-                pb_1.Message.setRepeatedWrapperField(this, 1, value);
-            }
-            static fromObject(data: {
-                values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
-            }): ArrayInput {
-                const message = new ArrayInput({});
-                if (data.values != null) {
-                    message.values = data.values.map(item => QueryListRecordsRequest.ValueInput.fromObject(item));
-                }
-                return message;
-            }
-            toObject() {
-                const data: {
-                    values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
-                } = {};
-                if (this.values != null) {
-                    data.values = this.values.map((item: QueryListRecordsRequest.ValueInput) => item.toObject());
-                }
-                return data;
-            }
-            serialize(): Uint8Array;
-            serialize(w: pb_1.BinaryWriter): void;
-            serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
-                const writer = w || new pb_1.BinaryWriter();
-                if (this.values.length)
-                    writer.writeRepeatedMessage(1, this.values, (item: QueryListRecordsRequest.ValueInput) => item.serialize(writer));
-                if (!w)
-                    return writer.getResultBuffer();
-            }
-            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ArrayInput {
-                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ArrayInput();
-                while (reader.nextField()) {
-                    if (reader.isEndGroup())
-                        break;
-                    switch (reader.getFieldNumber()) {
-                        case 1:
-                            reader.readMessage(message.values, () => pb_1.Message.addToRepeatedWrapperField(message, 1, QueryListRecordsRequest.ValueInput.deserialize(reader), QueryListRecordsRequest.ValueInput));
-                            break;
-                        default: reader.skipField();
-                    }
-                }
-                return message;
-            }
-            serializeBinary(): Uint8Array {
-                return this.serialize();
-            }
-            static deserializeBinary(bytes: Uint8Array): ArrayInput {
-                return ArrayInput.deserialize(bytes);
-            }
-        }
-        export class MapInput extends pb_1.Message {
-            #one_of_decls: number[][] = [];
-            constructor(data?: any[] | {
-                values?: Map<string, QueryListRecordsRequest.ValueInput>;
-            }) {
-                super();
-                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
-                if (!Array.isArray(data) && typeof data == "object") {
-                    if ("values" in data && data.values != undefined) {
-                        this.values = data.values;
-                    }
-                }
-                if (!this.values)
-                    this.values = new Map();
-            }
-            get values() {
-                return pb_1.Message.getField(this, 1) as any as Map<string, QueryListRecordsRequest.ValueInput>;
-            }
-            set values(value: Map<string, QueryListRecordsRequest.ValueInput>) {
-                pb_1.Message.setField(this, 1, value as any);
-            }
-            static fromObject(data: {
-                values?: {
-                    [key: string]: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>;
-                };
-            }): MapInput {
-                const message = new MapInput({});
-                if (typeof data.values == "object") {
-                    message.values = new Map(Object.entries(data.values).map(([key, value]) => [key, QueryListRecordsRequest.ValueInput.fromObject(value)]));
-                }
-                return message;
-            }
-            toObject() {
-                const data: {
-                    values?: {
-                        [key: string]: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>;
-                    };
-                } = {};
-                if (this.values != null) {
-                    data.values = (Object.fromEntries)((Array.from)(this.values).map(([key, value]) => [key, value.toObject()]));
-                }
-                return data;
-            }
-            serialize(): Uint8Array;
-            serialize(w: pb_1.BinaryWriter): void;
-            serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
-                const writer = w || new pb_1.BinaryWriter();
-                for (const [key, value] of this.values) {
-                    writer.writeMessage(1, this.values, () => {
-                        writer.writeString(1, key);
-                        writer.writeMessage(2, value, () => value.serialize(writer));
-                    });
-                }
-                if (!w)
-                    return writer.getResultBuffer();
-            }
-            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): MapInput {
-                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new MapInput();
-                while (reader.nextField()) {
-                    if (reader.isEndGroup())
-                        break;
-                    switch (reader.getFieldNumber()) {
-                        case 1:
-                            reader.readMessage(message, () => pb_1.Map.deserializeBinary(message.values as any, reader, reader.readString, () => {
-                                let value;
-                                reader.readMessage(message, () => value = QueryListRecordsRequest.ValueInput.deserialize(reader));
-                                return value;
-                            }));
-                            break;
-                        default: reader.skipField();
-                    }
-                }
-                return message;
-            }
-            serializeBinary(): Uint8Array {
-                return this.serialize();
-            }
-            static deserializeBinary(bytes: Uint8Array): MapInput {
-                return MapInput.deserialize(bytes);
+            static deserializeBinary(bytes: Uint8Array): ReferenceInput {
+                return ReferenceInput.deserialize(bytes);
            }
        }
        export class ValueInput extends pb_1.Message {
-            #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7]];
-            constructor(data?: any[] | ({} & (({
+            #one_of_decls: number[][] = [];
+            constructor(data?: any[] | {
+                type?: string;
                string?: string;
-                int?: never;
-                float?: never;
-                boolean?: never;
-                link?: never;
-                array?: never;
-                map?: never;
-            } | {
-                string?: never;
                int?: number;
-                float?: never;
-                boolean?: never;
-                link?: never;
-                array?: never;
-                map?: never;
-            } | {
-                string?: never;
-                int?: never;
                float?: number;
-                boolean?: never;
-                link?: never;
-                array?: never;
-                map?: never;
-            } | {
-                string?: never;
-                int?: never;
-                float?: never;
                boolean?: boolean;
-                link?: never;
-                array?: never;
-                map?: never;
-            } | {
-                string?: never;
-                int?: never;
-                float?: never;
-                boolean?: never;
-                link?: string;
-                array?: never;
-                map?: never;
-            } | {
-                string?: never;
-                int?: never;
-                float?: never;
-                boolean?: never;
-                link?: never;
-                array?: QueryListRecordsRequest.ArrayInput;
-                map?: never;
-            } | {
-                string?: never;
-                int?: never;
-                float?: never;
-                boolean?: never;
-                link?: never;
-                array?: never;
-                map?: QueryListRecordsRequest.MapInput;
-            })))) {
+                reference?: QueryListRecordsRequest.ReferenceInput;
+                values?: QueryListRecordsRequest.ValueInput[];
+            }) {
                super();
-                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [7], this.#one_of_decls);
                if (!Array.isArray(data) && typeof data == "object") {
+                    if ("type" in data && data.type != undefined) {
+                        this.type = data.type;
+                    }
                    if ("string" in data && data.string != undefined) {
                        this.string = data.string;
                    }
@ -528,105 +335,72 @@ export namespace vulcanize.registry.v1beta1 {
                    if ("boolean" in data && data.boolean != undefined) {
                        this.boolean = data.boolean;
                    }
-                    if ("link" in data && data.link != undefined) {
-                        this.link = data.link;
+                    if ("reference" in data && data.reference != undefined) {
+                        this.reference = data.reference;
                    }
-                    if ("array" in data && data.array != undefined) {
-                        this.array = data.array;
-                    }
-                    if ("map" in data && data.map != undefined) {
-                        this.map = data.map;
+                    if ("values" in data && data.values != undefined) {
+                        this.values = data.values;
                    }
                }
            }
-            get string() {
+            get type() {
                return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
            }
-            set string(value: string) {
-                pb_1.Message.setOneofField(this, 1, this.#one_of_decls[0], value);
+            set type(value: string) {
+                pb_1.Message.setField(this, 1, value);
            }
-            get has_string() {
-                return pb_1.Message.getField(this, 1) != null;
+            get string() {
+                return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+            }
+            set string(value: string) {
+                pb_1.Message.setField(this, 2, value);
            }
            get int() {
-                return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
-            }
-            set int(value: number) {
-                pb_1.Message.setOneofField(this, 2, this.#one_of_decls[0], value);
-            }
-            get has_int() {
-                return pb_1.Message.getField(this, 2) != null;
-            }
-            get float() {
                return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
            }
-            set float(value: number) {
-                pb_1.Message.setOneofField(this, 3, this.#one_of_decls[0], value);
+            set int(value: number) {
+                pb_1.Message.setField(this, 3, value);
            }
-            get has_float() {
-                return pb_1.Message.getField(this, 3) != null;
+            get float() {
+                return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
+            }
+            set float(value: number) {
+                pb_1.Message.setField(this, 4, value);
            }
            get boolean() {
-                return pb_1.Message.getFieldWithDefault(this, 4, false) as boolean;
+                return pb_1.Message.getFieldWithDefault(this, 5, false) as boolean;
            }
            set boolean(value: boolean) {
-                pb_1.Message.setOneofField(this, 4, this.#one_of_decls[0], value);
+                pb_1.Message.setField(this, 5, value);
            }
-            get has_boolean() {
-                return pb_1.Message.getField(this, 4) != null;
+            get reference() {
+                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.ReferenceInput, 6) as QueryListRecordsRequest.ReferenceInput;
            }
-            get link() {
-                return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
+            set reference(value: QueryListRecordsRequest.ReferenceInput) {
+                pb_1.Message.setWrapperField(this, 6, value);
            }
-            set link(value: string) {
-                pb_1.Message.setOneofField(this, 5, this.#one_of_decls[0], value);
-            }
-            get has_link() {
-                return pb_1.Message.getField(this, 5) != null;
-            }
-            get array() {
-                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.ArrayInput, 6) as QueryListRecordsRequest.ArrayInput;
-            }
-            set array(value: QueryListRecordsRequest.ArrayInput) {
-                pb_1.Message.setOneofWrapperField(this, 6, this.#one_of_decls[0], value);
-            }
-            get has_array() {
+            get has_reference() {
                return pb_1.Message.getField(this, 6) != null;
            }
-            get map() {
-                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.MapInput, 7) as QueryListRecordsRequest.MapInput;
+            get values() {
+                return pb_1.Message.getRepeatedWrapperField(this, QueryListRecordsRequest.ValueInput, 7) as QueryListRecordsRequest.ValueInput[];
            }
-            set map(value: QueryListRecordsRequest.MapInput) {
-                pb_1.Message.setOneofWrapperField(this, 7, this.#one_of_decls[0], value);
-            }
-            get has_map() {
-                return pb_1.Message.getField(this, 7) != null;
-            }
-            get value() {
-                const cases: {
-                    [index: number]: "none" | "string" | "int" | "float" | "boolean" | "link" | "array" | "map";
-                } = {
-                    0: "none",
-                    1: "string",
-                    2: "int",
-                    3: "float",
-                    4: "boolean",
-                    5: "link",
-                    6: "array",
-                    7: "map"
-                };
-                return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7])];
+            set values(value: QueryListRecordsRequest.ValueInput[]) {
+                pb_1.Message.setRepeatedWrapperField(this, 7, value);
            }
            static fromObject(data: {
+                type?: string;
                string?: string;
                int?: number;
                float?: number;
                boolean?: boolean;
-                link?: string;
-                array?: ReturnType<typeof QueryListRecordsRequest.ArrayInput.prototype.toObject>;
-                map?: ReturnType<typeof QueryListRecordsRequest.MapInput.prototype.toObject>;
+                reference?: ReturnType<typeof QueryListRecordsRequest.ReferenceInput.prototype.toObject>;
+                values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
            }): ValueInput {
                const message = new ValueInput({});
+                if (data.type != null) {
+                    message.type = data.type;
+                }
                if (data.string != null) {
                    message.string = data.string;
                }
@ -639,27 +413,27 @@ export namespace vulcanize.registry.v1beta1 {
                if (data.boolean != null) {
                    message.boolean = data.boolean;
                }
-                if (data.link != null) {
-                    message.link = data.link;
+                if (data.reference != null) {
+                    message.reference = QueryListRecordsRequest.ReferenceInput.fromObject(data.reference);
                }
-                if (data.array != null) {
-                    message.array = QueryListRecordsRequest.ArrayInput.fromObject(data.array);
-                }
-                if (data.map != null) {
-                    message.map = QueryListRecordsRequest.MapInput.fromObject(data.map);
+                if (data.values != null) {
+                    message.values = data.values.map(item => QueryListRecordsRequest.ValueInput.fromObject(item));
                }
                return message;
            }
            toObject() {
                const data: {
+                    type?: string;
                    string?: string;
                    int?: number;
                    float?: number;
                    boolean?: boolean;
-                    link?: string;
-                    array?: ReturnType<typeof QueryListRecordsRequest.ArrayInput.prototype.toObject>;
-                    map?: ReturnType<typeof QueryListRecordsRequest.MapInput.prototype.toObject>;
+                    reference?: ReturnType<typeof QueryListRecordsRequest.ReferenceInput.prototype.toObject>;
+                    values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
                } = {};
+                if (this.type != null) {
+                    data.type = this.type;
+                }
                if (this.string != null) {
                    data.string = this.string;
                }
@ -672,14 +446,11 @@ export namespace vulcanize.registry.v1beta1 {
                if (this.boolean != null) {
                    data.boolean = this.boolean;
                }
-                if (this.link != null) {
-                    data.link = this.link;
+                if (this.reference != null) {
+                    data.reference = this.reference.toObject();
                }
-                if (this.array != null) {
-                    data.array = this.array.toObject();
-                }
-                if (this.map != null) {
-                    data.map = this.map.toObject();
+                if (this.values != null) {
+                    data.values = this.values.map((item: QueryListRecordsRequest.ValueInput) => item.toObject());
                }
                return data;
            }
@ -687,20 +458,20 @@ export namespace vulcanize.registry.v1beta1 {
            serialize(w: pb_1.BinaryWriter): void;
            serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
                const writer = w || new pb_1.BinaryWriter();
-                if (this.has_string)
-                    writer.writeString(1, this.string);
-                if (this.has_int)
-                    writer.writeInt64(2, this.int);
-                if (this.has_float)
-                    writer.writeDouble(3, this.float);
-                if (this.has_boolean)
-                    writer.writeBool(4, this.boolean);
-                if (this.has_link)
-                    writer.writeString(5, this.link);
-                if (this.has_array)
-                    writer.writeMessage(6, this.array, () => this.array.serialize(writer));
-                if (this.has_map)
-                    writer.writeMessage(7, this.map, () => this.map.serialize(writer));
+                if (this.type.length)
+                    writer.writeString(1, this.type);
+                if (this.string.length)
+                    writer.writeString(2, this.string);
+                if (this.int != 0)
+                    writer.writeInt64(3, this.int);
+                if (this.float != 0)
+                    writer.writeDouble(4, this.float);
+                if (this.boolean != false)
+                    writer.writeBool(5, this.boolean);
+                if (this.has_reference)
+                    writer.writeMessage(6, this.reference, () => this.reference.serialize(writer));
+                if (this.values.length)
+                    writer.writeRepeatedMessage(7, this.values, (item: QueryListRecordsRequest.ValueInput) => item.serialize(writer));
                if (!w)
                    return writer.getResultBuffer();
            }
@ -711,25 +482,25 @@ export namespace vulcanize.registry.v1beta1 {
                        break;
                    switch (reader.getFieldNumber()) {
                        case 1:
-                            message.string = reader.readString();
+                            message.type = reader.readString();
                            break;
                        case 2:
-                            message.int = reader.readInt64();
+                            message.string = reader.readString();
                            break;
                        case 3:
-                            message.float = reader.readDouble();
+                            message.int = reader.readInt64();
                            break;
                        case 4:
-                            message.boolean = reader.readBool();
+                            message.float = reader.readDouble();
                            break;
                        case 5:
-                            message.link = reader.readString();
+                            message.boolean = reader.readBool();
                            break;
                        case 6:
-                            reader.readMessage(message.array, () => message.array = QueryListRecordsRequest.ArrayInput.deserialize(reader));
+                            reader.readMessage(message.reference, () => message.reference = QueryListRecordsRequest.ReferenceInput.deserialize(reader));
                            break;
                        case 7:
-                            reader.readMessage(message.map, () => message.map = QueryListRecordsRequest.MapInput.deserialize(reader));
+                            reader.readMessage(message.values, () => pb_1.Message.addToRepeatedWrapperField(message, 7, QueryListRecordsRequest.ValueInput.deserialize(reader), QueryListRecordsRequest.ValueInput));
                            break;
                        default: reader.skipField();
                    }
--- a/src/proto/vulcanize/registry/v1beta1/registry.ts
+++ b/src/proto/vulcanize/registry/v1beta1/registry.ts
@ -2,13 +2,14 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/registry/v1beta1/registry.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../google/protobuf/duration";
 import * as dependency_2 from "./../../../google/protobuf/timestamp";
 import * as dependency_3 from "./../../../gogoproto/gogo";
 import * as dependency_4 from "./../../../cosmos/base/v1beta1/coin";
+import * as dependency_5 from "./../../../google/protobuf/any";
 import * as pb_1 from "google-protobuf";
 export namespace vulcanize.registry.v1beta1 {
    export class Params extends pb_1.Message {
@ -347,7 +348,7 @@ export namespace vulcanize.registry.v1beta1 {
            expiry_time?: string;
            deleted?: boolean;
            owners?: string[];
-            attributes?: Uint8Array;
+            attributes?: dependency_5.google.protobuf.Any;
            names?: string[];
            type?: string;
        }) {
@ -420,10 +421,13 @@ export namespace vulcanize.registry.v1beta1 {
            pb_1.Message.setField(this, 6, value);
        }
        get attributes() {
-            return pb_1.Message.getFieldWithDefault(this, 7, new Uint8Array(0)) as Uint8Array;
+            return pb_1.Message.getWrapperField(this, dependency_5.google.protobuf.Any, 7) as dependency_5.google.protobuf.Any;
        }
-        set attributes(value: Uint8Array) {
-            pb_1.Message.setField(this, 7, value);
+        set attributes(value: dependency_5.google.protobuf.Any) {
+            pb_1.Message.setWrapperField(this, 7, value);
+        }
+        get has_attributes() {
+            return pb_1.Message.getField(this, 7) != null;
        }
        get names() {
            return pb_1.Message.getFieldWithDefault(this, 8, []) as string[];
@ -444,7 +448,7 @@ export namespace vulcanize.registry.v1beta1 {
            expiry_time?: string;
            deleted?: boolean;
            owners?: string[];
-            attributes?: Uint8Array;
+            attributes?: ReturnType<typeof dependency_5.google.protobuf.Any.prototype.toObject>;
            names?: string[];
            type?: string;
        }): Record {
@ -468,7 +472,7 @@ export namespace vulcanize.registry.v1beta1 {
                message.owners = data.owners;
            }
            if (data.attributes != null) {
-                message.attributes = data.attributes;
+                message.attributes = dependency_5.google.protobuf.Any.fromObject(data.attributes);
            }
            if (data.names != null) {
                message.names = data.names;
@ -486,7 +490,7 @@ export namespace vulcanize.registry.v1beta1 {
                expiry_time?: string;
                deleted?: boolean;
                owners?: string[];
-                attributes?: Uint8Array;
+                attributes?: ReturnType<typeof dependency_5.google.protobuf.Any.prototype.toObject>;
                names?: string[];
                type?: string;
            } = {};
@ -509,7 +513,7 @@ export namespace vulcanize.registry.v1beta1 {
                data.owners = this.owners;
            }
            if (this.attributes != null) {
-                data.attributes = this.attributes;
+                data.attributes = this.attributes.toObject();
            }
            if (this.names != null) {
                data.names = this.names;
@ -535,8 +539,8 @@ export namespace vulcanize.registry.v1beta1 {
                writer.writeBool(5, this.deleted);
            if (this.owners.length)
                writer.writeRepeatedString(6, this.owners);
-            if (this.attributes.length)
-                writer.writeBytes(7, this.attributes);
+            if (this.has_attributes)
+                writer.writeMessage(7, this.attributes, () => this.attributes.serialize(writer));
            if (this.names.length)
                writer.writeRepeatedString(8, this.names);
            if (this.type.length)
@ -569,7 +573,7 @@ export namespace vulcanize.registry.v1beta1 {
                        pb_1.Message.addToRepeatedField(message, 6, reader.readString());
                        break;
                    case 7:
-                        message.attributes = reader.readBytes();
+                        reader.readMessage(message.attributes, () => message.attributes = dependency_5.google.protobuf.Any.deserialize(reader));
                        break;
                    case 8:
                        pb_1.Message.addToRepeatedField(message, 8, reader.readString());
--- a/src/proto/vulcanize/registry/v1beta1/tx.ts
+++ b/src/proto/vulcanize/registry/v1beta1/tx.ts
@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
 * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 4.25.1
+ * compiler version: 3.12.4
 * source: vulcanize/registry/v1beta1/tx.proto
 * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";
--- a/src/registry-client.ts
+++ b/src/registry-client.ts
@ -10,23 +10,15 @@ const attributeField = `
  attributes {
    key
    value {
-      ... on BooleanValue { bool: value }
-      ... on IntValue { int: value }
-      ... on FloatValue { float: value }
-      ... on StringValue { string: value }
-      ... on BytesValue { bytes: value }
-      ... on LinkValue { link: value }
-      ... on ArrayValue {
-        array: value {
-          ... on BooleanValue { bool: value }
-          ... on IntValue { int: value }
-          ... on FloatValue { float: value }
-          ... on StringValue { string: value }
-          ... on BytesValue { bytes: value }
-          ... on LinkValue { link: value }
-        }
+      null
+      int
+      float
+      string
+      boolean
+      json
+      reference {
+        id
      }
-      ... on MapValue { map: value { key mapping: value { __typename } } }
    }
  }
 `;
--- a/src/sdk.test.ts
+++ b/src/sdk.test.ts
@ -50,18 +50,18 @@ describe('Querying', () => {
    expect(records.length).toBeGreaterThanOrEqual(1);

    const { attributes: { repo_registration_record_cid: record_repo_registration_record_cid } } = records[0];
-    expect(repo_registration_record_cid).toStrictEqual(record_repo_registration_record_cid);
+    expect(repo_registration_record_cid).toBe(record_repo_registration_record_cid);
  });

  test('Query records by attributes.', async () => {
-    const { version, url } = watcher.record;
-    const records = await registry.queryRecords({ version, url, type: undefined }, true);
+    const { version, name } = watcher.record;
+    const records = await registry.queryRecords({ version, name }, true);
    expect(records.length).toBe(1);

    [ watcher ] = records;
-    const { attributes: { version: recordVersion, url: recordName } } = watcher;
+    const { attributes: { version: recordVersion, name: recordName } } = watcher;
    expect(recordVersion).toBe(version);
-    expect(recordName).toBe(url);
+    expect(recordName).toBe(name);
  });

  test('Query records by id.', async () => {
@ -75,7 +75,6 @@ describe('Querying', () => {
    expect(record.id).toBe(watcher.id);
    // temp fix
    expect(record.attributes.repo_registration_record_cid).toBeDefined();
-    expect(record.attributes.repo_registration_record_cid).toHaveProperty("/");
-    expect(record.attributes.repo_registration_record_cid["/"]).toHaveLength(46);
+    expect(record.attributes.repo_registration_record_cid).toHaveLength(46);
  });
 });
--- a/src/testing/data/watcher.yml
+++ b/src/testing/data/watcher.yml
@ -1,10 +1,7 @@
 record:
  type: WebsiteRegistrationRecord
  url: 'https://cerc.io'
-  repo_registration_record_cid:
-    /: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
-  build_artifact_cid:
-    /: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
-  tls_cert_cid:
-    /: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
+  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
+  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
+  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
  version: 1.0.23
--- a/src/types.ts
+++ b/src/types.ts
@ -1,8 +1,12 @@
 import assert from 'assert';
 import { Validator } from 'jsonschema';
+import { ethers } from 'ethers';

 import RecordSchema from './schema/record.json';
 import { Util } from './util';
+import * as attributes from './proto/vulcanize/registry/v1beta1/attributes';
+import * as evmTx from './proto/ethermint/evm/v1/tx';
+import * as any from './proto/google/protobuf/any';

 /**
 * Record.
@ -27,7 +31,17 @@ export class Record {
  }

  get attributes() {
-    return Buffer.from(JSON.stringify(this._record), 'binary')
+
+    var a = new any.google.protobuf.Any()
+
+    if (this._record.type=="WebsiteRegistrationRecord"){
+      var attr= new attributes.vulcanize.registry.v1beta1.WebsiteRegistrationRecord(this._record)
+      a= new any.google.protobuf.Any({
+        type_url: "/vulcanize.registry.v1beta1.WebsiteRegistrationRecord",
+        value: attr.serialize()
+      })
+    }
+    return a
  }

  /**
@ -128,3 +142,33 @@ export class Payload {
    }
  }
 }
+
+export class EthereumTxData {
+  _tx: ethers.Transaction
+
+  constructor (tx: ethers.Transaction) {
+    this._tx = tx
+  }
+
+  serialize () {
+    var data= new evmTx.ethermint.evm.v1.LegacyTx({
+      nonce: this._tx.nonce,
+      data: ethers.utils.arrayify(this._tx.data),
+      gas: this._tx.gasLimit.toNumber(),
+      gas_price: this._tx.gasPrice?.toString(),
+      r: ethers.utils.arrayify(this._tx.r!),
+      s: ethers.utils.arrayify(this._tx.s!),
+      
+      // TODO: Check if need to put in array
+      v: ethers.utils.arrayify([this._tx.v!]),
+
+      to: this._tx.to,
+      value: this._tx.value.toString()
+    })
+    
+    return new any.google.protobuf.Any({
+      type_url: "/ethermint.evm.v1.TxData",
+      value: data.serialize()
+    });
+  }
+}
--- a/src/util.ts
+++ b/src/util.ts
@ -10,21 +10,21 @@ export class Util {
  /**
   * Sorts JSON object.
   */
-  static sortJSON(obj: any) {
-    if (obj instanceof Array) {
-      for (let i = 0; i < obj.length; i++) {
-        obj[i] = Util.sortJSON(obj[i]);
+  static sortJSON(object: any) {
+    if (object instanceof Array) {
+      for (let i = 0; i < object.length; i++) {
+        object[i] = Util.sortJSON(object[i]);
      }
-      return obj;
+      return object;
    }
-    if (typeof obj !== 'object' || obj === null) return obj;
+    if (typeof object !== 'object' || object === null) return object;

-    let keys = Object.keys(obj);
+    let keys = Object.keys(object);
    keys = keys.sort();
    const newObject: {[key: string]: any} = {};

    for (let i = 0; i < keys.length; i++) {
-      newObject[keys[i]] = Util.sortJSON(obj[keys[i]]);
+      newObject[keys[i]] = Util.sortJSON(object[keys[i]]);
    }
    return newObject;
  }
@ -32,44 +32,29 @@ export class Util {
  /**
   * Marshal object into gql 'attributes' variable.
   */
-  static toGQLAttributes(obj: any) {
+  static toGQLAttributes(object: any) {
    const vars: any[] = [];
-    Object.keys(obj).forEach(key => {
-      const value = this.toGQLValue(obj[key]);

-      if (value !== undefined) {
-        vars.push({ key, value });
+    Object.keys(object).forEach(key => {
+      let type: string = typeof object[key];
+      if (object[key] === null) {
+        vars.push({ key, value: { 'null': true } });
+      } else if (type === 'number') {
+        type = (object[key] % 1 === 0) ? 'int' : 'float';
+        vars.push({ key, value: { [type]: object[key] } });
+      } else if (type === 'string') {
+        vars.push({ key, value: { 'string': object[key] } });
+      } else if (type === 'boolean') {
+        vars.push({ key, value: { 'boolean': object[key] } });
+      } else if (type === 'object') {
+        const nestedObject = object[key];
+        if (nestedObject['/'] !== undefined) {
+          vars.push({ key, value: { 'reference': { id: nestedObject['/'] } } });
+        }
      }
    });
-    return vars;
-  }

-  static toGQLValue(obj: any) {
-      if (obj === null) {
-        return null;
-      }
-      let type: string = typeof obj;
-      switch (type) {
-        case 'number':
-          type = (obj % 1 === 0) ? 'int' : 'float';
-          return { [type]: obj };
-        case 'string':
-          return { 'string': obj };
-        case 'boolean':
-          return { 'boolean': obj };
-        case 'object':
-          if (obj['/'] !== undefined) {
-            return { 'link': obj['/']  };
-          }
-          if (obj instanceof Array) {
-            return { 'array': obj };
-          }
-          return { 'map': obj };
-        case 'undefined':
-          return undefined;
-        default:
-          throw new Error(`Unknown object type '${type}': ${obj}`);
-      }
+    return vars;
  }

  /**
@ -79,29 +64,24 @@ export class Util {
    const res: {[key: string]: any} = {};

    attributes.forEach(attr => {
-      res[attr.key] = (attr.value === null) ? null : this.fromGQLValue(attr.value);
+      if (attr.value.null) {
+        res[attr.key] = null;
+      } else if (attr.value.json) {
+        res[attr.key] = JSON.parse(attr.value.json);
+      } else if (attr.value.reference) {
+        // Convert GQL reference to IPLD style link.
+        const ref = attr.value.reference;
+        res[attr.key] = { '/': ref.id };
+      } else {
+        const { values, null: n, ...types } = attr.value;
+        const value = Object.values(types).find(v => v !== null);
+        res[attr.key] = value;
+      }
    });

    return res;
  }

-  static fromGQLValue(obj: any) {
-    // Get first non-null key
-    const present = Object.keys(obj).find(k => obj[k] !== null);
-    if (present === undefined) {
-      throw new Error('Object has no non-null values');
-    }
-
-    // Create an array if array type attribute
-    if (present === 'array') {
-      return obj[present].map((e: any) => {
-        return this.fromGQLValue(e);
-      });
-    }
-
-    return obj[present];
-  }
-
  /**
   * Get record content ID.
   */
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
nabarun	1177a17516	WIP: Send eth tx wrapped in cosmos tx message	2023-03-08 20:30:11 +05:30
nabarun	7d0a84b701	Fix protoc-gen-ts error with updated typescript	2023-03-08 20:27:59 +05:30