Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/flat-hairs-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphprotocol/graph-cli': patch
---

handle sized arrays in abi when changetype
22 changes: 19 additions & 3 deletions packages/cli/src/scaffold/__snapshots__/ethereum.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dataSources:
handler: handleExampleEvent
- event: ExampleEvent(bytes32)
handler: handleExampleEvent1
- event: TupleArrayEvent((uint256,address)[],address[])
- event: TupleArrayEvent((uint256,address)[],address[],address[10])
handler: handleTupleArrayEvent
file: ./src/contract.ts
"
Expand Down Expand Up @@ -153,6 +153,7 @@ export function handleTupleArrayEvent(event: TupleArrayEventEvent): void {
)
entity.tupleArray = changetype<Bytes[]>(event.params.tupleArray)
entity.addressArray = changetype<Bytes[]>(event.params.addressArray)
entity.addressSizedArray = changetype<Bytes[]>(event.params.addressSizedArray)

entity.blockNumber = event.block.number
entity.blockTimestamp = event.block.timestamp
Expand Down Expand Up @@ -266,6 +267,7 @@ type TupleArrayEvent @entity(immutable: true) {
id: Bytes!
tupleArray: [Bytes!]! # tuple[]
addressArray: [Bytes!]! # address[]
addressSizedArray: [Bytes!]! # address[10]
blockNumber: BigInt!
blockTimestamp: BigInt!
transactionHash: Bytes!
Expand Down Expand Up @@ -409,7 +411,8 @@ export function createExampleEvent1Event(a: Bytes): ExampleEvent1 {

export function createTupleArrayEventEvent(
tupleArray: Array<ethereum.Tuple>,
addressArray: Array<Address>
addressArray: Array<Address>,
addressSizedArray: Array<Address>
): TupleArrayEvent {
let tupleArrayEventEvent = changetype<TupleArrayEvent>(newMockEvent())

Expand All @@ -427,6 +430,12 @@ export function createTupleArrayEventEvent(
ethereum.Value.fromAddressArray(addressArray)
)
)
tupleArrayEventEvent.parameters.push(
new ethereum.EventParam(
"addressSizedArray",
ethereum.Value.fromAddressArray(addressSizedArray)
)
)

return tupleArrayEventEvent
}
Expand Down Expand Up @@ -569,7 +578,8 @@ export function createExampleEvent1Event(a: Bytes): ExampleEvent1 {

export function createTupleArrayEventEvent(
tupleArray: Array<ethereum.Tuple>,
addressArray: Array<Address>
addressArray: Array<Address>,
addressSizedArray: Array<Address>
): TupleArrayEvent {
let tupleArrayEventEvent = changetype<TupleArrayEvent>(newMockEvent())

Expand All @@ -587,6 +597,12 @@ export function createTupleArrayEventEvent(
ethereum.Value.fromAddressArray(addressArray)
)
)
tupleArrayEventEvent.parameters.push(
new ethereum.EventParam(
"addressSizedArray",
ethereum.Value.fromAddressArray(addressSizedArray)
)
)

return tupleArrayEventEvent
}
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/scaffold/ethereum.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const TEST_TUPLE_ARRAY_EVENT = {
],
},
{ name: 'addressArray', type: 'address[]' },
{ name: 'addressSizedArray', type: 'address[10]' },
],
};

Expand Down
5 changes: 3 additions & 2 deletions packages/cli/src/scaffold/mapping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ export const generateFieldAssignment = (
): { assignment: string; imports: string[] } => {
const safeKey = key.map(k => util.handleReservedWord(k));
const safeValue = value.map(v => util.handleReservedWord(v));
const cleanType = type.replace(/\[\d+\]/g, '[]');

let rightSide = `event.params.${safeValue.join('.')}`;
const imports = [];

if (type in VALUE_TYPECAST_MAP) {
const castTo = VALUE_TYPECAST_MAP[type];
if (cleanType in VALUE_TYPECAST_MAP) {
const castTo = VALUE_TYPECAST_MAP[cleanType];
rightSide = `changetype<${castTo}>(${rightSide})`;
imports.push(castTo.replace('[]', ''));
}
Expand Down