Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-core",
"version": "14.2.8",
"version": "14.2.9",
"description": "MultiversX SDK for JavaScript and TypeScript",
"author": "MultiversX",
"homepage": "https://multiversx.com",
Expand Down
24 changes: 24 additions & 0 deletions src/multisig/multisigTransactionsFactory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,30 @@ describe("test multisig transactions factory", function () {
);
});

it("should create transaction for propose transfer execute with EGLD send", function () {
const senderAddress = Address.newFromBech32("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");

const multisigContractAddress = Address.newFromBech32(
"erd1qqqqqqqqqqqqqpgq0rffvv4vk9vesqplv9ws55fxzdfaspqa8cfszy2hms",
);
const amount = 1000000000000000000n; // 1 EGLD
const transaction = factory.createTransactionForProposeTransferExecute(senderAddress, {
multisigContract: multisigContractAddress,
gasLimit: 60_000_000n,
nativeTokenAmount: amount,
to: multisigContractAddress,
});

assert.instanceOf(transaction, Transaction);
assert.equal(transaction.sender.toBech32(), senderAddress.toBech32());
assert.equal(transaction.receiver.toBech32(), multisigContractAddress.toBech32());
assert.equal(transaction.chainID, config.chainID);
assert.deepEqual(
transaction.data.toString(),
"proposeTransferExecute@0000000000000000050078d29632acb15998003f615d0a51261353d8041d3e13@0de0b6b3a7640000@",
);
});

it("should create transaction for propose transfer execute ESDT", function () {
const senderAddress = Address.newFromBech32("erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx");
const destinationContract = Address.newFromBech32(
Expand Down
22 changes: 13 additions & 9 deletions src/multisig/multisigTransactionsFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,18 @@ export class MultisigTransactionsFactory {
sender: Address,
options: resources.ProposeTransferExecuteInput,
): Transaction {
const gasOption = new U64Value(options.optGasLimit ?? 0n);
const input = ProposeTransferExecuteContractInput.newFromTransferExecuteInput({
multisig: options.multisigContract,
to: options.to,
functionName: options.functionName,
arguments: options.functionArguments,
abi: options.abi,
});
const gasOption = options.optGasLimit ? new U64Value(options.optGasLimit) : null;
let functionCall = [];
if (options.functionName) {
const input = ProposeTransferExecuteContractInput.newFromTransferExecuteInput({
multisig: options.multisigContract,
to: options.to,
functionName: options.functionName,
arguments: options.functionArguments,
abi: options.abi,
});
functionCall = input.functionCall;
}

return this.smartContractFactory.createTransactionForExecute(sender, {
contract: options.multisigContract,
Expand All @@ -141,7 +145,7 @@ export class MultisigTransactionsFactory {
new AddressValue(options.to),
new BigUIntValue(options.nativeTokenAmount),
new OptionValue(new OptionType(new U64Type()), gasOption),
VariadicValue.fromItems(...input.functionCall.map((value) => new BytesValue(value))),
VariadicValue.fromItems(...functionCall.map((value) => new BytesValue(value))),
],
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/multisig/proposeTransferExecuteContractInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class ProposeTransferExecuteContractInput {
multisig: Address;
to: Address;
functionName: string;
arguments: any[];
arguments?: any[];
optGasLimit?: bigint;
abi?: Abi;
}): ProposeTransferExecuteContractInput {
Expand Down
4 changes: 2 additions & 2 deletions src/multisig/resources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export type ProposeTransferExecuteInput = MultisigContractInput & {
to: Address;
nativeTokenAmount: bigint;
optGasLimit?: bigint;
functionName: string;
functionArguments: any[];
functionName?: string;
functionArguments?: any[];
abi?: Abi;
};

Expand Down
Loading