ava-labs · navillanueva · Nov 21, 2025 · Sep 12, 2025 · Sep 25, 2025 · Sep 25, 2025
@@ -100,12 +100,12 @@ export default function ConsoleHistoryPage() {
           type: 'address'
         });
       }
-      if (toolboxStore.stakingManagerAddress && toolboxStore.stakingManagerAddress !== '') {
+      if (toolboxStore.nativeStakingManagerAddress && toolboxStore.nativeStakingManagerAddress !== '') {
         items.push({
-          id: 'tb-staking-mgr',
-          title: 'Staking Manager',
+          id: 'tb-native-staking-mgr',
+          title: 'Native Token Staking Manager',
           description: 'Deployed Contract',
-          address: toolboxStore.stakingManagerAddress,
+          address: toolboxStore.nativeStakingManagerAddress,
           chainId,
           type: 'address'
         });

@@ -0,0 +1,15 @@
+"use client";
+
+import StepFlow from "@/components/console/step-flow";
+import { steps } from "../steps";
+
+export default function NativeStakingManagerSetupClientPage({ currentStepKey }: { currentStepKey: string }) {
+    const basePath = "/console/permissionless-l1s/native-staking-manager-setup";
+    return (
+        <StepFlow
+            steps={steps}
+            basePath={basePath}
+            currentStepKey={currentStepKey}
+        />
+    );
+}
@@ -0,0 +1,8 @@
+import NativeStakingManagerSetupClientPage from "./client-page";
+
+export default async function Page({ params }: { params: Promise<{ step: string }> }) {
+    const { step } = await params;
+    return (
+        <NativeStakingManagerSetupClientPage currentStepKey={step} />
+    );
+}
@@ -0,0 +1,7 @@
+import { redirect } from "next/navigation";
+
+export default function Page() {
+  redirect("/console/permissionless-l1s/native-staking-manager-setup/deploy-native-token-staking-manager");
+}
+
+
@@ -0,0 +1,26 @@
+import { type StepDefinition } from "@/components/console/step-flow";
+import ReadContract from "@/components/toolbox/console/permissioned-l1s/validator-manager-setup/ReadContract";
+import DeployNativeTokenStakingManager from "@/components/toolbox/console/permissionless-l1s/setup/native/DeployNativeStakingManager";
+import InitializeNativeTokenStakingManager from "@/components/toolbox/console/permissionless-l1s/setup/native/InitializeNativeStakingManager";
+import DeployExampleRewardCalculator from "@/components/toolbox/console/permissionless-l1s/setup/DeployExampleRewardCalculator";
+import TransferOwnershipToStakingManager from "@/components/toolbox/console/permissionless-l1s/setup/TransferOwnershipToStakingManager";
+import EnableStakingManagerMinting from "@/components/toolbox/console/permissionless-l1s/setup/native/EnableStakingManagerMinting";
+
+export const steps: StepDefinition[] = [
+    {
+        type: "single",
+        key: "deploy-native-token-staking-manager",
+        title: "Deploy Staking Manager",
+        component: DeployNativeTokenStakingManager,
+    },
+    { type: "single", key: "deploy-example-reward-calculator", title: "Deploy Example Reward Calculator", component: DeployExampleRewardCalculator },
+    {
+        type: "single",
+        key: "initialize-native-staking-manager",
+        title: "Initialize Staking Manager",
+        component: InitializeNativeTokenStakingManager,
+    },
+    { type: "single", key: "enable-staking-minting", title: "Enable StakingManager in Native Minter", component: EnableStakingManagerMinting },
+    { type: "single", key: "transfer-ownership", title: "Transfer Ownership to Staking Manager", component: TransferOwnershipToStakingManager },
+    { type: "single", key: "read-contract", title: "Read Contract", component: ReadContract },
+];
@@ -230,16 +230,9 @@ const data = {
       icon: Globe,
       items: [
         {
-          title: "Migrate from Permissioned L1",
-          url: "/console/permissionless-l1s/deploy-reward-manager",
+          title: "Native Staking Manager Setup",
+          url: "/console/permissionless-l1s/native-staking-manager-setup",
           icon: GitMerge,
-          comingSoon: true,
-        },
-        {
-          title: "Stake & Unstake",
-          url: "/console/permissionless-l1s/manage-validators",
-          icon: Hexagon,
-          comingSoon: true,
         },
       ],
     },

@@ -15,18 +15,20 @@ function SetEnabledComponent({
   precompileType = "precompiled contract",
   abi = allowListAbi.abi,
   onSuccess,
+  defaultAddress,
 }: {
   precompileAddress: string;
   precompileType?: string;
   abi?: any;
   onSuccess?: () => void;
+  defaultAddress?: string;
 }) {
   const { publicClient, walletEVMAddress, walletChainId } =
     useWalletStore();
   const { coreWalletClient } = useConnectedWallet();
   const viemChain = useViemChainStore();
   const [isProcessing, setIsProcessing] = useState(false);
-  const [enabledAddress, setEnabledAddress] = useState<string>("");
+  const [enabledAddress, setEnabledAddress] = useState<string>(defaultAddress || "");
   const [txHash, setTxHash] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
 
@@ -523,11 +525,13 @@ export function AllowlistComponent({
   precompileType = "precompiled contract",
   abi = allowListAbi.abi,
   onSuccess,
+  defaultEnabledAddress,
 }: {
   precompileAddress: string;
   precompileType?: string;
   abi?: any;
   onSuccess?: () => void;
+  defaultEnabledAddress?: string;
 }) {
   return (
     <div className="space-y-6">
@@ -538,6 +542,7 @@ export function AllowlistComponent({
             precompileType={precompileType}
             abi={abi}
             onSuccess={onSuccess}
+            defaultAddress={defaultEnabledAddress}
           />
           <SetManagerComponent
             precompileAddress={precompileAddress}

@@ -116,4 +116,4 @@ export const CheckPrecompile = ({
     }
 
     return <>{children}</>;
-}; 
+}; 
@@ -29,6 +29,7 @@ interface ValidatorListInputProps {
   maxValidators?: number;
   selectedSubnetId?: string | null;
   isTestnet?: boolean;
+  hideConsensusWeight?: boolean;
 }
 
 export function ValidatorListInput({
@@ -42,6 +43,7 @@ export function ValidatorListInput({
   maxValidators,
   selectedSubnetId = null,
   isTestnet = false,
+  hideConsensusWeight = false,
 }: ValidatorListInputProps) {
 
   const [error, setError] = useState<string | null>(null)
@@ -85,6 +87,7 @@ export function ValidatorListInput({
           onChange={onChange}
           l1TotalInitializedWeight={l1TotalInitializedWeight}
           userPChainBalanceNavax={userPChainBalanceNavax}
+          hideConsensusWeight={hideConsensusWeight}
         />
       </div>
     </div>

@@ -14,6 +14,7 @@ interface Props {
   onUpdate: (index: number, updated: Partial<ConvertToL1Validator>) => void
   l1TotalInitializedWeight?: bigint | null
   userPChainBalanceNavax?: bigint | null
+  hideConsensusWeight?: boolean
 }
 
 export function ValidatorItem({
@@ -25,6 +26,7 @@ export function ValidatorItem({
   onUpdate,
   l1TotalInitializedWeight = null,
   userPChainBalanceNavax = null,
+  hideConsensusWeight = false,
 }: Props) {
 
   let insufficientBalanceError: string | null = null
@@ -89,29 +91,31 @@ export function ValidatorItem({
             />
           </div>
 
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
-            <div className="space-y-2">
-              <label className="block text-sm font-medium text-zinc-700 dark:text-zinc-300">
-                Consensus Weight
-              </label>
-              <input
-                type="number"
-                value={validator.validatorWeight.toString()}
-                onChange={(e) => onUpdate(index, { validatorWeight: BigInt(e.target.value || 0) })}
-                className={cn(
-                  "w-full rounded p-2",
-                  "bg-zinc-50 dark:bg-zinc-900",
-                  "border border-zinc-200 dark:border-zinc-700",
-                  "text-zinc-900 dark:text-zinc-100",
-                  "shadow-sm focus:ring focus:ring-primary/30 focus:ring-opacity-50",
+          <div className={cn("grid gap-3", hideConsensusWeight ? "grid-cols-1" : "grid-cols-1 md:grid-cols-2")}>
+            {!hideConsensusWeight && (
+              <div className="space-y-2">
+                <label className="block text-sm font-medium text-zinc-700 dark:text-zinc-300">
+                  Consensus Weight
+                </label>
+                <input
+                  type="number"
+                  value={validator.validatorWeight.toString()}
+                  onChange={(e) => onUpdate(index, { validatorWeight: BigInt(e.target.value || 0) })}
+                  className={cn(
+                    "w-full rounded p-2",
+                    "bg-zinc-50 dark:bg-zinc-900",
+                    "border border-zinc-200 dark:border-zinc-700",
+                    "text-zinc-900 dark:text-zinc-100",
+                    "shadow-sm focus:ring focus:ring-primary/30 focus:ring-opacity-50",
+                  )}
+                />
+                {hasWeightError && (
+                  <p className="text-xs mt-1 text-red-500 dark:text-red-400">
+                    Warning: This validator's weight is 20% or more of the current L1 total stake ({ Number(validator.validatorWeight * 10000n / l1TotalInitializedWeight / 100n).toFixed(2) }%). Recommended to be less than 20%.
+                  </p>
                 )}
-              />
-              {hasWeightError && (
-                <p className="text-xs mt-1 text-red-500 dark:text-red-400">
-                  Warning: This validator's weight is 20% or more of the current L1 total stake ({ Number(validator.validatorWeight * 10000n / l1TotalInitializedWeight / 100n).toFixed(2) }%). Recommended to be less than 20%.
-                </p>
-              )}
-            </div>
+              </div>
+            )}
             <div className="space-y-2">
               <label className="block text-sm font-medium text-zinc-700 dark:text-zinc-300">
                 Validator Balance (P-Chain AVAX)

@@ -9,9 +9,10 @@ interface Props {
   onChange: (validators: ConvertToL1Validator[]) => void
   l1TotalInitializedWeight?: bigint | null
   userPChainBalanceNavax?: bigint | null
+  hideConsensusWeight?: boolean
 }
 
-export function ValidatorsList({ validators, onChange, l1TotalInitializedWeight = null, userPChainBalanceNavax = null }: Props) {
+export function ValidatorsList({ validators, onChange, l1TotalInitializedWeight = null, userPChainBalanceNavax = null, hideConsensusWeight = false }: Props) {
   const [expandedIndex, setExpandedIndex] = useState<number | null>(null)
 
   const toggleExpand = (index: number) => {
@@ -45,6 +46,7 @@ export function ValidatorsList({ validators, onChange, l1TotalInitializedWeight
           onUpdate={updateValidator}
           l1TotalInitializedWeight={l1TotalInitializedWeight}
           userPChainBalanceNavax={userPChainBalanceNavax}
+          hideConsensusWeight={hideConsensusWeight}
         />
       ))}
     </div>

@@ -23,11 +23,11 @@ import {
   ShieldCheck,
   ShieldUser,
   SquareTerminal,
-  Hexagon,
   SlidersVertical,
   SquareMinus,
   SquarePlus,
   BookKey,
+  Hexagon,
 } from "lucide-react";
 
 import {
@@ -178,16 +178,9 @@ const data = {
       icon: Globe,
       items: [
         {
-          title: "Migrate from Permissioned L1",
-          url: "/console/permissionless-l1s/deploy-reward-manager",
+          title: "Native Staking Manager Setup",
+          url: "/console/permissionless-l1s/native-staking-manager-setup",
           icon: GitMerge,
-          comingSoon: true,
-        },
-        {
-          title: "Stake & Unstake",
-          url: "/console/permissionless-l1s/manage-validators",
-          icon: Hexagon,
-          comingSoon: true,
         },
       ],
     },

@@ -9,6 +9,7 @@ import { packWarpIntoAccessList } from '@/components/toolbox/console/permissione
 import { hexToBytes, bytesToHex } from 'viem';
 import validatorManagerAbi from '@/contracts/icm-contracts/compiled/ValidatorManager.json';
 import poaManagerAbi from '@/contracts/icm-contracts/compiled/PoAManager.json';
+import nativeTokenStakingManagerAbi from '@/contracts/icm-contracts/compiled/NativeTokenStakingManager.json';
 import { packL1ValidatorRegistration } from '@/components/toolbox/coreViem/utils/convertWarp';
 import { getValidationIdHex } from '@/components/toolbox/coreViem/hooks/getValidationID';
 import { useAvalancheSDKChainkit } from '@/components/toolbox/stores/useAvalancheSDKChainkit';
@@ -61,8 +62,18 @@ const CompleteValidatorRegistration: React.FC<CompleteValidatorRegistrationProps
 
   // Determine target contract and ABI based on ownerType
   const useMultisig = ownerType === 'PoAManager';
-  const targetContractAddress = useMultisig ? contractOwner : validatorManagerAddress;
-  const targetAbi = useMultisig ? poaManagerAbi.abi : validatorManagerAbi.abi;
+  const useStakingManager = ownerType === 'StakingManager';
+
+  // For both PoAManager and StakingManager, we use the contractOwner address
+  // For direct ValidatorManager (EOA owned), we use validatorManagerAddress
+  const targetContractAddress = (useMultisig || useStakingManager) ? contractOwner : validatorManagerAddress;
+
+  // Select the appropriate ABI based on owner type
+  const targetAbi = useMultisig 
+    ? poaManagerAbi.abi 
+    : useStakingManager 
+      ? nativeTokenStakingManagerAbi.abi 
+      : validatorManagerAbi.abi;
 
   // Initialize state with prop value when it becomes available
   useEffect(() => {
@@ -90,7 +101,7 @@ const CompleteValidatorRegistration: React.FC<CompleteValidatorRegistrationProps
       onError("Validator Manager address is not set. Check L1 Subnet selection.");
       return;
     }
-    if (ownershipState === 'differentEOA' && !useMultisig) {
+    if (ownershipState === 'differentEOA' && !useMultisig && !useStakingManager) {
       setErrorState("You are not the contract owner. Please contact the contract owner.");
       onError("You are not the contract owner. Please contact the contract owner.");
       return;
@@ -100,6 +111,11 @@ const CompleteValidatorRegistration: React.FC<CompleteValidatorRegistrationProps
       onError("PoAManager address could not be fetched. Please ensure the ValidatorManager is owned by a PoAManager.");
       return;
     }
+    if (useStakingManager && !contractOwner?.trim()) {
+      setErrorState("StakingManager address could not be fetched. Please ensure the ValidatorManager is owned by a StakingManager.");
+      onError("StakingManager address could not be fetched. Please ensure the ValidatorManager is owned by a StakingManager.");
+      return;
+    }
     if (!coreWalletClient || !publicClient || !viemChain || !coreWalletClient.account) {
       setErrorState("Wallet or chain configuration is not properly initialized.");
       onError("Wallet or chain configuration is not properly initialized.");
@@ -122,9 +138,31 @@ const CompleteValidatorRegistration: React.FC<CompleteValidatorRegistrationProps
       });
 
       // Step 2: Get validation ID from contract using nodeID
+      // For StakingManager, we need to query the underlying ValidatorManager
+      let validationIdQueryAddress = validatorManagerAddress;
+
+      if (useStakingManager && contractOwner) {
+        // Get the underlying ValidatorManager address from StakingManager settings
+        try {
+          const settings = await publicClient.readContract({
+            address: contractOwner as `0x${string}`,
+            abi: nativeTokenStakingManagerAbi.abi,
+            functionName: 'getStakingManagerSettings',
+          }) as any;
+
+          validationIdQueryAddress = settings.manager; // This is the actual ValidatorManager
+          console.log('[StakingManager] Querying ValidatorManager for validation ID:', validationIdQueryAddress);
+        } catch (err) {
+          console.warn("Failed to get ValidatorManager from StakingManager settings, using default:", err);
+        }
+      }
+
+      console.log('[CompleteValidatorRegistration] Querying validation ID from:', validationIdQueryAddress);
+      console.log('[CompleteValidatorRegistration] NodeID:', registrationMessageData.nodeID);
+
       const validationId = await getValidationIdHex(
         publicClient,
-        validatorManagerAddress as `0x${string}`,
+        validationIdQueryAddress as `0x${string}`,
         registrationMessageData.nodeID
       );
 
@@ -149,6 +187,7 @@ const CompleteValidatorRegistration: React.FC<CompleteValidatorRegistrationProps
 
       // Step 4: Get justification for the validation
       // For validator registration, we need to find the original registration message
+      // Note: Justification is always fetched from logs, which would be on the chain regardless of contract
       const justification = await GetRegistrationJustification(
         validationId, // Use the actual validation ID instead of converting nodeID
         subnetIdL1,
@@ -254,7 +293,7 @@ const CompleteValidatorRegistration: React.FC<CompleteValidatorRegistrationProps
 
       <Button
         onClick={handleCompleteRegisterValidator}
-        disabled={isProcessing || !pChainTxIdState.trim() || !!successMessage || (ownershipState === 'differentEOA' && !useMultisig) || isLoadingOwnership}
+        disabled={isProcessing || !pChainTxIdState.trim() || !!successMessage || (ownershipState === 'differentEOA' && !useMultisig && !useStakingManager) || isLoadingOwnership}
       >
         {isLoadingOwnership ? 'Checking ownership...' : (isProcessing ? 'Processing...' : 'Sign & Complete Validator Registration')}
       </Button>
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,4 +116,4 @@ export const CheckPrecompile = ({ @@
         }
         return <>{children}</>;
-    };
+    };