protobuf query update

test patch

rm debug

.dockerignore

@@ -0,0 +1,2 @@
+Dockerfile
+node_modules

Dockerfile

@@ -21,34 +21,18 @@ RUN \
     && npm config -g set prefix ${NPM_GLOBAL} \
     && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \
     # Install eslint
-    && su ${USERNAME} -c "umask 0002 && npm install -g eslint lerna jest" \
+    && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \
     && 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
+WORKDIR /app/laconic-sdk
+
+COPY package*.json .
 RUN yarn install
+COPY . .
 
 WORKDIR /app/laconic-sdk

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;
-    string string                 = 2;
-    int64 int                     = 3;
-    double float                  = 4;
-    bool                boolean   = 5;
-    ReferenceInput      reference = 6;
-    repeated ValueInput values    = 7;
+    oneof value {
+      string string    = 1;
+      int64 int        = 2;
+      double float     = 3;
+      bool boolean     = 4;
+      string link      = 5;
+      ArrayInput array = 6;
+      MapInput map     = 7;
+    }
   }
   message KeyValueInput {
     string     key   = 1;

src/index.ts

@@ -180,9 +180,9 @@ export class Registry {
   }
 
   /**
- * Publish record.
- * @param transactionPrivateKey - private key in HEX to sign transaction.
- */
+   * Publish record.
+   * @param transactionPrivateKey - private key in HEX to sign transaction.
+   */
   async setRecord(
     params: { privateKey: string, record: any, bondId: string },
     transactionPrivateKey: string,

src/naming.test.ts

@@ -18,12 +18,6 @@ const namingTests = () => {
   let watcher: any;
   let watcherId: string;
 
-  let authorityName: string;
-  let otherAuthorityName: string;
-  let otherPrivateKey: string;
-
-  let crn: string;
-
   beforeAll(async () => {
     registry = new Registry(gqlEndpoint, restEndpoint, chainId);
 
@@ -46,221 +40,271 @@ const namingTests = () => {
     watcherId = result.data.id;
   });
 
-  test('Reserve authority.', async () => {
-    authorityName = `laconic-${Date.now()}`;
-    await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
+  describe('Authority tests', () => {
+    test('Reserve authority.', async () => {
+      const authorityName = `laconic-${Date.now()}`;
+
+      await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
+    });
+
+    describe('With authority reserved', () => {
+      let authorityName: string;
+      let crn: string;
+
+      beforeAll(async () => {
+        authorityName = `laconic-${Date.now()}`;
+        crn = `crn://${authorityName}/app/test`;
+
+        await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
+      })
+
+      test('Lookup authority.', async () => {
+        const [record] = await registry.lookupAuthorities([authorityName]);
+
+        expect(record).toBeDefined();
+        expect(record.ownerAddress).not.toBe('');
+        expect(record.ownerPublicKey).not.toBe('');
+        expect(Number(record.height)).toBeGreaterThan(0);
+      });
+
+      test('Lookup non existing authority', async () => {
+        const [record] = await registry.lookupAuthorities(['does-not-exist']);
+
+        expect(record.ownerAddress).toBe('');
+        expect(record.ownerPublicKey).toBe('');
+        expect(Number(record.height)).toBe(0);
+      });
+
+      test('Reserve already reserved authority', async () => {
+        await expect(registry.reserveAuthority({ name: authorityName }, privateKey, fee)).
+          rejects.toThrow('Name already reserved.');
+      });
+
+      test('Reserve sub-authority.', async () => {
+        const subAuthority = `echo.${authorityName}`;
+        await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);
+
+        const [record] = await registry.lookupAuthorities([subAuthority]);
+        expect(record).toBeDefined();
+        expect(record.ownerAddress).not.toBe('');
+        expect(record.ownerPublicKey).not.toBe('');
+        expect(Number(record.height)).toBeGreaterThan(0);
+      });
+
+      test('Reserve sub-authority with different owner.', async () => {
+        // Create another account, send tx to set public key on the account.
+        const mnenonic1 = Account.generateMnemonic();
+        const otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
+        await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount1.formattedCosmosAddress }, privateKey, fee);
+
+        const mnenonic2 = Account.generateMnemonic();
+        const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
+        await registry.sendCoins({ denom: 'aphoton', amount: '10', destinationAddress: otherAccount2.formattedCosmosAddress }, otherAccount1.getPrivateKey(), fee);
+
+        const subAuthority = `halo.${authorityName}`;
+        await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.formattedCosmosAddress }, privateKey, fee);
+
+        const [record] = await registry.lookupAuthorities([subAuthority]);
+        expect(record).toBeDefined();
+        expect(record.ownerAddress).toBeDefined();
+        expect(record.ownerAddress).toBe(otherAccount1.getCosmosAddress());
+        expect(record.ownerPublicKey).toBeDefined();
+        expect(Number(record.height)).toBeGreaterThan(0);
+      });
+
+      test('Set name for unbonded authority', async () => {
+        assert(watcherId)
+        await expect(registry.setName({ crn, cid: watcherId }, privateKey, fee)).
+          rejects.toThrow('Authority bond not found.');
+      });
+
+      test('Set authority bond', async () => {
+        await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
+      });
+    });
   });
 
-  test('Lookup authority.', async () => {
-    const [record] = await registry.lookupAuthorities([authorityName]);
+  describe('Naming tests', () => {
+    let authorityName: string;
+    let otherAuthorityName: string;
+    let otherPrivateKey: string;
+    let otherAccount: Account;
 
-    expect(record).toBeDefined();
-    expect(record.ownerAddress).not.toBe('');
-    expect(record.ownerPublicKey).not.toBe('');
-    expect(Number(record.height)).toBeGreaterThan(0);
-  });
+    beforeAll(async () => {
+      authorityName = `laconic-${Date.now()}`;
 
-  test('Lookup non existing authority', async () => {
-    const [record] = await registry.lookupAuthorities(['does-not-exist']);
+      await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
+      await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
 
-    expect(record.ownerAddress).toBe('');
-    expect(record.ownerPublicKey).toBe('');
-    expect(Number(record.height)).toBe(0);
-  });
+      // Create another account.
+      const mnenonic = Account.generateMnemonic();
+      otherAccount = await Account.generateFromMnemonic(mnenonic);
+      await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
 
-  test('Reserve already reserved authority', async () => {
-    await expect(registry.reserveAuthority({ name: authorityName }, privateKey, fee)).rejects.toThrow('Name already reserved.');
-  });
+      otherAuthorityName = `other-${Date.now()}`;
+      otherPrivateKey = otherAccount.privateKey.toString('hex');
+    });
 
-  test('Reserve sub-authority.', async () => {
-    const subAuthority = `echo.${authorityName}`;
-    await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);
+    test('Set name', async () => {
+      const crn = `crn://${authorityName}/app/test1`;
 
-    const [record] = await registry.lookupAuthorities([subAuthority]);
-    expect(record).toBeDefined();
-    expect(record.ownerAddress).not.toBe('');
-    expect(record.ownerPublicKey).not.toBe('');
-    expect(Number(record.height)).toBeGreaterThan(0);
-  });
+      await registry.setName({ crn, cid: watcherId }, privateKey, fee);
 
-  test('Reserve sub-authority with different owner.', async () => {
-    // Create another account, send tx to set public key on the account.
-    const mnenonic1 = Account.generateMnemonic();
-    const otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
-    await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount1.formattedCosmosAddress }, privateKey, fee);
+      // Query records should return it (some CRN points to it).
+      const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
+      expect(records).toBeDefined();
+      expect(records).toHaveLength(1);
 
-    const mnenonic2 = Account.generateMnemonic();
-    const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
-    await registry.sendCoins({ denom: 'aphoton', amount: '10', destinationAddress: otherAccount2.formattedCosmosAddress }, otherAccount1.getPrivateKey(), fee);
+      await registry.deleteName({ crn }, privateKey, fee);
+    });
 
-    const subAuthority = `halo.${authorityName}`;
-    await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.formattedCosmosAddress }, privateKey, fee);
+    describe('With name set', () => {
+      let crn: string;
 
-    const [record] = await registry.lookupAuthorities([subAuthority]);
-    expect(record).toBeDefined();
-    expect(record.ownerAddress).toBeDefined();
-    expect(record.ownerAddress).toBe(otherAccount1.getCosmosAddress());
-    expect(record.ownerPublicKey).toBeDefined();
-    expect(Number(record.height)).toBeGreaterThan(0);
-  });
+      beforeAll(async () => {
+        crn = `crn://${authorityName}/app/test2`;
+        await registry.setName({ crn, cid: watcherId }, privateKey, fee);
+      });
 
-  test('Set name for unbonded authority', async () => {
-    crn = `crn://${authorityName}/app/test`;
-    assert(watcherId)
-    await expect(registry.setName({ crn, cid: watcherId }, privateKey, fee)).rejects.toThrow('Authority bond not found.');
-  });
+      afterAll(async () => {
+        await registry.deleteName({ crn }, privateKey, fee);
+      });
 
-  test('Set authority bond', async () => {
-    await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
-  });
+      test('Lookup name', async () => {
+        const records = await registry.lookupNames([crn]);
+        expect(records).toBeDefined();
+        expect(records).toHaveLength(1);
 
-  test('Set name', async () => {
-    crn = `crn://${authorityName}/app/test`;
-    await registry.setName({ crn, cid: watcherId }, privateKey, fee);
+        const [{ latest, history }] = records;
+        expect(latest).toBeDefined();
+        expect(latest.id).toBeDefined();
+        expect(latest.id).toBe(watcherId);
+        expect(latest.height).toBeDefined();
+        expect(history).toBeUndefined();
+      });
 
-    // Query records should return it (some CRN points to it).
-    const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
-  });
+      test('Resolve name', async () => {
+        const records = await registry.resolveNames([crn]);
+        expect(records).toBeDefined();
+        expect(records).toHaveLength(1);
 
-  test('Lookup name', async () => {
-    const records = await registry.lookupNames([crn]);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
+        const [{ attributes }] = records;
+        expect(attributes).toEqual(watcher.record);
+      });
 
-    const [{ latest, history }] = records;
-    expect(latest).toBeDefined();
-    expect(latest.id).toBeDefined();
-    expect(latest.id).toBe(watcherId);
-    expect(latest.height).toBeDefined();
-    expect(history).toBeUndefined();
-  });
+      test('Lookup name with history', async () => {
+        const updatedWatcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
+        const result = await registry.setRecord(
+          {
+            privateKey,
+            bondId,
+            record: updatedWatcher.record
+          },
+          privateKey,
+          fee
+        )
 
-  test('Resolve name', async () => {
-    const records = await registry.resolveNames([crn]);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
+        const updatedWatcherId = result.data.id;
+        await registry.setName({ crn, cid: updatedWatcherId }, privateKey, fee);
 
-    const [{ attributes }] = records;
-    expect(attributes).toEqual(watcher.record);
-  });
+        const records = await registry.lookupNames([crn], true);
+        expect(records).toHaveLength(1);
 
-  test('Lookup name with history', async () => {
-    const updatedWatcher = await ensureUpdatedConfig(WATCHER_YML_PATH);
-    const result = await registry.setRecord(
-      {
-        privateKey,
-        bondId,
-        record: updatedWatcher.record
-      },
-      privateKey,
-      fee
-    )
+        const [{ latest, history }] = records;
+        expect(latest).toBeDefined();
+        expect(latest.id).toBeDefined();
+        expect(latest.id).toBe(updatedWatcherId);
+        expect(latest.height).toBeDefined();
+        expect(history).toBeDefined();
+        expect(history).toHaveLength(1);
 
-    const updatedWatcherId = result.data.id;
-    await registry.setName({ crn, cid: updatedWatcherId }, privateKey, fee);
+        const [oldRecord] = history;
+        expect(oldRecord).toBeDefined();
+        expect(oldRecord.id).toBeDefined();
+        expect(oldRecord.id).toBe(watcherId);
+        expect(oldRecord.height).toBeDefined();
+      });
 
-    const records = await registry.lookupNames([crn], true);
-    expect(records).toHaveLength(1);
+      test('Delete name', async () => {
+        await registry.deleteName({ crn }, privateKey, fee);
 
-    const [{ latest, history }] = records;
-    expect(latest).toBeDefined();
-    expect(latest.id).toBeDefined();
-    expect(latest.id).toBe(updatedWatcherId);
-    expect(latest.height).toBeDefined();
-    expect(history).toBeDefined();
-    expect(history).toHaveLength(1);
+        let records = await registry.lookupNames([crn], true);
+        expect(records).toBeDefined();
+        expect(records).toHaveLength(1);
 
-    const [oldRecord] = history;
-    expect(oldRecord).toBeDefined();
-    expect(oldRecord.id).toBeDefined();
-    expect(oldRecord.id).toBe(watcherId);
-    expect(oldRecord.height).toBeDefined();
-  });
+        const [{ latest }] = records;
+        expect(latest).toBeDefined();
+        expect(latest.id).toBeDefined();
+        expect(latest.id).toBe('');
+        expect(latest.height).toBeDefined();
 
-  test('Set name without reserving authority', async () => {
-    await expect(registry.setName({ crn: 'crn://not-reserved/app/test', cid: watcherId }, privateKey, fee))
-      .rejects.toThrow('Name authority not found.');
-  });
+        // Query records should NOT return it (no CRN points to it).
+        records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
+        expect(records).toBeDefined();
+        expect(records).toHaveLength(0);
 
-  test('Set name for non-owned authority', async () => {
-    // Create another account.
-    const mnenonic = Account.generateMnemonic();
-    const otherAccount = await Account.generateFromMnemonic(mnenonic);
-    await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
+        // Query all records should return it (all: true).
+        records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+        expect(records).toBeDefined();
+        expect(records).toHaveLength(1);
+      });
 
-    // Other account reserves an authority.
-    otherAuthorityName = `other-${Date.now()}`;
-    otherPrivateKey = otherAccount.privateKey.toString('hex');
-    await registry.reserveAuthority({ name: otherAuthorityName }, otherPrivateKey, fee);
+      test('Delete already deleted name', async () => {
+        await registry.deleteName({ crn }, privateKey, fee);
+        await registry.deleteName({ crn }, privateKey, fee);
 
-    // Try setting name under other authority.
-    await expect(registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, privateKey, fee)).rejects.toThrow('Access denied.');
-  });
+        const records = await registry.lookupNames([crn], true);
+        expect(records).toBeDefined();
+        expect(records).toHaveLength(1);
 
-  test('Lookup non existing name', async () => {
-    const records = await registry.lookupNames(['crn://not-reserved/app/test']);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
-    const [record] = records;
-    expect(record).toBeNull();
-  });
+        const [{ latest }] = records;
+        expect(latest).toBeDefined();
+        expect(latest.id).toBeDefined();
+        expect(latest.id).toBe('');
+        expect(latest.height).toBeDefined();
+      });
+    });
 
-  test('Resolve non existing name', async () => {
-    const records = await registry.resolveNames(['crn://not-reserved/app/test']);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
-    const [record] = records;
-    expect(record).toBeNull();
-  });
+    test('Set name without reserving authority', async () => {
+      await expect(registry.setName({ crn: 'crn://not-reserved/app/test', cid: watcherId }, privateKey, fee))
+        .rejects.toThrow('Name authority not found.');
+    });
 
-  test('Delete name', async () => {
-    await registry.deleteName({ crn }, privateKey, fee);
+    test('Set name for non-owned authority', async () => {
+      await registry.sendCoins({ denom: 'aphoton', amount: '1000000000', destinationAddress: otherAccount.formattedCosmosAddress }, privateKey, fee);
 
-    let records = await registry.lookupNames([crn], true);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
+      // Other account reserves an authority.
+      await registry.reserveAuthority({ name: otherAuthorityName }, otherPrivateKey, fee);
 
-    const [{ latest }] = records;
-    expect(latest).toBeDefined();
-    expect(latest.id).toBeDefined();
-    expect(latest.id).toBe('');
-    expect(latest.height).toBeDefined();
+      // Try setting name under other authority.
+      await expect(registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, privateKey, fee)).rejects.toThrow('Access denied.');
+    });
 
-    // Query records should NOT return it (no CRN points to it).
-    records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version });
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(0);
+    test('Delete name for non-owned authority.', async () => {
+      const otherBondId = await registry.getNextBondId(otherPrivateKey);
+      await registry.createBond({ denom: 'aphoton', amount: '10000' }, otherPrivateKey, fee);
+      await registry.setAuthorityBond({ name: otherAuthorityName, bondId: otherBondId }, otherPrivateKey, fee);
+      await registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, otherPrivateKey, fee);
 
-    // Query all records should return it (all: true).
-    records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
-  });
+      // Try deleting name under other authority.
+      await expect(registry.deleteName({ crn: `crn://${otherAuthorityName}/app/test` }, privateKey, fee)).rejects.toThrow('Access denied.');
+    });
 
-  test('Delete already deleted name', async () => {
-    await registry.deleteName({ crn }, privateKey, fee);
+    test('Lookup non existing name', async () => {
+      const records = await registry.lookupNames(['crn://not-reserved/app/test']);
+      expect(records).toBeDefined();
+      expect(records).toHaveLength(1);
+      const [record] = records;
+      expect(record).toBeNull();
+    });
 
-    const records = await registry.lookupNames([crn], true);
-    expect(records).toBeDefined();
-    expect(records).toHaveLength(1);
-
-    const [{ latest }] = records;
-    expect(latest).toBeDefined();
-    expect(latest.id).toBeDefined();
-    expect(latest.id).toBe('');
-    expect(latest.height).toBeDefined();
-  });
-
-  test('Delete name for non-owned authority.', async () => {
-    const otherBondId = await registry.getNextBondId(otherPrivateKey);
-    await registry.createBond({ denom: 'aphoton', amount: '10000' }, otherPrivateKey, fee);
-    await registry.setAuthorityBond({ name: otherAuthorityName, bondId: otherBondId }, otherPrivateKey, fee);
-    await registry.setName({ crn: `crn://${otherAuthorityName}/app/test`, cid: watcherId }, otherPrivateKey, fee);
-
-    // Try deleting name under other authority.
-    await expect(registry.deleteName({ crn: `crn://${otherAuthorityName}/app/test` }, privateKey, fee)).rejects.toThrow('Access denied.');
+    test('Resolve non existing name', async () => {
+      const records = await registry.resolveNames(['crn://not-reserved/app/test']);
+      expect(records).toBeDefined();
+      expect(records).toHaveLength(1);
+      const [record] = records;
+      expect(record).toBeNull();
+    });
   });
 };
 

src/proto/cosmos/base/query/v1beta1/pagination.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: cosmos/base/query/v1beta1/pagination.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";

src/proto/cosmos/base/v1beta1/coin.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: cosmos/base/v1beta1/coin.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/proto/gogoproto/gogo.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: gogoproto/gogo.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../google/protobuf/descriptor";

src/proto/google/api/annotations.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: google/api/annotations.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./http";

src/proto/google/api/http.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: google/api/http.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";

src/proto/google/protobuf/descriptor.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: google/protobuf/descriptor.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";

src/proto/google/protobuf/duration.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: google/protobuf/duration.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";

src/proto/google/protobuf/timestamp.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: google/protobuf/timestamp.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";

src/proto/vulcanize/auction/v1beta1/genesis.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/auction/v1beta1/genesis.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

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

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/auction/v1beta1/query.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/proto/vulcanize/auction/v1beta1/tx.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/auction/v1beta1/tx.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/proto/vulcanize/auction/v1beta1/types.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/auction/v1beta1/types.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/proto/vulcanize/bond/v1beta1/bond.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/bond/v1beta1/bond.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/proto/vulcanize/bond/v1beta1/genesis.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/bond/v1beta1/genesis.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

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

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/bond/v1beta1/query.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/proto/vulcanize/bond/v1beta1/tx.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/bond/v1beta1/tx.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

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

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/registry/v1beta1/genesis.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

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

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/registry/v1beta1/query.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./registry";
@@ -239,7 +239,7 @@ export namespace vulcanize.registry.v1beta1 {
         }
     }
     export namespace QueryListRecordsRequest {
-        export class 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 {
-                const message = new ReferenceInput({});
+            }): LinkInput {
+                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 {
-                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ReferenceInput();
+            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): LinkInput {
+                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 {
-                return ReferenceInput.deserialize(bytes);
+            static deserializeBinary(bytes: Uint8Array): LinkInput {
+                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) {
-                        this.type = data.type;
+                    if ("values" in data && data.values != undefined) {
+                        this.values = data.values;
                     }
+                }
+            }
+            get values() {
+                return pb_1.Message.getRepeatedWrapperField(this, QueryListRecordsRequest.ValueInput, 1) as QueryListRecordsRequest.ValueInput[];
+            }
+            set values(value: QueryListRecordsRequest.ValueInput[]) {
+                pb_1.Message.setRepeatedWrapperField(this, 1, value);
+            }
+            static fromObject(data: {
+                values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
+            }): ArrayInput {
+                const message = new ArrayInput({});
+                if (data.values != null) {
+                    message.values = data.values.map(item => QueryListRecordsRequest.ValueInput.fromObject(item));
+                }
+                return message;
+            }
+            toObject() {
+                const data: {
+                    values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
+                } = {};
+                if (this.values != null) {
+                    data.values = this.values.map((item: QueryListRecordsRequest.ValueInput) => item.toObject());
+                }
+                return data;
+            }
+            serialize(): Uint8Array;
+            serialize(w: pb_1.BinaryWriter): void;
+            serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+                const writer = w || new pb_1.BinaryWriter();
+                if (this.values.length)
+                    writer.writeRepeatedMessage(1, this.values, (item: QueryListRecordsRequest.ValueInput) => item.serialize(writer));
+                if (!w)
+                    return writer.getResultBuffer();
+            }
+            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): ArrayInput {
+                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new ArrayInput();
+                while (reader.nextField()) {
+                    if (reader.isEndGroup())
+                        break;
+                    switch (reader.getFieldNumber()) {
+                        case 1:
+                            reader.readMessage(message.values, () => pb_1.Message.addToRepeatedWrapperField(message, 1, QueryListRecordsRequest.ValueInput.deserialize(reader), QueryListRecordsRequest.ValueInput));
+                            break;
+                        default: reader.skipField();
+                    }
+                }
+                return message;
+            }
+            serializeBinary(): Uint8Array {
+                return this.serialize();
+            }
+            static deserializeBinary(bytes: Uint8Array): ArrayInput {
+                return ArrayInput.deserialize(bytes);
+            }
+        }
+        export class MapInput extends pb_1.Message {
+            #one_of_decls: number[][] = [];
+            constructor(data?: any[] | {
+                values?: Map<string, QueryListRecordsRequest.ValueInput>;
+            }) {
+                super();
+                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+                if (!Array.isArray(data) && typeof data == "object") {
+                    if ("values" in data && data.values != undefined) {
+                        this.values = data.values;
+                    }
+                }
+                if (!this.values)
+                    this.values = new Map();
+            }
+            get values() {
+                return pb_1.Message.getField(this, 1) as any as Map<string, QueryListRecordsRequest.ValueInput>;
+            }
+            set values(value: Map<string, QueryListRecordsRequest.ValueInput>) {
+                pb_1.Message.setField(this, 1, value as any);
+            }
+            static fromObject(data: {
+                values?: {
+                    [key: string]: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>;
+                };
+            }): MapInput {
+                const message = new MapInput({});
+                if (typeof data.values == "object") {
+                    message.values = new Map(Object.entries(data.values).map(([key, value]) => [key, QueryListRecordsRequest.ValueInput.fromObject(value)]));
+                }
+                return message;
+            }
+            toObject() {
+                const data: {
+                    values?: {
+                        [key: string]: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>;
+                    };
+                } = {};
+                if (this.values != null) {
+                    data.values = (Object.fromEntries)((Array.from)(this.values).map(([key, value]) => [key, value.toObject()]));
+                }
+                return data;
+            }
+            serialize(): Uint8Array;
+            serialize(w: pb_1.BinaryWriter): void;
+            serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+                const writer = w || new pb_1.BinaryWriter();
+                for (const [key, value] of this.values) {
+                    writer.writeMessage(1, this.values, () => {
+                        writer.writeString(1, key);
+                        writer.writeMessage(2, value, () => value.serialize(writer));
+                    });
+                }
+                if (!w)
+                    return writer.getResultBuffer();
+            }
+            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): MapInput {
+                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new MapInput();
+                while (reader.nextField()) {
+                    if (reader.isEndGroup())
+                        break;
+                    switch (reader.getFieldNumber()) {
+                        case 1:
+                            reader.readMessage(message, () => pb_1.Map.deserializeBinary(message.values as any, reader, reader.readString, () => {
+                                let value;
+                                reader.readMessage(message, () => value = QueryListRecordsRequest.ValueInput.deserialize(reader));
+                                return value;
+                            }));
+                            break;
+                        default: reader.skipField();
+                    }
+                }
+                return message;
+            }
+            serializeBinary(): Uint8Array {
+                return this.serialize();
+            }
+            static deserializeBinary(bytes: Uint8Array): MapInput {
+                return MapInput.deserialize(bytes);
+            }
+        }
+        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) {
-                        this.reference = data.reference;
+                    if ("link" in data && data.link != undefined) {
+                        this.link = data.link;
                     }
-                    if ("values" in data && data.values != undefined) {
-                        this.values = data.values;
+                    if ("array" in data && data.array != undefined) {
+                        this.array = data.array;
+                    }
+                    if ("map" in data && data.map != undefined) {
+                        this.map = data.map;
                     }
                 }
             }
-            get type() {
+            get string() {
                 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;
-            }
             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() {
-                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.ReferenceInput, 6) as QueryListRecordsRequest.ReferenceInput;
+            get has_boolean() {
+                return pb_1.Message.getField(this, 4) != null;
             }
-            set reference(value: QueryListRecordsRequest.ReferenceInput) {
-                pb_1.Message.setWrapperField(this, 6, value);
+            get link() {
+                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() {
-                return pb_1.Message.getRepeatedWrapperField(this, QueryListRecordsRequest.ValueInput, 7) as QueryListRecordsRequest.ValueInput[];
+            get map() {
+                return pb_1.Message.getWrapperField(this, QueryListRecordsRequest.MapInput, 7) as QueryListRecordsRequest.MapInput;
             }
-            set values(value: QueryListRecordsRequest.ValueInput[]) {
-                pb_1.Message.setRepeatedWrapperField(this, 7, value);
+            set map(value: QueryListRecordsRequest.MapInput) {
+                pb_1.Message.setOneofWrapperField(this, 7, this.#one_of_decls[0], value);
+            }
+            get has_map() {
+                return pb_1.Message.getField(this, 7) != null;
+            }
+            get value() {
+                const cases: {
+                    [index: number]: "none" | "string" | "int" | "float" | "boolean" | "link" | "array" | "map";
+                } = {
+                    0: "none",
+                    1: "string",
+                    2: "int",
+                    3: "float",
+                    4: "boolean",
+                    5: "link",
+                    6: "array",
+                    7: "map"
+                };
+                return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7])];
             }
             static fromObject(data: {
-                type?: string;
                 string?: string;
                 int?: number;
                 float?: number;
                 boolean?: boolean;
-                reference?: ReturnType<typeof QueryListRecordsRequest.ReferenceInput.prototype.toObject>;
-                values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
+                link?: string;
+                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) {
-                    message.reference = QueryListRecordsRequest.ReferenceInput.fromObject(data.reference);
+                if (data.link != null) {
+                    message.link = data.link;
                 }
-                if (data.values != null) {
-                    message.values = data.values.map(item => QueryListRecordsRequest.ValueInput.fromObject(item));
+                if (data.array != null) {
+                    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>;
-                    values?: ReturnType<typeof QueryListRecordsRequest.ValueInput.prototype.toObject>[];
+                    link?: string;
+                    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) {
-                    data.reference = this.reference.toObject();
+                if (this.link != null) {
+                    data.link = this.link;
                 }
-                if (this.values != null) {
-                    data.values = this.values.map((item: QueryListRecordsRequest.ValueInput) => item.toObject());
+                if (this.array != null) {
+                    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)
-                    writer.writeString(1, this.type);
-                if (this.string.length)
-                    writer.writeString(2, this.string);
-                if (this.int != 0)
-                    writer.writeInt64(3, this.int);
-                if (this.float != 0)
-                    writer.writeDouble(4, this.float);
-                if (this.boolean != false)
-                    writer.writeBool(5, this.boolean);
-                if (this.has_reference)
-                    writer.writeMessage(6, this.reference, () => this.reference.serialize(writer));
-                if (this.values.length)
-                    writer.writeRepeatedMessage(7, this.values, (item: QueryListRecordsRequest.ValueInput) => item.serialize(writer));
+                if (this.has_string)
+                    writer.writeString(1, this.string);
+                if (this.has_int)
+                    writer.writeInt64(2, this.int);
+                if (this.has_float)
+                    writer.writeDouble(3, this.float);
+                if (this.has_boolean)
+                    writer.writeBool(4, this.boolean);
+                if (this.has_link)
+                    writer.writeString(5, this.link);
+                if (this.has_array)
+                    writer.writeMessage(6, this.array, () => this.array.serialize(writer));
+                if (this.has_map)
+                    writer.writeMessage(7, this.map, () => this.map.serialize(writer));
                 if (!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/proto/vulcanize/registry/v1beta1/registry.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/registry/v1beta1/registry.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../google/protobuf/duration";

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

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.12.4
+ * compiler version: 4.24.4
  * source: vulcanize/registry/v1beta1/tx.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as dependency_1 from "./../../../gogoproto/gogo";

src/registry-client.ts

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

src/sdk.test.ts

@@ -50,7 +50,7 @@ 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 () => {
@@ -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
-  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
-  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
+  repo_registration_record_cid:
+    /: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
+  build_artifact_cid:
+    /: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
+  tls_cert_cid:
+    /: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
   version: 1.0.23

src/util.ts

@@ -10,21 +10,21 @@ export class Util {
   /**
    * Sorts JSON object.
    */
-  static sortJSON(object: any) {
-    if (object instanceof Array) {
-      for (let i = 0; i < object.length; i++) {
-        object[i] = Util.sortJSON(object[i]);
+  static sortJSON(obj: any) {
+    if (obj instanceof Array) {
+      for (let i = 0; i < obj.length; 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,40 @@ export class Util {
   /**
    * Marshal object into gql 'attributes' variable.
    */
-  static toGQLAttributes(object: any) {
+  static toGQLAttributes(obj: any) {
     const vars: any[] = [];
-
-    Object.keys(object).forEach(key => {
-      let type: string = typeof object[key];
-      if (object[key] === null) {
-        vars.push({ key, value: { 'null': true } });
-      } else if (type === 'number') {
-        type = (object[key] % 1 === 0) ? 'int' : 'float';
-        vars.push({ key, value: { [type]: object[key] } });
-      } else if (type === 'string') {
-        vars.push({ key, value: { 'string': object[key] } });
-      } else if (type === 'boolean') {
-        vars.push({ key, value: { 'boolean': object[key] } });
-      } else if (type === 'object') {
-        const nestedObject = object[key];
-        if (nestedObject['/'] !== undefined) {
-          vars.push({ key, value: { 'reference': { id: nestedObject['/'] } } });
-        }
-      }
+    Object.keys(obj).forEach(key => {
+      vars.push({ key, value: this.toGQLValue(obj[key]) });
     });
-
     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 };
+        default:
+          throw new Error(`Unknown object type '${type}': ${obj}`);
+      }
+  }
+
   /**
    * Unmarshal attributes array to object.
    */
@@ -64,24 +73,20 @@ export class Util {
     const res: {[key: string]: any} = {};
 
     attributes.forEach(attr => {
-      if (attr.value.null) {
-        res[attr.key] = null;
-      } else if (attr.value.json) {
-        res[attr.key] = JSON.parse(attr.value.json);
-      } else if (attr.value.reference) {
-        // Convert GQL reference to IPLD style link.
-        const ref = attr.value.reference;
-        res[attr.key] = { '/': ref.id };
-      } else {
-        const { values, null: n, ...types } = attr.value;
-        const value = Object.values(types).find(v => v !== null);
-        res[attr.key] = value;
-      }
+      res[attr.key] = this.fromGQLValue(attr.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.
    */