diff --git a/modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransaction.ts b/modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransfer.ts similarity index 97% rename from modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransaction.ts rename to modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransfer.ts index 469dffa062..6feade5022 100644 --- a/modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransaction.ts +++ b/modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransfer.ts @@ -21,7 +21,7 @@ import { DIGITAL_ASSET_TRANSFER_AMOUNT, } from '../constants'; -export class DigitalAssetTransaction extends Transaction { +export class DigitalAssetTransfer extends Transaction { constructor(coinConfig: Readonly) { super(coinConfig); this._type = TransactionType.SendNFT; diff --git a/modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransaction.ts b/modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransfer.ts similarity index 97% rename from modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransaction.ts rename to modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransfer.ts index adffc7e99c..c3c350c607 100644 --- a/modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransaction.ts +++ b/modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransfer.ts @@ -15,7 +15,7 @@ import { InvalidTransactionError, TransactionRecipient, TransactionType } from ' import { BaseCoin as CoinConfig, NetworkType } from '@bitgo/statics'; import { FUNGIBLE_ASSET_TYPE_ARGUMENT, FUNGIBLE_ASSET_TRANSFER_FUNCTION } from '../constants'; -export class FungibleAssetTransaction extends Transaction { +export class FungibleAssetTransfer extends Transaction { constructor(coinConfig: Readonly) { super(coinConfig); this._type = TransactionType.SendToken; diff --git a/modules/sdk-coin-apt/src/lib/transactionBuilder/digitalAssestTransactionBuilder.ts b/modules/sdk-coin-apt/src/lib/transactionBuilder/digitalAssetTransferBuilder.ts similarity index 89% rename from modules/sdk-coin-apt/src/lib/transactionBuilder/digitalAssestTransactionBuilder.ts rename to modules/sdk-coin-apt/src/lib/transactionBuilder/digitalAssetTransferBuilder.ts index bee007c861..52f3ce0d91 100644 --- a/modules/sdk-coin-apt/src/lib/transactionBuilder/digitalAssestTransactionBuilder.ts +++ b/modules/sdk-coin-apt/src/lib/transactionBuilder/digitalAssetTransferBuilder.ts @@ -3,13 +3,13 @@ import { BaseCoin as CoinConfig } from '@bitgo/statics'; import { TransactionType } from '@bitgo/sdk-core'; import utils from '../utils'; import { TransactionPayload, TransactionPayloadEntryFunction } from '@aptos-labs/ts-sdk'; -import { DigitalAssetTransaction } from '../transaction/digitalAssetTransaction'; +import { DigitalAssetTransfer } from '../transaction/digitalAssetTransfer'; import { DIGITAL_ASSET_TYPE_ARGUMENT } from '../constants'; export class DigitalAssetTransactionBuilder extends TransactionBuilder { constructor(_coinConfig: Readonly) { super(_coinConfig); - this._transaction = new DigitalAssetTransaction(_coinConfig); + this._transaction = new DigitalAssetTransfer(_coinConfig); } protected get transactionType(): TransactionType { @@ -23,7 +23,7 @@ export class DigitalAssetTransactionBuilder extends TransactionBuilder { } /** @inheritdoc */ - validateTransaction(transaction?: DigitalAssetTransaction): void { + validateTransaction(transaction?: DigitalAssetTransfer): void { if (!transaction) { throw new Error('transaction not defined'); } diff --git a/modules/sdk-coin-apt/src/lib/transactionBuilder/fungibleAssetTransactionBuilder.ts b/modules/sdk-coin-apt/src/lib/transactionBuilder/fungibleAssetTransferBuilder.ts similarity index 87% rename from modules/sdk-coin-apt/src/lib/transactionBuilder/fungibleAssetTransactionBuilder.ts rename to modules/sdk-coin-apt/src/lib/transactionBuilder/fungibleAssetTransferBuilder.ts index 70a58876df..48233d5061 100644 --- a/modules/sdk-coin-apt/src/lib/transactionBuilder/fungibleAssetTransactionBuilder.ts +++ b/modules/sdk-coin-apt/src/lib/transactionBuilder/fungibleAssetTransferBuilder.ts @@ -1,16 +1,16 @@ import { TransactionBuilder } from './transactionBuilder'; import { BaseCoin as CoinConfig } from '@bitgo/statics'; -import { FungibleAssetTransaction } from '../transaction/fungibleAssetTransaction'; +import { FungibleAssetTransfer } from '../transaction/fungibleAssetTransfer'; import { TransactionType } from '@bitgo/sdk-core'; import BigNumber from 'bignumber.js'; import utils from '../utils'; import { TransactionPayload, TransactionPayloadEntryFunction } from '@aptos-labs/ts-sdk'; import { FUNGIBLE_ASSET_TYPE_ARGUMENT } from '../constants'; -export class FungibleAssetTransactionBuilder extends TransactionBuilder { +export class FungibleAssetTransferBuilder extends TransactionBuilder { constructor(_coinConfig: Readonly) { super(_coinConfig); - this._transaction = new FungibleAssetTransaction(_coinConfig); + this._transaction = new FungibleAssetTransfer(_coinConfig); } protected get transactionType(): TransactionType { @@ -24,7 +24,7 @@ export class FungibleAssetTransactionBuilder extends TransactionBuilder { } /** @inheritdoc */ - validateTransaction(transaction?: FungibleAssetTransaction): void { + validateTransaction(transaction?: FungibleAssetTransfer): void { if (!transaction) { throw new Error('fungible asset transaction not defined'); } diff --git a/modules/sdk-coin-apt/src/lib/transactionBuilderFactory.ts b/modules/sdk-coin-apt/src/lib/transactionBuilderFactory.ts index db39350ced..96c6c80f44 100644 --- a/modules/sdk-coin-apt/src/lib/transactionBuilderFactory.ts +++ b/modules/sdk-coin-apt/src/lib/transactionBuilderFactory.ts @@ -6,10 +6,10 @@ import { Transaction } from './transaction/transaction'; import { SignedTransaction } from '@aptos-labs/ts-sdk'; import { TransferTransaction } from './transaction/transferTransaction'; import { BaseCoin as CoinConfig } from '@bitgo/statics'; -import { FungibleAssetTransaction } from './transaction/fungibleAssetTransaction'; -import { FungibleAssetTransactionBuilder } from './transactionBuilder/fungibleAssetTransactionBuilder'; -import { DigitalAssetTransaction } from './transaction/digitalAssetTransaction'; -import { DigitalAssetTransactionBuilder } from './transactionBuilder/digitalAssestTransactionBuilder'; +import { FungibleAssetTransfer } from './transaction/fungibleAssetTransfer'; +import { FungibleAssetTransferBuilder } from './transactionBuilder/fungibleAssetTransferBuilder'; +import { DigitalAssetTransfer } from './transaction/digitalAssetTransfer'; +import { DigitalAssetTransactionBuilder } from './transactionBuilder/digitalAssetTransferBuilder'; export class TransactionBuilderFactory extends BaseTransactionBuilderFactory { constructor(_coinConfig: Readonly) { @@ -27,11 +27,11 @@ export class TransactionBuilderFactory extends BaseTransactionBuilderFactory { transferTx.fromDeserializedSignedTransaction(signedTxn); return this.getTransferBuilder(transferTx); case TransactionType.SendToken: - const fungibleTransferTokenTx = new FungibleAssetTransaction(this._coinConfig); + const fungibleTransferTokenTx = new FungibleAssetTransfer(this._coinConfig); fungibleTransferTokenTx.fromDeserializedSignedTransaction(signedTxn); return this.getFungibleAssetTransactionBuilder(fungibleTransferTokenTx); case TransactionType.SendNFT: - const digitalAssetTransferTx = new DigitalAssetTransaction(this._coinConfig); + const digitalAssetTransferTx = new DigitalAssetTransfer(this._coinConfig); digitalAssetTransferTx.fromDeserializedSignedTransaction(signedTxn); return this.getDigitalAssetTransactionBuilder(digitalAssetTransferTx); default: @@ -53,8 +53,8 @@ export class TransactionBuilderFactory extends BaseTransactionBuilderFactory { } /** @inheritdoc */ - getFungibleAssetTransactionBuilder(tx?: Transaction): FungibleAssetTransactionBuilder { - return this.initializeBuilder(tx, new FungibleAssetTransactionBuilder(this._coinConfig)); + getFungibleAssetTransactionBuilder(tx?: Transaction): FungibleAssetTransferBuilder { + return this.initializeBuilder(tx, new FungibleAssetTransferBuilder(this._coinConfig)); } /** @inheritdoc */ diff --git a/modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssestTransactionBuilder.ts b/modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssetTransferBuilder.ts similarity index 91% rename from modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssestTransactionBuilder.ts rename to modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssetTransferBuilder.ts index 2b3b8f04f5..bb5c2e6654 100644 --- a/modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssestTransactionBuilder.ts +++ b/modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssetTransferBuilder.ts @@ -3,13 +3,13 @@ import { coins } from '@bitgo/statics'; import * as testData from '../../resources/apt'; import { TransactionType } from '@bitgo/sdk-core'; import should from 'should'; -import { DigitalAssetTransaction } from '../../../src/lib/transaction/digitalAssetTransaction'; +import { DigitalAssetTransfer } from '../../../src/lib/transaction/digitalAssetTransfer'; describe('Apt Digital Asset Transfer Builder', () => { const factory = getBuilderFactory('tapt'); //TODO: change coin 'tapt' to digital asset (nft) when configured it('should build a digital asset transfer', async function () { - const digitalAssetTransfer = new DigitalAssetTransaction(coins.get('tapt')); + const digitalAssetTransfer = new DigitalAssetTransfer(coins.get('tapt')); const txBuilder = factory.getDigitalAssetTransactionBuilder(digitalAssetTransfer); txBuilder.sender(testData.sender2.address); txBuilder.recipient(testData.digitalTokenRecipients[0]); @@ -21,7 +21,7 @@ describe('Apt Digital Asset Transfer Builder', () => { txBuilder.sequenceNumber(14); txBuilder.expirationTime(1736246155); txBuilder.addFeePayerAddress(testData.feePayer.address); - const tx = (await txBuilder.build()) as DigitalAssetTransaction; + const tx = (await txBuilder.build()) as DigitalAssetTransfer; should.equal(tx.sender, testData.sender2.address); should.equal(tx.recipient.address, testData.digitalTokenRecipients[0].address); should.equal(tx.assetId, testData.digitalAssetAddress); @@ -51,7 +51,7 @@ describe('Apt Digital Asset Transfer Builder', () => { it('should build and send a signed tx', async function () { const txBuilder = factory.from(testData.DIGITAL_ASSET_TRANSFER); - const tx = (await txBuilder.build()) as DigitalAssetTransaction; + const tx = (await txBuilder.build()) as DigitalAssetTransfer; should.equal(tx.type, TransactionType.SendNFT); tx.inputs.length.should.equal(1); tx.inputs[0].should.deepEqual({ @@ -77,7 +77,7 @@ describe('Apt Digital Asset Transfer Builder', () => { }); it('should succeed to validate a valid signablePayload', async function () { - const transaction = new DigitalAssetTransaction(coins.get('tapt')); + const transaction = new DigitalAssetTransfer(coins.get('tapt')); const txBuilder = factory.getDigitalAssetTransactionBuilder(transaction); txBuilder.sender(testData.sender2.address); txBuilder.recipient(testData.digitalTokenRecipients[0]); @@ -89,7 +89,7 @@ describe('Apt Digital Asset Transfer Builder', () => { txBuilder.expirationTime(1736246155); txBuilder.assetId(testData.digitalAssetAddress); txBuilder.addFeePayerAddress(testData.feePayer.address); - const tx = (await txBuilder.build()) as DigitalAssetTransaction; + const tx = (await txBuilder.build()) as DigitalAssetTransfer; const signablePayload = tx.signablePayload; should.equal( signablePayload.toString('hex'), @@ -98,7 +98,7 @@ describe('Apt Digital Asset Transfer Builder', () => { }); it('should build a unsigned tx and validate its toJson', async function () { - const transaction = new DigitalAssetTransaction(coins.get('tapt')); + const transaction = new DigitalAssetTransfer(coins.get('tapt')); const txBuilder = factory.getDigitalAssetTransactionBuilder(transaction); txBuilder.sender(testData.sender2.address); txBuilder.recipient(testData.digitalTokenRecipients[0]); @@ -110,7 +110,7 @@ describe('Apt Digital Asset Transfer Builder', () => { txBuilder.expirationTime(1736246155); txBuilder.assetId(testData.digitalAssetAddress); txBuilder.addFeePayerAddress(testData.feePayer.address); - const tx = (await txBuilder.build()) as DigitalAssetTransaction; + const tx = (await txBuilder.build()) as DigitalAssetTransfer; const toJson = tx.toJson(); should.equal(toJson.sender, testData.sender2.address); should.deepEqual(toJson.recipient, { @@ -127,7 +127,7 @@ describe('Apt Digital Asset Transfer Builder', () => { it('should build a signed tx and validate its toJson', async function () { const txBuilder = factory.from(testData.DIGITAL_ASSET_TRANSFER); - const tx = (await txBuilder.build()) as DigitalAssetTransaction; + const tx = (await txBuilder.build()) as DigitalAssetTransfer; const toJson = tx.toJson(); should.equal(toJson.id, '0xfb4f870c4ae1bc74f6ceff72d8ee92f109239be8e12ddb07ddf30d7e6bd30586'); should.equal(toJson.sender, testData.sender2.address); diff --git a/modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleTokenTransferBuilder.ts b/modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleAssetTransferBuilder.ts similarity index 95% rename from modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleTokenTransferBuilder.ts rename to modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleAssetTransferBuilder.ts index 2b40cb9c3b..63ee0e5dff 100644 --- a/modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleTokenTransferBuilder.ts +++ b/modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleAssetTransferBuilder.ts @@ -4,14 +4,14 @@ import { TransferTransaction } from '../../../src'; import * as testData from '../../resources/apt'; import { TransactionType } from '@bitgo/sdk-core'; import should from 'should'; -import { FungibleAssetTransaction } from '../../../src/lib/transaction/fungibleAssetTransaction'; +import { FungibleAssetTransfer } from '../../../src/lib/transaction/fungibleAssetTransfer'; describe('Apt Token Transfer Builder', () => { const factory = getBuilderFactory('tapt:usdt'); describe('Succeed', () => { it('should build a token transfer', async function () { - const fungibleTokenTransfer = new FungibleAssetTransaction(coins.get('tapt:usdt')); + const fungibleTokenTransfer = new FungibleAssetTransfer(coins.get('tapt:usdt')); const txBuilder = factory.getFungibleAssetTransactionBuilder(fungibleTokenTransfer); txBuilder.sender(testData.sender2.address); txBuilder.recipient(testData.fungibleTokenRecipients[0]); @@ -23,7 +23,7 @@ describe('Apt Token Transfer Builder', () => { txBuilder.sequenceNumber(14); txBuilder.expirationTime(1736246155); txBuilder.addFeePayerAddress(testData.feePayer.address); - const tx = (await txBuilder.build()) as FungibleAssetTransaction; + const tx = (await txBuilder.build()) as FungibleAssetTransfer; should.equal(tx.sender, testData.sender2.address); should.equal(tx.recipient.address, testData.fungibleTokenRecipients[0].address); should.equal(tx.recipient.amount, testData.fungibleTokenRecipients[0].amount); @@ -54,7 +54,7 @@ describe('Apt Token Transfer Builder', () => { it('should build and send a signed tx', async function () { const txBuilder = factory.from(testData.FUNGIBLE_TOKEN_TRANSFER); - const tx = (await txBuilder.build()) as FungibleAssetTransaction; + const tx = (await txBuilder.build()) as FungibleAssetTransfer; tx.inputs.length.should.equal(1); tx.inputs[0].should.deepEqual({ address: testData.sender2.address, @@ -79,7 +79,7 @@ describe('Apt Token Transfer Builder', () => { }); it('should succeed to validate a valid signablePayload', async function () { - const transaction = new FungibleAssetTransaction(coins.get('tapt')); + const transaction = new FungibleAssetTransfer(coins.get('tapt')); const txBuilder = factory.getFungibleAssetTransactionBuilder(transaction); txBuilder.sender(testData.sender2.address); txBuilder.recipient(testData.fungibleTokenRecipients[0]); @@ -91,7 +91,7 @@ describe('Apt Token Transfer Builder', () => { txBuilder.expirationTime(1736246155); txBuilder.assetId(testData.fungibleTokenAddress.usdt); txBuilder.addFeePayerAddress(testData.feePayer.address); - const tx = (await txBuilder.build()) as FungibleAssetTransaction; + const tx = (await txBuilder.build()) as FungibleAssetTransfer; const signablePayload = tx.signablePayload; should.equal( signablePayload.toString('hex'), @@ -100,7 +100,7 @@ describe('Apt Token Transfer Builder', () => { }); it('should build a unsigned tx and validate its toJson', async function () { - const transaction = new FungibleAssetTransaction(coins.get('tapt')); + const transaction = new FungibleAssetTransfer(coins.get('tapt')); const txBuilder = factory.getFungibleAssetTransactionBuilder(transaction); txBuilder.sender(testData.sender2.address); txBuilder.recipient(testData.fungibleTokenRecipients[0]); @@ -112,7 +112,7 @@ describe('Apt Token Transfer Builder', () => { txBuilder.expirationTime(1736246155); txBuilder.assetId(testData.fungibleTokenAddress.usdt); txBuilder.addFeePayerAddress(testData.feePayer.address); - const tx = (await txBuilder.build()) as FungibleAssetTransaction; + const tx = (await txBuilder.build()) as FungibleAssetTransfer; const toJson = tx.toJson(); should.equal(toJson.sender, testData.sender2.address); should.deepEqual(toJson.recipient, { @@ -129,7 +129,7 @@ describe('Apt Token Transfer Builder', () => { it('should build a signed tx and validate its toJson', async function () { const txBuilder = factory.from(testData.FUNGIBLE_TOKEN_TRANSFER); - const tx = (await txBuilder.build()) as FungibleAssetTransaction; + const tx = (await txBuilder.build()) as FungibleAssetTransfer; const toJson = tx.toJson(); should.equal(toJson.id, '0x2dae2ecd096a212d6f565bd161c92f506cebb700aaf16c88bd3456b88d4c392a'); should.equal(toJson.sender, testData.sender2.address); @@ -168,7 +168,7 @@ describe('Apt Token Transfer Builder', () => { ); }); it('should fail for invalid fungible token address', async function () { - const transaction = new FungibleAssetTransaction(coins.get('tapt')); + const transaction = new FungibleAssetTransfer(coins.get('tapt')); const txBuilder = factory.getFungibleAssetTransactionBuilder(transaction); should(() => txBuilder.assetId('randomString')).throwError('Invalid address randomString'); });