@quantovainc/qcore 0.1.18 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantovainc/qcore",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "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

@@ -27,6 +27,14 @@ function checkAmount(amount) {
   }
 }
 
+function accountIndex(index) {
+  const i = BigInt(index);
+  if (i < 0n || i > 0xffffffffffffffffn) {
+    throw new Error('the account index must fit in an unsigned 64 bit integer');
+  }
+  return i;
+}
+
 async function readBounded(res) {
   if (!res.body || typeof res.body.getReader !== 'function') {
     const header = res.headers.get('content-length');
@@ -180,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) {
@@ -228,7 +238,7 @@ function makeClient(core) {
     storage(address) { return this._call('get_storage', JSON.stringify({ address })); }
     events(height) { return this._call('get_events', core.eventsBody(BigInt(height))); }
 
-    address(seedHex, index) { return core.address(seedHex, BigInt(index)); }
+    address(seedHex, index) { return core.address(seedHex, accountIndex(index)); }
 
     async transfer(seedHex, index, to, amount, maxFeeQuon) {
       if (!core.valid_address(to)) throw new Error('the recipient is not a q1 address');
@@ -242,11 +252,11 @@ 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 from = core.address(seedHex, BigInt(index));
+      const from = core.address(seedHex, accountIndex(index));
       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_transfer(seedHex, BigInt(index), to, String(amount), BigInt(acct.nonce), String(fee), chainId)
+        core.sign_transfer(seedHex, accountIndex(index), to, String(amount), BigInt(acct.nonce), String(fee), chainId)
       );
       const outcome = await this.submit(signed.tx_hex);
       return { signed, outcome };
@@ -262,10 +272,10 @@ 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 from = core.address(seedHex, BigInt(index));
+      const from = core.address(seedHex, accountIndex(index));
       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.signRegister(seedHex, BigInt(index), BigInt(acct.nonce), String(fee), chainId));
+      const signed = JSON.parse(core.signRegister(seedHex, accountIndex(index), BigInt(acct.nonce), String(fee), chainId));
       const outcome = await this.submit(signed.tx_hex);
       return { signed, outcome };
     }
@@ -281,11 +291,11 @@ 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 from = core.address(seedHex, BigInt(index));
+      const from = core.address(seedHex, accountIndex(index));
       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(seedHex, BigInt(index), target, argsHex, BigInt(acct.nonce), BigInt(meterLimit), String(fee), chainId)
+        core.sign_call(seedHex, accountIndex(index), target, argsHex, BigInt(acct.nonce), BigInt(meterLimit), String(fee), chainId)
       );
       const outcome = await this.submit(signed.tx_hex);
       return { signed, outcome };
@@ -312,10 +322,8 @@ 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);
-      // orderSpec.fields are the signed fields in message order, each { offset, width, value } read
-      // from the interface descriptor, so a wide amount or an address is signed at its true width.
       const order = JSON.parse(core.buildTypedOrderCall(
         chainId,
         contract,
@@ -325,14 +333,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 };