Merge branch 'master' into rel/latest

Author: mohammadalfaiyazbitgo

CODEOWNERS

@@ -61,7 +61,7 @@
 /modules/sdk-coin-cspr/ @BitGo/ethalt-team
 /modules/sdk-coin-dot/ @BitGo/ethalt-team
 /modules/sdk-coin-eos/ @BitGo/ethalt-team
-/modules/sdk-coin-fetch/ @BitGo/ethalt-team
+/modules/sdk-coin-fetchai/ @BitGo/ethalt-team
 /modules/sdk-coin-flr/ @BitGo/ethalt-team
 /modules/sdk-coin-ethlike/ @BitGo/ethalt-team
 /modules/sdk-coin-hbar/ @BitGo/ethalt-team
@@ -84,6 +84,7 @@
 /modules/sdk-coin-tao/ @BitGo/ethalt-team
 /modules/sdk-coin-ton/ @BitGo/ethalt-team
 /modules/sdk-coin-trx/ @BitGo/ethalt-team
+/modules/sdk-coin-vet/ @Bitgo/ethalt-team
 /modules/sdk-coin-wemix/ @BitGo/ethalt-team
 /modules/sdk-coin-world/ @BitGo/ethalt-team
 /modules/sdk-coin-xdc/ @BitGo/ethalt-team

Dockerfile

@@ -76,7 +76,7 @@ COPY --from=builder /tmp/bitgo/modules/sdk-coin-cronos /var/modules/sdk-coin-cro
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-cspr /var/modules/sdk-coin-cspr/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-dot /var/modules/sdk-coin-dot/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-etc /var/modules/sdk-coin-etc/
-COPY --from=builder /tmp/bitgo/modules/sdk-coin-fetch /var/modules/sdk-coin-fetch/
+COPY --from=builder /tmp/bitgo/modules/sdk-coin-fetchai /var/modules/sdk-coin-fetchai/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-flr /var/modules/sdk-coin-flr/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-hash /var/modules/sdk-coin-hash/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-hbar /var/modules/sdk-coin-hbar/
@@ -129,6 +129,7 @@ COPY --from=builder /tmp/bitgo/modules/sdk-coin-lnbtc /var/modules/sdk-coin-lnbt
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-ltc /var/modules/sdk-coin-ltc/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-xlm /var/modules/sdk-coin-xlm/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-zec /var/modules/sdk-coin-zec/
+COPY --from=builder /tmp/bitgo/modules/sdk-coin-vet /var/modules/sdk-coin-vet/
 
 RUN cd /var/modules/abstract-lightning && yarn link && \
 cd /var/modules/sdk-core && yarn link && \
@@ -168,7 +169,7 @@ cd /var/modules/sdk-coin-cronos && yarn link && \
 cd /var/modules/sdk-coin-cspr && yarn link && \
 cd /var/modules/sdk-coin-dot && yarn link && \
 cd /var/modules/sdk-coin-etc && yarn link && \
-cd /var/modules/sdk-coin-fetch && yarn link && \
+cd /var/modules/sdk-coin-fetchai && yarn link && \
 cd /var/modules/sdk-coin-flr && yarn link && \
 cd /var/modules/sdk-coin-hash && yarn link && \
 cd /var/modules/sdk-coin-hbar && yarn link && \
@@ -220,7 +221,8 @@ cd /var/modules/sdk-coin-ethw && yarn link && \
 cd /var/modules/sdk-coin-lnbtc && yarn link && \
 cd /var/modules/sdk-coin-ltc && yarn link && \
 cd /var/modules/sdk-coin-xlm && yarn link && \
-cd /var/modules/sdk-coin-zec && yarn link
+cd /var/modules/sdk-coin-zec && yarn link && \
+cd /var/modules/sdk-coin-vet && yarn link
 #COPY_END
 
 #LINK_START
@@ -263,7 +265,7 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/sdk-coin-cspr && \
     yarn link @bitgo/sdk-coin-dot && \
     yarn link @bitgo/sdk-coin-etc && \
-    yarn link @bitgo/sdk-coin-fetch && \
+    yarn link @bitgo/sdk-coin-fetchai && \
     yarn link @bitgo/sdk-coin-flr && \
     yarn link @bitgo/sdk-coin-hash && \
     yarn link @bitgo/sdk-coin-hbar && \
@@ -315,7 +317,8 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/sdk-coin-lnbtc && \
     yarn link @bitgo/sdk-coin-ltc && \
     yarn link @bitgo/sdk-coin-xlm && \
-    yarn link @bitgo/sdk-coin-zec
+    yarn link @bitgo/sdk-coin-zec && \
+    yarn link @bitgo/sdk-coin-vet
 #LINK_END
 
 #LABEL_START

modules/abstract-substrate/src/lib/transaction.ts

@@ -21,10 +21,10 @@ import { DEFAULT_SUBSTRATE_PREFIX } from './constants';
 
 export class Transaction extends BaseTransaction {
   protected _substrateTransaction: UnsignedTransaction;
-  private _signedTransaction?: string;
-  private _registry: TypeRegistry;
-  private _chainName: string;
-  private _sender: string;
+  protected _signedTransaction?: string;
+  protected _registry: TypeRegistry;
+  protected _chainName: string;
+  protected _sender: string;
 
   private static FAKE_SIGNATURE = `0x${Buffer.from(new Uint8Array(256).fill(1)).toString('hex')}`;
 
@@ -128,6 +128,7 @@ export class Transaction extends BaseTransaction {
 
   /** @inheritdoc */
   toJson(): TxData {
+    console.log('Transaction toJson called in substrate Transaction class');
     if (!this._substrateTransaction) {
       throw new InvalidTransactionError('Empty transaction');
     }

modules/abstract-substrate/src/lib/transactionBuilder.ts

@@ -27,8 +27,11 @@ import { Transaction } from './transaction';
 import { BaseTransactionSchema, SignedTransactionSchema, SigningPayloadTransactionSchema } from './txnSchema';
 import utils from './utils';
 
-export abstract class TransactionBuilder extends BaseTransactionBuilder {
-  protected _transaction: Transaction;
+export abstract class TransactionBuilder<
+  TMethod = TxMethod,
+  TTransaction extends Transaction = Transaction
+> extends BaseTransactionBuilder {
+  protected _transaction: TTransaction;
   protected _keyPair: KeyPair;
   protected _signature?: string;
   protected _sender: string;
@@ -39,7 +42,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   protected _tip?: number;
   protected _eraPeriod?: number;
   protected _registry: TypeRegistry;
-  protected _method?: TxMethod;
+  protected _method?: TMethod;
   protected _material: Material;
   // signatures that will be used to sign a transaction when building
   // not the same as the _signatures in transaction which is the signature in
@@ -48,7 +51,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
 
   constructor(_coinConfig: Readonly<CoinConfig>) {
     super(_coinConfig);
-    this._transaction = new Transaction(_coinConfig);
+    this._transaction = new Transaction(_coinConfig) as TTransaction;
   }
 
   /**
@@ -134,7 +137,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
     return this;
   }
 
-  private method(method: TxMethod): this {
+  private method(method: TMethod): this {
     this._method = method;
     return this;
   }
@@ -154,17 +157,17 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   }
 
   /** @inheritdoc */
-  protected get transaction(): Transaction {
+  protected get transaction(): TTransaction {
     return this._transaction;
   }
 
   /** @inheritdoc */
-  protected set transaction(transaction: Transaction) {
+  protected set transaction(transaction: TTransaction) {
     this._transaction = transaction;
   }
 
   /** @inheritdoc */
-  protected fromImplementation(rawTransaction: string): Transaction {
+  protected fromImplementation(rawTransaction: string): TTransaction {
     const decodedTxn = decode(rawTransaction, {
       metadataRpc: this._material.metadata,
       registry: this._registry,
@@ -186,7 +189,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
     if (decodedTxn.tip) {
       this.fee({ amount: `${decodedTxn.tip}`, type: 'tip' });
     }
-    this.method(decodedTxn.method as unknown as TxMethod);
+    this.method(decodedTxn.method as unknown as TMethod);
     return this._transaction;
   }
 
@@ -197,7 +200,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   }
 
   /** @inheritdoc */
-  protected async buildImplementation(): Promise<Transaction> {
+  protected async buildImplementation(): Promise<TTransaction> {
     this.transaction.setTransaction(this.buildTransaction());
     this.transaction.transactionType(this.transactionType);
     this.transaction.registry(this._registry);
@@ -320,7 +323,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   }
 
   /** @inheritdoc */
-  validateTransaction(_: Transaction): void {
+  validateTransaction(_: TTransaction): void {
     this.validateBaseFields(
       this._sender,
       this._blockNumber,
@@ -382,7 +385,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   }
 
   /** @inheritdoc */
-  protected signImplementation({ key }: BaseKey): Transaction {
+  protected signImplementation({ key }: BaseKey): TTransaction {
     this._keyPair = new KeyPair({ prv: key });
     return this._transaction;
   }

modules/account-lib/package.json

@@ -45,7 +45,7 @@
     "@bitgo/sdk-coin-dot": "^4.1.58",
     "@bitgo/sdk-coin-etc": "^2.2.47",
     "@bitgo/sdk-coin-eth": "^24.4.3",
-    "@bitgo/sdk-coin-fetch": "^1.2.0",
+    "@bitgo/sdk-coin-fetchai": "^1.2.0",
     "@bitgo/sdk-coin-flr": "^1.2.4",
     "@bitgo/sdk-coin-hash": "^3.0.49",
     "@bitgo/sdk-coin-hbar": "^2.0.80",

modules/account-lib/src/index.ts

@@ -113,8 +113,8 @@ export { Mantra };
 import * as Cronos from '@bitgo/sdk-coin-cronos';
 export { Cronos };
 
-import * as Fetch from '@bitgo/sdk-coin-fetch';
-export { Fetch };
+import * as FetchAi from '@bitgo/sdk-coin-fetchai';
+export { FetchAi };
 
 import * as Initia from '@bitgo/sdk-coin-initia';
 export { Initia };
@@ -272,8 +272,8 @@ const coinBuilderMap = {
   tbaby: Baby.TransactionBuilder,
   cronos: Cronos.TransactionBuilder,
   tcronos: Cronos.TransactionBuilder,
-  fetch: Fetch.TransactionBuilder,
-  tfetch: Fetch.TransactionBuilder,
+  fetchai: FetchAi.TransactionBuilder,
+  tfetchai: FetchAi.TransactionBuilder,
   initia: Initia.TransactionBuilder,
   tinitia: Initia.TransactionBuilder,
   flr: Flr.TransactionBuilder,

modules/bitgo/package.json

@@ -78,7 +78,7 @@
     "@bitgo/sdk-coin-eth": "^24.4.3",
     "@bitgo/sdk-coin-ethlike": "^1.2.15",
     "@bitgo/sdk-coin-ethw": "^20.0.80",
-    "@bitgo/sdk-coin-fetch": "^1.2.0",
+    "@bitgo/sdk-coin-fetchai": "^1.2.0",
     "@bitgo/sdk-coin-flr": "^1.2.4",
     "@bitgo/sdk-coin-hash": "^3.0.49",
     "@bitgo/sdk-coin-hbar": "^2.0.80",
@@ -128,7 +128,7 @@
     "bignumber.js": "^9.1.1",
     "fs-extra": "^9.1.0",
     "lodash": "^4.17.14",
-    "openpgp": "5.10.1",
+    "openpgp": "5.11.3",
     "stellar-sdk": "^10.0.1",
     "superagent": "^9.0.1"
   },

modules/bitgo/src/v2/coinFactory.ts

@@ -48,7 +48,7 @@ import {
   Eth,
   Ethw,
   EthLikeCoin,
-  Fetch,
+  FetchAi,
   Flr,
   TethLikeCoin,
   FiatAED,
@@ -121,7 +121,7 @@ import {
   Teos,
   Tetc,
   Teth,
-  Tfetch,
+  TfetchAi,
   Tflr,
   Tmon,
   TfiatAED,
@@ -161,13 +161,15 @@ import {
   Ttia,
   Tton,
   Ttrx,
+  Tvet,
   Txlm,
   Txdc,
   Txrp,
   Txtz,
   Tzec,
   Tzeta,
   Tzketh,
+  Vet,
   Wemix,
   World,
   Xdc,
@@ -217,7 +219,7 @@ export function registerCoinConstructors(coinFactory: CoinFactory, coinMap: Coin
   coinFactory.register('fiatgbp', FiatGBP.createInstance);
   coinFactory.register('fiatsgd', FiatSGD.createInstance);
   coinFactory.register('fiatusd', FiatUsd.createInstance);
-  coinFactory.register('fetch', Fetch.createInstance);
+  coinFactory.register('fetchai', FetchAi.createInstance);
   coinFactory.register('flr', Flr.createInstance);
   coinFactory.register('gteth', Gteth.createInstance);
   coinFactory.register('hash', Hash.createInstance);
@@ -285,7 +287,7 @@ export function registerCoinConstructors(coinFactory: CoinFactory, coinMap: Coin
   coinFactory.register('tfiatgbp', TfiatGBP.createInstance);
   coinFactory.register('tfiatsgd', TfiatSGD.createInstance);
   coinFactory.register('tfiatusd', TfiatUsd.createInstance);
-  coinFactory.register('tfetch', Tfetch.createInstance);
+  coinFactory.register('tfetchai', TfetchAi.createInstance);
   coinFactory.register('tflr', Tflr.createInstance);
   coinFactory.register('tmon', Tmon.createInstance);
   coinFactory.register('thash', Thash.createInstance);
@@ -318,6 +320,7 @@ export function registerCoinConstructors(coinFactory: CoinFactory, coinMap: Coin
   coinFactory.register('ttia', Ttia.createInstance);
   coinFactory.register('tton', Tton.createInstance);
   coinFactory.register('ttrx', Ttrx.createInstance);
+  coinFactory.register('tvet', Tvet.createInstance);
   coinFactory.register('txdc', Txdc.createInstance);
   coinFactory.register('txlm', Txlm.createInstance);
   coinFactory.register('txrp', Txrp.createInstance);
@@ -327,6 +330,7 @@ export function registerCoinConstructors(coinFactory: CoinFactory, coinMap: Coin
   coinFactory.register('tzketh', Tzketh.createInstance);
   coinFactory.register('twemix', Twemix.createInstance);
   coinFactory.register('tworld', Tworld.createInstance);
+  coinFactory.register('vet', Vet.createInstance);
   coinFactory.register('xdc', Xdc.createInstance);
   coinFactory.register('xlm', Xlm.createInstance);
   coinFactory.register('xrp', Xrp.createInstance);

modules/bitgo/src/v2/coins/index.ts

@@ -27,7 +27,7 @@ import { Dot, Tdot } from '@bitgo/sdk-coin-dot';
 import { Eos, EosToken, Teos } from '@bitgo/sdk-coin-eos';
 import { Etc, Tetc } from '@bitgo/sdk-coin-etc';
 import { Erc20Token, Eth, Gteth, Hteth, Teth } from '@bitgo/sdk-coin-eth';
-import { Fetch, Tfetch } from '@bitgo/sdk-coin-fetch';
+import { FetchAi, TfetchAi } from '@bitgo/sdk-coin-fetchai';
 import { Flr, Tflr } from '@bitgo/sdk-coin-flr';
 import { Ethw } from '@bitgo/sdk-coin-ethw';
 import { EthLikeCoin, TethLikeCoin } from '@bitgo/sdk-coin-ethlike';
@@ -60,6 +60,7 @@ import { Tia, Ttia } from '@bitgo/sdk-coin-tia';
 import { Ton, Tton } from '@bitgo/sdk-coin-ton';
 import { Trx, Ttrx } from '@bitgo/sdk-coin-trx';
 import { StellarToken, Txlm, Xlm } from '@bitgo/sdk-coin-xlm';
+import { Vet, Tvet } from '@bitgo/sdk-coin-vet';
 import { Wemix, Twemix } from '@bitgo/sdk-coin-wemix';
 import { World, Tworld } from '@bitgo/sdk-coin-world';
 import { Xdc, Txdc } from '@bitgo/sdk-coin-xdc';
@@ -99,7 +100,7 @@ export { Erc20Token, Eth, Gteth, Hteth, Teth };
 export { Ethw };
 export { EthLikeCoin, TethLikeCoin };
 export { Etc, Tetc };
-export { Fetch, Tfetch };
+export { FetchAi, TfetchAi };
 export { Flr, Tflr };
 export { Hash, Thash };
 export { Hbar, Thbar };
@@ -130,6 +131,7 @@ export { Sei, Tsei };
 export { Injective, Tinjective };
 export { Islm, Tislm };
 export { Trx, Ttrx };
+export { Vet, Tvet };
 export { Xdc, Txdc };
 export { StellarToken, Txlm, Xlm };
 export { Txrp, Xrp, XrpToken };

modules/bitgo/test/v2/unit/keychains.ts

@@ -82,7 +82,7 @@ describe('V2 Keychains', function () {
         n.asset !== UnderlyingAsset.SONEIUM &&
         n.asset !== UnderlyingAsset.VET &&
         n.asset !== UnderlyingAsset.CRONOS &&
-        n.asset !== UnderlyingAsset.FETCH &&
+        n.asset !== UnderlyingAsset.FETCHAI &&
         n.asset !== UnderlyingAsset.INITIA &&
         coinFamilyValues.includes(n.name)
     );