Merge pull request #397 from MeshJS/account-index-fix

Account index fix

packages/mesh-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/common",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",

packages/mesh-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/contract",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -34,9 +34,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.7.18",
-    "@meshsdk/core": "1.7.18",
-    "@meshsdk/core-csl": "1.7.18"
+    "@meshsdk/common": "1.7.19",
+    "@meshsdk/core": "1.7.19",
+    "@meshsdk/core-csl": "1.7.19"
   },
   "prettier": "@meshsdk/configs/prettier",
   "publishConfig": {

packages/mesh-core-csl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core-csl",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -31,15 +31,15 @@
   },
   "devDependencies": {
     "@meshsdk/configs": "*",
-    "@meshsdk/provider": "1.7.18",
+    "@meshsdk/provider": "1.7.19",
     "@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.7.18",
+    "@meshsdk/common": "1.7.19",
     "@sidan-lab/sidan-csl-rs-browser": "0.9.6",
     "@sidan-lab/sidan-csl-rs-nodejs": "0.9.6",
     "json-bigint": "^1.0.0"

packages/mesh-core-cst/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core-cst",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -42,7 +42,7 @@
     "@harmoniclabs/cbor": "1.3.0",
     "@harmoniclabs/plutus-data": "1.2.4",
     "@harmoniclabs/uplc": "1.2.4",
-    "@meshsdk/common": "1.7.18",
+    "@meshsdk/common": "1.7.19",
     "@stricahq/bip32ed25519": "^1.1.0",
     "@stricahq/cbors": "^1.0.3",
     "pbkdf2": "^3.1.2"

packages/mesh-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -33,13 +33,13 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.7.18",
-    "@meshsdk/core-csl": "1.7.18",
-    "@meshsdk/core-cst": "1.7.18",
-    "@meshsdk/provider": "1.7.18",
-    "@meshsdk/react": "1.7.18",
-    "@meshsdk/transaction": "1.7.18",
-    "@meshsdk/wallet": "1.7.18"
+    "@meshsdk/common": "1.7.19",
+    "@meshsdk/core-csl": "1.7.19",
+    "@meshsdk/core-cst": "1.7.19",
+    "@meshsdk/provider": "1.7.19",
+    "@meshsdk/react": "1.7.19",
+    "@meshsdk/transaction": "1.7.19",
+    "@meshsdk/wallet": "1.7.19"
   },
   "prettier": "@meshsdk/configs/prettier",
   "publishConfig": {

packages/mesh-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/provider",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -34,8 +34,8 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.7.18",
-    "@meshsdk/core-cst": "1.7.18",
+    "@meshsdk/common": "1.7.19",
+    "@meshsdk/core-cst": "1.7.19",
     "@utxorpc/sdk": "0.6.2",
     "@utxorpc/spec": "0.10.1",
     "axios": "^1.7.2"

packages/mesh-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/react",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "react": "^18.2.0",
-    "@meshsdk/common": "1.7.18",
-    "@meshsdk/transaction": "1.7.18",
-    "@meshsdk/wallet": "1.7.18"
+    "@meshsdk/common": "1.7.19",
+    "@meshsdk/transaction": "1.7.19",
+    "@meshsdk/wallet": "1.7.19"
   },
   "devDependencies": {
     "@meshsdk/configs": "*",

packages/mesh-transaction/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/transaction",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -35,9 +35,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.7.18",
-    "@meshsdk/core-csl": "1.7.18",
-    "@meshsdk/core-cst": "1.7.18",
+    "@meshsdk/common": "1.7.19",
+    "@meshsdk/core-csl": "1.7.19",
+    "@meshsdk/core-cst": "1.7.19",
     "json-bigint": "^1.0.0"
   },
   "prettier": "@meshsdk/configs/prettier",

packages/mesh-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/wallet",
-  "version": "1.7.18",
+  "version": "1.7.19",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -35,10 +35,10 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.7.18",
-    "@meshsdk/core-csl": "1.7.18",
-    "@meshsdk/core-cst": "1.7.18",
-    "@meshsdk/transaction": "1.7.18",
+    "@meshsdk/common": "1.7.19",
+    "@meshsdk/core-csl": "1.7.19",
+    "@meshsdk/core-cst": "1.7.19",
+    "@meshsdk/transaction": "1.7.19",
     "@nufi/dapp-client-cardano": "0.3.5",
     "@nufi/dapp-client-core": "0.3.5"
   },

packages/mesh-wallet/src/mesh/index.ts

@@ -106,6 +106,11 @@ export class MeshWallet implements IInitiator, ISigner, ISubmitter {
   constructor(options: CreateMeshWalletOptions) {
     this._networkId = options.networkId;
 
+    if (options.fetcher) this._fetcher = options.fetcher;
+    if (options.submitter) this._submitter = options.submitter;
+    if (options.accountIndex) this._accountIndex = options.accountIndex;
+    if (options.keyIndex) this._keyIndex = options.keyIndex;
+
     switch (options.key.type) {
       case "root":
         this._wallet = new EmbeddedWallet({
@@ -143,11 +148,6 @@ export class MeshWallet implements IInitiator, ISigner, ISubmitter {
         this.buildAddressFromBech32Address(options.key.address);
         break;
     }
-
-    if (options.fetcher) this._fetcher = options.fetcher;
-    if (options.submitter) this._submitter = options.submitter;
-    if (options.accountIndex) this._accountIndex = options.accountIndex;
-    if (options.keyIndex) this._keyIndex = options.keyIndex;
   }
 
   /**
@@ -324,7 +324,12 @@ export class MeshWallet implements IInitiator, ISigner, ISubmitter {
     if (address === undefined) {
       address = this.getChangeAddress()!;
     }
-    return this._wallet.signData(address, payload);
+    return this._wallet.signData(
+      address,
+      payload,
+      this._accountIndex,
+      this._keyIndex,
+    );
   }
 
   /**

scripts/mesh-cli/package.json

@@ -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.18",
+  "version": "1.7.19",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.cjs",