DEVELOPMENT.md

@@ -12,13 +12,5 @@ Run following scripts when [proto files](./proto/) are updated.
 2. Generate typescript code for the proto files
 
     ```bash
-    ./scripts/create-proto-files.sh
+    ./scripts/proto-gen.sh
     ```
-
-3. Remove GRPC code from generated code
-
-    ```bash
-    ./scripts/remove-grpc.sh
-    ```
-
-    Reference: https://github.com/tharsis/evmosjs/tree/main/packages/proto#note

proto/vulcanize/registry/v1beta1/query.proto

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

scripts/proto-gen.sh

@@ -23,6 +23,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 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

src/bond.test.ts

@@ -97,17 +97,17 @@ const bondTests = () => {
 
     // Create a new record.
     version1 = await publishNewWatcherVersion(bondId1);
-    let [record1] = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
+    let [record1] = await registry.queryRecords({ type: watcher.record.type, 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({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
+    [record1] = await registry.queryRecords({ type: watcher.record.type, 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({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
+    [record1] = await registry.queryRecords({ type: watcher.record.type, version: version1 }, true);
     expect(record1.bondId).toBe(bondId1);
   });
 
@@ -117,9 +117,9 @@ const bondTests = () => {
 
     // Check version1, version2 as associated with bondId1.
     let records;
-    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
+    records = await registry.queryRecords({ type: watcher.record.type, version: version1 }, true);
     expect(records[0].bondId).toBe(bondId1);
-    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
+    records = await registry.queryRecords({ type: watcher.record.type, version: version2 }, true);
     expect(records[0].bondId).toBe(bondId1);
 
     // Create another bond.
@@ -131,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({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
+    records = await registry.queryRecords({ type: watcher.record.type, version: version1 }, true);
     expect(records[0].bondId).toBe(bondId2);
-    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
+    records = await registry.queryRecords({ type: watcher.record.type, 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({ type: watcher.record.type, name: watcher.record.name, version: version1 }, true);
+    records = await registry.queryRecords({ type: watcher.record.type, version: version1 }, true);
     expect(records[0].bondId).toBe('');
-    records = await registry.queryRecords({ type: watcher.record.type, name: watcher.record.name, version: version2 }, true);
+    records = await registry.queryRecords({ type: watcher.record.type, version: version2 }, true);
     expect(records[0].bondId).toBe('');
   });
 };

src/proto/vulcanize/registry/v1beta1/query.ts

@@ -239,7 +239,7 @@ export namespace vulcanize.registry.v1beta1 {
         }
     }
     export namespace QueryListRecordsRequest {
-        export class ReferenceInput extends pb_1.Message {
+        export class LinkInput 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;
-            }): ReferenceInput {
+            }): LinkInput {
-                const message = new ReferenceInput({});
+                const message = new LinkInput({});
                 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): ReferenceInput {
+            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): LinkInput {
-                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ReferenceInput();
+                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new LinkInput();
                 while (reader.nextField()) {
                     if (reader.isEndGroup())
                         break;
@@ -302,27 +302,220 @@ export namespace vulcanize.registry.v1beta1 {
             serializeBinary(): Uint8Array {
                 return this.serialize();
             }
-            static deserializeBinary(bytes: Uint8Array): ReferenceInput {
+            static deserializeBinary(bytes: Uint8Array): LinkInput {
-                return ReferenceInput.deserialize(bytes);
+                return LinkInput.deserialize(bytes);
             }
         }
-        export class ValueInput extends pb_1.Message {
+        export class ArrayInput extends pb_1.Message {
             #one_of_decls: number[][] = [];
             constructor(data?: any[] | {
-                type?: string;
-                string?: string;
-                int?: number;
-                float?: number;
-                boolean?: boolean;
-                reference?: QueryListRecordsRequest.ReferenceInput;
                 values?: QueryListRecordsRequest.ValueInput[];
             }) {
                 super();
-                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [7], this.#one_of_decls);
+                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1], this.#one_of_decls);
                 if (!Array.isArray(data) && typeof data == "object") {
-                    if ("type" in data && data.type != undefined) {
+                    if ("values" in data && data.values != undefined) {
-                        this.type = data.type;
+                        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);
+            }
+        }
+        export class ValueInput extends pb_1.Message {
+            #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7]];
+            constructor(data?: any[] | ({} & (({
+                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;
+            })))) {
+                super();
+                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+                if (!Array.isArray(data) && typeof data == "object") {
                     if ("string" in data && data.string != undefined) {
                         this.string = data.string;
                     }
@@ -335,72 +528,105 @@ export namespace vulcanize.registry.v1beta1 {
                     if ("boolean" in data && data.boolean != undefined) {
                         this.boolean = data.boolean;
                     }
-                    if ("reference" in data && data.reference != undefined) {
+                    if ("link" in data && data.link != undefined) {
-                        this.reference = data.reference;
+                        this.link = data.link;
                     }
-                    if ("values" in data && data.values != undefined) {
+                    if ("array" in data && data.array != undefined) {
-                        this.values = data.values;
+                        this.array = data.array;
+                    }
+                    if ("map" in data && data.map != undefined) {
+                        this.map = data.map;
                     }
                 }
             }
-            get type() {
-                return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
-            }
-            set type(value: string) {
-                pb_1.Message.setField(this, 1, value);
-            }
             get string() {
-                return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+                return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
             }
             set string(value: string) {
-                pb_1.Message.setField(this, 2, value);
+                pb_1.Message.setOneofField(this, 1, this.#one_of_decls[0], value);
+            }
+            get has_string() {
+                return pb_1.Message.getField(this, 1) != null;
             }
             get int() {
-                return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
+                return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
             }
             set int(value: number) {
-                pb_1.Message.setField(this, 3, value);
+                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, 4, 0) as number;
+                return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
             }
             set float(value: number) {
-                pb_1.Message.setField(this, 4, value);
+                pb_1.Message.setOneofField(this, 3, this.#one_of_decls[0], value);
+            }
+            get has_float() {
+                return pb_1.Message.getField(this, 3) != null;
             }
             get boolean() {
-                return pb_1.Message.getFieldWithDefault(this, 5, false) as boolean;
+                return pb_1.Message.getFieldWithDefault(this, 4, false) as boolean;
             }
             set boolean(value: boolean) {
-                pb_1.Message.setField(this, 5, value);
+                pb_1.Message.setOneofField(this, 4, this.#one_of_decls[0], value);
             }
-            get reference() {
+            get has_boolean() {
-                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.ReferenceInput, 6) as QueryListRecordsRequest.ReferenceInput;
+                return pb_1.Message.getField(this, 4) != null;
             }
-            set reference(value: QueryListRecordsRequest.ReferenceInput) {
+            get link() {
-                pb_1.Message.setWrapperField(this, 6, value);
+                return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
             }
-            get has_reference() {
+            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() {
                 return pb_1.Message.getField(this, 6) != null;
             }
-            get values() {
+            get map() {
-                return pb_1.Message.getRepeatedWrapperField(this, QueryListRecordsRequest.ValueInput, 7) as QueryListRecordsRequest.ValueInput[];
+                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.MapInput, 7) as QueryListRecordsRequest.MapInput;
             }
-            set values(value: QueryListRecordsRequest.ValueInput[]) {
+            set map(value: QueryListRecordsRequest.MapInput) {
-                pb_1.Message.setRepeatedWrapperField(this, 7, value);
+                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])];
             }
             static fromObject(data: {
-                type?: string;
                 string?: string;
                 int?: number;
                 float?: number;
                 boolean?: boolean;
-                reference?: ReturnType<typeof QueryListRecordsRequest.ReferenceInput.prototype.toObject>;
+                link?: string;
-                values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
+                array?: ReturnType<typeof QueryListRecordsRequest.ArrayInput.prototype.toObject>;
+                map?: ReturnType<typeof QueryListRecordsRequest.MapInput.prototype.toObject>;
             }): ValueInput {
                 const message = new ValueInput({});
-                if (data.type != null) {
-                    message.type = data.type;
-                }
                 if (data.string != null) {
                     message.string = data.string;
                 }
@@ -413,27 +639,27 @@ export namespace vulcanize.registry.v1beta1 {
                 if (data.boolean != null) {
                     message.boolean = data.boolean;
                 }
-                if (data.reference != null) {
+                if (data.link != null) {
-                    message.reference = QueryListRecordsRequest.ReferenceInput.fromObject(data.reference);
+                    message.link = data.link;
                 }
-                if (data.values != null) {
+                if (data.array != null) {
-                    message.values = data.values.map(item => QueryListRecordsRequest.ValueInput.fromObject(item));
+                    message.array = QueryListRecordsRequest.ArrayInput.fromObject(data.array);
+                }
+                if (data.map != null) {
+                    message.map = QueryListRecordsRequest.MapInput.fromObject(data.map);
                 }
                 return message;
             }
             toObject() {
                 const data: {
-                    type?: string;
                     string?: string;
                     int?: number;
                     float?: number;
                     boolean?: boolean;
-                    reference?: ReturnType<typeof QueryListRecordsRequest.ReferenceInput.prototype.toObject>;
+                    link?: string;
-                    values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
+                    array?: ReturnType<typeof QueryListRecordsRequest.ArrayInput.prototype.toObject>;
+                    map?: ReturnType<typeof QueryListRecordsRequest.MapInput.prototype.toObject>;
                 } = {};
-                if (this.type != null) {
-                    data.type = this.type;
-                }
                 if (this.string != null) {
                     data.string = this.string;
                 }
@@ -446,11 +672,14 @@ export namespace vulcanize.registry.v1beta1 {
                 if (this.boolean != null) {
                     data.boolean = this.boolean;
                 }
-                if (this.reference != null) {
+                if (this.link != null) {
-                    data.reference = this.reference.toObject();
+                    data.link = this.link;
                 }
-                if (this.values != null) {
+                if (this.array != null) {
-                    data.values = this.values.map((item: QueryListRecordsRequest.ValueInput) => item.toObject());
+                    data.array = this.array.toObject();
+                }
+                if (this.map != null) {
+                    data.map = this.map.toObject();
                 }
                 return data;
             }
@@ -458,20 +687,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.type.length)
+                if (this.has_string)
-                    writer.writeString(1, this.type);
+                    writer.writeString(1, this.string);
-                if (this.string.length)
+                if (this.has_int)
-                    writer.writeString(2, this.string);
+                    writer.writeInt64(2, this.int);
-                if (this.int != 0)
+                if (this.has_float)
-                    writer.writeInt64(3, this.int);
+                    writer.writeDouble(3, this.float);
-                if (this.float != 0)
+                if (this.has_boolean)
-                    writer.writeDouble(4, this.float);
+                    writer.writeBool(4, this.boolean);
-                if (this.boolean != false)
+                if (this.has_link)
-                    writer.writeBool(5, this.boolean);
+                    writer.writeString(5, this.link);
-                if (this.has_reference)
+                if (this.has_array)
-                    writer.writeMessage(6, this.reference, () => this.reference.serialize(writer));
+                    writer.writeMessage(6, this.array, () => this.array.serialize(writer));
-                if (this.values.length)
+                if (this.has_map)
-                    writer.writeRepeatedMessage(7, this.values, (item: QueryListRecordsRequest.ValueInput) => item.serialize(writer));
+                    writer.writeMessage(7, this.map, () => this.map.serialize(writer));
                 if (!w)
                     return writer.getResultBuffer();
             }
@@ -482,25 +711,25 @@ export namespace vulcanize.registry.v1beta1 {
                         break;
                     switch (reader.getFieldNumber()) {
                         case 1:
-                            message.type = reader.readString();
-                            break;
-                        case 2:
                             message.string = reader.readString();
                             break;
-                        case 3:
+                        case 2:
                             message.int = reader.readInt64();
                             break;
-                        case 4:
+                        case 3:
                             message.float = reader.readDouble();
                             break;
-                        case 5:
+                        case 4:
                             message.boolean = reader.readBool();
                             break;
+                        case 5:
+                            message.link = reader.readString();
+                            break;
                         case 6:
-                            reader.readMessage(message.reference, () => message.reference = QueryListRecordsRequest.ReferenceInput.deserialize(reader));
+                            reader.readMessage(message.array, () => message.array = QueryListRecordsRequest.ArrayInput.deserialize(reader));
                             break;
                         case 7:
-                            reader.readMessage(message.values, () => pb_1.Message.addToRepeatedWrapperField(message, 7, QueryListRecordsRequest.ValueInput.deserialize(reader), QueryListRecordsRequest.ValueInput));
+                            reader.readMessage(message.map, () => message.map = QueryListRecordsRequest.MapInput.deserialize(reader));
                             break;
                         default: reader.skipField();
                     }

src/registry-client.ts

@@ -10,15 +10,14 @@ const attributeField = `
   attributes {
     key
     value {
-      null
+      ... on BooleanValue { bool: value }
-      int
+      ... on IntValue { int: value }
-      float
+      ... on FloatValue { float: value }
-      string
+      ... on StringValue { string: value }
-      boolean
+      ... on BytesValue { bytes: value }
-      json
+      ... on LinkValue { link: value }
-      reference {
+      ... on ArrayValue { array: value { __typename } }
-        id
+      ... on MapValue { map: value { key mapping: value { __typename } } }
-      }
     }
   }
 `;

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).toBe(record_repo_registration_record_cid);
+    expect(repo_registration_record_cid).toStrictEqual(record_repo_registration_record_cid);
   });
 
   test('Query records by attributes.', async () => {
-    const { version, name } = watcher.record;
+    const { version, url } = watcher.record;
-    const records = await registry.queryRecords({ version, name }, true);
+    const records = await registry.queryRecords({ version, url, type: undefined }, true);
     expect(records.length).toBe(1);
 
     [ watcher ] = records;
-    const { attributes: { version: recordVersion, name: recordName } } = watcher;
+    const { attributes: { version: recordVersion, url: recordName } } = watcher;
     expect(recordVersion).toBe(version);
-    expect(recordName).toBe(name);
+    expect(recordName).toBe(url);
   });
 
   test('Query records by id.', async () => {
@@ -75,6 +75,7 @@ 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).toHaveLength(46);
+    expect(record.attributes.repo_registration_record_cid).toHaveProperty("/");
+    expect(record.attributes.repo_registration_record_cid["/"]).toHaveLength(46);
   });
 });

src/testing/data/watcher.yml

@@ -1,7 +1,10 @@
 record:
   type: WebsiteRegistrationRecord
   url: 'https://cerc.io'
-  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
+  repo_registration_record_cid:
-  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
+    /: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
-  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
+  build_artifact_cid:
+    /: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
+  tls_cert_cid:
+    /: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
   version: 1.0.23

src/util.ts

@@ -10,21 +10,21 @@ export class Util {
   /**
    * Sorts JSON object.
    */
-  static sortJSON(object: any) {
+  static sortJSON(obj: any) {
-    if (object instanceof Array) {
+    if (obj instanceof Array) {
-      for (let i = 0; i < object.length; i++) {
+      for (let i = 0; i < obj.length; i++) {
-        object[i] = Util.sortJSON(object[i]);
+        obj[i] = Util.sortJSON(obj[i]);
       }
-      return object;
+      return obj;
     }
-    if (typeof object !== 'object' || object === null) return object;
+    if (typeof obj !== 'object' || obj === null) return obj;
 
-    let keys = Object.keys(object);
+    let keys = Object.keys(obj);
     keys = keys.sort();
     const newObject: {[key: string]: any} = {};
 
     for (let i = 0; i < keys.length; i++) {
-      newObject[keys[i]] = Util.sortJSON(object[keys[i]]);
+      newObject[keys[i]] = Util.sortJSON(obj[keys[i]]);
     }
     return newObject;
   }
@@ -32,31 +32,46 @@ export class Util {
   /**
    * Marshal object into gql 'attributes' variable.
    */
-  static toGQLAttributes(object: any) {
+  static toGQLAttributes(obj: any) {
     const vars: any[] = [];
+    Object.keys(obj).forEach(key => {
+      const value = this.toGQLValue(obj[key]);
       
-    Object.keys(object).forEach(key => {
+      if (value !== undefined) {
-      let type: string = typeof object[key];
+        vars.push({ key, value });
-      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}`);
+      }
+  }
+
   /**
    * Unmarshal attributes array to object.
    */
@@ -64,24 +79,20 @@ export class Util {
     const res: {[key: string]: any} = {};
 
     attributes.forEach(attr => {
-      if (attr.value.null) {
+      res[attr.key] = this.fromGQLValue(attr.value);
-        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) {
+    const present = Object.keys(obj).find(k => obj[k] !== null);
+    if (present === undefined) {
+      throw new Error('Object has no non-null values');
+    }
+    return obj[present];
+  }
+    
   /**
    * Get record content ID.
    */