Merge pull request #5541 from BitGo/WIN-4540-alter-tokenAddress-for-sol

chore(sdk-coin-sol): use contractAddress to form tokenAddress

modules/sdk-coin-sol/src/solToken.ts

@@ -53,6 +53,10 @@ export class SolToken extends Sol {
     return this.tokenConfig.decimalPlaces;
   }
 
+  get contractAddress() {
+    return this.tokenConfig.tokenAddress;
+  }
+
   getChain() {
     return this.tokenConfig.type;
   }

modules/sdk-coin-sol/test/unit/solToken.ts

@@ -0,0 +1,31 @@
+import 'should';
+import { BitGoAPI } from '@bitgo/sdk-api';
+import { TestBitGo, TestBitGoAPI } from '@bitgo/sdk-test';
+import { SolToken } from '../../src';
+
+describe('SOL Token:', function () {
+  let bitgo: TestBitGoAPI;
+  let solTokenCoin;
+  const tokenName = 'sol:spx';
+
+  before(function () {
+    bitgo = TestBitGo.decorate(BitGoAPI, { env: 'test' });
+    SolToken.createTokenConstructors().forEach(({ name, coinConstructor }) => {
+      bitgo.safeRegister(name, coinConstructor);
+    });
+    bitgo.initializeTestVars();
+    solTokenCoin = bitgo.coin(tokenName);
+  });
+
+  it('should return constants', function () {
+    solTokenCoin.getChain().should.equal(tokenName);
+    solTokenCoin.getBaseChain().should.equal('sol');
+    solTokenCoin.getBaseFactor().should.equal(1e8);
+    solTokenCoin.getFullName().should.equal('Solana Token');
+    solTokenCoin.coin.should.equal('sol');
+    solTokenCoin.decimalPlaces.should.equal(8);
+    solTokenCoin.network.should.equal('Mainnet');
+    solTokenCoin.tokenAddress.should.equal('J3NKxxXZcnNiMjKw9hYb2K4LUxgwB6t1FtPtQVsv3KFr');
+    solTokenCoin.contractAddress.should.equal('J3NKxxXZcnNiMjKw9hYb2K4LUxgwB6t1FtPtQVsv3KFr');
+  });
+});

modules/statics/src/account.ts

@@ -332,7 +332,7 @@ export class SolCoin extends AccountCoinToken {
       ...options,
     });
 
-    this.tokenAddress = options.tokenAddress;
+    this.tokenAddress = options.contractAddress;
     this.contractAddress = options.contractAddress;
   }
 }

modules/statics/src/tokenConfig.ts

@@ -54,6 +54,7 @@ export type StellarTokenConfig = BaseNetworkConfig;
 
 export type SolTokenConfig = BaseNetworkConfig & {
   tokenAddress: string;
+  contractAddress: string;
 };
 
 export type AdaTokenConfig = BaseNetworkConfig & {
@@ -434,6 +435,7 @@ const formattedSolTokens = coins.reduce((acc: SolTokenConfig[], coin) => {
       name: coin.fullName,
       tokenAddress: coin.tokenAddress,
       decimalPlaces: coin.decimalPlaces,
+      contractAddress: coin.contractAddress,
     });
   }
   return acc;