syncing with the latest testnet changes

Author: signorecello

tooling/sparta/src/admins/manageValidators.ts

@@ -7,6 +7,7 @@ import {
 import { ChainInfoService } from "../services/chaininfo-service.js";
 import { paginate } from "../utils/pagination.js";
 import { ValidatorService } from "../services/validator-service.js";
+import { validateAddress } from "../utils/inputValidator.js";
 
 export const EXCLUDED_VALIDATORS = [
 	"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
@@ -100,8 +101,18 @@ export default {
 						.setDescription("The validator to remove")
 						.setRequired(true)
 				)
+		)
+		.addSubcommand((subcommand) =>
+			subcommand
+				.setName("fund")
+				.setDescription("Fund a validator with Sepolia ETH")
+				.addStringOption((option) =>
+					option
+						.setName("address")
+						.setDescription("The validator to fund")
+						.setRequired(true)
+				)
 		),
-
 	execute: async (interaction: ChatInputCommandInteraction) => {
 		await interaction.deferReply({
 			flags: MessageFlags.Ephemeral,
@@ -158,19 +169,36 @@ export default {
 					return `Failed`;
 				}
 
-				// Basic address validation
-				if (!address.match(/^0x[a-fA-F0-9]{40}$/)) {
-					return interaction.reply({
+				if (validateAddress(address)) {
+					await interaction.editReply({
 						content: "Please provide a valid Ethereum address.",
-						flags: MessageFlags.Ephemeral,
 					});
+					return `Failed`;
 				}
 
 				await ValidatorService.addValidator(address);
 				await interaction.editReply({
 					content: `Successfully added validator address: ${address}`,
 				});
 				return `Added validator ${address}`;
+			} else if (interaction.options.getSubcommand() === "fund") {
+				const address = interaction.options.getString("address");
+				if (!address) {
+					await interaction.editReply({
+						content: "Please provide an address to fund",
+					});
+					return `Failed`;
+				}
+				if (validateAddress(address)) {
+					await interaction.editReply({
+						content: "Please provide a valid Ethereum address.",
+					});
+					return `Failed`;
+				}
+				await ValidatorService.fundValidator(address);
+				await interaction.editReply({
+					content: `Successfully funded validator ${address}`,
+				});
 			}
 			return;
 		} catch (error) {

tooling/sparta/src/commands/getChainInfo.ts

@@ -2,6 +2,8 @@ import {
 	SlashCommandBuilder,
 	ChatInputCommandInteraction,
 	MessageFlags,
+	TextChannel,
+	DiscordAPIError,
 } from "discord.js";
 import { ChainInfoService } from "../services/chaininfo-service.js";
 
@@ -11,9 +13,8 @@ export default {
 		.setDescription("Get chain info"),
 
 	execute: async (interaction: ChatInputCommandInteraction) => {
-		await interaction.deferReply({
-			flags: MessageFlags.Ephemeral,
-		});
+		// Defer reply without ephemeral flag to make it visible to everyone
+		await interaction.deferReply();
 
 		try {
 			const {
@@ -24,6 +25,58 @@ export default {
 				proposerNow,
 			} = await ChainInfoService.getInfo();
 
+			// Delete previous get-info messages from the bot in this channel
+			try {
+				if (interaction.channel && !interaction.channel.isDMBased()) {
+					const channel = interaction.channel as TextChannel;
+					const messages = await channel.messages.fetch({
+						limit: 15,
+					});
+
+					// Filter for bot messages that look like chain info responses
+					// and aren't the current interaction's response
+					const botMessages = messages.filter(
+						(m) =>
+							m.author.id === interaction.client.user?.id &&
+							m.content.includes("Pending block:") &&
+							m.content.includes("Proven block:") &&
+							m.content.includes("Current epoch:") &&
+							!m.flags.has(MessageFlags.Ephemeral) &&
+							// Ensure we don't delete the message we're about to send
+							m.id !== interaction.id
+					);
+
+					if (botMessages.size > 0) {
+						try {
+							// Try bulk delete first (only works for messages less than 14 days old)
+							await channel.bulkDelete(botMessages);
+						} catch (error) {
+							// If bulk delete fails (e.g., messages are too old), delete individually
+							if (
+								error instanceof DiscordAPIError &&
+								error.code === 50034
+							) {
+								for (const message of botMessages.values()) {
+									try {
+										await message.delete();
+									} catch (deleteError) {
+										console.error(
+											"Error deleting individual message:",
+											deleteError
+										);
+									}
+								}
+							} else {
+								throw error;
+							}
+						}
+					}
+				}
+			} catch (error) {
+				console.error("Error deleting previous messages:", error);
+				// Continue with the command even if message deletion fails
+			}
+
 			await interaction.editReply({
 				content: `Pending block: ${pendingBlockNum}\nProven block: ${provenBlockNum}\nCurrent epoch: ${currentEpoch}\nCurrent slot: ${currentSlot}\nProposer now: ${proposerNow}`,
 			});

tooling/sparta/src/services/validator-service.ts

@@ -26,7 +26,7 @@ export class ValidatorService {
 
 	static async fundValidator(address: string): Promise<string> {
 		try {
-			const command = `cast send --value ${process.env.ETHEREUM_VALUE} --rpc-url ${process.env.ETHEREUM_HOST} --chain-id ${process.env.ETHEREUM_CHAIN_ID} --private-key ${process.env.MINTER_PRIVATE_KEY} ${address}`;
+			const command = `cast send --value ${process.env.FUNDER_AMOUNT} --rpc-url ${process.env.ETHEREUM_HOST} --chain-id ${process.env.L1_CHAIN_ID} --private-key ${process.env.FUNDER_ADDRESS_PRIVATE_KEY} ${address}`;
 
 			const { stdout, stderr } = await execAsync(command);