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/fast-flies-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solanafm/explorer-kit": minor
---

feat: 1.2.0
20 changes: 15 additions & 5 deletions packages/explorerkit-idls/tests/idls.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ import { addIdlToMap, getProgramIdl, IdlRepository } from "../src";
import { getMultipleProgramIdls } from "../src/idls/IdlRepository";

describe("getProgramIdl", () => {
it("should return null if the program does not have an idl", async () => {
const idl = await getProgramIdl("BRGovFm72qvoE8MwWP1ipgefSuUvp5y2Vs7PoRM74Sth");
expect(idl).toBeNull();
it("should return an error now if the program does not have an idl", async () => {
try {
await getProgramIdl("BRGovFm72qvoE8MwWP1ipgefSuUvp5y2Vs7PoRM74Sth");
// If we reach this line, the test should fail because no error was thrown
expect.fail("Expected an error but none was thrown");
} catch (error) {
expect(error.message).toBe("Error fetching IDL for BRGovFm72qvoE8MwWP1ipgefSuUvp5y2Vs7PoRM74Sth");
}
});

it("should return an idl from the cloud repository if the program has an idl", async () => {
Expand Down Expand Up @@ -87,8 +92,13 @@ describe("getProgramIdl", () => {
});

it("should returns undefined when program ID is not found in the IDL repository map", async () => {
const idl = await getProgramIdl("randomProgramID");
expect(idl).toBeNull();
try {
await getProgramIdl("randomProgramID");
// If we reach this line, the test should fail because no error was thrown
expect.fail("Expected an error but none was thrown");
} catch (error) {
expect(error.message).toBe("Error fetching IDL for randomProgramID");
}
});

it("should returns the latest IDL when no slot is specified", async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BorshEventCoder, BorshInstructionCoder } from "@coral-xyz/anchor";
import { BorshEventCoder as V1BorshEventCoder } from "@coral-xyz/anchor-new";

import { createAnchorEventParser, createShankEventParser } from "../parsers/v2/event";
import { createAnchorEventParser, createAnchorV1EventParser, createShankEventParser } from "../parsers/v2/event";
import { createBubblegumEventParser } from "../parsers/v2/event/anchor/bubblegum";
import { createSPLCompEventParser } from "../parsers/v2/event/anchor/spl-compression";
import { createTCompEventParser } from "../parsers/v2/event/anchor/tcomp";
Expand All @@ -9,7 +10,11 @@ import { IdlItem } from "../types/IdlItem";
import { FMShankSerializer } from "../types/KinobiTreeGenerator";
import { ParserOutput } from "../types/Parsers";

export type EventParsers = BorshInstructionCoder | BorshEventCoder | Map<number | string, FMShankSerializer>;
export type EventParsers =
| BorshInstructionCoder
| BorshEventCoder
| V1BorshEventCoder
| Map<number | string, FMShankSerializer>;

export interface EventParserInterface {
eventsLayout: EventParsers;
Expand All @@ -33,6 +38,9 @@ export const createEventParser = (idlItem: IdlItem, programHash: string) => {
return createAnchorEventParser(idlItem);
}

case "anchorV1":
return createAnchorV1EventParser(idlItem);

case "kinobi":
switch (programHash) {
case "PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY":
Expand Down
56 changes: 56 additions & 0 deletions packages/explorerkit-translator/src/parsers/v2/event/anchor-v1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { BorshEventCoder, Idl as AnchorIdl } from "@coral-xyz/anchor-new";
import { IdlTypeDefTyStruct } from "@coral-xyz/anchor-new/dist/cjs/idl";
import { convertBNToNumberInObject } from "@solanafm/utils";

import { mapNewAnchorDataTypeToName } from "../../../helpers/idl";
import { EventParserInterface } from "../../../interfaces";
import { IdlItem } from "../../../types/IdlItem";
import { ParserOutput, ParserType } from "../../../types/Parsers";

export const createAnchorV1EventParser: (idlItem: IdlItem) => EventParserInterface = (idlItem: IdlItem) => {
const idl = idlItem.idl as AnchorIdl;
const eventsLayout = new BorshEventCoder(idl);

const parseEvents = (eventData: string, mapTypes?: boolean): ParserOutput => {
try {
if (eventsLayout) {
const decodedEventData = eventsLayout.decode(eventData);

if (decodedEventData) {
const filteredIdlEvent = idl.events?.filter((event) => event.name === decodedEventData.name) ?? [];

if (mapTypes) {
if (filteredIdlEvent && filteredIdlEvent[0]) {
const eventName = filteredIdlEvent[0].name;
const dataFields = (idl.types?.filter((type) => type.name === eventName)[0]?.type as IdlTypeDefTyStruct)
.fields;
decodedEventData.data = mapNewAnchorDataTypeToName(decodedEventData.data, dataFields);
}
}

decodedEventData.data = convertBNToNumberInObject(decodedEventData.data);

return {
name: decodedEventData.name,
data: convertBNToNumberInObject(decodedEventData.data),
type: ParserType.EVENT,
};
}
}

return null;
} catch (error) {
throw new Error(`Error parsing event data - ${eventData}`, {
cause: {
decoderError: error,
programId: idlItem.programId,
},
});
}
};

return {
eventsLayout,
parseEvents,
};
};
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { createAnchorEventParser } from "./anchor";
export { createAnchorV1EventParser } from "./anchor-v1";
export { createShankEventParser } from "./shank";
2 changes: 1 addition & 1 deletion packages/explorerkit-translator/tests/v2/account.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe("parseAnchorAccount", () => {
expect(decodedData).not.toBeNull();
expect(decodedData?.type).toBe("account");
expect(decodedData?.name).toBe("Pool");
expect(decodedData?.data["admin"].type).toBe("publicKey");
expect(decodedData?.data["aVault"].type).toBe("publicKey");
}
}
});
Expand Down
52 changes: 52 additions & 0 deletions packages/explorerkit-translator/tests/v2/event.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,55 @@ describe("createShankEventParser", () => {
}
});
});

describe("createNewAnchorParser", () => {
it("should construct an anchor 0.3.0 event parser for a given valid IDL", async () => {
const programId = "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4";
const idlItem = await getProgramIdl(programId);

if (idlItem) {
const parser = new SolanaFMParser(idlItem, programId);
const eventParser = parser.createParser(ParserType.EVENT);

expect(eventParser).not.toBeNull();
expect(checkIfEventParser(eventParser)).toBe(true);
}
});

it("should construct an anchor 0.3.0 event parser for a given valid IDL and parses the event data", async () => {
const programId = "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4";
const eventData =
"QMbN6CYIceKpKlqLTylZUoQlUKqT/VuVtazmqOuSDJOULkNpDCDscwabiFf+q4GE+2h/Y0YYwDXaxDncGus7VZig8AAAAAABG+xuAQAAAABuE+O/mSsnCUc4smt9N6Da8XiGrtyfTQYxWwx20dhGYdoM2iAAAAAA";
const idlItem = await getProgramIdl(programId);

if (idlItem) {
const parser = new SolanaFMParser(idlItem, programId);
const eventParser = parser.createParser(ParserType.EVENT);
if (eventParser && checkIfEventParser(eventParser)) {
const decodedData = eventParser.parseEvents(eventData);
expect(decodedData).not.toBeNull();
expect(decodedData?.type).toBe("event");
expect(decodedData?.name).toBe("SwapEvent");
}
}
});

it("should construct an anchor 0.3.0 event parser for a given valid IDL, parses the event data and properly map the data type with the given IDL", async () => {
const programId = "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4";
const eventData =
"QMbN6CYIceKpKlqLTylZUoQlUKqT/VuVtazmqOuSDJOULkNpDCDscwabiFf+q4GE+2h/Y0YYwDXaxDncGus7VZig8AAAAAABG+xuAQAAAABuE+O/mSsnCUc4smt9N6Da8XiGrtyfTQYxWwx20dhGYdoM2iAAAAAA";
const idlItem = await getProgramIdl(programId);

if (idlItem) {
const parser = new SolanaFMParser(idlItem, programId);
const eventParser = parser.createParser(ParserType.EVENT);
if (eventParser && checkIfEventParser(eventParser)) {
const decodedData = eventParser.parseEvents(eventData, true);
expect(decodedData).not.toBeNull();
expect(decodedData?.type).toBe("event");
expect(decodedData?.name).toBe("SwapEvent");
expect(decodedData?.data["input_amount"].type).toBe("u64");
}
}
});
});