Skip to content

fix tx evaluation multiplier - underestimated fees #608

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.

Sign up for GitHub

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

Merged
twwu123 merged 7 commits into from
Apr 22, 2025
Merged

fix tx evaluation multiplier - underestimated fees #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5b68fd
fix tx evaluation multiplier - underestimated fees
twwu123 Apr 19, 2025
f23b529
fix redeemer evaluation logic
lisicky Apr 21, 2025
59242b0
Merge branch 'main' into fix/redeemer-underestimated-fees
twwu123 Apr 21, 2025
1a9eae7
fix redeemer evaluation logic
lisicky Apr 21, 2025
2f1ef43
Merge remote-tracking branch 'origin/fix/redeemer-underestimated-fees…
lisicky Apr 21, 2025
aee55ff
fix script tx test withdrawal with script ref
twwu123 Apr 22, 2025
856ce39
chore: release
twwu123 Apr 22, 2025
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
6 changes: 3 additions & 3 deletions packages/hydra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/hydra",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Mesh Hydra package",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand All @@ -27,8 +27,8 @@
"test": "jest"
},
"dependencies": {
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/core-cst": "1.9.0-beta.37",
"@meshsdk/common": "1.9.0-beta-38",
"@meshsdk/core-cst": "1.9.0-beta-38",
"axios": "^1.7.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mesh-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/common",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Contains constants, types and interfaces used across the SDK and different serialization libraries",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-contract/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/contract",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "List of open-source smart contracts, complete with documentation, live demos, and end-to-end source code. https://meshjs.dev/smart-contracts",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -34,8 +34,8 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/core": "1.9.0-beta.37"
"@meshsdk/common": "1.9.0-beta-38",
"@meshsdk/core": "1.9.0-beta-38"
},
"prettier": "@meshsdk/configs/prettier",
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-core-csl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/core-csl",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Types and utilities functions between Mesh and cardano-serialization-lib",
"main": "./dist/index.cjs",
"module": "./dist/index.js",
Expand Down Expand Up @@ -31,15 +31,15 @@
},
"devDependencies": {
"@meshsdk/configs": "*",
"@meshsdk/provider": "1.9.0-beta.37",
"@meshsdk/provider": "1.9.0-beta-38",
"@types/json-bigint": "^1.0.4",
"eslint": "^8.57.0",
"ts-jest": "^29.1.4",
"tsup": "^8.0.2",
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/common": "1.9.0-beta-38",
"@sidan-lab/whisky-js-browser": "^1.0.1",
"@sidan-lab/whisky-js-nodejs": "^1.0.1",
"@types/base32-encoding": "^1.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/mesh-core-cst/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/core-cst",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Types and utilities functions between Mesh and cardano-js-sdk",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -44,7 +44,7 @@
"@harmoniclabs/plutus-data": "1.2.4",
"@harmoniclabs/uplc": "1.2.4",
"@harmoniclabs/pair": "^1.0.0",
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/common": "1.9.0-beta-38",
"@types/base32-encoding": "^1.0.2",
"base32-encoding": "^1.0.0",
"bech32": "^2.0.0",
Expand Down
14 changes: 7 additions & 7 deletions packages/mesh-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/core",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Mesh SDK Core - https://meshjs.dev/",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -33,12 +33,12 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/core-cst": "1.9.0-beta.37",
"@meshsdk/provider": "1.9.0-beta.37",
"@meshsdk/react": "1.9.0-beta.37",
"@meshsdk/transaction": "1.9.0-beta.37",
"@meshsdk/wallet": "1.9.0-beta.37"
"@meshsdk/common": "1.9.0-beta-38",
"@meshsdk/core-cst": "1.9.0-beta-38",
"@meshsdk/provider": "1.9.0-beta-38",
"@meshsdk/react": "1.9.0-beta-38",
"@meshsdk/transaction": "1.9.0-beta-38",
"@meshsdk/wallet": "1.9.0-beta-38"
},
"prettier": "@meshsdk/configs/prettier",
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/provider",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Blockchain data providers - https://meshjs.dev/providers",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -35,8 +35,8 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/core-cst": "1.9.0-beta.37",
"@meshsdk/common": "1.9.0-beta-38",
"@meshsdk/core-cst": "1.9.0-beta-38",
"@utxorpc/sdk": "0.6.2",
"@utxorpc/spec": "0.10.1",
"axios": "^1.7.2"
Expand Down
8 changes: 4 additions & 4 deletions packages/mesh-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/react",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "React component library - https://meshjs.dev/react",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -30,9 +30,9 @@
},
"dependencies": {
"@fabianbormann/cardano-peer-connect": "^1.2.18",
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/transaction": "1.9.0-beta.37",
"@meshsdk/wallet": "1.9.0-beta.37",
"@meshsdk/common": "1.9.0-beta-38",
"@meshsdk/transaction": "1.9.0-beta-38",
"@meshsdk/wallet": "1.9.0-beta-38",
"@meshsdk/web3-sdk": "0.0.26",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/mesh-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/svelte",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Svelte component library - https://meshjs.dev/svelte",
"type": "module",
"exports": {
Expand All @@ -26,7 +26,7 @@
"dev": "vite dev"
},
"dependencies": {
"@meshsdk/core": "1.9.0-beta.37",
"@meshsdk/core": "1.9.0-beta-38",
"bits-ui": "1.0.0-next.65"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-transaction/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/transaction",
"version": "1.9.0-beta.37",
"version": "1.9.0-beta-38",
"description": "Transactions - https://meshjs.dev/apis/transaction",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -35,8 +35,8 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.9.0-beta.37",
"@meshsdk/core-cst": "1.9.0-beta.37",
"@meshsdk/common": "1.9.0-beta-38",
"@meshsdk/core-cst": "1.9.0-beta-38",
"@cardano-sdk/core": "^0.45.5",
"@cardano-sdk/util": "^0.15.5",
"@cardano-sdk/input-selection": "^0.13.33",
Expand Down
49 changes: 39 additions & 10 deletions packages/mesh-transaction/src/mesh-tx-builder/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
}
if (this.verbose) {
console.log(
"txBodyJson",
"txBodyJson - before coin selection",
JSON.stringify(this.meshTxBuilderBody, (key, val) => {
if (key === "extraInputs") return undefined;
if (key === "selectionConfig") return undefined;
Expand All @@ -167,12 +167,21 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
collateral.txIn.scriptSize = 0;
}
await this.completeTxParts();
this.sortTxParts();
const txPrototype = await this.selectUtxos();
await this.updateByTxPrototype(txPrototype);
await this.updateByTxPrototype(txPrototype, true);
this.queueAllLastItem();
this.removeDuplicateInputs();
this.sortTxParts();

if (this.verbose) {
console.log(
"txBodyJson - after coin selection",
JSON.stringify(this.meshTxBuilderBody, (key, val) => {
if (key === "extraInputs") return undefined;
if (key === "selectionConfig") return undefined;
return val;
}),
);
}
const txHex = this.serializer.serializeTxBody(
this.meshTxBuilderBody,
this._protocolParams,
Expand All @@ -192,8 +201,6 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
await clonedBuilder.updateByTxPrototype(selectionSkeleton);
clonedBuilder.queueAllLastItem();

this.sortTxParts();

try {
await clonedBuilder.evaluateRedeemers();
} catch (error) {
Expand Down Expand Up @@ -262,6 +269,7 @@ export class MeshTxBuilder extends MeshTxBuilderCore {

updateByTxPrototype = async (
selectionSkeleton: CoinSelectionInterface.TransactionPrototype,
final = false,
) => {
for (let utxo of selectionSkeleton.newInputs) {
this.txIn(
Expand All @@ -288,6 +296,7 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
this.updateRedeemer(
this.meshTxBuilderBody,
selectionSkeleton.redeemers ?? [],
final,
);
};

Expand Down Expand Up @@ -365,7 +374,7 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
redeemers.push({
tag: "SPEND",
index: i,
budget: input.scriptTxIn.redeemer.exUnits,
budget: structuredClone(input.scriptTxIn.redeemer.exUnits),
});
}
}
Expand All @@ -375,7 +384,7 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
redeemers.push({
tag: "MINT",
index: i,
budget: mint.redeemer.exUnits,
budget: structuredClone(mint.redeemer.exUnits),
});
}
}
Expand All @@ -385,7 +394,7 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
redeemers.push({
tag: "CERT",
index: i,
budget: cert.redeemer.exUnits,
budget: structuredClone(cert.redeemer.exUnits),
});
}
}
Expand All @@ -395,7 +404,17 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
redeemers.push({
tag: "REWARD",
index: i,
budget: withdrawal.redeemer.exUnits,
budget: structuredClone(withdrawal.redeemer.exUnits),
});
}
}
for (let i = 0; i < meshTxBuilderBody.votes.length; i++) {
const vote = meshTxBuilderBody.votes[i]!;
if (vote.type === "ScriptVote" && vote.redeemer) {
redeemers.push({
tag: "VOTE",
index: i,
budget: structuredClone(vote.redeemer.exUnits),
});
}
}
Expand Down Expand Up @@ -1454,6 +1473,16 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
stepUnits += BigInt(vote.redeemer.exUnits.steps);
}
}
memUnits = BigInt(
new BigNumber(memUnits)
.integerValue(BigNumber.ROUND_CEIL)
.toString(),
);
stepUnits = BigInt(
new BigNumber(stepUnits)
.integerValue(BigNumber.ROUND_CEIL)
.toString(),
);
return {
memUnits,
stepUnits,
Expand Down
Loading