Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
22 changes: 11 additions & 11 deletions example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@taquito/example",
"private": true,
"version": "24.0.2",
"version": "24.1.0",
"scripts": {
"example": "node -r ts-node/register --preserve-symlinks example-node.ts",
"example:activation": "node -r ts-node/register --preserve-symlinks example-activate.ts",
Expand Down Expand Up @@ -41,16 +41,16 @@
},
"dependencies": {
"@ledgerhq/hw-transport-node-hid": "^6.29.16",
"@taquito/ledger-signer": "^24.0.2",
"@taquito/local-forging": "^24.0.2",
"@taquito/michel-codec": "^24.0.2",
"@taquito/michelson-encoder": "^24.0.2",
"@taquito/rpc": "^24.0.2",
"@taquito/sapling": "^24.0.2",
"@taquito/signer": "^24.0.2",
"@taquito/taquito": "^24.0.2",
"@taquito/tzip16": "^24.0.2",
"@taquito/utils": "^24.0.2",
"@taquito/ledger-signer": "^24.1.0",
"@taquito/local-forging": "^24.1.0",
"@taquito/michel-codec": "^24.1.0",
"@taquito/michelson-encoder": "^24.1.0",
"@taquito/rpc": "^24.1.0",
"@taquito/sapling": "^24.1.0",
"@taquito/signer": "^24.1.0",
"@taquito/taquito": "^24.1.0",
"@taquito/tzip16": "^24.1.0",
"@taquito/utils": "^24.1.0",
"bignumber.js": "^9.1.2"
},
"devDependencies": {
Expand Down
72 changes: 36 additions & 36 deletions integration-tests/__tests__/contract/tz1-estimation-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await Tz1.estimate.transfer({ to: await Tezos.signer.publicKeyHash(), amount: 0.019 });
expect(estimate.gasLimit).toEqual(2101);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(387);
expect(estimate.suggestedFeeMutez).toEqual(389);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(367);
expect(estimate.totalCost).toEqual(367);
expect(estimate.usingBaseFeeMutez).toEqual(367);
expect(estimate.minimalFeeMutez).toEqual(369);
expect(estimate.totalCost).toEqual(369);
expect(estimate.usingBaseFeeMutez).toEqual(369);
expect(estimate.consumedMilligas).toEqual(2100040);
});

it('Verify .estimate.transfer with unallocated destination', async () => {
const estimate = await Tz1.estimate.transfer({ to: await (await createAddress()).signer.publicKeyHash(), amount: 0.017 });
expect(estimate.gasLimit).toEqual(2101);
expect(estimate.storageLimit).toEqual(277);
expect(estimate.suggestedFeeMutez).toEqual(387);
expect(estimate.suggestedFeeMutez).toEqual(389);
expect(estimate.burnFeeMutez).toEqual(69250);
expect(estimate.minimalFeeMutez).toEqual(367);
expect(estimate.totalCost).toEqual(69617);
expect(estimate.usingBaseFeeMutez).toEqual(367);
expect(estimate.minimalFeeMutez).toEqual(369);
expect(estimate.totalCost).toEqual(69619);
expect(estimate.usingBaseFeeMutez).toEqual(369);
expect(estimate.consumedMilligas).toEqual(2100040);
});

Expand All @@ -71,11 +71,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
});
expect(estimate.gasLimit).toEqual(677);
expect(estimate.storageLimit).toEqual(591);
expect(estimate.suggestedFeeMutez).toEqual(536);
expect(estimate.suggestedFeeMutez).toEqual(538);
expect(estimate.burnFeeMutez).toEqual(147750);
expect(estimate.minimalFeeMutez).toEqual(516);
expect(estimate.totalCost).toEqual(148266);
expect(estimate.usingBaseFeeMutez).toEqual(516);
expect(estimate.minimalFeeMutez).toEqual(518);
expect(estimate.totalCost).toEqual(148268);
expect(estimate.usingBaseFeeMutez).toEqual(518);
expect(estimate.consumedMilligas).toEqual(676402);
});

Expand All @@ -86,11 +86,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
});
expect(estimate.gasLimit).toEqual(100);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(182);
expect(estimate.suggestedFeeMutez).toEqual(184);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(162);
expect(estimate.totalCost).toEqual(162);
expect(estimate.usingBaseFeeMutez).toEqual(162);
expect(estimate.minimalFeeMutez).toEqual(164);
expect(estimate.totalCost).toEqual(164);
expect(estimate.usingBaseFeeMutez).toEqual(164);
expect(estimate.consumedMilligas).toEqual(100000);
});

Expand All @@ -99,11 +99,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await Tz1.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(3458);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(595);
expect(estimate.suggestedFeeMutez).toEqual(597);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(575);
expect(estimate.totalCost).toEqual(575);
expect(estimate.usingBaseFeeMutez).toEqual(575);
expect(estimate.minimalFeeMutez).toEqual(577);
expect(estimate.totalCost).toEqual(577);
expect(estimate.usingBaseFeeMutez).toEqual(577);
expect(estimate.consumedMilligas).toEqual(3457645);
});

Expand All @@ -116,11 +116,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await Tz1.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(5573);
expect(estimate.storageLimit).toEqual(534);
expect(estimate.suggestedFeeMutez).toEqual(866);
expect(estimate.suggestedFeeMutez).toEqual(868);
expect(estimate.burnFeeMutez).toEqual(133500);
expect(estimate.minimalFeeMutez).toEqual(846);
expect(estimate.totalCost).toEqual(134346);
expect(estimate.usingBaseFeeMutez).toEqual(846);
expect(estimate.minimalFeeMutez).toEqual(848);
expect(estimate.totalCost).toEqual(134348);
expect(estimate.usingBaseFeeMutez).toEqual(848);
expect(estimate.consumedMilligas).toEqual(5572174);
});

Expand All @@ -129,11 +129,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await Tz1.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(1869);
expect(estimate.storageLimit).toEqual(337);
expect(estimate.suggestedFeeMutez).toEqual(442);
expect(estimate.suggestedFeeMutez).toEqual(444);
expect(estimate.burnFeeMutez).toEqual(84250);
expect(estimate.minimalFeeMutez).toEqual(422);
expect(estimate.totalCost).toEqual(84672);
expect(estimate.usingBaseFeeMutez).toEqual(422);
expect(estimate.minimalFeeMutez).toEqual(424);
expect(estimate.totalCost).toEqual(84674);
expect(estimate.usingBaseFeeMutez).toEqual(424);
expect(estimate.consumedMilligas).toEqual(1868269);
});

Expand All @@ -142,11 +142,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await Tz1.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(2394);
expect(estimate.storageLimit).toEqual(654);
expect(estimate.suggestedFeeMutez).toEqual(560);
expect(estimate.suggestedFeeMutez).toEqual(562);
expect(estimate.burnFeeMutez).toEqual(163500);
expect(estimate.minimalFeeMutez).toEqual(540);
expect(estimate.totalCost).toEqual(164040);
expect(estimate.usingBaseFeeMutez).toEqual(540);
expect(estimate.minimalFeeMutez).toEqual(542);
expect(estimate.totalCost).toEqual(164042);
expect(estimate.usingBaseFeeMutez).toEqual(542);
expect(estimate.consumedMilligas).toEqual(2393422);
// Do the actual operation
const op2 = await contract.methodsObject.do(originate2()).send();
Expand Down Expand Up @@ -178,11 +178,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
let estimate = await LowAmountTz1.estimate.transfer({ to: await Tezos.signer.publicKeyHash(), mutez: true, amount: amt - (1382 + getRevealFee(pkh)) });
expect(estimate.gasLimit).toEqual(2101);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(386);
expect(estimate.suggestedFeeMutez).toEqual(388);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(366);
expect(estimate.totalCost).toEqual(366);
expect(estimate.usingBaseFeeMutez).toEqual(366);
expect(estimate.minimalFeeMutez).toEqual(368);
expect(estimate.totalCost).toEqual(368);
expect(estimate.usingBaseFeeMutez).toEqual(368);
expect(estimate.consumedMilligas).toEqual(2100040);
});

Expand Down
72 changes: 36 additions & 36 deletions integration-tests/__tests__/contract/tz2-estimation-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await LowAmountTez.estimate.transfer({ to: await Tezos.signer.publicKeyHash(), amount: 0.019 });
expect(estimate.gasLimit).toEqual(2101);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(388);
expect(estimate.suggestedFeeMutez).toEqual(390);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(368);
expect(estimate.totalCost).toEqual(368);
expect(estimate.usingBaseFeeMutez).toEqual(368);
expect(estimate.minimalFeeMutez).toEqual(370);
expect(estimate.totalCost).toEqual(370);
expect(estimate.usingBaseFeeMutez).toEqual(370);
expect(estimate.consumedMilligas).toEqual(2100040);
});

it('Verify .estimate.transfer with unallocated destination', async () => {
const estimate = await LowAmountTez.estimate.transfer({ to: await (await createAddress()).signer.publicKeyHash(), amount: 0.017 });
expect(estimate.gasLimit).toEqual(2101);
expect(estimate.storageLimit).toEqual(277);
expect(estimate.suggestedFeeMutez).toEqual(388);
expect(estimate.suggestedFeeMutez).toEqual(390);
expect(estimate.burnFeeMutez).toEqual(69250);
expect(estimate.minimalFeeMutez).toEqual(368);
expect(estimate.totalCost).toEqual(69618);
expect(estimate.usingBaseFeeMutez).toEqual(368);
expect(estimate.minimalFeeMutez).toEqual(370);
expect(estimate.totalCost).toEqual(69620);
expect(estimate.usingBaseFeeMutez).toEqual(370);
expect(estimate.consumedMilligas).toEqual(2100040);
});

Expand All @@ -69,11 +69,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
});
expect(estimate.gasLimit).toEqual(677);
expect(estimate.storageLimit).toEqual(591);
expect(estimate.suggestedFeeMutez).toEqual(537);
expect(estimate.suggestedFeeMutez).toEqual(539);
expect(estimate.burnFeeMutez).toEqual(147750);
expect(estimate.minimalFeeMutez).toEqual(517);
expect(estimate.totalCost).toEqual(148267);
expect(estimate.usingBaseFeeMutez).toEqual(517);
expect(estimate.minimalFeeMutez).toEqual(519);
expect(estimate.totalCost).toEqual(148269);
expect(estimate.usingBaseFeeMutez).toEqual(519);
expect(estimate.consumedMilligas).toEqual(676402);
});

Expand All @@ -84,11 +84,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
});
expect(estimate.gasLimit).toEqual(100);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(183);
expect(estimate.suggestedFeeMutez).toEqual(185);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(163);
expect(estimate.totalCost).toEqual(163);
expect(estimate.usingBaseFeeMutez).toEqual(163);
expect(estimate.minimalFeeMutez).toEqual(165);
expect(estimate.totalCost).toEqual(165);
expect(estimate.usingBaseFeeMutez).toEqual(165);
expect(estimate.consumedMilligas).toEqual(100000);
});

Expand All @@ -97,11 +97,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await LowAmountTez.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(3458);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(596);
expect(estimate.suggestedFeeMutez).toEqual(598);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(576);
expect(estimate.totalCost).toEqual(576);
expect(estimate.usingBaseFeeMutez).toEqual(576);
expect(estimate.minimalFeeMutez).toEqual(578);
expect(estimate.totalCost).toEqual(578);
expect(estimate.usingBaseFeeMutez).toEqual(578);
expect(estimate.consumedMilligas).toEqual(3457645);
});

Expand All @@ -114,11 +114,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await LowAmountTez.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(5573);
expect(estimate.storageLimit).toEqual(534);
expect(estimate.suggestedFeeMutez).toEqual(867);
expect(estimate.suggestedFeeMutez).toEqual(869);
expect(estimate.burnFeeMutez).toEqual(133500);
expect(estimate.minimalFeeMutez).toEqual(847);
expect(estimate.totalCost).toEqual(134347);
expect(estimate.usingBaseFeeMutez).toEqual(847);
expect(estimate.minimalFeeMutez).toEqual(849);
expect(estimate.totalCost).toEqual(134349);
expect(estimate.usingBaseFeeMutez).toEqual(849);
expect(estimate.consumedMilligas).toEqual(5572174);
});

Expand All @@ -127,11 +127,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await LowAmountTez.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(1869);
expect(estimate.storageLimit).toEqual(337);
expect(estimate.suggestedFeeMutez).toEqual(443);
expect(estimate.suggestedFeeMutez).toEqual(445);
expect(estimate.burnFeeMutez).toEqual(84250);
expect(estimate.minimalFeeMutez).toEqual(423);
expect(estimate.totalCost).toEqual(84673);
expect(estimate.usingBaseFeeMutez).toEqual(423);
expect(estimate.minimalFeeMutez).toEqual(425);
expect(estimate.totalCost).toEqual(84675);
expect(estimate.usingBaseFeeMutez).toEqual(425);
expect(estimate.consumedMilligas).toEqual(1868269);
});

Expand All @@ -140,11 +140,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
const estimate = await LowAmountTez.estimate.transfer(tx);
expect(estimate.gasLimit).toEqual(2394);
expect(estimate.storageLimit).toEqual(654);
expect(estimate.suggestedFeeMutez).toEqual(561);
expect(estimate.suggestedFeeMutez).toEqual(563);
expect(estimate.burnFeeMutez).toEqual(163500);
expect(estimate.minimalFeeMutez).toEqual(541);
expect(estimate.totalCost).toEqual(164041);
expect(estimate.usingBaseFeeMutez).toEqual(541);
expect(estimate.minimalFeeMutez).toEqual(543);
expect(estimate.totalCost).toEqual(164043);
expect(estimate.usingBaseFeeMutez).toEqual(543);
expect(estimate.consumedMilligas).toEqual(2393422);
// Do the actual operation
const op2 = await contract.methodsObject.do(originate2()).send();
Expand Down Expand Up @@ -176,11 +176,11 @@ CONFIGS().forEach(({ lib, setup, knownBaker, createAddress, rpc }) => {
let estimate = await LowAmountTez.estimate.transfer({ to: await Tezos.signer.publicKeyHash(), mutez: true, amount: amt - (1382 + getRevealFee(pkh)) });
expect(estimate.gasLimit).toEqual(2101);
expect(estimate.storageLimit).toEqual(0);
expect(estimate.suggestedFeeMutez).toEqual(387);
expect(estimate.suggestedFeeMutez).toEqual(389);
expect(estimate.burnFeeMutez).toEqual(0);
expect(estimate.minimalFeeMutez).toEqual(367);
expect(estimate.totalCost).toEqual(367);
expect(estimate.usingBaseFeeMutez).toEqual(367);
expect(estimate.minimalFeeMutez).toEqual(369);
expect(estimate.totalCost).toEqual(369);
expect(estimate.usingBaseFeeMutez).toEqual(369);
expect(estimate.consumedMilligas).toEqual(2100040);
});

Expand Down
Loading
Loading