@ethernity-cloud/sdk-js 1.5.16 → 1.5.17

package/nodenithy/build/securelock/.ecld-test-stage/esr_local.js

@@ -104,8 +104,10 @@ class MemContract {
     return ethers.BigNumber.from(e ? e.version : 0);
   }
 
-  async relayNonce(enclave) {
-    return ethers.BigNumber.from(this._nonce[String(enclave).toLowerCase()] || 0);
+  async relayNonce(enclave, keyHash) {
+    // Per (enclave, key), like the contract: same-key commits serialize,
+    // different keys are independent.
+    return ethers.BigNumber.from(this._nonce[key(enclave, keyHash)] || 0);
   }
 
   async commitDigest(enclave, keyHash, cid, expectedVersion, relayNonce, nonce = 0) {
@@ -150,8 +152,7 @@ class MemContract {
       storedNonce = n;
     }
     this._entries[k] = { cid, version: cur + 1, updatedAt: 0, nonce: storedNonce };
-    const e = String(enclave).toLowerCase();
-    this._nonce[e] = (this._nonce[e] || 0) + 1;
+    this._nonce[k] = (this._nonce[k] || 0) + 1;
     this._persist();
   }
 }

package/nodenithy/build/securelock/.ecld-test-stage/nonce_ladder.js

@@ -1,146 +1,165 @@
-/* On-chain public nonce ladder through the local emulator (js SDK). */
-'use strict';
-const os = require('os');
-const path = require('path');
-const fs = require('fs');
-
-const d = fs.mkdtempSync(path.join(os.tmpdir(), 'esr-nonce-'));
-process.chdir(d);
-
-const ecldState = require(path.join(__dirname, 'ecld_state.js'));
-const esrLocal = require(path.join(__dirname, 'esr_local.js'));
-const { MemContract } = esrLocal;
-
-const A = '0xAAAA000000000000000000000000000000000001';
-
-async function main() {
-  esrLocal.install(ecldState, { caller: A, filePrefix: 'st' });
-  const { StateRegistry, StateNonceError } = ecldState;
-  const r = new StateRegistry();
-
-  // 1. first guarded commit: nonce=1 accepted, same-task read-back
-  await r.commit('counter', (s) => ({ n: (s.n || 0) + 1 }), { nonce: 1 });
-  let st = await r.get('counter');
-  if (st.n !== 1) throw new Error('step1 state ' + JSON.stringify(st));
-  if ((await r.getNonce('counter')) !== 1) throw new Error('step1 getNonce');
-  console.log('1. commit({nonce:1}) + same-task getNonce()==1 ok');
-
-  // 2. duplicate nonce -> StateNonceError (task code 36)
-  let threw = false;
-  try {
-    await r.commit('counter', (s) => ({ n: s.n + 1 }), { nonce: 1 });
-  } catch (e) {
-    if (!(e instanceof StateNonceError)) throw e;
-    threw = true;
-    console.log('2. duplicate nonce rejected ok:', e.message);
-  }
-  if (!threw) throw new Error('duplicate accepted');
-  st = await r.get('counter');
-  if (st.n !== 1) throw new Error('duplicate mutated state');
-
-  // 3. exactly +1 accepted; a gap (skip-ahead) is rejected
-  await r.commit('counter', (s) => ({ n: s.n + 1 }), { nonce: 2 });
-  st = await r.get('counter');
-  if (st.n !== 2 || (await r.getNonce('counter')) !== 2) throw new Error('step3a');
-  threw = false;
-  try {
-    await r.commit('counter', (s) => ({ n: s.n + 1 }), { nonce: 10 });
-  } catch (e) {
-    if (!(e instanceof StateNonceError)) throw e;
-    threw = true;
-  }
-  if (!threw) throw new Error('gap accepted');
-  console.log('3. nonce=2 (+1) accepted, gap nonce=10 rejected ok');
-
-  // 4. nonce-less commit AUTO-takes the next in sequence (2 -> 3)
-  await r.commit('counter', (s) => ({ ...s, note: 'free' }));
-  if ((await r.getNonce('counter')) !== 3) throw new Error('step4');
-  console.log('4. nonce-less commit auto-advanced the sequence to 3 ok');
-
-  // 5. stale (reused) nonce rejected; the exact next one still works
-  threw = false;
-  try {
-    await r.commit('counter', (s) => s, { nonce: 1 });
-  } catch (e) {
-    if (!(e instanceof StateNonceError)) throw e;
-    threw = true;
-  }
-  if (!threw) throw new Error('stale accepted');
-  threw = false;
-  try {
-    await r.commit('counter', (s) => s, { nonce: 0 });
-  } catch (e) {
-    if (!/reserved/.test(String(e.message))) throw e;
-    threw = true;
-  }
-  if (!threw) throw new Error('explicit 0 accepted');
-  await r.commit('counter', (s) => ({ ...s, step: 4 }), { nonce: 4 });
-  if ((await r.getNonce('counter')) !== 4) throw new Error('step5');
-  console.log('5. stale nonce=1 rejected, explicit nonce=0 refused, next nonce=4 accepted ok');
-
-  // 6. contract-side (registry) enforcement, bypassing the SDK pre-check
-  const mc = new MemContract(null);
-  const kh = '0x' + '11'.repeat(32);
-  mc.applyCommit('0xE', kh, 'cid1', 0, 1);
-  for (const bad of [1, 3]) { // reuse and gap both violate the +1 rule
-    threw = false;
-    try {
-      mc.applyCommit('0xE', kh, 'cid2', 1, bad);
-    } catch (e) {
-      if (!/NonceOutOfOrder/.test(String(e.message))) throw e;
-      threw = true;
-    }
-    if (!threw) throw new Error('registry accepted nonce ' + bad);
-  }
-  mc.applyCommit('0xE', kh, 'cid2', 1, 2);
-  if (Number(await mc.getNonce('0xE', kh)) !== 2) throw new Error('getNonce view');
-  console.log('6. contract-side +1 enforcement ok (reuse and gap both revert)');
-
-  // 7. chain-first getNonce after a task-memo wipe (fresh process/other task)
-  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
-  const ecld2 = require(path.join(__dirname, 'ecld_state.js'));
-  esrLocal.install(ecld2, { caller: A, filePrefix: 'st' });
-  const r2 = new ecld2.StateRegistry();
-  const n2 = await r2.getNonce('counter');
-  if (n2 !== 4) throw new Error('step7 got ' + n2);
-  console.log('7. chain-first getNonce()==4 after reload (public read, no memo) ok');
-
-  // 8. public: nonce read needs no ACL -- content read stays denied for B
-  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
-  const ecld3 = require(path.join(__dirname, 'ecld_state.js'));
-  const B = '0xBBBB000000000000000000000000000000000002';
-  esrLocal.install(ecld3, { caller: B, filePrefix: 'st' });
-  const r3 = new ecld3.StateRegistry();
-  threw = false;
-  try {
-    await r3.get('counter');
-  } catch (e) {
-    if (!(e instanceof ecld3.StatePermissionError)) throw e;
-    threw = true;
-  }
-  if (!threw) throw new Error('B read A content');
-  console.log('8. content read denied for B (ACL intact) while nonce stays public on-chain ok');
-
-  // 9. tamper detection: registry nonce diverges from the blob's reporting copy
-  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
-  const ecld4 = require(path.join(__dirname, 'ecld_state.js'));
-  const env4 = esrLocal.install(ecld4, { caller: A, filePrefix: 'st' });
-  for (const k of Object.keys(env4.contract._entries)) {
-    const e = env4.contract._entries[k];
-    if (e.nonce) e.nonce = Number(e.nonce) + 1; // simulate a torn/tampered entry
-  }
-  threw = false;
-  try {
-    await new ecld4.StateRegistry().get('counter');
-  } catch (e) {
-    if (!/nonce mismatch/.test(String(e.message))) throw e;
-    threw = true;
-    console.log('9. reporting-copy verification ok (tampered registry nonce refused):');
-    console.log('   ', e.message);
-  }
-  if (!threw) throw new Error('tampered nonce accepted');
-
-  console.log('\nNONCE LADDER (JS): ALL PASS');
-}
-
-main().catch((e) => { console.error('FAIL:', e.stack || e); process.exit(1); });
+/* On-chain public nonce ladder through the local emulator (js SDK). */
+'use strict';
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+
+const d = fs.mkdtempSync(path.join(os.tmpdir(), 'esr-nonce-'));
+process.chdir(d);
+
+const ecldState = require(path.join(__dirname, 'ecld_state.js'));
+const esrLocal = require(path.join(__dirname, 'esr_local.js'));
+const { MemContract } = esrLocal;
+
+const A = '0xAAAA000000000000000000000000000000000001';
+
+async function main() {
+  esrLocal.install(ecldState, { caller: A, filePrefix: 'st' });
+  const { StateRegistry, StateNonceError } = ecldState;
+  const r = new StateRegistry();
+
+  // 1. first guarded commit: nonce=1 accepted, same-task read-back
+  await r.commit('counter', (s) => ({ n: (s.n || 0) + 1 }), { nonce: 1 });
+  let st = await r.get('counter');
+  if (st.n !== 1) throw new Error('step1 state ' + JSON.stringify(st));
+  if ((await r.getNonce('counter')) !== 1) throw new Error('step1 getNonce');
+  console.log('1. commit({nonce:1}) + same-task getNonce()==1 ok');
+
+  // 2. duplicate nonce -> StateNonceError (task code 36)
+  let threw = false;
+  try {
+    await r.commit('counter', (s) => ({ n: s.n + 1 }), { nonce: 1 });
+  } catch (e) {
+    if (!(e instanceof StateNonceError)) throw e;
+    threw = true;
+    console.log('2. duplicate nonce rejected ok:', e.message);
+  }
+  if (!threw) throw new Error('duplicate accepted');
+  st = await r.get('counter');
+  if (st.n !== 1) throw new Error('duplicate mutated state');
+
+  // 3. exactly +1 accepted; a gap (skip-ahead) is rejected
+  await r.commit('counter', (s) => ({ n: s.n + 1 }), { nonce: 2 });
+  st = await r.get('counter');
+  if (st.n !== 2 || (await r.getNonce('counter')) !== 2) throw new Error('step3a');
+  threw = false;
+  try {
+    await r.commit('counter', (s) => ({ n: s.n + 1 }), { nonce: 10 });
+  } catch (e) {
+    if (!(e instanceof StateNonceError)) throw e;
+    threw = true;
+  }
+  if (!threw) throw new Error('gap accepted');
+  console.log('3. nonce=2 (+1) accepted, gap nonce=10 rejected ok');
+
+  // 4. nonce-less commit AUTO-takes the next in sequence (2 -> 3)
+  await r.commit('counter', (s) => ({ ...s, note: 'free' }));
+  if ((await r.getNonce('counter')) !== 3) throw new Error('step4');
+  console.log('4. nonce-less commit auto-advanced the sequence to 3 ok');
+
+  // 5. stale (reused) nonce rejected; the exact next one still works
+  threw = false;
+  try {
+    await r.commit('counter', (s) => s, { nonce: 1 });
+  } catch (e) {
+    if (!(e instanceof StateNonceError)) throw e;
+    threw = true;
+  }
+  if (!threw) throw new Error('stale accepted');
+  threw = false;
+  try {
+    await r.commit('counter', (s) => s, { nonce: 0 });
+  } catch (e) {
+    if (!/reserved/.test(String(e.message))) throw e;
+    threw = true;
+  }
+  if (!threw) throw new Error('explicit 0 accepted');
+  await r.commit('counter', (s) => ({ ...s, step: 4 }), { nonce: 4 });
+  if ((await r.getNonce('counter')) !== 4) throw new Error('step5');
+  console.log('5. stale nonce=1 rejected, explicit nonce=0 refused, next nonce=4 accepted ok');
+
+  // 6. contract-side (registry) enforcement, bypassing the SDK pre-check
+  const mc = new MemContract(null);
+  const kh = '0x' + '11'.repeat(32);
+  mc.applyCommit('0xE', kh, 'cid1', 0, 1);
+  for (const bad of [1, 3]) { // reuse and gap both violate the +1 rule
+    threw = false;
+    try {
+      mc.applyCommit('0xE', kh, 'cid2', 1, bad);
+    } catch (e) {
+      if (!/NonceOutOfOrder/.test(String(e.message))) throw e;
+      threw = true;
+    }
+    if (!threw) throw new Error('registry accepted nonce ' + bad);
+  }
+  mc.applyCommit('0xE', kh, 'cid2', 1, 2);
+  if (Number(await mc.getNonce('0xE', kh)) !== 2) throw new Error('getNonce view');
+  console.log('6. contract-side +1 enforcement ok (reuse and gap both revert)');
+
+  // 7. chain-first getNonce after a task-memo wipe (fresh process/other task)
+  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
+  const ecld2 = require(path.join(__dirname, 'ecld_state.js'));
+  esrLocal.install(ecld2, { caller: A, filePrefix: 'st' });
+  const r2 = new ecld2.StateRegistry();
+  const n2 = await r2.getNonce('counter');
+  if (n2 !== 4) throw new Error('step7 got ' + n2);
+  console.log('7. chain-first getNonce()==4 after reload (public read, no memo) ok');
+
+  // 8. public: nonce read needs no ACL -- content read stays denied for B
+  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
+  const ecld3 = require(path.join(__dirname, 'ecld_state.js'));
+  const B = '0xBBBB000000000000000000000000000000000002';
+  esrLocal.install(ecld3, { caller: B, filePrefix: 'st' });
+  const r3 = new ecld3.StateRegistry();
+  threw = false;
+  try {
+    await r3.get('counter');
+  } catch (e) {
+    if (!(e instanceof ecld3.StatePermissionError)) throw e;
+    threw = true;
+  }
+  if (!threw) throw new Error('B read A content');
+  console.log('8. content read denied for B (ACL intact) while nonce stays public on-chain ok');
+
+  // 9. tamper detection: registry nonce diverges from the blob's reporting copy
+  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
+  const ecld4 = require(path.join(__dirname, 'ecld_state.js'));
+  const env4 = esrLocal.install(ecld4, { caller: A, filePrefix: 'st' });
+  for (const k of Object.keys(env4.contract._entries)) {
+    const e = env4.contract._entries[k];
+    if (e.nonce) e.nonce = Number(e.nonce) + 1; // simulate a torn/tampered entry
+  }
+  threw = false;
+  try {
+    await new ecld4.StateRegistry().get('counter');
+  } catch (e) {
+    if (!/nonce mismatch/.test(String(e.message))) throw e;
+    threw = true;
+    console.log('9. reporting-copy verification ok (tampered registry nonce refused):');
+    console.log('   ', e.message);
+  }
+  if (!threw) throw new Error('tampered nonce accepted');
+
+  // 10. per-run commit cap: the 257th commit in one task throws StateLimitError
+  delete require.cache[require.resolve(path.join(__dirname, 'ecld_state.js'))];
+  const ecld5 = require(path.join(__dirname, 'ecld_state.js'));
+  esrLocal.install(ecld5, { caller: A, filePrefix: 'cap' });
+  const r5 = new ecld5.StateRegistry();
+  for (let i = 0; i < 256; i += 1) {
+    // eslint-disable-next-line no-await-in-loop
+    await r5.commit(`cap-${i % 7}`, (s) => ({ ...s, i }));
+  }
+  threw = false;
+  try {
+    await r5.commit('cap-overflow', (s) => s);
+  } catch (e) {
+    if (!(e instanceof ecld5.StateLimitError)) throw e;
+    threw = true;
+  }
+  if (!threw) throw new Error('commit #257 accepted');
+  console.log('10. per-run cap ok: 256 commits fine, #257 refused (StateLimitError -> code 38)');
+
+  console.log('\nNONCE LADDER (JS): ALL PASS');
+}
+
+main().catch((e) => { console.error('FAIL:', e.stack || e); process.exit(1); });