@quantovainc/qcore 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantovainc/qcore",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Quantova's post quantum client core for JavaScript. Signs with ML-DSA-65 and builds Q1 addresses.",
   "scripts": {
     "build": "RUSTFLAGS=\"--remap-path-prefix=$HOME/quantova-stack=/qcore --remap-path-prefix=$HOME/.cargo=/cargo --remap-path-prefix=$HOME/.rustup=/rustup\" wasm-pack build --target bundler --out-dir pkg && RUSTFLAGS=\"--remap-path-prefix=$HOME/quantova-stack=/qcore --remap-path-prefix=$HOME/.cargo=/cargo --remap-path-prefix=$HOME/.rustup=/rustup\" wasm-pack build --target nodejs --out-dir pkg-node",

package/shared.js

@@ -188,13 +188,15 @@ function makeClient(core) {
     _signingChainId(info) {
       const name = info && info.chain_id;
       if (!name) throw new Error('the gateway did not report a chain id to bind the signature to');
+      const id = BigInt(core.chainIdFromName(name));
       const configured = this.network && this.network.chainId;
       if (configured && name !== configured) {
         throw new Error(`the gateway reports chain ${name} but this client is configured for ${configured}; refusing to sign a transaction that would be valid on a network you did not choose`);
-      } else if (!configured && !this.acknowledgeMainnet && this._isMainnetId(BigInt(core.chainIdFromName(name)))) {
-        throw new Error(`the gateway reports the mainnet chain ${name} but this client did not choose a network; refusing to sign a mainnet transaction without acknowledgeMainnet`);
       }
-      return BigInt(core.chainIdFromName(name));
+      if (!this.acknowledgeMainnet && this._isMainnetId(id)) {
+        throw new Error(`the gateway reports the mainnet chain ${name}; refusing to sign a mainnet transaction without acknowledgeMainnet`);
+      }
+      return id;
     }
 
     _isMainnetId(id) {
@@ -219,7 +221,10 @@ function makeClient(core) {
         const text = await readBounded(res);
         let data;
         try { data = JSON.parse(text); } catch { throw new Error('the node returned a non JSON response'); }
-        if (!res.ok) throw new Error(data.message || data.error || ('status ' + res.status));
+        if (!res.ok) {
+          const detail = data && typeof data === 'object' ? (data.message || data.error) : null;
+          throw new Error(detail || ('status ' + res.status));
+        }
         return data;
       } finally {
         clearTimeout(timer);
@@ -320,7 +325,7 @@ function makeClient(core) {
       if (BigInt(fee) > ceiling) {
         throw new Error(`the gateway fee ${fee} is above the maximum you allowed ${maxFeeQuon}, refusing to sign`);
       }
-      const signer = core.orderSigner(ownerSeedHex, BigInt(ownerIndex));
+      const signer = core.orderSigner(ownerSeedHex, accountIndex(ownerIndex));
       const nonce = await this.contractNonce(contract, signer);
       const order = JSON.parse(core.buildTypedOrderCall(
         chainId,
@@ -331,14 +336,14 @@ function makeClient(core) {
         BigInt(orderSpec.regionOff || 0),
         JSON.stringify(orderSpec.fields || []),
         ownerSeedHex,
-        BigInt(ownerIndex),
+        accountIndex(ownerIndex),
         nonce,
       ));
-      const from = core.address(callerSeedHex, BigInt(callerIndex));
+      const from = core.address(callerSeedHex, accountIndex(callerIndex));
       const acct = await this.account(from);
       if (!acct || acct.nonce == null) throw new Error('the gateway did not report a nonce');
       const signed = JSON.parse(
-        core.sign_call(callerSeedHex, BigInt(callerIndex), contract, order.call_args, BigInt(acct.nonce), BigInt(meterLimit), String(fee), chainId)
+        core.sign_call(callerSeedHex, accountIndex(callerIndex), contract, order.call_args, BigInt(acct.nonce), BigInt(meterLimit), String(fee), chainId)
       );
       const outcome = await this.submit(signed.tx_hex);
       return { order, signed, outcome };