Merge pull request #7 from GitGab19/main

Add SRI mainnet endpoints to wizard + improvements in binaries deployment steps + Demand Pool renaming + other improvements

Author: GitGab19

package-lock.json

@@ -14,7 +14,7 @@
  * Available pools:
  * - SRI Community Pool: mainnet & testnet4
  * - Braiins Pool: mainnet (non-JD only)
- * - Demand Pool: mainnet (JD or non-JD)
+ * - DMND Pool: mainnet (JD or non-JD)
  */
 
 import { Wizard, WizardConfig } from "./components/ui/wizard-framework";
@@ -66,8 +66,7 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
       description: "Which network will your Bitcoin Node operate on?",
       options: [
         { id: 'opt_main', label: "Mainnet", subLabel: "Production Network", value: "mainnet", nextStepId: "bitcoin_guide_mainnet", icon: Globe },
-        { id: 'opt_test', label: "Testnet4", subLabel: "Testing Network", value: "testnet4", nextStepId: "bitcoin_guide_testnet", icon: Activity },
-        { id: 'opt_sig', label: "Signet", subLabel: "Developer Network", value: "signet", nextStepId: "bitcoin_guide_signet", icon: Terminal, warning: "Coming soon", disabled: true }
+        { id: 'opt_test', label: "Testnet4", subLabel: "Testing Network", value: "testnet4", nextStepId: "bitcoin_guide_testnet", icon: Activity }
       ]
     },
     bitcoin_guide_mainnet: { 
@@ -84,13 +83,6 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
       nextStepId: 'select_pool_construct_testnet4',
       component: <BitcoinSetupContent network="testnet4" showBitcoinConf={false} />
     },
-    bitcoin_guide_signet: { 
-      id: 'bitcoin_guide_signet', 
-      type: 'instruction', 
-      title: "Bitcoin Core Setup (Signet)", 
-      nextStepId: 'select_pool_construct_mainnet',
-      component: <BitcoinSetupContent network="signet" showBitcoinConf={false} />
-    },
     select_pool_construct_mainnet: {
       id: 'select_pool_construct_mainnet',
       type: 'question',
@@ -107,20 +99,18 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
           iconUrl: getPoolConfig("community_sri")?.iconUrl,
           badge: "Testing",
           badgeColor: "blue",
-          warning: "Not for production use – rewards are not paid out."
+          warning: "Not for production use – any blocks found will be donated to the SRI project"
         },
         { 
           id: 'pool_demand', 
-          label: "DEMAND", 
-          subLabel: "Work in progress", 
+          label: "DMND",  
           value: "demand", 
           nextStepId: "jd_client_configuration", 
           icon: Zap,
           iconUrl: getPoolConfig("demand")?.iconUrl,
-          badge: "Soon",
-          badgeColor: "orange",
-          warning: "This option is coming soon.",
-          disabled: true
+          warning: "Pool for registered businesses only at the moment",
+          disabled: true,
+          url: "https://dmnd.work/"
         }
       ]
     },
@@ -140,7 +130,7 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
           iconUrl: getPoolConfig("community_sri")?.iconUrl,
           badge: "Testing",
           badgeColor: "blue",
-          warning: "Not for production use – rewards are not paid out."
+          warning: "Not for production use – any blocks found will be donated to the SRI project"
         }
       ]
     },
@@ -160,7 +150,7 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
           iconUrl: getPoolConfig("community_sri")?.iconUrl,
           badge: "Testing",
           badgeColor: "blue",
-          warning: "Not for production use – no share accounting / no payouts."
+          warning: "Not for production use – any blocks found will be donated to the SRI project."
         },
         { 
           id: 'pool_braiins', 
@@ -173,16 +163,14 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
         },
         { 
           id: 'pool_demand', 
-          label: "DEMAND", 
-          subLabel: "Work in progress", 
+          label: "DMND",
           value: "demand", 
           nextStepId: "translator_proxy_configuration", 
           icon: Zap,
           iconUrl: getPoolConfig("demand")?.iconUrl,
-          badge: "Soon",
-          badgeColor: "orange",
-          warning: "Coming soon.",
-          disabled: true
+          warning: "Pool for registered businesses only at the moment",
+          disabled: true,
+          url: "https://dmnd.work/"
         }
       ]
     },
@@ -199,9 +187,10 @@ const POOL_CONNECTION_WIZARD_CONFIG: WizardConfig = {
           value: "community_sri", 
           nextStepId: "translator_proxy_configuration", 
           icon: Globe,
+          iconUrl: getPoolConfig("community_sri")?.iconUrl,
           badge: "Testing",
           badgeColor: "blue",
-          warning: "Not for production use – no share accounting / no payouts."
+          warning: "Not for production use – any blocks found will be donated to the SRI project"
         }
       ]
     },

src/PoolConnectionWizard.tsx

@@ -38,19 +38,22 @@ export const WizardStepCard: React.FC<WizardStepCardProps> = ({
           {step.options?.map((option) => {
             const Icon = getIcon(option.iconName, option.icon);
             const isDisabled = option.disabled;
+            const hasUrl = !!option.url;
+            const Component = isDisabled && hasUrl ? 'div' : 'button';
             return (
-              <button
+              <Component
                 key={option.value}
-                type="button"
-                disabled={isDisabled}
+                {...(Component === 'button' ? { type: 'button', disabled: isDisabled } : {})}
                 onClick={() => {
                   if (!isDisabled) {
                     onOptionSelect(option.nextStepId, option.value);
+                  } else if (hasUrl) {
+                    window.open(option.url, '_blank', 'noopener,noreferrer');
                   }
                 }}
                 className={cn(
                   "group relative flex flex-col items-center justify-center p-8 rounded-xl border border-border/50 bg-card/30 transition-all duration-300 text-left md:text-center h-full",
-                  isDisabled
+                  isDisabled && !hasUrl
                     ? "opacity-60 cursor-not-allowed"
                     : "hover:bg-card/80 hover:border-primary/50 hover:shadow-[0_0_30px_-10px_rgba(34,211,238,0.3)] cursor-pointer"
                 )}
@@ -107,7 +110,7 @@ export const WizardStepCard: React.FC<WizardStepCardProps> = ({
                   </span>
                 )}
                 <div className="absolute inset-0 border-2 border-transparent group-hover:border-primary/20 rounded-xl transition-colors pointer-events-none" />
-              </button>
+              </Component>
             );
           })}
         </div>

src/components/ui/wizard-framework/WizardStepCard.tsx

@@ -17,6 +17,7 @@ export interface WizardOption {
   badgeColor?: "green" | "orange" | "blue" | "default";
   warning?: string;
   disabled?: boolean;
+  url?: string; // URL to open when option is clicked (for disabled options)
 }
 
 export interface WizardStep {

src/components/ui/wizard-framework/types.ts

@@ -22,7 +22,7 @@ import { getPoolConfig } from './pools';
  */
 export function buildJdClientConfig(data: ConfigTemplateData): string {
   const network = data.network || 'mainnet';
-  const selectedPoolConfig = getPoolConfig(data.selectedPool);
+  const selectedPoolConfig = getPoolConfig(data.selectedPool, network);
   const jdcPoolAddress = selectedPoolConfig?.address || DEFAULT_CONFIG_VALUES.localhost;
   const jdcPoolPort = selectedPoolConfig?.port || DEFAULT_CONFIG_VALUES.poolPort;
   const jdcJdsAddress = selectedPoolConfig?.jdsAddress || DEFAULT_CONFIG_VALUES.localhost;
@@ -69,7 +69,8 @@ export function buildTranslatorConfig(data: ConfigTemplateData, options?: {
     // Connecting to pool (pool templates)
     // In full stack: connects to local pool (127.0.0.1:34254)
     // In pool connection: connects to selected external pool
-    const poolConfig = getPoolConfig(data.selectedPool);
+    const network = data.network || 'mainnet';
+    const poolConfig = getPoolConfig(data.selectedPool, network);
     if (poolConfig) {
       // External pool (pool connection wizard)
       upstreamAddress = poolConfig.address;

src/config-templates/config-builder.ts

@@ -23,8 +23,7 @@ export const DEFAULT_CONFIG_VALUES = {
   // RPC ports by network
   rpcPorts: {
     mainnet: 8332,
-    testnet4: 48332,
-    signet: 38332
+    testnet4: 48332
   },
 
   // Addresses
@@ -39,18 +38,17 @@ export const DEFAULT_CONFIG_VALUES = {
   // Address placeholders
   addressPlaceholders: {
     mainnet: "bc1q...",
-    testnet4: "tb1q...",
-    signet: "bc1q..."
+    testnet4: "tb1q..."
   }
 } as const;
 
 // Network-specific RPC ports
-export function getRpcPort(network: 'mainnet' | 'testnet4' | 'signet' = 'mainnet'): number {
+export function getRpcPort(network: 'mainnet' | 'testnet4' = 'mainnet'): number {
   return DEFAULT_CONFIG_VALUES.rpcPorts[network];
 }
 
 // Get address placeholder for network
-export function getAddressPlaceholder(network: 'mainnet' | 'testnet4' | 'signet' = 'mainnet'): string {
+export function getAddressPlaceholder(network: 'mainnet' | 'testnet4' = 'mainnet'): string {
   return DEFAULT_CONFIG_VALUES.addressPlaceholders[network];
 }
 

src/config-templates/constants.ts

@@ -12,9 +12,8 @@
  *   - Non-JD mode only (uses pool's templates)
  *   - Leading mining pool provider
  * 
- * - demand: Demand Pool (mainnet only)
+ * - demand: DMND Pool (mainnet only)
  *   - Supports both JD and non-JD modes
- *   - Work in progress
  */
 
 import type { PoolConfig } from './types';
@@ -34,15 +33,25 @@ export const POOLS: Record<string, PoolConfig> = {
   community_sri: {
     name: "Community SRI Pool",
     address: "75.119.150.111",
-    port: 34254,
+    port: 3333, // Default (mainnet), will be overridden by network-specific configs
     authorityPubkey: "9auqWEzQDVyd2oe1JVGFLMLHZtCo2FFqZwtKA5gd9xbuEu7PH72",
     aggregateChannels: false,
     jdsAddress: "75.119.150.111",
-    jdsPort: 34264,
-    iconUrl: "https://stratumprotocol.org/assets/sv2-logo.png"
+    jdsPort: 3334, // Default (mainnet), will be overridden by network-specific configs
+    iconUrl: "https://stratumprotocol.org/assets/sv2-logo.png",
+    networks: {
+      mainnet: {
+        port: 3333,
+        jdsPort: 3334,
+      },
+      testnet4: {
+        port: 43333,
+        jdsPort: 43334,
+      }
+    }
   },
   demand: {
-    name: "DEMAND",
+    name: "DMND",
     address: "127.0.0.1", // Placeholder - update when available
     port: 34254,
     authorityPubkey: "9auqWEzQDVyd2oe1JVGFLMLHZtCo2FFqZwtKA5gd9xbuEu7PH72", // Placeholder
@@ -53,7 +62,10 @@ export const POOLS: Record<string, PoolConfig> = {
   }
 };
 
-export function getPoolConfig(poolValue: string | undefined): PoolConfig | null {
+export function getPoolConfig(
+  poolValue: string | undefined,
+  network?: 'mainnet' | 'testnet4'
+): PoolConfig | null {
   if (!poolValue) return null;
 
   // Map pool values to config keys
@@ -64,6 +76,18 @@ export function getPoolConfig(poolValue: string | undefined): PoolConfig | null
   };
 
   const poolKey = poolMap[poolValue];
-  return poolKey ? POOLS[poolKey] : null;
+  if (!poolKey || !POOLS[poolKey]) return null;
+  
+  const baseConfig = POOLS[poolKey];
+  
+  // If network is specified and pool has network-specific config, merge it
+  if (network && baseConfig.networks?.[network]) {
+    return {
+      ...baseConfig,
+      ...baseConfig.networks[network]
+    };
+  }
+  
+  return baseConfig;
 }