Skip to content

Commit

Permalink
Merge pull request #453 from MeshJS/fix/sorted-inputs-and-mints
Browse files Browse the repository at this point in the history
fix unsorted inputs and mints
  • Loading branch information
jinglescode authored Dec 19, 2024
2 parents 2511e25 + b1f3a3a commit 2de7d49
Show file tree
Hide file tree
Showing 13 changed files with 476 additions and 462 deletions.
846 changes: 421 additions & 425 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/mesh-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/common",
"version": "1.8.2",
"version": "1.8.3",
"description": "Contains constants, types and interfaces used across the SDK and different serialization libraries",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down
8 changes: 4 additions & 4 deletions packages/mesh-contract/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/contract",
"version": "1.8.2",
"version": "1.8.3",
"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,9 +34,9 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.8.2",
"@meshsdk/core": "1.8.2",
"@meshsdk/core-csl": "1.8.2"
"@meshsdk/common": "1.8.3",
"@meshsdk/core": "1.8.3",
"@meshsdk/core-csl": "1.8.3"
},
"prettier": "@meshsdk/configs/prettier",
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-core-csl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/core-csl",
"version": "1.8.2",
"version": "1.8.3",
"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.8.2",
"@meshsdk/provider": "1.8.3",
"@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.8.2",
"@meshsdk/common": "1.8.3",
"@sidan-lab/sidan-csl-rs-browser": "0.9.12",
"@sidan-lab/sidan-csl-rs-nodejs": "0.9.12",
"@types/base32-encoding": "^1.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/mesh-core-cst/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/core-cst",
"version": "1.8.2",
"version": "1.8.3",
"description": "Types and utilities functions between Mesh and cardano-js-sdk",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -42,7 +42,7 @@
"@harmoniclabs/cbor": "1.3.0",
"@harmoniclabs/plutus-data": "1.2.4",
"@harmoniclabs/uplc": "1.2.4",
"@meshsdk/common": "1.8.2",
"@meshsdk/common": "1.8.3",
"@stricahq/bip32ed25519": "^1.1.0",
"@stricahq/cbors": "^1.0.3",
"pbkdf2": "^3.1.2"
Expand Down
16 changes: 8 additions & 8 deletions packages/mesh-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/core",
"version": "1.8.2",
"version": "1.8.3",
"description": "Mesh SDK Core - https://meshjs.dev/",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -33,13 +33,13 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.8.2",
"@meshsdk/core-csl": "1.8.2",
"@meshsdk/core-cst": "1.8.2",
"@meshsdk/provider": "1.8.2",
"@meshsdk/react": "1.8.2",
"@meshsdk/transaction": "1.8.2",
"@meshsdk/wallet": "1.8.2"
"@meshsdk/common": "1.8.3",
"@meshsdk/core-csl": "1.8.3",
"@meshsdk/core-cst": "1.8.3",
"@meshsdk/provider": "1.8.3",
"@meshsdk/react": "1.8.3",
"@meshsdk/transaction": "1.8.3",
"@meshsdk/wallet": "1.8.3"
},
"prettier": "@meshsdk/configs/prettier",
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions packages/mesh-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/provider",
"version": "1.8.2",
"version": "1.8.3",
"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.8.2",
"@meshsdk/core-cst": "1.8.2",
"@meshsdk/common": "1.8.3",
"@meshsdk/core-cst": "1.8.3",
"@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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/react",
"version": "1.8.2",
"version": "1.8.3",
"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.8.2",
"@meshsdk/transaction": "1.8.2",
"@meshsdk/wallet": "1.8.2",
"@meshsdk/common": "1.8.3",
"@meshsdk/transaction": "1.8.3",
"@meshsdk/wallet": "1.8.3",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-icons": "^1.3.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/mesh-svelte/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/svelte",
"version": "1.8.2",
"version": "1.8.3",
"description": "Svelte component library - https://meshjs.dev/svelte",
"type": "module",
"exports": {
Expand All @@ -26,7 +26,7 @@
"dev": "vite dev"
},
"dependencies": {
"@meshsdk/core": "1.8.2",
"@meshsdk/core": "1.8.3",
"bits-ui": "1.0.0-next.65"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/mesh-transaction/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/transaction",
"version": "1.8.2",
"version": "1.8.3",
"description": "Transactions - https://meshjs.dev/apis/transaction",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -35,9 +35,9 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.8.2",
"@meshsdk/core-csl": "1.8.2",
"@meshsdk/core-cst": "1.8.2",
"@meshsdk/common": "1.8.3",
"@meshsdk/core-csl": "1.8.3",
"@meshsdk/core-cst": "1.8.3",
"json-bigint": "^1.0.0"
},
"prettier": "@meshsdk/configs/prettier",
Expand Down
18 changes: 18 additions & 0 deletions packages/mesh-transaction/src/mesh-tx-builder/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,24 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
});
this.addUtxosFromSelection();

// Sort inputs based on txHash and txIndex
this.meshTxBuilderBody.inputs.sort((a, b) => {
if (a.txIn.txHash < b.txIn.txHash) return -1;
if (a.txIn.txHash > b.txIn.txHash) return 1;
if (a.txIn.txIndex < b.txIn.txIndex) return -1;
if (a.txIn.txIndex > b.txIn.txIndex) return 1;
return 0;
});

// Sort mints based on policy id and asset name
this.meshTxBuilderBody.mints.sort((a, b) => {
if (a.policyId < b.policyId) return -1;
if (a.policyId > b.policyId) return 1;
if (a.assetName < b.assetName) return -1;
if (a.assetName > b.assetName) return 1;
return 0;
});

let txHex = this.serializer.serializeTxBody(
this.meshTxBuilderBody,
this._protocolParams,
Expand Down
10 changes: 5 additions & 5 deletions packages/mesh-wallet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@meshsdk/wallet",
"version": "1.8.2",
"version": "1.8.3",
"description": "Wallets - https://meshjs.dev/apis/wallets",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -35,10 +35,10 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.8.2",
"@meshsdk/core-csl": "1.8.2",
"@meshsdk/core-cst": "1.8.2",
"@meshsdk/transaction": "1.8.2",
"@meshsdk/common": "1.8.3",
"@meshsdk/core-csl": "1.8.3",
"@meshsdk/core-cst": "1.8.3",
"@meshsdk/transaction": "1.8.3",
"@nufi/dapp-client-cardano": "0.3.5",
"@nufi/dapp-client-core": "0.3.5"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/mesh-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A quick and easy way to bootstrap your dApps on Cardano using Mesh.",
"homepage": "https://meshjs.dev",
"author": "MeshJS",
"version": "1.8.2",
"version": "1.8.3",
"license": "Apache-2.0",
"type": "module",
"main": "./dist/index.cjs",
Expand Down

0 comments on commit 2de7d49

Please sign in to comment.