certusone
/
wormhole-explorer
mirror of https://github.com/certusone/wormhole-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

solana: mapping to logmsgpublished

This commit is contained in:
matias martinez 2023-11-21 11:58:52 -03:00
parent a64a13878b
commit a6dabfaa17
12 changed files with 455 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockchain-watcher/config/default.json
View File

@ -3,7 +3,7 @@
"port": 9090,
"logLevel": "debug",
"dryRun": true,
"supportedChains": ["ethereum"],
"supportedChains": ["ethereum", "solana"],
"sns": {
"topicArn": "arn:aws:sns:us-east-1:000000000000:localstack-topic.fifo",
"region": "us-east-1",

177
blockchain-watcher/package-lock.json generated
View File

@ -13,6 +13,7 @@
"@certusone/wormhole-sdk": "^0.9.21-beta.0",
"@types/config": "^3.3.3",
"axios": "^1.6.0",
"bs58": "^5.0.0",
"config": "^3.3.9",
"dotenv": "^16.3.1",
"ethers": "^5",
@ -1244,6 +1245,14 @@
"follow-redirects": "^1.14.4"
}
},
"node_modules/@certusone/wormhole-sdk/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/@classic-terra/terra.proto": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@classic-terra/terra.proto/-/terra.proto-1.1.0.tgz",
@ -3741,19 +3750,6 @@
"bs58": "^5.0.0"
}
},
"node_modules/@mysten/bcs/node_modules/base-x": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
"integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
},
"node_modules/@mysten/bcs/node_modules/bs58": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
"integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
"dependencies": {
"base-x": "^4.0.0"
}
},
"node_modules/@mysten/sui.js": {
"version": "0.32.2",
"resolved": "https://registry.npmjs.org/@mysten/sui.js/-/sui.js-0.32.2.tgz",
@ -3829,6 +3825,14 @@
"node": ">=11"
}
},
"node_modules/@project-serum/anchor/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/@project-serum/anchor/node_modules/superstruct": {
"version": "0.15.5",
"resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.15.5.tgz",
@ -4563,6 +4567,14 @@
"superstruct": "^0.14.2"
}
},
"node_modules/@solana/web3.js/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/@solana/web3.js/node_modules/superstruct": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.14.2.tgz",
@ -5634,6 +5646,14 @@
"text-encoding-utf-8": "^1.0.2"
}
},
"node_modules/borsh/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/bowser": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
@ -5728,13 +5748,18 @@
}
},
"node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
"integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
"dependencies": {
"base-x": "^3.0.2"
"base-x": "^4.0.0"
}
},
"node_modules/bs58/node_modules/base-x": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
"integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
},
"node_modules/bs58check": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
@ -5745,6 +5770,14 @@
"safe-buffer": "^5.1.2"
}
},
"node_modules/bs58check/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/bser": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@ -6239,6 +6272,14 @@
"sha3": "^2.1.1"
}
},
"node_modules/crypto-addr-codec/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/crypto-hash": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/crypto-hash/-/crypto-hash-1.3.0.tgz",
@ -9684,6 +9725,14 @@
"tweetnacl": "^1.0.1"
}
},
"node_modules/near-api-js/node_modules/bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"dependencies": {
"base-x": "^3.0.2"
}
},
"node_modules/no-case": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@ -12522,6 +12571,14 @@
"requires": {
"follow-redirects": "^1.14.4"
}
},
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
}
}
},
@ -14326,21 +14383,6 @@
"integrity": "sha512-wFPb8bkhwrbiStfZMV5rFM7J+umpke59/dNjDp+UYJKykNlW23LCk2ePyEUvGdb62HGJM1jyOJ8g4egE3OmdKA==",
"requires": {
"bs58": "^5.0.0"
},
"dependencies": {
"base-x": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
"integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
},
"bs58": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
"integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
"requires": {
"base-x": "^4.0.0"
}
}
}
},
"@mysten/sui.js": {
@ -14400,6 +14442,14 @@
"toml": "^3.0.0"
},
"dependencies": {
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
},
"superstruct": {
"version": "0.15.5",
"resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.15.5.tgz",
@ -14990,6 +15040,14 @@
"superstruct": "^0.14.2"
},
"dependencies": {
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
},
"superstruct": {
"version": "0.14.2",
"resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.14.2.tgz",
@ -15922,6 +15980,16 @@
"bn.js": "^5.2.0",
"bs58": "^4.0.0",
"text-encoding-utf-8": "^1.0.2"
},
"dependencies": {
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
}
}
},
"bowser": {
@ -15992,11 +16060,18 @@
}
},
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
"integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
"requires": {
"base-x": "^3.0.2"
"base-x": "^4.0.0"
},
"dependencies": {
"base-x": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
"integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
}
}
},
"bs58check": {
@ -16007,6 +16082,16 @@
"bs58": "^4.0.0",
"create-hash": "^1.1.0",
"safe-buffer": "^5.1.2"
},
"dependencies": {
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
}
}
},
"bser": {
@ -16394,6 +16479,16 @@
"ripemd160-min": "0.0.6",
"safe-buffer": "^5.2.0",
"sha3": "^2.1.1"
},
"dependencies": {
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
}
}
},
"crypto-hash": {
@ -18999,6 +19094,16 @@
"node-fetch": "^2.6.1",
"text-encoding-utf-8": "^1.0.2",
"tweetnacl": "^1.0.1"
},
"dependencies": {
"bs58": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
"integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
"requires": {
"base-x": "^3.0.2"
}
}
}
},
"no-case": {

1
blockchain-watcher/package.json
View File

@ -18,6 +18,7 @@
"@certusone/wormhole-sdk": "^0.9.21-beta.0",
"@types/config": "^3.3.3",
"axios": "^1.6.0",
"bs58": "^5.0.0",
"config": "^3.3.9",
"dotenv": "^16.3.1",
"ethers": "^5",

24
blockchain-watcher/src/domain/actions/solana/HandleSolanaTransactions.ts
View File

@ -1,3 +1,4 @@
import winston from "winston";
import { solana } from "../../entities";
/**
@ -5,8 +6,9 @@ import { solana } from "../../entities";
*/
export class HandleSolanaTransaction<T> {
cfg: HandleSolanaTxConfig;
mapper: (txs: solana.Transaction) => T;
mapper: (txs: solana.Transaction, args: { programId: string }) => T;
target?: (parsed: T[]) => Promise<void>;
logger: winston.Logger = winston.child({ module: "HandleSolanaTransaction" });
constructor(
cfg: HandleSolanaTxConfig,
@ -19,9 +21,25 @@ export class HandleSolanaTransaction<T> {
}
public async handle(txs: solana.Transaction[]): Promise<T[]> {
const mappedItems = txs.filter((tx) => !tx.meta?.err).map((tx) => this.mapper(tx));
const filteredItems = txs.filter((tx) => {
const hasError = tx.meta?.err;
if (hasError)
this.logger.warn(
`Ignoring tx for program ${this.cfg.programId} in ${tx.slot} has error: ${tx.meta?.err}`
);
return !hasError;
});
if (this.target) await this.target(mappedItems);
const mappedItems = [];
for (const tx of filteredItems) {
mappedItems.push(await this.mapper(tx, { programId: this.cfg.programId }));
}
if (this.target) {
await this.target(mappedItems);
} else {
this.logger.warn(`No target for ${this.cfg.programId} txs`);
}
return mappedItems;
}

2
blockchain-watcher/src/domain/actions/solana/PollSolanaTransactions.ts
View File

@ -60,7 +60,7 @@ export class PollSolanaTransactions extends RunPollingJob {
let toBlock = await this.findValidBlock(range.toSlot, (slot) => slot - 1);
let fromBlock = await this.findValidBlock(range.fromSlot, (slot) => slot + 1);
if (fromBlock.blockTime > toBlock.blockTime) {
if (!fromBlock.blockTime || !toBlock.blockTime || fromBlock.blockTime > toBlock.blockTime) {
// TODO: validate if this is correct
throw new Error(
`Invalid slot range: fromSlotBlockTime=${fromBlock.blockTime} toSlotBlockTime=${toBlock.blockTime}`

10
blockchain-watcher/src/domain/entities/solana.ts
View File

@ -5,11 +5,17 @@ export type Transaction = {
signatures: string[];
};
meta?: {
innerInstructions?: CompiledInnerInstruction[] | null;
err?: {} | string | null;
};
blockTime?: number | null;
};
type CompiledInnerInstruction = {
index: number;
instructions: CompiledInstruction[];
};
export type CompiledInstruction = {
programIdIndex: number;
accounts: number[];
@ -17,7 +23,9 @@ export type CompiledInstruction = {
};
export type Message = {
accountKeys: string[];
instructions: CompiledInstruction[];
compiledInstructions: MessageCompiledInstruction[];
};
export type Block = {
@ -29,7 +37,7 @@ export type Block = {
signatures: string[];
};
}[];
blockTime: number;
blockTime: number | null;
};
export type MessageCompiledInstruction = {

1
blockchain-watcher/src/infrastructure/RepositoriesBuilder.ts
View File

@ -66,6 +66,7 @@ export class RepositoriesBuilder {
metadataRepo: this.getMetadataRepository(),
statsRepo: this.getStatsRepository(),
snsRepo: this.getSnsEventRepository(),
solanaSlotRepo: this.getSolanaSlotRepository(),
}
)
);

2
blockchain-watcher/src/infrastructure/mappers/index.ts Normal file
View File

@ -0,0 +1,2 @@
export * from "./solanaLogMessagePublishedMapper";
export * from "./evmLogMessagePublishedMapper";

126
blockchain-watcher/src/infrastructure/mappers/solanaLogMessagePublishedMapper.ts
View File

@ -1,73 +1,81 @@
import { BigNumber } from "ethers";
import { decode } from "bs58";
import { Connection, Commitment } from "@solana/web3.js";
import { getPostedMessage } from "@certusone/wormhole-sdk/lib/cjs/solana/wormhole";
import { solana, LogFoundEvent, LogMessagePublished } from "../../domain/entities";
import { CompiledInstruction, MessageCompiledInstruction } from "../../domain/entities/solana";
import { configuration } from "../config";
export const solanaLogMessagePublishedMapper = (
tx: solana.Transaction
): LogFoundEvent<LogMessagePublished>[] => {
const connection = new Connection(configuration.platforms.solana.rpcs[0]);
export const solanaLogMessagePublishedMapper = async (
tx: solana.Transaction,
{ programId, commitment }: { programId: string; commitment?: Commitment }
): Promise<LogFoundEvent<LogMessagePublished>[]> => {
if (!tx || !tx.blockTime) {
throw new Error(`Block time is missing for tx in slot ${tx?.slot} @ time ${tx?.blockTime}`);
}
/*
const message = res.transaction.message;
const accountKeys = isLegacyMessage(message)
? message.accountKeys
: message.staticAccountKeys;
const programIdIndex = accountKeys.findIndex((i) => i.toBase58() === WORMHOLE_PROGRAM_ID);
const instructions = message.compiledInstructions;
const innerInstructions =
res.meta?.innerInstructions?.flatMap((i) =>
i.instructions.map(normalizeCompileInstruction),
) || [];
const whInstructions = innerInstructions
.concat(instructions)
.filter((i) => i.programIdIndex === programIdIndex);
for (const instruction of whInstructions) {
// skip if not postMessage instruction
const message = tx.transaction.message;
const accountKeys = message.accountKeys;
const programIdIndex = accountKeys.findIndex((i) => i === programId);
const instructions = message.compiledInstructions;
const innerInstructions =
tx.meta?.innerInstructions?.flatMap((i) => i.instructions.map(normalizeCompileInstruction)) ||
[];
const instructionId = instruction.data;
if (instructionId[0] !== 0x01) continue;
const whInstructions = innerInstructions
.concat(instructions)
.filter((i) => i.programIdIndex === programIdIndex);
const accountId = accountKeys[instruction.accountKeyIndexes[1]];
const { message } = await getPostedMessage(connection, accountId.toBase58(), COMMITMENT);
const {
sequence,
emitterAddress,
emitterChain,
submissionTime: timestamp,
nonce,
payload,
consistencyLevel,
} = message || {};
const results: LogFoundEvent<LogMessagePublished>[] = [];
for (const instruction of whInstructions) {
// skip if not postMessage instruction
const instructionId = instruction.data;
if (instructionId[0] !== 0x01) {
continue;
}
// We store `blockNumber` with the slot number.
const blockNumber = res.slot.toString();
const chainId = emitterChain;
const emitter = emitterAddress.toString('hex');
const parsePayload = payload.toString('hex');
const parseSequence = Number(sequence);
const txHash = res.transaction.signatures[0];
const accountId = accountKeys[instruction.accountKeyIndexes[1]];
const { message } = await getPostedMessage(connection, accountId, commitment);
const {
sequence,
emitterAddress,
emitterChain,
submissionTime: timestamp,
nonce,
payload,
consistencyLevel,
} = message || {};
}
*/
return [
{
results.push({
name: "log-message-published",
address: log.address, //
chainId: 1,
txHash: log.transactionHash,
blockHeight: log.blockNumber,
blockTime: log.blockTime,
address: programId, //
chainId: emitterChain,
txHash: tx.transaction.signatures[0],
blockHeight: BigInt(tx.slot.toString()),
blockTime: tx.blockTime,
attributes: {
sender: parsedArgs[0],
sequence: (parsedArgs[1] as BigNumber).toNumber(),
payload: parsedArgs[3],
nonce: parsedArgs[2],
consistencyLevel: parsedArgs[4],
sender: emitterAddress.toString("hex"),
sequence: Number(sequence),
payload: payload.toString("hex"),
nonce,
consistencyLevel,
},
},
];
});
}
return results;
};
const normalizeCompileInstruction = (
instruction: CompiledInstruction | MessageCompiledInstruction
): MessageCompiledInstruction => {
if ("accounts" in instruction) {
return {
accountKeyIndexes: instruction.accounts,
data: decode(instruction.data),
programIdIndex: instruction.programIdIndex,
};
} else {
return instruction;
}
};

7
blockchain-watcher/src/infrastructure/repositories/StaticJobRepository.ts
View File

@ -16,9 +16,9 @@ import {
StatRepository,
} from "../../domain/repositories";
import { FileMetadataRepo, SnsEventRepository } from "./index";
import { evmLogMessagePublishedMapper } from "../mappers/evmLogMessagePublishedMapper";
import log from "../log";
import { HandleSolanaTransaction } from "../../domain/actions/solana/HandleSolanaTransactions";
import { solanaLogMessagePublishedMapper, evmLogMessagePublishedMapper } from "../mappers";
import log from "../log";
export class StaticJobRepository implements JobRepository {
private fileRepo: FileMetadataRepo;
@ -82,7 +82,7 @@ export class StaticJobRepository implements JobRepository {
}
const mapper = this.mappers.get(handler.mapper);
if (!mapper) {
throw new Error(`Handler ${handler.action} not found`);
throw new Error(`Handler ${handler.mapper} not found`);
}
result.push((await maybeHandler(handler.config, handler.target, mapper)).bind(maybeHandler));
}
@ -110,6 +110,7 @@ export class StaticJobRepository implements JobRepository {
this.sources.set("PollSolanaTransactions", pollSolanaTransactions);
this.mappers.set("evmLogMessagePublishedMapper", evmLogMessagePublishedMapper);
this.mappers.set("solanaLogMessagePublishedMapper", solanaLogMessagePublishedMapper);
const snsTarget = () => this.snsRepo.asTarget();
const dummyTarget = async () => async (events: any[]) => {

53
blockchain-watcher/src/infrastructure/repositories/Web3SolanaSlotRepository.ts
View File

@ -1,6 +1,11 @@
import { Commitment, Connection, PublicKey, SolanaJSONRPCError } from "@solana/web3.js";
import {
Commitment,
Connection,
PublicKey,
VersionedTransactionResponse,
SolanaJSONRPCError,
} from "@solana/web3.js";
import {} from "../../domain/entities";
import { Fallible, solana } from "../../domain/entities";
import { SolanaSlotRepository } from "../../domain/repositories";
@ -24,7 +29,10 @@ export class Web3SolanaSlotRepository implements SolanaSlotRepository {
new solana.Failure(0, "Block not found")
);
}
return Fallible.ok<solana.Block, solana.Failure>(block as solana.Block);
return Fallible.ok<solana.Block, solana.Failure>({
...block,
transactions: block.transactions.map((tx) => this.mapTx(tx, slot)),
});
})
.catch((err) => {
if (err instanceof SolanaJSONRPCError) {
@ -61,7 +69,44 @@ export class Web3SolanaSlotRepository implements SolanaSlotRepository {
return txs
.filter((tx) => tx !== null)
.map((tx, i) => {
return tx as solana.Transaction;
const message = tx?.transaction.message;
const accountKeys =
message?.version === "legacy"
? message.accountKeys.map((key) => key.toBase58())
: message?.staticAccountKeys.map((key) => key.toBase58());
return {
...tx,
transaction: {
...tx?.transaction,
message: {
...tx?.transaction.message,
accountKeys,
compiledInstructions: message?.compiledInstructions,
},
},
} as solana.Transaction;
});
}
private mapTx(tx: Partial<VersionedTransactionResponse>, slot?: number): solana.Transaction {
const message = tx?.transaction?.message;
const accountKeys =
message?.version === "legacy"
? message.accountKeys.map((key) => key.toBase58())
: message?.staticAccountKeys.map((key) => key.toBase58());
return {
...tx,
slot: tx.slot || slot,
transaction: {
...tx.transaction,
message: {
...tx?.transaction?.message,
accountKeys,
compiledInstructions: message?.compiledInstructions,
},
},
} as solana.Transaction;
}
}

158
blockchain-watcher/test/infrastructure/mappers/solanaLogMessagePublishedMapper.test.ts Normal file
View File

@ -0,0 +1,158 @@
import { expect, describe, it } from "@jest/globals";
import { solana } from "../../../src/domain/entities";
import { solanaLogMessagePublishedMapper } from "../../../src/infrastructure/mappers/solanaLogMessagePublishedMapper";
describe("solanaLogMessagePublishedMapper", () => {
it("should map a solana transaction to a log-message-published event", async () => {
const programId = "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth";
const tx = {
blockTime: 1700571926,
meta: {
computeUnitsConsumed: 38108,
err: null,
fee: 45000,
innerInstructions: [
{
index: 1,
instructions: [
{ accounts: [0, 1], data: "3Bxs43gDisiYM5ts", programIdIndex: 2, stackHeight: 2 },
{ accounts: [1], data: "9krTDAJ1gisg2T8j", programIdIndex: 2, stackHeight: 2 },
{
accounts: [1],
data: "SYXsBvR59WTsF4KEVN8LCQ1X9MekXCGPPNo3Af36taxCQBED",
programIdIndex: 2,
stackHeight: 2,
},
],
},
],
loadedAddresses: { readonly: [], writable: [] },
logMessages: [
"Program worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth invoke [1]",
"Program 11111111111111111111111111111111 invoke [2]",
"Program 11111111111111111111111111111111 success",
"Program 11111111111111111111111111111111 invoke [2]",
"Program 11111111111111111111111111111111 success",
"Program 11111111111111111111111111111111 invoke [2]",
"Program 11111111111111111111111111111111 success",
"Program worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth consumed 38108 of 400000 compute units",
"Program worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth success",
],
postBalances: [548150063, 1301520, 1, 3647040, 1, 0, 1009200, 1141440],
postTokenBalances: [],
preBalances: [549496583, 0, 1, 3647040, 1, 0, 1009200, 1141440],
preTokenBalances: [],
rewards: [],
status: { Ok: null },
},
slot: 231368528,
transaction: {
message: {
header: {
numReadonlySignedAccounts: 0,
numReadonlyUnsignedAccounts: 6,
numRequiredSignatures: 2,
},
accountKeys: [
"DPpi7Sv1BgH8rgNLfcF5hQXccjfHzDWCutH6HyVJXo2c",
"6YWeHdUSFyciT7EwDcT2XnBHQykJv4EiH8j63jS3gKSL",
"11111111111111111111111111111111",
"6d3w8mGjJauf6gCAg7WfLezbaPmUHYGuoNutnfYF1RYM",
"KeccakSecp256k11111111111111111111111111111",
"Sysvar1nstructions1111111111111111111111111",
"SysvarRent111111111111111111111111111111111",
"worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth",
],
recentBlockhash: "BFHcrzxbqH93hinicAiJ4qFUDn3teurRnVSAV3zgyiSt",
instructions: [
{
accounts: [],
data: "hm62hycs7UDQNrAfDW2YdfVAnH86Ezqr5FRGQQc5VbBR84unD6iT4dneGMkbvseGehcBCs36x7cb1aGui81EvGWnwgAkYRmo4RE4ccABa5hZHwTJY9sEfzTTirfKHCxRpohqAVj2fd13CnJot9hnqRfVTyFS25nFMwnWpTay16BcFcgFBmwWAoSv5EVfcuquRkVh9XMLyTXX1LqwY2ubFrViXSf7vctQroqvVaBf8KF8AiQ1NfkyQqXpiac1Fdz7NdfmdNxabaurJi8Q4Li2s6x6Yhd5qjpRWFsvpThs3HXjm3qRfN2biY5HTy5abmdyz8NR3jxybgzsehUTtwTDRQTdvdszUDWKYmjViqLuEtesTg68bkGk2Sw8vWzFpw8wHueEG4RW3XVPvmyLYsuKE2UXiyntUczc14FHUuTRuMpFDcoajhHk9kPFSqFYMEBiK5MQj9xK1dEn32J5WMQwbvUfxgBpLW6pCymWTPCecHDsCWYxG3DpSmrsbBCuzxdVN1ZFWF2WbG53gVCYNCksaHZmzCkXjo985bgZ9yByaYhtkNc5mWMffYdnynUWTwcB7iW8qN9YbVK44QMqgsK8s6V2GHw6S2v78pUw2a6HtVFyoNThN77yyn7YhHEKroXKWiNXgMnGxLjNTUB8DHUYFg7Ak9wB2C6whkPowkDreUovSXoncC6ovrgT97g7tWmj8PcwAD7iPgDc2AFYFqV6fbj5gJwDxT38sheRYUHoCGREmpmDyJveCsgo74HpimwyZhnauK4pZi4M4aWNLTvdrEdHZ4AVvnzbst6WBkg62nNAiz2dkqUgVLBh1oAnk5rFTuqowBuoMa3gVVKo758wT9qksVgYbZDJKrcqr89g6huQ7VNDjwxaueYbtjmRKxvwb9v6mdbDtGApmtSYNroWznQ18KF1SW422VHdAbfY1NXbd9PM5u2c4mv7MYdFxKsGiN",
programIdIndex: 4,
stackHeight: null,
},
{
accounts: [0, 3, 1, 5, 6, 2],
data: "6f4i6QEQuN9Xu1k2omxzJbdsSVL",
programIdIndex: 7,
stackHeight: null,
},
],
indexToProgramIds: {},
compiledInstructions: [
{
programIdIndex: 4,
accountKeyIndexes: [],
data: {
type: "Buffer",
data: [
7, 78, 0, 0, 143, 0, 0, 161, 2, 32, 0, 0, 163, 0, 0, 228, 0, 0, 161, 2, 32, 0, 0,
248, 0, 0, 57, 1, 0, 161, 2, 32, 0, 0, 77, 1, 0, 142, 1, 0, 161, 2, 32, 0, 0, 162,
1, 0, 227, 1, 0, 161, 2, 32, 0, 0, 247, 1, 0, 56, 2, 0, 161, 2, 32, 0, 0, 76, 2,
0, 141, 2, 0, 161, 2, 32, 0, 0, 59, 51, 204, 135, 248, 215, 99, 74, 107, 66, 65,
74, 160, 39, 31, 10, 158, 178, 19, 247, 139, 113, 78, 152, 216, 104, 158, 173,
117, 242, 60, 47, 111, 11, 39, 15, 162, 101, 151, 167, 65, 70, 40, 10, 189, 243,
205, 153, 220, 47, 188, 222, 232, 11, 218, 184, 255, 231, 127, 221, 37, 61, 206,
230, 0, 88, 204, 58, 229, 192, 151, 178, 19, 206, 60, 129, 151, 158, 27, 159, 149,
112, 116, 106, 165, 3, 210, 147, 221, 8, 171, 179, 168, 188, 218, 112, 226, 92,
49, 49, 27, 124, 46, 134, 151, 125, 137, 207, 247, 242, 138, 32, 193, 210, 41,
171, 208, 67, 188, 141, 100, 185, 141, 64, 53, 165, 10, 209, 137, 107, 18, 181,
66, 93, 26, 81, 67, 162, 46, 193, 145, 96, 135, 120, 216, 22, 191, 65, 123, 1,
255, 108, 185, 82, 88, 155, 222, 134, 44, 37, 239, 67, 146, 19, 47, 185, 212, 164,
33, 87, 156, 94, 21, 252, 196, 69, 191, 21, 115, 155, 193, 198, 202, 177, 243, 53,
80, 54, 244, 147, 184, 30, 84, 210, 14, 117, 87, 25, 29, 59, 26, 213, 61, 160,
214, 67, 51, 168, 83, 98, 116, 109, 214, 78, 101, 113, 149, 63, 88, 8, 254, 217,
15, 201, 154, 197, 127, 33, 176, 22, 72, 196, 210, 245, 0, 17, 77, 232, 70, 1,
147, 189, 243, 162, 252, 248, 31, 134, 160, 151, 101, 244, 118, 47, 209, 4, 63,
253, 158, 86, 175, 163, 112, 215, 156, 208, 139, 218, 88, 193, 237, 42, 85, 42,
173, 196, 121, 102, 233, 227, 133, 147, 146, 60, 101, 80, 239, 64, 241, 154, 63,
198, 250, 78, 190, 167, 90, 86, 181, 207, 125, 34, 79, 14, 127, 156, 245, 84, 246,
183, 164, 176, 57, 5, 146, 83, 195, 128, 93, 0, 16, 122, 0, 134, 179, 45, 122, 9,
119, 146, 106, 32, 81, 49, 216, 115, 29, 57, 203, 235, 153, 210, 200, 156, 182,
223, 166, 149, 149, 170, 47, 151, 192, 41, 129, 137, 93, 215, 178, 181, 225, 104,
186, 127, 119, 236, 109, 99, 178, 176, 72, 114, 96, 227, 217, 155, 138, 221, 154,
70, 143, 112, 32, 185, 30, 197, 4, 158, 50, 149, 239, 237, 42, 169, 127, 253, 164,
207, 76, 40, 145, 125, 108, 252, 0, 140, 130, 178, 253, 130, 250, 237, 39, 17,
213, 154, 240, 242, 73, 157, 22, 231, 38, 246, 178, 13, 25, 229, 42, 53, 107, 116,
76, 12, 67, 37, 29, 182, 248, 226, 60, 3, 119, 195, 199, 147, 102, 74, 41, 57,
110, 123, 60, 184, 30, 119, 252, 104, 157, 39, 179, 190, 11, 134, 145, 209, 198,
123, 98, 62, 94, 159, 195, 14, 25, 115, 56, 229, 58, 140, 237, 185, 145, 202, 243,
155, 117, 248, 181, 1, 84, 206, 91, 77, 52, 143, 183, 75, 149, 142, 137, 102, 226,
236, 61, 189, 73, 88, 167, 205, 210, 49, 221, 81, 99, 210, 175, 81, 22, 34, 101,
20, 219, 184, 39, 130, 193, 30, 173, 193, 14, 220, 163, 55, 219, 125, 17, 160,
206, 143, 46, 224, 124, 192, 116, 60, 223, 75, 34, 151, 183, 117, 193, 233, 202,
147, 252, 71, 146, 15, 70, 232, 4, 137, 128, 7, 186, 220, 206, 235, 238, 107, 212,
98, 1, 116, 163, 191, 145, 57, 83, 214, 149, 38, 13, 136, 188, 26, 162, 90, 78,
238, 54, 62, 240, 145, 62, 159, 160, 23, 234, 98, 198, 39, 201, 106, 33, 183, 112,
38, 215, 224, 190, 86, 146, 31, 102, 155, 202, 73, 138, 117, 235, 0, 141, 115, 75,
],
},
},
{
programIdIndex: 7,
accountKeyIndexes: [0, 3, 1, 5, 6, 2],
data: {
type: "Buffer",
data: [
7, 0, 1, 2, 3, 4, 255, 5, 255, 6, 255, 255, 255, 255, 255, 255, 255, 255, 255,
255,
],
},
},
],
},
},
version: "legacy",
} as any as solana.Transaction;
const events = await solanaLogMessagePublishedMapper(tx, { programId });
expect(events).toHaveLength(1);
expect(events[0].name).toBe("log-message-published");
expect(events[0].address).toBe(programId);
expect(events[0].chainId).toBe(1);
expect(events[0].txHash).toBe(tx.transaction.signatures[0]);
expect(events[0].blockHeight).toBe(tx.slot.toString());
expect(events[0].blockTime).toBe(tx.blockTime);
});
});