ignition testnet

Author: signorecello

tooling/sparta/README.md

@@ -76,10 +76,11 @@ GUILD_ID=your_guild_id
 # Ethereum Configuration
 ETHEREUM_HOST=http://localhost:8545
 ETHEREUM_ROLLUP_ADDRESS=your_rollup_address
-ETHEREUM_ADMIN_ADDRESS=your_admin_address
 ETHEREUM_CHAIN_ID=1337
-ETHEREUM_PRIVATE_KEY=your_private_key
+MINTER_PRIVATE_KEY=your_private_key
+WITHDRAWER_ADDRESS=address_to_withdraw_funds_to
 ETHEREUM_VALUE=20ether
+APPROVAL_AMOUNT=some_amount
 ```
 
 5. Start the bot in development mode:
@@ -151,6 +152,7 @@ terraform apply
 
 ### Admin Commands
 - `/admin validators get`: List validators
+- `/admin validators add`: Add a validator
 - `/admin validators remove`: Remove a validator
 - `/admin committee get`: Get committee information
 - `/admin stake manage`: Manage validator stakes

tooling/sparta/src/.env.example

@@ -5,10 +5,11 @@ GUILD_ID=your_guild_id_here
 
 # Ethereum Configuration
 ETHEREUM_HOST=http://localhost:8545
-ETHEREUM_PRIVATE_KEY=your_private_key_here
-ETHEREUM_ROLLUP_ADDRESS=your_rollup_address_here
+MINTER_PRIVATE_KEY=your_minter_private_key_here
+ETHEREUM_REGISTRY_ADDRESS=your_registry_address_here
+WITHDRAWER_ADDRESS=your_withdrawer_address_here
 ETHEREUM_CHAIN_ID=1337
 ETHEREUM_VALUE=20ether
-ETHEREUM_ADMIN_ADDRESS=your_admin_address_here
 
 MINIMUM_STAKE=100000000000000000000
+APPROVAL_AMOUNT=10000000000000000000000

tooling/sparta/src/admins/index.ts

@@ -1,3 +1,3 @@
-import validators from "./editValidators.js";
+import validators from "./manageValidators.js";
 
 export default { validators };

tooling/sparta/src/admins/editValidators.ts renamed to tooling/sparta/src/admins/manageValidators.ts

@@ -79,6 +79,17 @@ export default {
 						.setDescription("Get committee")
 				)
 		)
+		.addSubcommand((subcommand) =>
+			subcommand
+				.setName("add")
+				.setDescription("Add a validator")
+				.addStringOption((option) =>
+					option
+						.setName("address")
+						.setDescription("The validator to add")
+						.setRequired(true)
+				)
+		)
 		.addSubcommand((subcommand) =>
 			subcommand
 				.setName("remove")
@@ -114,6 +125,7 @@ export default {
 					interaction,
 					"Committee"
 				);
+				return "Checked committee";
 			} else if (interaction.options.getSubcommand() === "validators") {
 				await paginate(
 					filteredValidators,
@@ -122,25 +134,52 @@ export default {
 					interaction,
 					"Validators"
 				);
+				return "Checked validators";
 			} else if (interaction.options.getSubcommand() === "remove") {
 				const address = interaction.options.getString("address");
 				if (!address) {
 					await interaction.editReply({
 						content: "Please provide an address to remove",
 					});
-					return;
+					return `Failed`;
 				}
 				await ValidatorService.removeValidator(address);
 				await interaction.editReply({
 					content: `Removed validator ${address}`,
 				});
+				return "Removed validator";
+			} else if (interaction.options.getSubcommand() === "add") {
+				const address = interaction.options.getString("address");
+
+				if (!address) {
+					await interaction.editReply({
+						content: "Please provide an address to remove",
+					});
+					return `Failed`;
+				}
+
+				// Basic address validation
+				if (!address.match(/^0x[a-fA-F0-9]{40}$/)) {
+					return interaction.reply({
+						content: "Please provide a valid Ethereum address.",
+						flags: MessageFlags.Ephemeral,
+					});
+				}
+
+				await ValidatorService.addValidator(address);
+				await interaction.editReply({
+					content: `Successfully added validator address: ${address}`,
+				});
+				return `Added validator ${address}`;
 			}
 			return;
 		} catch (error) {
-			console.error("Error in get-info command:", error);
 			await interaction.editReply({
-				content: `Failed to get chain info`,
+				content: `Failed with error: ${error}`,
 			});
+			return `Failed with error: ${
+				error instanceof Error && error.message
+			}`;
 		}
 	},
 };

tooling/sparta/src/commands/addValidator.ts

@@ -0,0 +1,75 @@
+import {
+	SlashCommandBuilder,
+	ChatInputCommandInteraction,
+	MessageFlags,
+} from "discord.js";
+import { ChainInfoService } from "../services/chaininfo-service.js";
+
+export default {
+	data: new SlashCommandBuilder()
+		.setName("validator")
+		.setDescription("Manage validator addresses")
+		.addSubcommand((subcommand) =>
+			subcommand
+				.setName("check")
+				.setDescription("Check if you are a validator")
+				.addStringOption((option) =>
+					option
+						.setName("address")
+						.setDescription("The validator address to check")
+				)
+		),
+
+	execute: async (
+		interaction: ChatInputCommandInteraction
+	): Promise<string> => {
+		try {
+			const address = interaction.options.getString("address");
+			if (!address) {
+				await interaction.reply({
+					content: "Address is required.",
+					flags: MessageFlags.Ephemeral,
+				});
+				return `Address not provided`;
+			}
+
+			// Basic address validation
+			if (!address.match(/^0x[a-fA-F0-9]{40}$/)) {
+				await interaction.reply({
+					content: "Please provide a valid Ethereum address.",
+					flags: MessageFlags.Ephemeral,
+				});
+				return `Invalid address`;
+			}
+
+			await interaction.deferReply({ flags: MessageFlags.Ephemeral });
+
+			if (interaction.options.getSubcommand() === "check") {
+				const info = await ChainInfoService.getInfo();
+				const { validators, committee } = info;
+
+				let reply = "";
+				if (validators.includes(address)) {
+					reply += "You are a validator\n";
+				}
+				if (committee.includes(address)) {
+					reply += "You are a committee member\n";
+				}
+
+				await interaction.editReply({
+					content:
+						reply || "You are not a validator or committee member",
+				});
+				return `Checked validator ${address}`;
+			}
+			return `Unknown subcommand`;
+		} catch (error) {
+			await interaction.editReply({
+				content: `Failed to check validator address`,
+			});
+			return `Failed with error: ${
+				error instanceof Error && error.message
+			}`;
+		}
+	},
+};

tooling/sparta/src/commands/checkValidator.ts

@@ -16,7 +16,6 @@ export default {
 		});
 
 		try {
-			console.log("Getting chain info");
 			const {
 				pendingBlockNum,
 				provenBlockNum,
@@ -28,11 +27,14 @@ export default {
 			await interaction.editReply({
 				content: `Pending block: ${pendingBlockNum}\nProven block: ${provenBlockNum}\nCurrent epoch: ${currentEpoch}\nCurrent slot: ${currentSlot}\nProposer now: ${proposerNow}`,
 			});
+			return `Got chain info`;
 		} catch (error) {
-			console.error("Error in get-info command:", error);
 			await interaction.editReply({
 				content: `Failed to get chain info`,
 			});
+			return `Failed with error: ${
+				error instanceof Error && error.message
+			}`;
 		}
 	},
 };

tooling/sparta/src/commands/getChainInfo.ts

@@ -1,4 +1,4 @@
-import addValidator from "./addValidator.js";
+import addValidator from "./checkValidator.js";
 import getChainInfo from "./getChainInfo.js";
 
 export default { addValidator, getChainInfo };

tooling/sparta/src/commands/index.ts

@@ -10,6 +10,7 @@ import {
 	Collection,
 	Interaction,
 	MessageFlags,
+	TextChannel,
 } from "discord.js";
 import { deployCommands } from "../utils/deploy-commands.js";
 import usersCommands from "../commands/index.js";
@@ -66,8 +67,16 @@ client.on("interactionCreate", async (interaction: Interaction) => {
 	if (!command) return;
 
 	try {
-		console.log("Executing command:", command.data.name);
-		await command.execute(interaction);
+		const channel = interaction.channel as TextChannel;
+
+		const reply = await command.execute(interaction);
+		console.log("Command:", {
+			name: interaction.commandName,
+			channel: channel.name,
+			user: interaction.user.username,
+			date: interaction.createdAt,
+			result: reply,
+		});
 	} catch (error) {
 		console.error(error);
 		await interaction.reply({

tooling/sparta/src/discord/index.ts

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+docker run aztecprotocol/aztec:1dc66419e0e7e1543bee081471701f90192fa33e get-node-info --node-url {$1}:8080 --json