fix(root): merge conflicts

TICKET: WP-0000

Author: zahin-mohammad

modules/account-lib/package.json

@@ -85,6 +85,7 @@
     "@bitgo/sdk-core": "^35.2.0",
     "@bitgo/sdk-lib-mpc": "^10.5.0",
     "@bitgo/statics": "^54.2.0",
+    "@bitgo/sdk-coin-vet": "^1.3.0",
     "bignumber.js": "^9.1.1",
     "bs58": "^4.0.1"
   },

modules/account-lib/src/index.ts

@@ -191,6 +191,9 @@ export { Stt };
 import * as Soneium from '@bitgo/sdk-coin-soneium';
 export { Soneium };
 
+import * as Vet from '@bitgo/sdk-coin-vet';
+export { Vet };
+
 const coinBuilderMap = {
   trx: Trx.WrappedBuilder,
   ttrx: Trx.WrappedBuilder,
@@ -301,6 +304,8 @@ const coinBuilderMap = {
   tsoneium: Soneium.TransactionBuilder,
   polyx: Polyx.TransactionBuilderFactory,
   tpolyx: Polyx.TransactionBuilderFactory,
+  vet: Vet.TransactionBuilderFactory,
+  tvet: Vet.TransactionBuilderFactory,
 };
 
 /**

modules/sdk-coin-sol/src/lib/utils.ts

@@ -544,12 +544,14 @@ export async function getAssociatedTokenAccountAddress(
   }
 
   const coin = getSolTokenFromAddressOnly(tokenMintAddress);
-  if (!coin || !(coin instanceof SolCoin)) {
-    throw new UtilsError(`Token not found or not a Solana token: ${tokenMintAddress}`);
+  let ataAddress: PublicKey;
+  let programId: string;
+  if (coin && coin instanceof SolCoin && (coin as any).programId) {
+    programId = (coin as any).programId.toString();
+  } else {
+    programId = TOKEN_PROGRAM_ID.toString();
   }
 
-  let ataAddress: PublicKey;
-  const programId = coin.programId;
   if (programId === TOKEN_2022_PROGRAM_ID.toString()) {
     ataAddress = await getAssociatedTokenAddress(mintPublicKey, ownerPublicKey, false, TOKEN_2022_PROGRAM_ID);
   } else {

modules/sdk-coin-vet/package.json

@@ -46,7 +46,10 @@
     "@bitgo/statics": "^54.2.0",
     "bignumber.js": "^9.1.1",
     "ethereumjs-util": "7.1.5",
-    "tweetnacl": "^1.0.3"
+    "tweetnacl": "^1.0.3",
+    "lodash": "^4.17.21",
+    "@vechain/sdk-core": "^1.2.0-rc.3",
+    "@noble/curves": "1.8.1"
   },
   "devDependencies": {
     "@bitgo/sdk-api": "^1.63.4",

modules/sdk-coin-vet/src/lib/iface.ts

@@ -1,6 +1,16 @@
+import {
+  TransactionExplanation as BaseTransactionExplanation,
+  TransactionType as BitGoTransactionType,
+} from '@bitgo/sdk-core';
+
 /**
  * The transaction data returned from the toJson() function of a transaction
  */
 export interface TxData {
   id: string;
 }
+
+export interface VetTransactionExplanation extends BaseTransactionExplanation {
+  sender?: string;
+  type?: BitGoTransactionType;
+}

modules/sdk-coin-vet/src/lib/index.ts

@@ -3,8 +3,8 @@ import * as Utils from './utils';
 import * as Interface from './iface';
 
 export { KeyPair } from './keyPair';
-export { Transaction } from './transaction';
-export { TransactionBuilder } from './transactionBuilder';
-export { TransferBuilder } from './transferBuilder';
+export { Transaction } from './transaction/transaction';
+export { TransactionBuilder } from './transactionBuilder/transactionBuilder';
+export { TransferBuilder } from './transactionBuilder/transferBuilder';
 export { TransactionBuilderFactory } from './transactionBuilderFactory';
 export { Constants, Utils, Interface };