Merge pull request #6931 from BitGo/WIN-7162-add-ada-fingerprint

feat(sdk-coin-ada): Add fingerprint as the contract address

Author: Ranjna-G

modules/sdk-coin-ada/src/adaToken.ts

@@ -50,10 +50,6 @@ export class AdaToken extends Ada {
     return this.tokenConfig.decimalPlaces;
   }
 
-  get uniqueAssetId() {
-    return this.tokenConfig.uniqueAssetId;
-  }
-
   getChain() {
     return this.tokenConfig.type;
   }
@@ -85,4 +81,8 @@ export class AdaToken extends Ada {
   transactionDataAllowed() {
     return false;
   }
+
+  get contractAddress() {
+    return this.tokenConfig.contractAddress;
+  }
 }

modules/statics/src/account.ts

@@ -169,9 +169,9 @@ export interface CosmosTokenConstructorOptions extends AccountConstructorOptions
 }
 
 export interface AdaTokenConstructorOptions extends AccountConstructorOptions {
-  uniqueAssetId: string;
   policyId: string;
   assetName: string;
+  contractAddress: string;
 }
 export interface ContractAddress extends String {
   __contractaddress_phantom__: never;
@@ -703,17 +703,17 @@ export class PolyxCoin extends AccountCoinToken {
 }
 
 export class AdaToken extends AccountCoinToken {
-  public uniqueAssetId: string;
   public policyId: string;
   public assetName: string;
+  public contractAddress: string;
   constructor(options: AdaTokenConstructorOptions) {
     super({
       ...options,
     });
 
-    this.uniqueAssetId = options.uniqueAssetId;
     this.policyId = options.policyId;
     this.assetName = options.assetName;
+    this.contractAddress = options.contractAddress;
   }
 }
 
@@ -1876,6 +1876,7 @@ export function tsolToken(
  * @param decimalPlaces Number of decimal places this token supports (divisibility exponent)
  * @param policyId Policy Id
  * @param assetName Asset name -> Policy ID + Asset name is the unique identifier
+ * @param contractAddress Fingerprint of this token
  * @param asset Asset which this coin represents. This is the same for both mainnet and testnet variants of a coin.
  * @param prefix? Optional token prefix. Defaults to empty string
  * @param suffix? Optional token suffix. Defaults to token name.
@@ -1890,15 +1891,14 @@ export function adaToken(
   decimalPlaces: number,
   policyId: string,
   assetName: string,
-  encodedAssetName: string,
+  contractAddress: string,
   asset: UnderlyingAsset,
   features: CoinFeature[] = [...AccountCoin.DEFAULT_FEATURES, CoinFeature.REQUIRES_RESERVE],
   prefix = '',
   suffix: string = name.toUpperCase(),
   network: AccountNetwork = Networks.main.ada,
   primaryKeyCurve: KeyCurve = KeyCurve.Ed25519
 ) {
-  const uniqueAssetId = `${policyId}${encodedAssetName}`;
   return Object.freeze(
     new AdaToken({
       id,
@@ -1911,11 +1911,11 @@ export function adaToken(
       suffix,
       features,
       decimalPlaces,
+      contractAddress,
       asset,
       isToken: true,
       primaryKeyCurve,
       baseUnit: BaseUnit.ADA,
-      uniqueAssetId,
     })
   );
 }
@@ -1929,6 +1929,7 @@ export function adaToken(
  * @param decimalPlaces Number of decimal places this token supports (divisibility exponent)
  * @param policyId Policy Id
  * @param assetName Asset name -> Policy ID + Asset name is the unique identifier
+ * @param contractAddress Fingerprint of this token
  * @param asset Asset which this coin represents. This is the same for both mainnet and testnet variants of a coin.
  * @param prefix? Optional token prefix. Defaults to empty string
  * @param suffix? Optional token suffix. Defaults to token name.
@@ -1942,7 +1943,7 @@ export function tadaToken(
   decimalPlaces: number,
   policyId: string,
   assetName: string,
-  encodedAssetName: string,
+  contractAddress: string,
   asset: UnderlyingAsset,
   features: CoinFeature[] = [...AccountCoin.DEFAULT_FEATURES, CoinFeature.REQUIRES_RESERVE],
   network: AccountNetwork = Networks.test.ada,
@@ -1956,7 +1957,7 @@ export function tadaToken(
     decimalPlaces,
     policyId,
     assetName,
-    encodedAssetName,
+    contractAddress,
     asset,
     features,
     prefix,

modules/statics/src/coins.ts

@@ -258,9 +258,9 @@ export function createToken(token: AmsTokenConfig): Readonly<BaseCoin> | undefin
     case 'ada':
       return initializer(
         ...commonArgs.slice(0, 4), // id, name, fullName, decimalPlaces
-        token.uniqueAssetId,
         token.assetName,
         token.policyId,
+        token.contractAddress,
         ...commonArgs.slice(4) // asset, features, prefix, suffix, network, primaryKeyCurve
       );
     default:

modules/statics/src/coins/adaTokens.ts

@@ -8,10 +8,10 @@ export const adaTokens = [
     'a7678172-84b3-4c7e-ac46-9875d23a1cb7',
     'tada:water',
     'Test ADA Token',
-    6,
+    0, // Tokens are not divisible - https://cardano-ledger.readthedocs.io/en/latest/explanations/token-bundles.html
     '2533cca6eb42076e144e9f2772c390dece9fce173bc38c72294b3924',
     'WATER',
-    '5741544552',
+    'asset1n69xf60d0760xvn8v2ffd5frvsm0cl2r8hfjf6',
     UnderlyingAsset['tada:water'],
     ADA_TOKEN_FEATURES,
     Networks.test.ada

modules/statics/src/tokenConfig.ts

@@ -70,7 +70,7 @@ export type SolTokenConfig = BaseNetworkConfig & {
 export type AdaTokenConfig = BaseNetworkConfig & {
   policyId: string;
   assetName: string;
-  uniqueAssetId: string;
+  contractAddress: string;
 };
 
 export type AlgoTokenConfig = BaseNetworkConfig & {
@@ -386,7 +386,6 @@ export interface AmsTokenConfig {
   programId?: string;
   addressCoin?: string;
   assetName?: string;
-  uniqueAssetId?: string;
   policyId?: string;
 }
 
@@ -791,7 +790,7 @@ function getAdaTokenConfig(coin: AdaToken): AdaTokenConfig {
     policyId: coin.policyId,
     assetName: coin.assetName,
     decimalPlaces: coin.decimalPlaces,
-    uniqueAssetId: coin.uniqueAssetId,
+    contractAddress: coin.contractAddress,
   };
 }
 const getFormattedAdaTokens = (customCoinMap = coins) =>