@quantovainc/qcore 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantovainc/qcore",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Quantova's post quantum client core for JavaScript. Signs with ML-DSA-65 and builds Q1 addresses.",
   "scripts": {
     "build": "bash scripts/build.sh",

package/pkg/package.json

@@ -2,7 +2,7 @@
   "name": "qcore-js",
   "type": "module",
   "description": "The JavaScript binding for the Quantova client core, generated over QCore with wasm-bindgen. The core does the key derivation, the post quantum signing, and the wire, the page does the fetch.",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "Apache-2.0 OR MIT",
   "repository": {
     "type": "git",

package/pkg-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qcore-js",
   "description": "The JavaScript binding for the Quantova client core, generated over QCore with wasm-bindgen. The core does the key derivation, the post quantum signing, and the wire, the page does the fetch.",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "Apache-2.0 OR MIT",
   "repository": {
     "type": "git",

package/shared.js

@@ -8,14 +8,7 @@ function feeCeiling(maxFeeQuon) {
   if (typeof maxFeeQuon === 'number') {
     throw new Error('pass the maximum fee as a decimal string or a BigInt, never a JavaScript number, because a number silently rounds above 2^53 and could set the ceiling higher than you intended');
   }
-  let ceiling;
-  try {
-    ceiling = BigInt(maxFeeQuon);
-  } catch {
-    throw new Error('the maximum fee must be an integer number of Quon');
-  }
-  if (ceiling < 0n) throw new Error('the maximum fee cannot be negative');
-  return ceiling;
+  return wholeNumber(maxFeeQuon, 'maximum fee', U128_MAX);
 }
 
 function checkAmount(amount) {
@@ -28,41 +21,18 @@ function checkAmount(amount) {
 }
 
 function accountIndex(index) {
-  if (typeof index === 'number' && !Number.isSafeInteger(index)) {
-    throw new Error('the account index must be a whole number in the safe integer range, a number that large silently rounds and would sign with a different account key');
-  }
-  let i;
-  try {
-    i = BigInt(index);
-  } catch {
-    throw new Error('the account index must be a whole number');
-  }
-  if (i < 0n || i > 0xffffffffffffffffn) {
-    throw new Error('the account index must fit in an unsigned 64 bit integer');
-  }
-  return i;
+  return wholeNumber(index, 'account index', U64_MAX);
 }
 
 function accountNonce(nonce) {
-  if (typeof nonce === 'number' && !Number.isSafeInteger(nonce)) {
-    throw new Error('the gateway reported a nonce outside the safe integer range, a number that large silently rounds and would sign a different nonce');
-  }
-  let n;
-  try {
-    n = BigInt(nonce);
-  } catch {
-    throw new Error('the gateway reported a nonce that is not a whole number');
-  }
-  if (n < 0n || n > 0xffffffffffffffffn) {
-    throw new Error('the gateway reported a nonce outside the unsigned 64 bit range');
-  }
-  return n;
+  return wholeNumber(nonce, 'nonce', U64_MAX);
 }
 
 const VALIDITY_BLOCKS = 300n;
 const MAX_PLAUSIBLE_HEAD = 1n << 40n;
 const HEAD_BLOCKS_PER_SEC = 4n;
 const HEAD_SLACK_SECS = 60n;
+const GENESIS_FLOOR_SECS = 1735689600n;
 const U64_MAX = 0xffffffffffffffffn;
 const U128_MAX = (1n << 128n) - 1n;
 
@@ -141,19 +111,7 @@ function isPublicChain(name) {
 }
 
 function meterLimitOf(meterLimit) {
-  if (typeof meterLimit === 'number' && !Number.isSafeInteger(meterLimit)) {
-    throw new Error('the meter limit must be a whole number in the safe integer range');
-  }
-  let meter;
-  try {
-    meter = BigInt(meterLimit);
-  } catch {
-    throw new Error('the meter limit must be a whole number');
-  }
-  if (meter < 0n || meter > 0xffffffffffffffffn) {
-    throw new Error('the meter limit must fit in an unsigned 64 bit integer');
-  }
-  return meter;
+  return wholeNumber(meterLimit, 'meter limit', U64_MAX);
 }
 
 function validUntil(info) {
@@ -175,17 +133,7 @@ function validUntil(info) {
 }
 
 function gatewayFee(fee) {
-  if (typeof fee === 'number' && !Number.isSafeInteger(fee)) {
-    throw new Error('the gateway reported a fee outside the safe integer range, a number that large silently rounds and would sign a different fee');
-  }
-  let f;
-  try {
-    f = BigInt(fee);
-  } catch {
-    throw new Error('the gateway reported a fee that is not a whole number');
-  }
-  if (f < 0n) throw new Error('the gateway reported a negative fee');
-  return f;
+  return wholeNumber(fee, 'fee', U128_MAX);
 }
 
 async function readBounded(res) {
@@ -435,9 +383,6 @@ function makeClient(core) {
         const next = BigInt(used) + 1n;
         const local = this._nextNonces.get(key);
         if (local == null || local < next) this._nextNonces.set(key, next);
-      } else if (verdict === 'rejected') {
-        const held = this._signedNonces && this._signedNonces.get(key);
-        if (held) held.delete(String(used));
       }
     }
 
@@ -445,6 +390,10 @@ function makeClient(core) {
       const until = validUntil(info);
       const head = until - VALIDITY_BLOCKS;
       const now = BigInt(Math.floor(Date.now() / 1000));
+      if (now > GENESIS_FLOOR_SECS) {
+        const maxHead = (now - GENESIS_FLOOR_SECS + HEAD_SLACK_SECS) * HEAD_BLOCKS_PER_SEC;
+        if (head > maxHead) throw new Error(`the gateway reports head ${head} further ahead than wall-clock time allows, refusing to sign`);
+      }
       if (this._headFloor) {
         const { height, at } = this._headFloor;
         if (head < height) throw new Error(`the gateway reports head ${head} below the ${height} it reported earlier, refusing to sign`);

package/shared.mjs

@@ -8,14 +8,7 @@ function feeCeiling(maxFeeQuon) {
   if (typeof maxFeeQuon === 'number') {
     throw new Error('pass the maximum fee as a decimal string or a BigInt, never a JavaScript number, because a number silently rounds above 2^53 and could set the ceiling higher than you intended');
   }
-  let ceiling;
-  try {
-    ceiling = BigInt(maxFeeQuon);
-  } catch {
-    throw new Error('the maximum fee must be an integer number of Quon');
-  }
-  if (ceiling < 0n) throw new Error('the maximum fee cannot be negative');
-  return ceiling;
+  return wholeNumber(maxFeeQuon, 'maximum fee', U128_MAX);
 }
 
 function checkAmount(amount) {
@@ -28,41 +21,18 @@ function checkAmount(amount) {
 }
 
 function accountIndex(index) {
-  if (typeof index === 'number' && !Number.isSafeInteger(index)) {
-    throw new Error('the account index must be a whole number in the safe integer range, a number that large silently rounds and would sign with a different account key');
-  }
-  let i;
-  try {
-    i = BigInt(index);
-  } catch {
-    throw new Error('the account index must be a whole number');
-  }
-  if (i < 0n || i > 0xffffffffffffffffn) {
-    throw new Error('the account index must fit in an unsigned 64 bit integer');
-  }
-  return i;
+  return wholeNumber(index, 'account index', U64_MAX);
 }
 
 function accountNonce(nonce) {
-  if (typeof nonce === 'number' && !Number.isSafeInteger(nonce)) {
-    throw new Error('the gateway reported a nonce outside the safe integer range, a number that large silently rounds and would sign a different nonce');
-  }
-  let n;
-  try {
-    n = BigInt(nonce);
-  } catch {
-    throw new Error('the gateway reported a nonce that is not a whole number');
-  }
-  if (n < 0n || n > 0xffffffffffffffffn) {
-    throw new Error('the gateway reported a nonce outside the unsigned 64 bit range');
-  }
-  return n;
+  return wholeNumber(nonce, 'nonce', U64_MAX);
 }
 
 const VALIDITY_BLOCKS = 300n;
 const MAX_PLAUSIBLE_HEAD = 1n << 40n;
 const HEAD_BLOCKS_PER_SEC = 4n;
 const HEAD_SLACK_SECS = 60n;
+const GENESIS_FLOOR_SECS = 1735689600n;
 const U64_MAX = 0xffffffffffffffffn;
 const U128_MAX = (1n << 128n) - 1n;
 
@@ -141,19 +111,7 @@ function isPublicChain(name) {
 }
 
 function meterLimitOf(meterLimit) {
-  if (typeof meterLimit === 'number' && !Number.isSafeInteger(meterLimit)) {
-    throw new Error('the meter limit must be a whole number in the safe integer range');
-  }
-  let meter;
-  try {
-    meter = BigInt(meterLimit);
-  } catch {
-    throw new Error('the meter limit must be a whole number');
-  }
-  if (meter < 0n || meter > 0xffffffffffffffffn) {
-    throw new Error('the meter limit must fit in an unsigned 64 bit integer');
-  }
-  return meter;
+  return wholeNumber(meterLimit, 'meter limit', U64_MAX);
 }
 
 function validUntil(info) {
@@ -175,17 +133,7 @@ function validUntil(info) {
 }
 
 function gatewayFee(fee) {
-  if (typeof fee === 'number' && !Number.isSafeInteger(fee)) {
-    throw new Error('the gateway reported a fee outside the safe integer range, a number that large silently rounds and would sign a different fee');
-  }
-  let f;
-  try {
-    f = BigInt(fee);
-  } catch {
-    throw new Error('the gateway reported a fee that is not a whole number');
-  }
-  if (f < 0n) throw new Error('the gateway reported a negative fee');
-  return f;
+  return wholeNumber(fee, 'fee', U128_MAX);
 }
 
 async function readBounded(res) {
@@ -435,9 +383,6 @@ function makeClient(core) {
         const next = BigInt(used) + 1n;
         const local = this._nextNonces.get(key);
         if (local == null || local < next) this._nextNonces.set(key, next);
-      } else if (verdict === 'rejected') {
-        const held = this._signedNonces && this._signedNonces.get(key);
-        if (held) held.delete(String(used));
       }
     }
 
@@ -445,6 +390,10 @@ function makeClient(core) {
       const until = validUntil(info);
       const head = until - VALIDITY_BLOCKS;
       const now = BigInt(Math.floor(Date.now() / 1000));
+      if (now > GENESIS_FLOOR_SECS) {
+        const maxHead = (now - GENESIS_FLOOR_SECS + HEAD_SLACK_SECS) * HEAD_BLOCKS_PER_SEC;
+        if (head > maxHead) throw new Error(`the gateway reports head ${head} further ahead than wall-clock time allows, refusing to sign`);
+      }
       if (this._headFloor) {
         const { height, at } = this._headFloor;
         if (head < height) throw new Error(`the gateway reports head ${head} below the ${height} it reported earlier, refusing to sign`);