Skip to content

Commit

Permalink
feat(sdk-coin-apt): changing names of classes
Browse files Browse the repository at this point in the history
TICKET: COIN-2820
  • Loading branch information
baltiyal authored and bhavidhingra committed Jan 31, 2025
1 parent 3b4f8e2 commit 713908f
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
DIGITAL_ASSET_TRANSFER_AMOUNT,
} from '../constants';

export class DigitalAssetTransaction extends Transaction {
export class DigitalAssetTransfer extends Transaction {
constructor(coinConfig: Readonly<CoinConfig>) {
super(coinConfig);
this._type = TransactionType.SendNFT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<CoinConfig>) {
super(coinConfig);
this._type = TransactionType.SendToken;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<CoinConfig>) {
super(_coinConfig);
this._transaction = new DigitalAssetTransaction(_coinConfig);
this._transaction = new DigitalAssetTransfer(_coinConfig);
}

protected get transactionType(): TransactionType {
Expand All @@ -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');
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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<CoinConfig>) {
super(_coinConfig);
this._transaction = new FungibleAssetTransaction(_coinConfig);
this._transaction = new FungibleAssetTransfer(_coinConfig);
}

protected get transactionType(): TransactionType {
Expand All @@ -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');
}
Expand Down
16 changes: 8 additions & 8 deletions modules/sdk-coin-apt/src/lib/transactionBuilderFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<CoinConfig>) {
Expand All @@ -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:
Expand All @@ -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 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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);
Expand Down Expand Up @@ -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({
Expand All @@ -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]);
Expand All @@ -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'),
Expand All @@ -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]);
Expand All @@ -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, {
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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);
Expand Down Expand Up @@ -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,
Expand All @@ -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]);
Expand All @@ -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'),
Expand All @@ -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]);
Expand All @@ -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, {
Expand All @@ -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);
Expand Down Expand Up @@ -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');
});
Expand Down

0 comments on commit 713908f

Please sign in to comment.