Skip to content

Commit

Permalink
Merge branch 'main' into feature-update/offline-fetcher-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
jinglescode authored Nov 15, 2024
2 parents ed1beaa + e36fc6c commit f50f314
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 34 deletions.
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.7.14",
"version": "1.7.15",
"description": "",
"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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -34,9 +34,9 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.7.14",
"@meshsdk/core": "1.7.14",
"@meshsdk/core-csl": "1.7.14"
"@meshsdk/common": "1.7.15",
"@meshsdk/core": "1.7.15",
"@meshsdk/core-csl": "1.7.15"
},
"prettier": "@meshsdk/configs/prettier",
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"module": "./dist/index.js",
Expand Down Expand Up @@ -38,7 +38,7 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.7.14",
"@meshsdk/common": "1.7.15",
"@sidan-lab/sidan-csl-rs-browser": "0.9.5",
"@sidan-lab/sidan-csl-rs-nodejs": "0.9.5",
"json-bigint": "^1.0.0"
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.7.14",
"version": "1.7.15",
"description": "",
"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.7.14",
"@meshsdk/common": "1.7.15",
"@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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -33,13 +33,13 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.7.14",
"@meshsdk/core-csl": "1.7.14",
"@meshsdk/core-cst": "1.7.14",
"@meshsdk/provider": "1.7.14",
"@meshsdk/react": "1.7.14",
"@meshsdk/transaction": "1.7.14",
"@meshsdk/wallet": "1.7.14"
"@meshsdk/common": "1.7.15",
"@meshsdk/core-csl": "1.7.15",
"@meshsdk/core-cst": "1.7.15",
"@meshsdk/provider": "1.7.15",
"@meshsdk/react": "1.7.15",
"@meshsdk/transaction": "1.7.15",
"@meshsdk/wallet": "1.7.15"
},
"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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -34,8 +34,8 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.7.14",
"@meshsdk/core-cst": "1.7.14",
"@meshsdk/common": "1.7.15",
"@meshsdk/core-cst": "1.7.15",
"@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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -30,9 +30,9 @@
},
"dependencies": {
"react": "^18.2.0",
"@meshsdk/common": "1.7.14",
"@meshsdk/transaction": "1.7.14",
"@meshsdk/wallet": "1.7.14"
"@meshsdk/common": "1.7.15",
"@meshsdk/transaction": "1.7.15",
"@meshsdk/wallet": "1.7.15"
},
"devDependencies": {
"@meshsdk/configs": "*",
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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -35,9 +35,9 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.7.14",
"@meshsdk/core-csl": "1.7.14",
"@meshsdk/core-cst": "1.7.14",
"@meshsdk/common": "1.7.15",
"@meshsdk/core-csl": "1.7.15",
"@meshsdk/core-cst": "1.7.15",
"json-bigint": "^1.0.0"
},
"prettier": "@meshsdk/configs/prettier",
Expand Down
5 changes: 5 additions & 0 deletions packages/mesh-transaction/src/mesh-tx-builder/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ export class MeshTxBuilder extends MeshTxBuilderCore {
}
this.removeDuplicateInputs();

// We can set scriptSize of collaterals as 0, because the ledger ignores this for fee calculations
for (let collateral of this.meshTxBuilderBody.collaterals) {
collateral.txIn.scriptSize = 0;
}

// Checking if all inputs are complete
const { inputs, collaterals, mints } = this.meshTxBuilderBody;
const incompleteTxIns = [...inputs, ...collaterals].filter(
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.7.14",
"version": "1.7.15",
"description": "",
"main": "./dist/index.cjs",
"browser": "./dist/index.js",
Expand Down Expand Up @@ -35,10 +35,10 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@meshsdk/common": "1.7.14",
"@meshsdk/core-csl": "1.7.14",
"@meshsdk/core-cst": "1.7.14",
"@meshsdk/transaction": "1.7.14",
"@meshsdk/common": "1.7.15",
"@meshsdk/core-csl": "1.7.15",
"@meshsdk/core-cst": "1.7.15",
"@meshsdk/transaction": "1.7.15",
"@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.7.14",
"version": "1.7.15",
"license": "Apache-2.0",
"type": "module",
"main": "./dist/index.cjs",
Expand Down

0 comments on commit f50f314

Please sign in to comment.