Skip to content

Commit 3254d67

Browse files
authored
Merge pull request #804 from MeshJS/fix/package-conflicts
Fix/package conflicts
2 parents 8df22eb + 63a49c3 commit 3254d67

11 files changed

Lines changed: 11076 additions & 29970 deletions

File tree

package-lock.json

Lines changed: 11035 additions & 29922 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@
3939
"dependencies": {
4040
"@bitcoinerlab/coinselect": "^1.3.2",
4141
"@bitcoinerlab/descriptors": "^2.3.1",
42-
"@bitcoinerlab/secp256k1": "^1.2.0",
43-
"npm": "^10.8.0"
42+
"@bitcoinerlab/secp256k1": "^1.2.0"
4443
},
4544
"overrides": {
46-
"ip": "npm:@webpod/ip@latest",
47-
"libsodium-wrappers-sumo": "0.7.15"
45+
"ip": "npm:@webpod/ip@latest"
4846
}
4947
}

packages/mesh-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/common",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "Contains constants, types and interfaces used across the SDK and different serialization libraries",
55
"main": "./dist/index.cjs",
66
"browser": "./dist/index.js",

packages/mesh-contract/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/contract",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "List of open-source smart contracts, complete with documentation, live demos, and end-to-end source code. https://meshjs.dev/smart-contracts",
55
"main": "./dist/index.cjs",
66
"browser": "./dist/index.js",
@@ -34,9 +34,8 @@
3434
"typescript": "^5.3.3"
3535
},
3636
"dependencies": {
37-
"@meshsdk/common": "1.9.0-beta.99",
38-
"@meshsdk/core": "1.9.0-beta.99",
39-
"libsodium-wrappers-sumo": "0.7.15"
37+
"@meshsdk/common": "1.9.0-beta.100",
38+
"@meshsdk/core": "1.9.0-beta.100"
4039
},
4140
"prettier": "@meshsdk/configs/prettier",
4241
"publishConfig": {

packages/mesh-core-csl/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/core-csl",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "Types and utilities functions between Mesh and cardano-serialization-lib",
55
"main": "./dist/index.cjs",
66
"module": "./dist/index.js",
@@ -38,7 +38,7 @@
3838
"typescript": "^5.3.3"
3939
},
4040
"dependencies": {
41-
"@meshsdk/common": "1.9.0-beta.99",
41+
"@meshsdk/common": "1.9.0-beta.100",
4242
"@sidan-lab/whisky-js-browser": "^1.0.11",
4343
"@sidan-lab/whisky-js-nodejs": "^1.0.11",
4444
"@types/base32-encoding": "^1.0.2",

packages/mesh-core-cst/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/core-cst",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "Types and utilities functions between Mesh and cardano-js-sdk",
55
"main": "./dist/index.cjs",
66
"browser": "./dist/index.js",
@@ -36,22 +36,21 @@
3636
"typescript": "^5.3.3"
3737
},
3838
"dependencies": {
39-
"@cardano-sdk/core": "^0.46.11",
40-
"@cardano-sdk/crypto": "^0.4.4",
41-
"@cardano-sdk/input-selection": "^0.14.27",
42-
"@cardano-sdk/util": "^0.17.1",
39+
"@cardano-sdk/core": "0.46.12",
40+
"@cardano-sdk/crypto": "0.4.5",
41+
"@cardano-sdk/input-selection": "0.14.28",
42+
"@cardano-sdk/util": "0.17.1",
4343
"@harmoniclabs/cbor": "1.6.0",
4444
"@harmoniclabs/pair": "^1.0.0",
4545
"@harmoniclabs/plutus-data": "1.2.6",
4646
"@harmoniclabs/uplc": "1.4.1",
47-
"@meshsdk/common": "1.9.0-beta.99",
47+
"@meshsdk/common": "1.9.0-beta.100",
4848
"@types/base32-encoding": "^1.0.2",
4949
"base32-encoding": "^1.0.0",
5050
"bech32": "^2.0.0",
5151
"blakejs": "^1.2.1",
5252
"bn.js": "^5.2.0",
5353
"hash.js": "^1.1.7",
54-
"libsodium-wrappers-sumo": "0.7.15",
5554
"scalus": "^0.14.2"
5655
},
5756
"overrides": {

packages/mesh-core/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/core",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "Mesh SDK Core - https://meshjs.dev/",
55
"main": "./dist/index.cjs",
66
"browser": "./dist/index.js",
@@ -33,12 +33,11 @@
3333
"typescript": "^5.3.3"
3434
},
3535
"dependencies": {
36-
"@meshsdk/common": "1.9.0-beta.99",
37-
"@meshsdk/core-cst": "1.9.0-beta.99",
38-
"@meshsdk/provider": "1.9.0-beta.89",
39-
"@meshsdk/transaction": "1.9.0-beta.99",
40-
"@meshsdk/wallet": "1.9.0-beta.99",
41-
"libsodium-wrappers-sumo": "0.7.15"
36+
"@meshsdk/common": "1.9.0-beta.100",
37+
"@meshsdk/core-cst": "1.9.0-beta.100",
38+
"@meshsdk/provider": "1.9.0-beta.99",
39+
"@meshsdk/transaction": "1.9.0-beta.100",
40+
"@meshsdk/wallet": "1.9.0-beta.100"
4241
},
4342
"prettier": "@meshsdk/configs/prettier",
4443
"publishConfig": {

packages/mesh-transaction/package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/transaction",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "Transactions - https://meshjs.dev/apis/transaction",
55
"main": "./dist/index.cjs",
66
"browser": "./dist/index.js",
@@ -35,13 +35,12 @@
3535
"typescript": "^5.3.3"
3636
},
3737
"dependencies": {
38-
"@meshsdk/common": "1.9.0-beta.99",
39-
"@meshsdk/core-cst": "1.9.0-beta.99",
40-
"@cardano-sdk/core": "^0.46.11",
41-
"@cardano-sdk/util": "^0.17.1",
42-
"@cardano-sdk/input-selection": "^0.14.27",
43-
"json-bigint": "^1.0.0",
44-
"libsodium-wrappers-sumo": "0.7.15"
38+
"@meshsdk/common": "1.9.0-beta.100",
39+
"@meshsdk/core-cst": "1.9.0-beta.100",
40+
"@cardano-sdk/core": "0.46.12",
41+
"@cardano-sdk/util": "0.17.1",
42+
"@cardano-sdk/input-selection": "0.14.28",
43+
"json-bigint": "^1.0.0"
4544
},
4645
"prettier": "@meshsdk/configs/prettier",
4746
"publishConfig": {

packages/mesh-transaction/src/mesh-tx-builder/coin-selection/largest-first-selector.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Output, TxIn, TxOutput, UTxO, value } from "@meshsdk/common";
1+
import { Output, TxIn, TxOutput, UTxO } from "@meshsdk/common";
22

33
import {
44
BuilderCallbacks,
@@ -154,14 +154,12 @@ export class LargestFirstInputSelector implements IInputSelector {
154154
): { changeOutputs: TxOutput[]; valueFulfilled: boolean } => {
155155
let lovelaceAvailable = remainingValue.get("lovelace") || 0n;
156156
let valueFulfilled = true;
157-
const valueAssets = remainingValue
158-
.entries()
157+
const valueAssets = Array.from(remainingValue.entries())
159158
.filter(([_, quantity]) => quantity > 0n)
160159
.map(([unit, quantity]) => ({
161160
unit,
162161
quantity: String(quantity),
163-
}))
164-
.toArray();
162+
}));
165163
const changeOutputs: TxOutput[] = [];
166164
let currentBundle: { unit: string; quantity: string }[] = [
167165
{
@@ -259,9 +257,11 @@ export class LargestFirstInputSelector implements IInputSelector {
259257
const selectedUtxos = new Set<UTxO>();
260258
while (remainingUtxos.length > 0) {
261259
// We select per asset by UTxO with largest quantity of that asset
262-
const assetToSelect = remainingValue.entries().find(([_, quantity]) => {
263-
return quantity < 0n;
264-
});
260+
const assetToSelect = Array.from(remainingValue.entries()).find(
261+
([_, quantity]) => {
262+
return quantity < 0n;
263+
},
264+
);
265265
if (!assetToSelect) {
266266
break; // No more assets to select
267267
}

packages/mesh-wallet/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@meshsdk/wallet",
3-
"version": "1.9.0-beta.99",
3+
"version": "1.9.0-beta.100",
44
"description": "Wallets - https://meshjs.dev/apis/wallets",
55
"main": "./dist/index.cjs",
66
"browser": "./dist/index.js",
@@ -35,11 +35,10 @@
3535
"typescript": "^5.3.3"
3636
},
3737
"dependencies": {
38-
"@meshsdk/common": "1.9.0-beta.99",
39-
"@meshsdk/core-cst": "1.9.0-beta.99",
40-
"@meshsdk/transaction": "1.9.0-beta.99",
41-
"@simplewebauthn/browser": "^13.0.0",
42-
"libsodium-wrappers-sumo": "0.7.15"
38+
"@meshsdk/common": "1.9.0-beta.100",
39+
"@meshsdk/core-cst": "1.9.0-beta.100",
40+
"@meshsdk/transaction": "1.9.0-beta.100",
41+
"@simplewebauthn/browser": "^13.0.0"
4342
},
4443
"prettier": "@meshsdk/configs/prettier",
4544
"publishConfig": {

0 commit comments

Comments
 (0)