Merge pull request #5508 from BitGo/WIN-4541-use-contractAddress-instead

chore(statics): use contractAddress to form issuerAddress and currenc…

Author: rakeshgsharma

modules/sdk-coin-xrp/src/xrpToken.ts

@@ -44,6 +44,10 @@ export class XrpToken extends Xrp {
     return this.tokenConfig.currencyCode;
   }
 
+  get contractAddress(): string {
+    return this.tokenConfig.contractAddress;
+  }
+
   get domain(): string {
     return this.tokenConfig.domain || '';
   }

modules/sdk-coin-xrp/test/unit/xrpToken.ts

@@ -28,5 +28,10 @@ describe('Xrp Tokens', function () {
     xrpTokenCoin.coin.should.equal('txrp');
     xrpTokenCoin.network.should.equal('Testnet');
     xrpTokenCoin.decimalPlaces.should.equal(15);
+    xrpTokenCoin.contractAddress.should.equal(
+      'rQhWct2fv4Vc4KRjRgMrxa8xPN9Zx9iLKV::524C555344000000000000000000000000000000'
+    );
+    xrpTokenCoin.issuerAddress.should.equal('rQhWct2fv4Vc4KRjRgMrxa8xPN9Zx9iLKV');
+    xrpTokenCoin.currencyCode.should.equal('524C555344000000000000000000000000000000');
   });
 });

modules/statics/src/account.ts

@@ -451,8 +451,8 @@ export class XrpCoin extends AccountCoinToken {
     }
 
     this.domain = options.domain as string;
-    this.currencyCode = options.currencyCode;
-    this.issuerAddress = options.issuerAddress;
+    this.issuerAddress = options.contractAddress.split('::')[0];
+    this.currencyCode = options.contractAddress.split('::')[1];
     this.contractAddress = options.contractAddress;
   }
 }

modules/statics/src/tokenConfig.ts

@@ -73,6 +73,7 @@ export type XrpTokenConfig = BaseNetworkConfig & {
   issuerAddress: string;
   currencyCode: string;
   domain?: string;
+  contractAddress: string;
 };
 
 export type SuiTokenConfig = BaseNetworkConfig & {
@@ -495,6 +496,7 @@ const formattedXrpTokens = coins.reduce((acc: XrpTokenConfig[], coin) => {
       issuerAddress: coin.issuerAddress,
       currencyCode: coin.currencyCode,
       domain: coin.domain,
+      contractAddress: coin.contractAddress,
     });
   }
   return acc;

modules/statics/test/unit/coins.ts

@@ -787,6 +787,17 @@ describe('Token contract address field defaults', () => {
         });
     });
   });
+  it('have issuerAddress and currencyCode formed from contractAddress', () => {
+    coins
+      .filter((coin) => coin.family === CoinFamily.XRP && coin instanceof XrpCoin)
+      .forEach((coin) => {
+        const xrpToken = coin as XrpCoin;
+        xrpToken.contractAddress.split('::')[0].should.not.be.empty();
+        xrpToken.contractAddress.split('::')[1].should.not.be.empty();
+        xrpToken.issuerAddress.should.eql(xrpToken.contractAddress.split('::')[0]);
+        xrpToken.currencyCode.should.eql(xrpToken.contractAddress.split('::')[1]);
+      });
+  });
 });
 
 describe('Cold Wallet Features', () => {