Hello world
`); window.fetch = global.fetch; @@ -354,3 +355,10 @@ describe('replace identity', () => { expect(mockFetch).toBeCalledTimes(1); }); }); +describe('makeNonce should create unique values', () => { + const nonces = new Set(); + for (let i = 0; i < 100; i++) { + nonces.add(toHexString(makeNonce())); + } + expect(nonces.size).toBe(100); +}); diff --git a/packages/agent/src/agent/http/types.ts b/packages/agent/src/agent/http/types.ts index 55b2dd80b..ff8e3da92 100644 --- a/packages/agent/src/agent/http/types.ts +++ b/packages/agent/src/agent/http/types.ts @@ -107,10 +107,12 @@ export function makeNonce(): Nonce { // Encode 128 bits. const buffer = new ArrayBuffer(16); const view = new DataView(buffer); - const value = BigInt(+Date.now()) * BigInt(100000) + BigInt(Math.floor(Math.random() * 100000)); - view.setBigUint64(0, value); - // tslint:disable-next-line:no-bitwise - view.setBigUint64(1, value >> BigInt(64)); + const now = BigInt(+Date.now()); + const randHi = Math.floor(Math.random() * 0xffffffff); + const randLo = Math.floor(Math.random() * 0xffffffff); + view.setBigUint64(0, now); + view.setUint32(8, randHi); + view.setUint32(12, randLo); return buffer as Nonce; } diff --git a/packages/identity/package.json b/packages/identity/package.json index 3dc75945c..78e4e6433 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -40,6 +40,7 @@ "@dfinity/principal": "^0.10.4" }, "dependencies": { + "@types/webappsec-credential-management": "^0.6.2", "borc": "^2.1.1", "js-sha256": "^0.9.0", "secp256k1": "^4.0.2", @@ -49,7 +50,6 @@ "@trust/webcrypto": "^0.9.2", "@types/jest": "^27.0.2", "@types/secp256k1": "^4.0.3", - "@types/webappsec-credential-management": "^0.6.2", "@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/parser": "^4.14.2", "eslint": "^7.19.0",