-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Transfer transactions factory #341
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
fccb77a
transfer transactions factory
popenta 8571d1a
first part of fixes after review
popenta 3b9de0d
Merge branch 'transfer-and-execute' into transfer-transactions-factory
popenta baa017d
small merge fix & formatting
popenta 8951aea
add extra check for no transfer and unit test
popenta 167c620
fixes after review
popenta 2bb7efa
refactoring
popenta 10ee598
remove unnecessary variable
popenta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
src/transactionsFactories/transferTransactionsFactory.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
import { assert } from "chai"; | ||
import { Address } from "../address"; | ||
import { Token, NextTokenTransfer, TokenComputer } from "../tokens"; | ||
import { TransactionsFactoryConfig } from "./transactionsFactoryConfig"; | ||
import { TransferTransactionsFactory } from "./transferTransactionsFactory"; | ||
import { ErrBadUsage } from "../errors"; | ||
|
||
describe("test transfer transcations factory", function () { | ||
const config = new TransactionsFactoryConfig("D"); | ||
const factory = new TransferTransactionsFactory(config, new TokenComputer()); | ||
|
||
const alice = Address.fromBech32("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"); | ||
const bob = Address.fromBech32("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx"); | ||
|
||
it("should throw error, no token transfer provided", async () => { | ||
let transfers: any = []; | ||
|
||
assert.throw( | ||
() => { | ||
factory.createTransactionForESDTTokenTransfer({ | ||
sender: alice, | ||
receiver: bob, | ||
tokenTransfers: transfers, | ||
}); | ||
}, | ||
ErrBadUsage, | ||
"No token transfer has been provided" | ||
); | ||
}); | ||
|
||
it("should create draft transaction for native token transfer without data", async () => { | ||
const transaction = factory.createTransactionForNativeTokenTransfer({ | ||
sender: alice, | ||
receiver: bob, | ||
nativeAmount: "1000000000000000000", | ||
}); | ||
|
||
assert.equal(transaction.sender, alice.bech32()); | ||
assert.equal(transaction.receiver, bob.bech32()); | ||
assert.equal(transaction.value.valueOf(), "1000000000000000000"); | ||
assert.equal(transaction.gasLimit.valueOf(), "50000"); | ||
assert.deepEqual(transaction.data, new Uint8Array()); | ||
}); | ||
|
||
it("should create draft transaction for native token transfer with data", async () => { | ||
const transaction = factory.createTransactionForNativeTokenTransfer({ | ||
sender: alice, | ||
receiver: bob, | ||
nativeAmount: "1000000000000000000", | ||
data: "test data", | ||
}); | ||
|
||
assert.equal(transaction.sender, alice.bech32()); | ||
assert.equal(transaction.receiver, bob.bech32()); | ||
assert.equal(transaction.value.valueOf(), "1000000000000000000"); | ||
assert.equal(transaction.gasLimit.valueOf(), "63500"); | ||
assert.deepEqual(transaction.data, Buffer.from("test data")); | ||
}); | ||
|
||
it("should create draft transaction for esdt transfer", async () => { | ||
const fooToken = new Token("FOO-123456", 0); | ||
const transfer = new NextTokenTransfer(fooToken, 1000000); | ||
|
||
const transaction = factory.createTransactionForESDTTokenTransfer({ | ||
sender: alice, | ||
receiver: bob, | ||
tokenTransfers: [transfer], | ||
}); | ||
|
||
assert.equal(transaction.sender, alice.bech32()); | ||
assert.equal(transaction.receiver, bob.bech32()); | ||
assert.equal(transaction.value.valueOf(), "0"); | ||
assert.equal(transaction.gasLimit.valueOf(), "410000"); | ||
assert.deepEqual(transaction.data.toString(), "ESDTTransfer@464f4f2d313233343536@0f4240"); | ||
}); | ||
|
||
it("should create draft transaction for nft transfer", async () => { | ||
const nft = new Token("NFT-123456", 10); | ||
const transfer = new NextTokenTransfer(nft, 1); | ||
|
||
const transaction = factory.createTransactionForESDTTokenTransfer({ | ||
sender: alice, | ||
receiver: bob, | ||
tokenTransfers: [transfer], | ||
}); | ||
|
||
assert.equal(transaction.sender, alice.bech32()); | ||
assert.equal(transaction.receiver, alice.bech32()); | ||
assert.equal(transaction.value.valueOf(), "0"); | ||
assert.equal(transaction.gasLimit.valueOf(), "1210500"); | ||
assert.deepEqual( | ||
transaction.data.toString(), | ||
"ESDTNFTTransfer@4e46542d313233343536@0a@01@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8" | ||
); | ||
}); | ||
|
||
it("should create draft transaction for multiple nft transfers", async () => { | ||
const firstNft = new Token("NFT-123456", 10); | ||
const firstTransfer = new NextTokenTransfer(firstNft, 1); | ||
|
||
const secondNft = new Token("TEST-987654", 1); | ||
const secondTransfer = new NextTokenTransfer(secondNft, 1); | ||
|
||
const transaction = factory.createTransactionForESDTTokenTransfer({ | ||
sender: alice, | ||
receiver: bob, | ||
tokenTransfers: [firstTransfer, secondTransfer], | ||
}); | ||
|
||
assert.equal(transaction.sender, alice.bech32()); | ||
assert.equal(transaction.receiver, alice.bech32()); | ||
assert.equal(transaction.value.valueOf(), "0"); | ||
assert.equal(transaction.gasLimit.valueOf(), "1466000"); | ||
assert.deepEqual( | ||
transaction.data.toString(), | ||
"MultiESDTNFTTransfer@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8@02@4e46542d313233343536@0a@01@544553542d393837363534@01@01" | ||
); | ||
}); | ||
}); |
120 changes: 120 additions & 0 deletions
120
src/transactionsFactories/transferTransactionsFactory.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
import BigNumber from "bignumber.js"; | ||
import { TokenTransfersDataBuilder } from "./tokenTransfersDataBuilder"; | ||
import { IAddress } from "../interface"; | ||
import { DraftTransaction } from "../draftTransaction"; | ||
import { DraftTransactionBuilder } from "./draftTransactionBuilder"; | ||
import { NextTokenTransfer, Token } from "../tokens"; | ||
import { ErrBadUsage } from "../errors"; | ||
|
||
const ADDITIONAL_GAS_FOR_ESDT_TRANSFER = 100000; | ||
const ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER = 800000; | ||
|
||
interface IConfig { | ||
chainID: string; | ||
minGasLimit: BigNumber.Value; | ||
gasLimitPerByte: BigNumber.Value; | ||
gasLimitESDTTransfer: BigNumber.Value; | ||
gasLimitESDTNFTTransfer: BigNumber.Value; | ||
gasLimitMultiESDTNFTTransfer: BigNumber.Value; | ||
} | ||
|
||
interface TokenComputer { | ||
isFungible(token: Token): boolean; | ||
} | ||
|
||
export class TransferTransactionsFactory { | ||
private readonly config: IConfig; | ||
private readonly dataArgsBuilder: TokenTransfersDataBuilder; | ||
private readonly tokenComputer: TokenComputer; | ||
|
||
constructor(config: IConfig, tokenComputer: TokenComputer) { | ||
this.config = config; | ||
this.tokenComputer = tokenComputer; | ||
this.dataArgsBuilder = new TokenTransfersDataBuilder(); | ||
} | ||
|
||
createTransactionForNativeTokenTransfer(options: { | ||
sender: IAddress; | ||
receiver: IAddress; | ||
nativeAmount: BigNumber.Value; | ||
data?: string; | ||
}): DraftTransaction { | ||
const data = options.data || ""; | ||
return new DraftTransactionBuilder({ | ||
config: this.config, | ||
sender: options.sender, | ||
receiver: options.receiver, | ||
dataParts: [data], | ||
gasLimit: 0, | ||
addDataMovementGas: true, | ||
amount: options.nativeAmount, | ||
}).build(); | ||
} | ||
|
||
createTransactionForESDTTokenTransfer(options: { | ||
sender: IAddress; | ||
receiver: IAddress; | ||
tokenTransfers: NextTokenTransfer[]; | ||
}): DraftTransaction { | ||
const numberOfTransfers = options.tokenTransfers.length; | ||
|
||
if (numberOfTransfers === 0) { | ||
throw new ErrBadUsage("No token transfer has been provided"); | ||
} | ||
|
||
if (numberOfTransfers === 1) { | ||
return this.createSingleESDTTransferDraft(options); | ||
} | ||
|
||
const transferArgs = this.dataArgsBuilder.buildArgsForMultiESDTNFTTransfer( | ||
options.receiver, | ||
options.tokenTransfers | ||
); | ||
|
||
const extraGasForTransfer = new BigNumber(this.config.gasLimitMultiESDTNFTTransfer) | ||
.multipliedBy(new BigNumber(numberOfTransfers)) | ||
.plus(new BigNumber(ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER)); | ||
|
||
return new DraftTransactionBuilder({ | ||
config: this.config, | ||
sender: options.sender, | ||
receiver: options.sender, | ||
dataParts: transferArgs, | ||
gasLimit: extraGasForTransfer, | ||
addDataMovementGas: true, | ||
}).build(); | ||
} | ||
|
||
private createSingleESDTTransferDraft(options: { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The suffix |
||
sender: IAddress; | ||
receiver: IAddress; | ||
tokenTransfers: NextTokenTransfer[]; | ||
}): DraftTransaction { | ||
let transferArgs: string[] = []; | ||
const transfer = options.tokenTransfers[0]; | ||
let extraGasForTransfer = new BigNumber(0); | ||
let receiver = options.receiver; | ||
|
||
if (this.tokenComputer.isFungible(transfer.token)) { | ||
transferArgs = this.dataArgsBuilder.buildArgsForESDTTransfer(transfer); | ||
extraGasForTransfer = new BigNumber(this.config.gasLimitESDTTransfer).plus( | ||
new BigNumber(ADDITIONAL_GAS_FOR_ESDT_TRANSFER) | ||
); | ||
} else { | ||
transferArgs = this.dataArgsBuilder.buildArgsForSingleESDTNFTTransfer(transfer, receiver); | ||
extraGasForTransfer = new BigNumber(this.config.gasLimitESDTNFTTransfer).plus( | ||
new BigNumber(ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER) | ||
); | ||
receiver = options.sender; | ||
} | ||
|
||
return new DraftTransactionBuilder({ | ||
config: this.config, | ||
sender: options.sender, | ||
receiver: receiver, | ||
dataParts: transferArgs, | ||
gasLimit: extraGasForTransfer, | ||
addDataMovementGas: true, | ||
}).build(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we use the prefix
I
by convention. But it's all right this way, as well, since the interface is not exported.