Merge pull request #5530 from BitGo/WIN-4533-alter-tokenId-for-hbar

chore(sdk-coin-hbar): use contractAddress to form tokenId

Author: rakeshgsharma

modules/sdk-coin-hbar/src/hbarToken.ts

@@ -40,6 +40,18 @@ export class HbarToken extends Hbar {
     return this.tokenConfig.decimalPlaces;
   }
 
+  get nodeAccountId(): string {
+    return this.tokenConfig.nodeAccountId;
+  }
+
+  get tokenId(): string {
+    return this.tokenConfig.tokenId;
+  }
+
+  get contractAddress(): string {
+    return this.tokenConfig.contractAddress;
+  }
+
   getChain(): string {
     return this.tokenConfig.type;
   }

modules/sdk-coin-hbar/test/unit/hbarToken.ts

@@ -26,5 +26,9 @@ describe('Hedera Hashgraph Token', function () {
     token.coin.should.equal('thbar');
     token.network.should.equal('Testnet');
     token.decimalPlaces.should.equal(6);
+    token.nodeAccountId.should.equal('0.0.3');
+    token.tokenId.should.equal('0.0.13078');
+    token.contractAddress.should.equal('0.0.13078');
+    token.tokenId.should.equal(token.contractAddress);
   });
 });

modules/statics/src/account.ts

@@ -284,7 +284,7 @@ export class HederaToken extends AccountCoinToken {
     });
 
     this.nodeAccountId = options.nodeAccountId;
-    this.tokenId = options.tokenId;
+    this.tokenId = options.contractAddress;
     this.contractAddress = options.contractAddress;
   }
 }

modules/statics/src/tokenConfig.ts

@@ -67,7 +67,11 @@ export type OfcTokenConfig = BaseTokenConfig & {
   isFiat: boolean;
 };
 
-export type HbarTokenConfig = BaseNetworkConfig;
+export type HbarTokenConfig = BaseNetworkConfig & {
+  nodeAccountId: string;
+  tokenId: string;
+  contractAddress: string;
+};
 
 export type XrpTokenConfig = BaseNetworkConfig & {
   issuerAddress: string;
@@ -451,6 +455,9 @@ const formattedHbarTokens = coins.reduce((acc: HbarTokenConfig[], coin) => {
       network: coin.network.type === NetworkType.MAINNET ? 'Mainnet' : 'Testnet',
       name: coin.fullName,
       decimalPlaces: coin.decimalPlaces,
+      nodeAccountId: coin.nodeAccountId,
+      tokenId: coin.tokenId,
+      contractAddress: coin.contractAddress,
     });
   }
   return acc;