Merge pull request #1500 from demergent-labs/0_19_0_fixes

0 19 0 fixes
demergent-labs · Dec 13, 2023 · f4fdb8e · f4fdb8e
2 parents 8ff7285 + 59d5dbd
commit f4fdb8e
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 4 deletions.
diff --git a/examples/bitcoin/test/test.ts b/examples/bitcoin/test/test.ts
@@ -22,7 +22,7 @@ const tests: Test[] = [
     ...impureSetup(wallets, state),
     {
         name: 'wait for blockchain balance to reflect',
-        wait: 60_000
+        wait: 120_000
     },
     ...testCanisterFunctionality()
 ];

diff --git a/property_tests/arbitraries/candid/primitive/floats/float32_arb.ts b/property_tests/arbitraries/candid/primitive/floats/float32_arb.ts
@@ -18,6 +18,12 @@ export function Float32DefinitionArb(): fc.Arbitrary<FloatCandidDefinition> {
     return SimpleCandidDefinitionArb('float32');
 }
 
+// TODO multiplying by zero is to remove -0
+// TODO we should open an issue with agent-js
+// TODO the agent should encode and decode -0 correctly
 export function Float32ValueArb(): fc.Arbitrary<CandidValues<number>> {
-    return SimpleCandidValuesArb(fc.float(), floatToSrcLiteral);
+    return SimpleCandidValuesArb(
+        fc.float().map((sample) => (sample === 0 ? sample * 0 : sample)),
+        floatToSrcLiteral
+    );
 }
diff --git a/property_tests/arbitraries/candid/primitive/floats/float64_arb.ts b/property_tests/arbitraries/candid/primitive/floats/float64_arb.ts
@@ -22,8 +22,11 @@ export function Float64ValueArb(): fc.Arbitrary<CandidValues<number>> {
     return SimpleCandidValuesArb(float64(), floatToSrcLiteral);
 }
 
+// TODO multiplying by zero is to remove -0
+// TODO we should open an issue with agent-js
+// TODO the agent should encode and decode -0 correctly
 function float64(): fc.Arbitrary<number> {
     return fc
         .float64Array({ maxLength: 1, minLength: 1 })
-        .map((sample) => sample[0]);
+        .map((sample) => (sample[0] === 0 ? sample[0] * 0 : sample[0]));
 }
diff --git a/property_tests/arbitraries/js_function_name_arb.ts b/property_tests/arbitraries/js_function_name_arb.ts
@@ -78,7 +78,60 @@ const azleKeywords = [
     'Vec'
 ];
 
-const jsKeywords = ['eval', 'var', 'new', 'try'];
+const jsKeywords = [
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'const',
+    'continue',
+    'debugger',
+    'default',
+    'delete',
+    'do',
+    'else',
+    'enum',
+    'export',
+    'extends',
+    'false',
+    'finally',
+    'for',
+    'function',
+    'if',
+    'implements',
+    'import',
+    'in',
+    'instanceof',
+    'interface',
+    'let',
+    'new',
+    'null',
+    'package',
+    'private',
+    'protected',
+    'public',
+    'return',
+    'super',
+    'switch',
+    'static',
+    'this',
+    'throw',
+    'true',
+    'try',
+    'typeof',
+    'var',
+    'void',
+    'while',
+    'with',
+    'yield',
+    // Additional words with special meaning
+    'NaN',
+    'Infinity',
+    'undefined',
+    'arguments',
+    'eval'
+];
 
 export const JsFunctionNameArb = fc
     .stringMatching(/^(_[a-zA-Z0-9]+|[a-zA-Z][a-zA-Z0-9]*)$/)

diff --git a/src/compiler/generate_candid_and_canister_methods.ts b/src/compiler/generate_candid_and_canister_methods.ts
@@ -13,6 +13,9 @@ export function generateCandidAndCanisterMethods(mainJs: string): {
 
     const sandbox = {
         globalThis: {},
+        window: {},
+        self: {},
+        global: {},
         crypto: {
             getRandomValues: () => {
                 let array = new Uint8Array(32);