testing clarity and commented alternate CID generation

2023-01-19 16:18:19 -05:00
30 changed files with 1550 additions and 1374 deletions
@@ -1,32 +0,0 @@
-name: Publish npm package to gitea
-on:
-  release:
-    types: [published]
-jobs:
-  npm_publish:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 16.x ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - 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.GITEA_PUBLISH_TOKEN }}"
-      - name: npm publish
-        run: |
-          npm publish
@@ -1,81 +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 containers scripts
-        working-directory: laconicd/tests/sdk_tests
-        run: ./build-laconicd-container.sh
-      - 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 basic 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"
-      - name: stop containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down
-      - name: start auction containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose -f docker-compose-auctions.yml up -d
-      - name: run auction 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:auctions"
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        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
@@ -1,72 +0,0 @@
-name: Tests
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - release/**
-
-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: build containers scripts
-        working-directory: laconicd/tests/sdk_tests
-        run: ./build-laconicd-container.sh
-      - 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 basic 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"
-      - name: stop containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose down
-      - name: start auction containers
-        working-directory: laconicd/tests/sdk_tests
-        run: docker compose -f docker-compose-auctions.yml up -d
-      - name: run auction 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:auctions"
-      - name: start containers
-        working-directory: laconicd/tests/sdk_tests
-        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
@@ -1,4 +1,4 @@
 node_modules
 dist
 .env
-.idea*
+.idea/
@@ -1,54 +0,0 @@
-# Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
-FROM node:${VARIANT}
-
-ARG USERNAME=node
-ARG NPM_GLOBAL=/usr/local/share/npm-global
-
-# Add NPM global to PATH.
-ENV PATH=${NPM_GLOBAL}/bin:${PATH}
-
-RUN \
-    # Configure global npm install location, use group to adapt to UID/GID changes
-    if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \
-    && usermod -a -G npm ${USERNAME} \
-    && umask 0002 \
-    && mkdir -p ${NPM_GLOBAL} \
-    && touch /usr/local/etc/npmrc \
-    && chown ${USERNAME}:npm ${NPM_GLOBAL} /usr/local/etc/npmrc \
-    && chmod g+s ${NPM_GLOBAL} \
-    && 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 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
-
-# Temp hack, clone the laconic-sdk repo here
-WORKDIR /app
-RUN yarn install
-
-WORKDIR /app/laconic-sdk
@@ -57,7 +57,7 @@ Follow these steps to run the tests:
  - In laconicd repo run:

    ```bash
-    TEST_REGISTRY_EXPIRY=true ./init.sh
+    TEST_NAMESERVICE_EXPIRY=true ./init.sh
    ```

  - Export the private key and change it in `.env` file again using:
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec "$@"
-
@@ -1,6 +1,6 @@
 {
  "name": "@cerc-io/laconic-sdk",
-  "version": "0.1.6",
+  "version": "0.1.4",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "repository": "git@github.com:cerc-io/laconic-sdk.git",
@@ -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;
-}
@@ -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;
-}
@@ -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\""];
+}
@@ -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\""];
-}
+}
@@ -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 -iname "*.proto")
@@ -1,39 +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..."
-
-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
@@ -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
@@ -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,
@@ -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' },
@@ -71,12 +75,10 @@ export const parseMsgSetRecordResponse = (data: string) => {
  const responseBytes = Buffer.from(data, 'hex')

  // TODO: Decode response using protobuf.
-  // const msgSetRecordResponse = nameserviceTx.vulcanize.nameservice.v1beta1.MsgSetRecordResponse.deserialize(responseBytes);
+  // const msgSetRecordResponse = registryTx.vulcanize.registry.v1beta1.MsgSetRecordResponse.deserialize(responseBytes);
  // return msgSetRecordResponse.toObject();
-
  // Workaround as proto based decoding is not working.
  const [_, id] = responseBytes.toString().split(';')
-
  return { id }
 }

@@ -30,7 +30,7 @@ const nameserviceExpiryTests = () => {
  test('Set record and check bond balance', async () => {
    // Create watcher.
    watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
-    const result = await registry.setRecord(
+    await registry.setRecord(
      {
        privateKey,
        bondId,
@@ -39,8 +39,8 @@ const nameserviceExpiryTests = () => {
      privateKey,
      fee
    )
-    console.log("SetRecordResult: " + result.data.id)
-    const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+
+    const [record] = await registry.queryRecords({ type: 'watcher', version: watcher.record.version }, true);
    recordExpiryTime = new Date(record.expiryTime);

    const [bond] = await registry.getBondsByIds([bondId]);
@@ -63,22 +63,21 @@ const nameserviceExpiryTests = () => {
  });

  test('Check record expiry time', async() => {
-    const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
-    const updatedExpiryTime = new Date();
+    const [record] = await registry.queryRecords({ type: 'watcher', version: watcher.record.version }, true);
+    const updatedExpiryTime = new Date(record.expiryTime);
    expect(updatedExpiryTime.getTime()).toBeGreaterThan(recordExpiryTime.getTime());
    recordExpiryTime = updatedExpiryTime;
  })

  test('Check authority expiry time', async() => {
    const [authority] = await registry.lookupAuthorities([authorityName]);
-    const updatedExpiryTime = new Date();
+    const updatedExpiryTime = new Date(authority.expiryTime);
    expect(updatedExpiryTime.getTime()).toBeGreaterThan(authorityExpiryTime.getTime());
    authorityExpiryTime = updatedExpiryTime;
  })

  test('Check bond balance', async () => {
    const [bond] = await registry.getBondsByIds([bondId]);
-    console.log(bond)
    expect(bond).toBeDefined();
    expect(bond.balance).toHaveLength(0);
  })
@@ -88,7 +87,7 @@ const nameserviceExpiryTests = () => {
  });

  test('Check record deleted without bond balance', async() => {
-    const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    const records = await registry.queryRecords({ type: 'watcher', version: watcher.record.version }, true);
    expect(records).toHaveLength(0);
  })

@@ -105,7 +104,7 @@ if (!process.env.TEST_NAMESERVICE_EXPIRY) {
  /**
    Running these tests requires timers to be set. In laconicd repo run:

-    TEST_REGISTRY_EXPIRY=true ./init.sh
+    TEST_NAMESERVICE_EXPIRY=true ./init.sh


    Run tests:
@@ -29,7 +29,7 @@ const namingTests = () => {

    // Create bond.
    bondId = await registry.getNextBondId(privateKey);
-    await registry.createBond({ denom: 'aphoton', amount: '2000000000' }, privateKey, fee);
+    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);

    // Create watcher.
    watcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
@@ -244,6 +244,7 @@ const namingTests = () => {

    const records = await registry.lookupNames([crn], true);
    expect(records).toBeDefined();
+    expect(records).toBeDefined();
    expect(records).toHaveLength(1);

    const [{ latest }] = records;
@@ -37,7 +37,7 @@ export namespace cosmos.base.query.v1beta1 {
            }
        }
        get key() {
-            return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array(0)) as Uint8Array;
+            return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array()) as Uint8Array;
        }
        set key(value: Uint8Array) {
            pb_1.Message.setField(this, 1, value);
@@ -184,7 +184,7 @@ export namespace cosmos.base.query.v1beta1 {
            }
        }
        get next_key() {
-            return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array(0)) as Uint8Array;
+            return pb_1.Message.getFieldWithDefault(this, 1, new Uint8Array()) as Uint8Array;
        }
        set next_key(value: Uint8Array) {
            pb_1.Message.setField(this, 1, value);
@@ -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()) 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);
+        }
+    }
+}
@@ -3604,7 +3604,7 @@ export namespace google.protobuf {
            return pb_1.Message.getField(this, 6) != null;
        }
        get string_value() {
-            return pb_1.Message.getFieldWithDefault(this, 7, new Uint8Array(0)) as Uint8Array;
+            return pb_1.Message.getFieldWithDefault(this, 7, new Uint8Array()) as Uint8Array;
        }
        set string_value(value: Uint8Array) {
            pb_1.Message.setField(this, 7, value);
@@ -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);
+        }
+    }
+}
@@ -9,6 +9,7 @@ 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());
@@ -4,4 +4,4 @@ record:
  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
-  version: 1.0.23
+  version: 1.0.17
@@ -24,18 +24,13 @@ export const getBaseConfig = async (path: string) => {
 * Provision a bond for record registration.
 */
 export const provisionBondId = async (registry: Registry, privateKey: string, fee: Fee) => {
-  // let bonds = await registry.queryBonds();
-  // console.log("found bonds: " + bonds.length)
-  // if (!bonds.length) {
-  //   await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
-  //   bonds = await registry.queryBonds();
-  //   console.log("created bond and got back: " + bonds.length)
-  // }
-  let bondId: string;
-  bondId = await registry.getNextBondId(privateKey);
-  await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
-  return bondId
-  //return bonds[0].id;
+  let bonds = await registry.queryBonds();
+  if (!bonds.length) {
+    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);
+    bonds = await registry.queryBonds();
+  }
+
+  return bonds[0].id;
 };

 export const getConfig = () => {
@@ -3,6 +3,8 @@ import { Validator } from 'jsonschema';

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

 /**
 * Record.
@@ -27,7 +29,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
  }

  /**
@@ -25,7 +25,7 @@ const utilTests = () => {
    await registry.createBond({ denom: 'aphoton', amount: '1000000000' }, privateKey, fee);

    // Create watcher.
-    watcher = await getBaseConfig(WATCHER_YML_PATH);
+    watcher = await getBaseConfig(WATCHER_YML_PATH); //this overwrites version to 0.0.1
    const result = await registry.setRecord(
      {
        privateKey,
@@ -2,6 +2,8 @@ import * as Block from 'multiformats/block'
 import { sha256 as hasher } from 'multiformats/hashes/sha2'
 import * as dagCBOR from '@ipld/dag-cbor'
 import * as dagJSON from '@ipld/dag-json'
+//import { CID } from 'multiformats/cid'
+//import * as json from 'multiformats/codecs/json'

 /**
 * Utils
@@ -86,15 +88,29 @@ export class Util {
   * Get record content ID.
   */
  static async getContentId(record: any) {
+    //this encode/decode does nothing, afaict
    const serialized = dagJSON.encode(record)
    const recordData = dagJSON.decode(serialized)
-
+    //these are for version 0.0.1 of watcher.yml test data:
+    //const dside = {"build_artifact_cid":"QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9","repo_registration_record_cid":"QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D","tls_cert_cid":"QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR","type":"WebsiteRegistrationRecord","url":"https://cerc.io","version":"0.0.1"}
+    //bafyreiek4hnoqmits66bjyxswapplweuoqe4en2ux6u772o4y3askpd3ny is the CBOR encoding w/ sha 256 hasher
+    //bafyreifalhff7dp6o4hd573b5zdbbnl2wml5q2nrms474lrzp7dgptwxkm is expected DAG-CBOR w/ sha 256 hasher
+    //bafyreihpfkdvib5muloxlj5b3tgdwibjdcu3zdsuhyft33z7gtgnlzlkpm is CBOR??? encoding of empty json payload.
    const block = await Block.encode({
      value: recordData,
      codec: dagCBOR,
      hasher
    })

+    //manual CID construction
+    //const dbytes = dagCBOR.encode(dside)
+    //console.log("BYTES: "  + dbytes)
+    //const hash = await hasher.digest(dbytes)
+    //console.log("HASH: " + hash)
+    //const cid = CID.create(1, dagCBOR.code, hash)
+
+    //console.log("TEST CID: " + cid.toString())
+
    return block.cid.toString();
  }
 }