diff --git a/.changeset/precise-ethereum-arrays.md b/.changeset/precise-ethereum-arrays.md new file mode 100644 index 000000000..061dd8753 --- /dev/null +++ b/.changeset/precise-ethereum-arrays.md @@ -0,0 +1,5 @@ +--- +'@graphprotocol/graph-cli': patch +--- + +Preserve fixed-size array dimensions and unsigned small-integer element types when generating Ethereum call values, including mixed fixed and dynamic nested arrays. diff --git a/packages/cli/src/codegen/types/array-values.test.ts b/packages/cli/src/codegen/types/array-values.test.ts new file mode 100644 index 000000000..338854663 --- /dev/null +++ b/packages/cli/src/codegen/types/array-values.test.ts @@ -0,0 +1,123 @@ +import { execFile } from 'node:child_process'; +import fs from 'node:fs'; +import { createRequire } from 'node:module'; +import os from 'node:os'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { promisify } from 'node:util'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; +import { ascTypeForEthereum, ethereumFromAsc } from './index.js'; + +const require = createRequire(import.meta.url); +const compiler = path.dirname(require.resolve('assemblyscript')); +const sdk = fileURLToPath(new URL('../../../../ts/', import.meta.url)); +const run = promisify(execFile); + +// The numbers are the graph-ts Ethereum ValueKind ABI discriminants. +const cases = [ + { type: 'bool[2]', input: '[true, false]', kinds: [7, 5] }, + { type: 'bool[2][]', input: '[[true, false]]', kinds: [8, 7, 5] }, + { type: 'bool[][2]', input: '[[true], [false]]', kinds: [7, 8, 5] }, + { type: 'bool[2][2]', input: '[[true, false], [false, true]]', kinds: [7, 7, 5] }, + { type: 'bool[][]', input: '[[true]]', kinds: [8, 8, 5] }, + { type: 'int8[2]', input: '[-1, 1]', kinds: [7, 3] }, + { type: 'uint8[2]', input: '[0, 255]', kinds: [7, 4] }, + { type: 'uint8[]', input: '[0, 255]', kinds: [8, 4] }, + { type: 'uint24[][]', input: '[[0, 16777215]]', kinds: [8, 8, 4] }, + { type: 'uint256[2]', input: '[BigInt.fromI32(1), BigInt.fromI32(2)]', kinds: [7, 4] }, + { type: 'string[2]', input: '["a", "b"]', kinds: [7, 6] }, + { type: 'bytes[1]', input: '[new Bytes(2)]', kinds: [7, 2] }, + { type: 'bytes32[1]', input: '[new Bytes(32)]', kinds: [7, 1] }, + { type: 'address[1]', input: '[new Address(20)]', kinds: [7, 0] }, + { type: 'tuple[1]', input: '[new InputTuple()]', kinds: [7, 9], ascType: 'Array' }, + { type: 'address[]', input: '[new Address(20)]', kinds: [8, 0] }, +]; + +const valueProbes = [ + { index: 5, path: '.toArray()[0].toI32()', expected: -1 }, + { index: 6, path: '.toArray()[1].toI32()', expected: 255 }, + { index: 8, path: '.toArray()[0].toArray()[1].toI32()', expected: 16_777_215 }, +]; + +describe('generated Ethereum array values', () => { + let directory: string; + let exports: WebAssembly.Exports; + + beforeAll(async () => { + directory = fs.mkdtempSync(path.join(os.tmpdir(), 'graph-array-values-')); + const modules = path.join(directory, 'node_modules', '@graphprotocol'); + fs.mkdirSync(modules, { recursive: true }); + fs.symlinkSync(sdk, path.join(modules, 'graph-ts'), 'dir'); + const functions = cases.map((item, index) => { + let current = 'value'; + let shape = `${current}.kind`; + for (let depth = 1; depth < item.kinds.length; depth++) { + current += '.toArray()[0]'; + shape = `(${shape}) * 16 + ${current}.kind`; + } + const declarations = `const input: ${item.ascType ?? ascTypeForEthereum(item.type)} = ${item.input}; + const value = ${ethereumFromAsc('input', item.type)}; + `; + const probe = valueProbes.find(probe => probe.index === index); + return `export function case${index}(): i32 { + ${declarations} + return ${shape}; + } + ${probe ? `export function probe${index}(): i32 { ${declarations} return value${probe.path}; }` : ''}`; + }); + const entry = path.join(directory, 'index.ts'); + const output = path.join(directory, 'mapping.wasm'); + fs.writeFileSync( + entry, + `import { Address, BigInt, Bytes, ethereum } from '@graphprotocol/graph-ts'; + class InputTuple extends ethereum.Tuple {} + ${functions.join('\n')}`, + ); + await run( + process.execPath, + [ + path.join(compiler, 'bin/asc'), + entry, + path.join(sdk, 'global/global.ts'), + '--baseDir', + directory, + '--lib', + path.join(directory, 'node_modules'), + '--runtime', + 'stub', + '--outFile', + output, + ], + { cwd: directory }, + ); + const module = new WebAssembly.Module(fs.readFileSync(output)); + exports = new WebAssembly.Instance(module, { + env: { + abort: () => { + throw new Error('AssemblyScript abort'); + }, + }, + conversion: { + // Required by the overflow diagnostic path in ByteArray.toI32. + 'typeConversion.bytesToHex': () => { + throw new Error('Unexpected integer overflow in generated array value'); + }, + }, + }).exports; + }, 15_000); + + afterAll(() => { + if (directory) fs.rmSync(directory, { recursive: true, force: true }); + }); + + it.each(cases)('preserves the runtime value kinds for $type', item => { + const index = cases.indexOf(item); + const evaluate = exports[`case${index}`] as () => number; + expect(evaluate()).toBe(item.kinds.reduce((shape, kind) => shape * 16 + kind)); + }); + + it.each(valueProbes)('preserves integer leaf values in case $index', probe => { + const evaluate = exports[`probe${probe.index}`] as () => number; + expect(evaluate()).toBe(probe.expected); + }); +}); diff --git a/packages/cli/src/codegen/types/index.test.ts b/packages/cli/src/codegen/types/index.test.ts index 99c60c432..a97e143a7 100644 --- a/packages/cli/src/codegen/types/index.test.ts +++ b/packages/cli/src/codegen/types/index.test.ts @@ -422,26 +422,42 @@ describe('AssemblyScript -> ethereum.Value', () => { test('Array
-> address[*]', () => { expect(codegen.ethereumFromAsc('x', 'address[]')).toBe('ethereum.Value.fromAddressArray(x)'); - expect(codegen.ethereumFromAsc('x', 'address[1]')).toBe('ethereum.Value.fromAddressArray(x)'); - expect(codegen.ethereumFromAsc('x', 'address[123]')).toBe('ethereum.Value.fromAddressArray(x)'); + expect(codegen.ethereumFromAsc('x', 'address[1]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Address): ethereum.Value => ethereum.Value.fromAddress(value0)))', + ); + expect(codegen.ethereumFromAsc('x', 'address[123]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Address): ethereum.Value => ethereum.Value.fromAddress(value0)))', + ); }); test('Array -> bool[*]', () => { expect(codegen.ethereumFromAsc('x', 'bool[]')).toBe('ethereum.Value.fromBooleanArray(x)'); - expect(codegen.ethereumFromAsc('x', 'bool[5]')).toBe('ethereum.Value.fromBooleanArray(x)'); - expect(codegen.ethereumFromAsc('x', 'bool[275]')).toBe('ethereum.Value.fromBooleanArray(x)'); + expect(codegen.ethereumFromAsc('x', 'bool[5]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: boolean): ethereum.Value => ethereum.Value.fromBoolean(value0)))', + ); + expect(codegen.ethereumFromAsc('x', 'bool[275]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: boolean): ethereum.Value => ethereum.Value.fromBoolean(value0)))', + ); }); test('Array -> byte[*]', () => { expect(codegen.ethereumFromAsc('x', 'byte[]')).toBe('ethereum.Value.fromFixedBytesArray(x)'); - expect(codegen.ethereumFromAsc('x', 'byte[7]')).toBe('ethereum.Value.fromFixedBytesArray(x)'); - expect(codegen.ethereumFromAsc('x', 'byte[553]')).toBe('ethereum.Value.fromFixedBytesArray(x)'); + expect(codegen.ethereumFromAsc('x', 'byte[7]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value0)))', + ); + expect(codegen.ethereumFromAsc('x', 'byte[553]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value0)))', + ); }); test('Array -> bytes[*]', () => { expect(codegen.ethereumFromAsc('x', 'bytes[]')).toBe('ethereum.Value.fromBytesArray(x)'); - expect(codegen.ethereumFromAsc('x', 'bytes[14]')).toBe('ethereum.Value.fromBytesArray(x)'); - expect(codegen.ethereumFromAsc('x', 'bytes[444]')).toBe('ethereum.Value.fromBytesArray(x)'); + expect(codegen.ethereumFromAsc('x', 'bytes[14]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Bytes): ethereum.Value => ethereum.Value.fromBytes(value0)))', + ); + expect(codegen.ethereumFromAsc('x', 'bytes[444]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Bytes): ethereum.Value => ethereum.Value.fromBytes(value0)))', + ); }); test('bytes0[*] (invalid)', () => { @@ -456,10 +472,10 @@ describe('AssemblyScript -> ethereum.Value', () => { 'ethereum.Value.fromFixedBytesArray(x)', ); expect(codegen.ethereumFromAsc('x', `bytes${i}[7]`)).toBe( - 'ethereum.Value.fromFixedBytesArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value0)))', ); expect(codegen.ethereumFromAsc('x', `bytes${i}[432]`)).toBe( - 'ethereum.Value.fromFixedBytesArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value0)))', ); } }); @@ -473,14 +489,24 @@ describe('AssemblyScript -> ethereum.Value', () => { test('Array -> int8..32[*], uint8..24[*]', () => { for (let i = 8; i <= 32; i += 8) { expect(codegen.ethereumFromAsc('x', `int${i}[]`)).toBe('ethereum.Value.fromI32Array(x)'); - expect(codegen.ethereumFromAsc('x', `int${i}[6]`)).toBe('ethereum.Value.fromI32Array(x)'); - expect(codegen.ethereumFromAsc('x', `int${i}[4638]`)).toBe('ethereum.Value.fromI32Array(x)'); + expect(codegen.ethereumFromAsc('x', `int${i}[6]`)).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: i32): ethereum.Value => ethereum.Value.fromI32(value0)))', + ); + expect(codegen.ethereumFromAsc('x', `int${i}[4638]`)).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: i32): ethereum.Value => ethereum.Value.fromI32(value0)))', + ); } for (let i = 8; i <= 24; i += 8) { - expect(codegen.ethereumFromAsc('x', `uint${i}[]`)).toBe('ethereum.Value.fromI32Array(x)'); - expect(codegen.ethereumFromAsc('x', `uint${i}[6]`)).toBe('ethereum.Value.fromI32Array(x)'); - expect(codegen.ethereumFromAsc('x', `uint${i}[593]`)).toBe('ethereum.Value.fromI32Array(x)'); + expect(codegen.ethereumFromAsc('x', `uint${i}[]`)).toBe( + 'ethereum.Value.fromArray(x.map((value0: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value0))))', + ); + expect(codegen.ethereumFromAsc('x', `uint${i}[6]`)).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value0))))', + ); + expect(codegen.ethereumFromAsc('x', `uint${i}[593]`)).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value0))))', + ); } }); @@ -489,10 +515,10 @@ describe('AssemblyScript -> ethereum.Value', () => { 'ethereum.Value.fromUnsignedBigIntArray(x)', ); expect(codegen.ethereumFromAsc('x', `uint32[6]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value0)))', ); expect(codegen.ethereumFromAsc('x', `uint32[593]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value0)))', ); }); @@ -502,28 +528,32 @@ describe('AssemblyScript -> ethereum.Value', () => { 'ethereum.Value.fromSignedBigIntArray(x)', ); expect(codegen.ethereumFromAsc('x', `int${i}[7]`)).toBe( - 'ethereum.Value.fromSignedBigIntArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: BigInt): ethereum.Value => ethereum.Value.fromSignedBigInt(value0)))', ); expect(codegen.ethereumFromAsc('x', `int${i}[6833]`)).toBe( - 'ethereum.Value.fromSignedBigIntArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: BigInt): ethereum.Value => ethereum.Value.fromSignedBigInt(value0)))', ); expect(codegen.ethereumFromAsc('x', `uint${i}[]`)).toBe( 'ethereum.Value.fromUnsignedBigIntArray(x)', ); expect(codegen.ethereumFromAsc('x', `uint${i}[23]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value0)))', ); expect(codegen.ethereumFromAsc('x', `uint${i}[467]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntArray(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value0)))', ); } }); test('Array -> string[*]', () => { expect(codegen.ethereumFromAsc('x', 'string[]')).toBe('ethereum.Value.fromStringArray(x)'); - expect(codegen.ethereumFromAsc('x', 'string[4]')).toBe('ethereum.Value.fromStringArray(x)'); - expect(codegen.ethereumFromAsc('x', 'string[754]')).toBe('ethereum.Value.fromStringArray(x)'); + expect(codegen.ethereumFromAsc('x', 'string[4]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: string): ethereum.Value => ethereum.Value.fromString(value0)))', + ); + expect(codegen.ethereumFromAsc('x', 'string[754]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: string): ethereum.Value => ethereum.Value.fromString(value0)))', + ); }); // Multidimensional arrays @@ -531,44 +561,52 @@ describe('AssemblyScript -> ethereum.Value', () => { test('Array> -> address[*][*]', () => { expect(codegen.ethereumFromAsc('x', 'address[][]')).toBe('ethereum.Value.fromAddressMatrix(x)'); expect(codegen.ethereumFromAsc('x', 'address[1][]')).toBe( - 'ethereum.Value.fromAddressMatrix(x)', + 'ethereum.Value.fromArray(x.map((value0: Array
): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Address): ethereum.Value => ethereum.Value.fromAddress(value1)))))', ); expect(codegen.ethereumFromAsc('x', 'address[][2]')).toBe( - 'ethereum.Value.fromAddressMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array
): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: Address): ethereum.Value => ethereum.Value.fromAddress(value1)))))', ); expect(codegen.ethereumFromAsc('x', 'address[123][321]')).toBe( - 'ethereum.Value.fromAddressMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array
): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Address): ethereum.Value => ethereum.Value.fromAddress(value1)))))', ); }); test('Array> -> bool[*][*]', () => { expect(codegen.ethereumFromAsc('x', 'bool[][]')).toBe('ethereum.Value.fromBooleanMatrix(x)'); - expect(codegen.ethereumFromAsc('x', 'bool[5][]')).toBe('ethereum.Value.fromBooleanMatrix(x)'); - expect(codegen.ethereumFromAsc('x', 'bool[][5]')).toBe('ethereum.Value.fromBooleanMatrix(x)'); + expect(codegen.ethereumFromAsc('x', 'bool[5][]')).toBe( + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: boolean): ethereum.Value => ethereum.Value.fromBoolean(value1)))))', + ); + expect(codegen.ethereumFromAsc('x', 'bool[][5]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: boolean): ethereum.Value => ethereum.Value.fromBoolean(value1)))))', + ); expect(codegen.ethereumFromAsc('x', 'bool[275][572]')).toBe( - 'ethereum.Value.fromBooleanMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: boolean): ethereum.Value => ethereum.Value.fromBoolean(value1)))))', ); }); test('Array> -> byte[*][*]', () => { expect(codegen.ethereumFromAsc('x', 'byte[][]')).toBe('ethereum.Value.fromFixedBytesMatrix(x)'); expect(codegen.ethereumFromAsc('x', 'byte[7][]')).toBe( - 'ethereum.Value.fromFixedBytesMatrix(x)', + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value1)))))', ); expect(codegen.ethereumFromAsc('x', 'byte[][6]')).toBe( - 'ethereum.Value.fromFixedBytesMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value1)))))', ); expect(codegen.ethereumFromAsc('x', 'byte[553][355]')).toBe( - 'ethereum.Value.fromFixedBytesMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value1)))))', ); }); test('Array> -> bytes[*][*]', () => { expect(codegen.ethereumFromAsc('x', 'bytes[][]')).toBe('ethereum.Value.fromBytesMatrix(x)'); - expect(codegen.ethereumFromAsc('x', 'bytes[14][]')).toBe('ethereum.Value.fromBytesMatrix(x)'); - expect(codegen.ethereumFromAsc('x', 'bytes[][41]')).toBe('ethereum.Value.fromBytesMatrix(x)'); + expect(codegen.ethereumFromAsc('x', 'bytes[14][]')).toBe( + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromBytes(value1)))))', + ); + expect(codegen.ethereumFromAsc('x', 'bytes[][41]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromBytes(value1)))))', + ); expect(codegen.ethereumFromAsc('x', 'bytes[444][333]')).toBe( - 'ethereum.Value.fromBytesMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromBytes(value1)))))', ); }); @@ -585,13 +623,13 @@ describe('AssemblyScript -> ethereum.Value', () => { 'ethereum.Value.fromFixedBytesMatrix(x)', ); expect(codegen.ethereumFromAsc('x', `bytes${i}[7][]`)).toBe( - 'ethereum.Value.fromFixedBytesMatrix(x)', + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value1)))))', ); expect(codegen.ethereumFromAsc('x', `bytes${i}[][7]`)).toBe( - 'ethereum.Value.fromFixedBytesMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value1)))))', ); expect(codegen.ethereumFromAsc('x', `bytes${i}[432][234]`)).toBe( - 'ethereum.Value.fromFixedBytesMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: Bytes): ethereum.Value => ethereum.Value.fromFixedBytes(value1)))))', ); } }); @@ -606,19 +644,29 @@ describe('AssemblyScript -> ethereum.Value', () => { test('Array> -> int8..32[*][*], uint8..24[*][*]', () => { for (let i = 8; i <= 32; i += 8) { expect(codegen.ethereumFromAsc('x', `int${i}[][]`)).toBe('ethereum.Value.fromI32Matrix(x)'); - expect(codegen.ethereumFromAsc('x', `int${i}[6][]`)).toBe('ethereum.Value.fromI32Matrix(x)'); - expect(codegen.ethereumFromAsc('x', `int${i}[][5]`)).toBe('ethereum.Value.fromI32Matrix(x)'); + expect(codegen.ethereumFromAsc('x', `int${i}[6][]`)).toBe( + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromI32(value1)))))', + ); + expect(codegen.ethereumFromAsc('x', `int${i}[][5]`)).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromI32(value1)))))', + ); expect(codegen.ethereumFromAsc('x', `int${i}[4638][8364]`)).toBe( - 'ethereum.Value.fromI32Matrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromI32(value1)))))', ); } for (let i = 8; i <= 24; i += 8) { - expect(codegen.ethereumFromAsc('x', `uint${i}[][]`)).toBe('ethereum.Value.fromI32Matrix(x)'); - expect(codegen.ethereumFromAsc('x', `uint${i}[6][]`)).toBe('ethereum.Value.fromI32Matrix(x)'); - expect(codegen.ethereumFromAsc('x', `uint${i}[][5]`)).toBe('ethereum.Value.fromI32Matrix(x)'); + expect(codegen.ethereumFromAsc('x', `uint${i}[][]`)).toBe( + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value1))))))', + ); + expect(codegen.ethereumFromAsc('x', `uint${i}[6][]`)).toBe( + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value1))))))', + ); + expect(codegen.ethereumFromAsc('x', `uint${i}[][5]`)).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value1))))))', + ); expect(codegen.ethereumFromAsc('x', `uint${i}[593][395]`)).toBe( - 'ethereum.Value.fromI32Matrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: i32): ethereum.Value => ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(value1))))))', ); } }); @@ -628,13 +676,13 @@ describe('AssemblyScript -> ethereum.Value', () => { 'ethereum.Value.fromUnsignedBigIntMatrix(x)', ); expect(codegen.ethereumFromAsc('x', `uint32[6][]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntMatrix(x)', + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `uint32[][5]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `uint32[593][395]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value1)))))', ); }); @@ -644,34 +692,38 @@ describe('AssemblyScript -> ethereum.Value', () => { 'ethereum.Value.fromSignedBigIntMatrix(x)', ); expect(codegen.ethereumFromAsc('x', `int${i}[8][]`)).toBe( - 'ethereum.Value.fromSignedBigIntMatrix(x)', + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromSignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `int${i}[][7]`)).toBe( - 'ethereum.Value.fromSignedBigIntMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromSignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `int${i}[6833][3386]`)).toBe( - 'ethereum.Value.fromSignedBigIntMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromSignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `uint${i}[][]`)).toBe( 'ethereum.Value.fromUnsignedBigIntMatrix(x)', ); expect(codegen.ethereumFromAsc('x', `uint${i}[23][]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntMatrix(x)', + 'ethereum.Value.fromArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `uint${i}[][32]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value1)))))', ); expect(codegen.ethereumFromAsc('x', `uint${i}[467][764]`)).toBe( - 'ethereum.Value.fromUnsignedBigIntMatrix(x)', + 'ethereum.Value.fromFixedSizedArray(x.map((value0: Array): ethereum.Value => ethereum.Value.fromFixedSizedArray(value0.map((value1: BigInt): ethereum.Value => ethereum.Value.fromUnsignedBigInt(value1)))))', ); } }); test('Array> -> string[*][*]', () => { expect(codegen.ethereumFromAsc('x', 'string[]')).toBe('ethereum.Value.fromStringArray(x)'); - expect(codegen.ethereumFromAsc('x', 'string[4]')).toBe('ethereum.Value.fromStringArray(x)'); - expect(codegen.ethereumFromAsc('x', 'string[754]')).toBe('ethereum.Value.fromStringArray(x)'); + expect(codegen.ethereumFromAsc('x', 'string[4]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: string): ethereum.Value => ethereum.Value.fromString(value0)))', + ); + expect(codegen.ethereumFromAsc('x', 'string[754]')).toBe( + 'ethereum.Value.fromFixedSizedArray(x.map((value0: string): ethereum.Value => ethereum.Value.fromString(value0)))', + ); }); }); diff --git a/packages/cli/src/codegen/types/index.ts b/packages/cli/src/codegen/types/index.ts index 771100029..23ffe53a3 100644 --- a/packages/cli/src/codegen/types/index.ts +++ b/packages/cli/src/codegen/types/index.ts @@ -95,8 +95,26 @@ export const ethereumToAsc = (code: string, ethereumType: string, internalType?: internalType, ); -export const ethereumFromAsc = (code: string, ethereumType: string) => - findConversionToType('AssemblyScript', 'ethereum', ethereumType).get('convert')(code); +export const ethereumFromAsc = (code: string, ethereumType: string) => { + const conversion = findConversionToType('AssemblyScript', 'ethereum', ethereumType); + if (/\[\d+\]/.test(ethereumType) || /^uint(8|16|24)\[/.test(ethereumType)) { + return ethereumArrayFromAsc(code, ethereumType, 0); + } + return conversion.get('convert')(code); +}; + +function ethereumArrayFromAsc(code: string, ethereumType: string, depth: number): string { + const array = /^(.*)\[([0-9]*)\]$/.exec(ethereumType); + if (!array) { + return findConversionToType('AssemblyScript', 'ethereum', ethereumType).get('convert')(code); + } + + const [, elementType, length] = array; + const value = `value${depth}`; + const converted = ethereumArrayFromAsc(value, elementType, depth + 1); + const constructor = length ? 'fromFixedSizedArray' : 'fromArray'; + return `ethereum.Value.${constructor}(${code}.map((${value}: ${ascTypeForEthereum(elementType)}): ethereum.Value => ${converted}))`; +} export const ascTypeForValue = (valueType: string) => findConversionFromType('Value', 'AssemblyScript', valueType).getIn(['to', 'type']);