Rename globalThis in generated proto bindings to avoid polyfill issues (#25)

Hot fix for #23

Co-authored-by: Gilbert <gilbertbgarza@gmail.com>
Reviewed-on: cerc-io/registry-sdk#25
Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/registry-sdk",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "git@github.com:cerc-io/registry-sdk.git",

src/index.ts

@@ -389,6 +389,13 @@ export class Registry {
     return this._client.getAuctionsByIds(ids);
   }
 
+  /**
+   * List authorities by owner.
+   */
+  async getAuthorities (owner?: string, auction = false) {
+    return this._client.getAuthorities(owner, auction);
+  }
+
   /**
    * Lookup authorities by names.
    */

src/nameservice-expiry.test.ts

@@ -60,7 +60,11 @@ const nameserviceExpiryTests = () => {
   });
 
   test('Wait for expiry duration', (done) => {
-    setTimeout(done, 60 * 1000);
+    // Wait for expiry time + time for a block to be executed
+    const expiryTime = 60 * 1000;
+    const waitTime = expiryTime + (3 * 1000);
+
+    setTimeout(done, waitTime);
   });
 
   test('Check record expiry time', async () => {
@@ -84,7 +88,11 @@ const nameserviceExpiryTests = () => {
   });
 
   test('Wait for expiry duration', (done) => {
-    setTimeout(done, 60 * 1000);
+    // Wait for expiry time + time for a block to be executed
+    const expiryTime = 60 * 1000;
+    const waitTime = expiryTime + (3 * 1000);
+
+    setTimeout(done, waitTime);
   });
 
   test('Check record deleted without bond balance', async () => {

src/naming.test.ts

@@ -1,6 +1,8 @@
 import assert from 'assert';
 import path from 'path';
 
+import { DirectSecp256k1Wallet, AccountData as CosmosAccount } from '@cosmjs/proto-signing';
+
 import { Account } from './account';
 import { Registry } from './index';
 import { ensureUpdatedConfig, getConfig } from './testing/helper';
@@ -19,6 +21,18 @@ const namingTests = () => {
   let watcher: any;
   let watcherId: string;
 
+  let otherAccount1: Account;
+
+  let reservedAuthorities: {
+    name: string;
+    entry: {
+      ownerAddress: string;
+      status: string;
+    };
+  }[] = [];
+
+  let account: CosmosAccount;
+
   beforeAll(async () => {
     registry = new Registry(gqlEndpoint, rpcEndpoint, chainId);
 
@@ -39,12 +53,26 @@ const namingTests = () => {
     );
 
     watcherId = result.id;
+
+    const accountWallet = await DirectSecp256k1Wallet.fromKey(Buffer.from(privateKey, 'hex'), 'laconic');
+    [account] = await accountWallet.getAccounts();
+
+    const mnenonic1 = Account.generateMnemonic();
+    otherAccount1 = await Account.generateFromMnemonic(mnenonic1);
+    await otherAccount1.init();
   });
 
   describe('Authority tests', () => {
     test('Reserve authority.', async () => {
       const authorityName = `laconic-${Date.now()}`;
       await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
+      reservedAuthorities.push({
+        name: authorityName,
+        entry: {
+          ownerAddress: account.address,
+          status: 'active'
+        }
+      });
     });
 
     describe('With authority reserved', () => {
@@ -56,6 +84,13 @@ const namingTests = () => {
         lrn = `lrn://${authorityName}/app/test`;
 
         await registry.reserveAuthority({ name: authorityName }, privateKey, fee);
+        reservedAuthorities.push({
+          name: authorityName,
+          entry: {
+            ownerAddress: account.address,
+            status: 'active'
+          }
+        });
       });
 
       test('Lookup authority.', async () => {
@@ -80,6 +115,13 @@ const namingTests = () => {
       test('Reserve sub-authority.', async () => {
         const subAuthority = `echo.${authorityName}`;
         await registry.reserveAuthority({ name: subAuthority }, privateKey, fee);
+        reservedAuthorities.push({
+          name: subAuthority,
+          entry: {
+            ownerAddress: account.address,
+            status: 'active'
+          }
+        });
 
         const [record] = await registry.lookupAuthorities([subAuthority]);
         expect(record).toBeDefined();
@@ -90,18 +132,22 @@ const namingTests = () => {
 
       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 otherAccount1.init();
-        await registry.sendCoins({ denom: DENOM, amount: '1000000000', destinationAddress: otherAccount1.address }, privateKey, fee);
-
         const mnenonic2 = Account.generateMnemonic();
         const otherAccount2 = await Account.generateFromMnemonic(mnenonic2);
         await otherAccount2.init();
+
+        await registry.sendCoins({ denom: DENOM, amount: '1000000000', destinationAddress: otherAccount1.address }, privateKey, fee);
         await registry.sendCoins({ denom: DENOM, amount: '1000', destinationAddress: otherAccount2.address }, otherAccount1.getPrivateKey(), fee);
 
         const subAuthority = `halo.${authorityName}`;
         await registry.reserveAuthority({ name: subAuthority, owner: otherAccount1.address }, privateKey, fee);
+        reservedAuthorities.push({
+          name: subAuthority,
+          entry: {
+            ownerAddress: otherAccount1.address,
+            status: 'active'
+          }
+        });
 
         const [record] = await registry.lookupAuthorities([subAuthority]);
         expect(record).toBeDefined();
@@ -120,6 +166,39 @@ const namingTests = () => {
       test('Set authority bond', async () => {
         await registry.setAuthorityBond({ name: authorityName, bondId }, privateKey, fee);
       });
+
+      test('List authorities.', async () => {
+        const authorities = await registry.getAuthorities(undefined, true);
+        reservedAuthorities.sort((a, b) => a.name.localeCompare(b.name));
+        const expectedEntryKeys = [
+          'ownerAddress',
+          'ownerPublicKey',
+          'height',
+          'status',
+          'bondId',
+          'expiryTime',
+          'auction'
+        ];
+
+        expect(authorities.length).toEqual(4);
+        expectedEntryKeys.forEach(key => {
+          authorities.forEach((authority: any) => {
+            expect(authority).toHaveProperty('name');
+            expect(authority.entry).toHaveProperty(key);
+          });
+        });
+        authorities.forEach((authority: any, index: number) => {
+          expect(authority).toMatchObject(reservedAuthorities[index]);
+        });
+      });
+
+      test('List authorities by owner.', async () => {
+        const authorities = await registry.getAuthorities(otherAccount1.address);
+
+        expect(authorities.length).toEqual(1);
+        expect(authorities[0].entry.ownerAddress).toBe(otherAccount1.address);
+        expect(authorities[0].entry.ownerPublicKey).toBe(otherAccount1.encodedPubkey);
+      });
     });
   });
 

src/onboarding.test.ts

@@ -25,9 +25,8 @@ const onboardingEnabledTests = () => {
     const mnemonic = Account.generateMnemonic();
     ethWallet = Wallet.fromMnemonic(mnemonic);
 
-    const account = new Account(Buffer.from(privateKey, 'hex'));
-    const cosmosAccount = await DirectSecp256k1Wallet.fromKey(account._privateKey, 'laconic');
-    [cosmosWallet] = await cosmosAccount.getAccounts();
+    const accountWallet = await DirectSecp256k1Wallet.fromKey(Buffer.from(privateKey, 'hex'), 'laconic');
+    [cosmosWallet] = await accountWallet.getAccounts();
 
     expectedParticipants = [
       {

src/proto/cerc/registry/v1/registry.ts

@@ -1162,7 +1162,7 @@ export const RecordsList = {
 declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
-var globalThis: any = (() => {
+var _globalThis: any = (() => {
   if (typeof globalThis !== "undefined") return globalThis;
   if (typeof self !== "undefined") return self;
   if (typeof window !== "undefined") return window;
@@ -1171,10 +1171,10 @@ var globalThis: any = (() => {
 })();
 
 function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+  if (_globalThis.Buffer) {
+    return Uint8Array.from(_globalThis.Buffer.from(b64, "base64"));
   } else {
-    const bin = globalThis.atob(b64);
+    const bin = _globalThis.atob(b64);
     const arr = new Uint8Array(bin.length);
     for (let i = 0; i < bin.length; ++i) {
       arr[i] = bin.charCodeAt(i);
@@ -1184,14 +1184,14 @@ function bytesFromBase64(b64: string): Uint8Array {
 }
 
 function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
+  if (_globalThis.Buffer) {
+    return _globalThis.Buffer.from(arr).toString("base64");
   } else {
     const bin: string[] = [];
     arr.forEach((byte) => {
       bin.push(String.fromCharCode(byte));
     });
-    return globalThis.btoa(bin.join(""));
+    return _globalThis.btoa(bin.join(""));
   }
 }
 

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

@@ -251,7 +251,7 @@ export const PageResponse = {
 declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
-var globalThis: any = (() => {
+var _globalThis: any = (() => {
   if (typeof globalThis !== "undefined") return globalThis;
   if (typeof self !== "undefined") return self;
   if (typeof window !== "undefined") return window;
@@ -260,10 +260,10 @@ var globalThis: any = (() => {
 })();
 
 function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+  if (_globalThis.Buffer) {
+    return Uint8Array.from(_globalThis.Buffer.from(b64, "base64"));
   } else {
-    const bin = globalThis.atob(b64);
+    const bin = _globalThis.atob(b64);
     const arr = new Uint8Array(bin.length);
     for (let i = 0; i < bin.length; ++i) {
       arr[i] = bin.charCodeAt(i);
@@ -273,14 +273,14 @@ function bytesFromBase64(b64: string): Uint8Array {
 }
 
 function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
+  if (_globalThis.Buffer) {
+    return _globalThis.Buffer.from(arr).toString("base64");
   } else {
     const bin: string[] = [];
     arr.forEach((byte) => {
       bin.push(String.fromCharCode(byte));
     });
-    return globalThis.btoa(bin.join(""));
+    return _globalThis.btoa(bin.join(""));
   }
 }
 

src/proto/google/protobuf/descriptor.ts

@@ -4324,7 +4324,7 @@ export const GeneratedCodeInfo_Annotation = {
 declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
-var globalThis: any = (() => {
+var _globalThis: any = (() => {
   if (typeof globalThis !== "undefined") return globalThis;
   if (typeof self !== "undefined") return self;
   if (typeof window !== "undefined") return window;
@@ -4333,10 +4333,10 @@ var globalThis: any = (() => {
 })();
 
 function bytesFromBase64(b64: string): Uint8Array {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+  if (_globalThis.Buffer) {
+    return Uint8Array.from(_globalThis.Buffer.from(b64, "base64"));
   } else {
-    const bin = globalThis.atob(b64);
+    const bin = _globalThis.atob(b64);
     const arr = new Uint8Array(bin.length);
     for (let i = 0; i < bin.length; ++i) {
       arr[i] = bin.charCodeAt(i);
@@ -4346,14 +4346,14 @@ function bytesFromBase64(b64: string): Uint8Array {
 }
 
 function base64FromBytes(arr: Uint8Array): string {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
+  if (_globalThis.Buffer) {
+    return _globalThis.Buffer.from(arr).toString("base64");
   } else {
     const bin: string[] = [];
     arr.forEach((byte) => {
       bin.push(String.fromCharCode(byte));
     });
-    return globalThis.btoa(bin.join(""));
+    return _globalThis.btoa(bin.join(""));
   }
 }
 

src/registry-client.ts

@@ -270,6 +270,34 @@ export class RegistryClient {
     return result;
   }
 
+  /**
+   * List authorities by owner.
+   */
+  async getAuthorities (owner?: string, auction = false) {
+    const query = `query ($owner: String) {
+      getAuthorities(owner: $owner) {
+        name
+        entry {
+          ownerAddress
+          ownerPublicKey
+          height
+          status
+          bondId
+          expiryTime
+          ${auction ? ('auction { ' + auctionFields + ' }') : ''}
+        }
+      }
+    }`;
+
+    const variables = {
+      owner
+    };
+
+    const result = await this._graph(query)(variables);
+
+    return result.getAuthorities;
+  }
+
   /**
    * Lookup authorities by names.
    */