test script and env fix

Author: iamyxsh

scripts/dispenser-tests/dispenser.test.ts

@@ -67,7 +67,7 @@ describe('ERC20 Vault Integration', () => {
       ENV.SUBSTRATE_CHAIN_ID,
     )
 
-    const derived = deriveEthAddress()
+    const derived = deriveEthAddress(DISPENSER_SIGNING_PATH, palletSS58Prefix0)
     derivedEthAddress = derived.derivedEthAddress
     derivedPubKey = derived.derivedPubKey
 

scripts/dispenser-tests/env.ts

@@ -90,6 +90,9 @@ const GAS_LIMIT = envBigInt('GAS_LIMIT', 100_000n)
 const DEFAULT_MAX_FEE_PER_GAS = envBigInt('DEFAULT_MAX_FEE_PER_GAS', 30_000_000_000n)
 const DEFAULT_MAX_PRIORITY_FEE_PER_GAS = envBigInt('DEFAULT_MAX_PRIORITY_FEE_PER_GAS', 2_000_000_000n)
 
+const FAUCET_OWNER_KEY = env('FAUCET_OWNER_KEY')
+const EVM_FUNDER_KEY = env('EVM_FUNDER_KEY')
+
 // Validate critical values
 if (!ethers.isAddress(FAUCET_ADDRESS)) throw new Error(`Invalid FAUCET_ADDRESS: ${FAUCET_ADDRESS}`)
 if (!ethers.isAddress(TARGET_ADDRESS)) throw new Error(`Invalid TARGET_ADDRESS: ${TARGET_ADDRESS}`)
@@ -109,6 +112,8 @@ export const ENV = {
   EVM_CHAIN_ID,
   ROOT_PUBLIC_KEY,
   FAUCET_ADDRESS,
+  FAUCET_OWNER_KEY,
+  EVM_FUNDER_KEY,
 
   // Test params
   TARGET_ADDRESS,

scripts/dispenser-tests/key-derivation.ts

@@ -6,13 +6,15 @@ export class KeyDerivation {
 
   static derivePublicKey(
     rootPublicKey: string,
+    predecessorId: string,
+    path: string,
     chainId: string
   ): string {
     const ec = new EC("secp256k1");
 
     const uncompressedRoot = rootPublicKey.slice(4);
 
-    const derivationPath = `${this.EPSILON_PREFIX},${chainId}`;
+    const derivationPath = `${this.EPSILON_PREFIX},${chainId},${predecessorId},${path}`;
     const hash = ethers.keccak256(ethers.toUtf8Bytes(derivationPath));
     const scalarHex = hash.slice(2);
 

scripts/dispenser-tests/utils.ts

@@ -682,12 +682,17 @@ async function ensureAliceHasFaucetAsset(
   console.log(`Alice faucet asset (${faucetAsset}) balance after mint: ${afterBal}`)
 }
 
-export function deriveEthAddress(): {
+export function deriveEthAddress(
+  path: string,
+  palletSS58: string,
+): {
   derivedPubKey: string
   derivedEthAddress: string
 } {
   const derivedPubKey = KeyDerivation.derivePublicKey(
     ENV.ROOT_PUBLIC_KEY,
+    palletSS58,
+    path,
     ENV.SUBSTRATE_CHAIN_ID,
   )
 
@@ -716,11 +721,12 @@ export async function ensureDerivedEthHasGas(
 
   if (ethBalance >= estimatedGas) return
 
-  if (ENV.EVM_NETWORK === 'anvil') {
-    const ANVIL_DEFAULT_KEY = '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
-    const funder = new ethers.Wallet(ANVIL_DEFAULT_KEY, provider)
+  const ANVIL_DEFAULT_KEY = '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
+  const funderKey = ENV.EVM_NETWORK === 'anvil' ? ANVIL_DEFAULT_KEY : ENV.EVM_FUNDER_KEY
+  if (funderKey) {
+    const funder = new ethers.Wallet(funderKey, provider)
     const fundAmount = estimatedGas * 10n
-    console.log(`Funding ${derivedEthAddress} with ${ethers.formatEther(fundAmount)} ETH from Anvil account...`)
+    console.log(`Funding ${derivedEthAddress} with ${ethers.formatEther(fundAmount)} ETH...`)
     const tx = await funder.sendTransaction({ to: derivedEthAddress, value: fundAmount })
     await tx.wait()
     console.log(`Funded. Tx: ${tx.hash}`)
@@ -731,7 +737,7 @@ export async function ensureDerivedEthHasGas(
     `Insufficient ETH at ${derivedEthAddress}\n` +
       `   Need: ${ethers.formatEther(estimatedGas)} ETH\n` +
       `   Have: ${ethers.formatEther(ethBalance)} ETH\n` +
-      `   Please fund this address with ETH for gas`,
+      `   Fund this address with ETH for gas, or set EVM_FUNDER_KEY to auto-fund`,
   )
 }
 
@@ -759,7 +765,15 @@ export async function ensureFaucetMpcAddress(
 
   console.log(`Setting faucet MPC to derived address ${derivedEthAddress}...`)
   // Use Anvil account 0 (deployer/owner) to call setMPC
-  const ownerKey = '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
+  const ANVIL_OWNER_KEY = '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
+  const ownerKey = ENV.EVM_NETWORK === 'anvil' ? ANVIL_OWNER_KEY : ENV.FAUCET_OWNER_KEY
+  if (!ownerKey) {
+    throw new Error(
+      `Faucet MPC is ${currentMpc} but derived address is ${derivedEthAddress}.\n` +
+        `   Set FAUCET_OWNER_KEY (owner of ${ENV.FAUCET_ADDRESS}) to auto-setMPC, ` +
+        `or call setMPC(${derivedEthAddress}) manually from the owner.`,
+    )
+  }
   const ownerWallet = new ethers.Wallet(ownerKey, provider)
   const contractWithSigner = faucetContract.connect(ownerWallet)
   const tx = await (contractWithSigner as any).setMPC(derivedEthAddress)
@@ -860,14 +874,15 @@ export async function executeAsRoot(
     return
   }
 
-  // Try TC path first — much faster than governance referendum
   const isTcMember = await isSignerTcMember(api, signer)
   if (isTcMember) {
-    await executeViaTechCommittee(api, signer, call, label)
-    return
+    const applied = await executeViaTechCommittee(api, signer, call, label)
+    if (applied) return
+    console.log(`${label}: TC motion did not apply the call (needs Root); falling back to referendum`)
+  } else {
+    console.log(`${label}: signer is not a TC member, using referendum`)
   }
 
-  console.log(`${label}: signer is not a TC member, falling back to referendum`)
   await executeAsRootViaReferendum(api, signer, call, label)
 }
 
@@ -953,7 +968,7 @@ async function executeViaTechCommittee(
   signer: any,
   call: SubmittableExtrinsic<'promise'>,
   label: string,
-) {
+): Promise<boolean> {
   const members = await (api.query as any).technicalCommittee.members()
   const memberList = members.toJSON() as string[]
   const memberCount = memberList.length
@@ -981,20 +996,26 @@ async function executeViaTechCommittee(
     }
   }
 
-  // Check if the call was executed (Executed event = threshold was 1 or auto-closed)
-  const executed = result.events.some(
-    (r: any) =>
-      r.event.section === 'technicalCommittee' &&
-      (r.event.method === 'Executed' || r.event.method === 'Closed'),
-  )
+  for (const { event } of result.events) {
+    if (event.section === 'technicalCommittee' && event.method === 'Executed') {
+      const res: any = (event.data as any).result ?? event.data[1]
+      if (res && res.isErr) {
+        console.warn(`${label}: TC motion executed but inner call failed: ${res.asErr.toString()}`)
+        return false
+      }
+      console.log(`${label}: TC proposal executed immediately`)
+      return true
+    }
+  }
 
-  if (executed) {
-    console.log(`${label}: TC proposal executed immediately`)
-  } else if (threshold > 1) {
+  if (threshold > 1) {
     console.log(`${label}: TC proposal needs ${threshold - 1} more Aye votes from other members`)
     // Poll for execution (other TC members may vote via separate process)
     await pollForTcExecution(api, result, label)
+    return true
   }
+
+  return false
 }
 
 /**

scripts/dispenser-tests/validate-mint.ts

@@ -0,0 +1,49 @@
+import { waitReady } from '@polkadot/wasm-crypto'
+import {
+  createApi,
+  createKeyringAndAccounts,
+  executeAsRoot,
+  getTokenFree,
+} from './utils'
+
+async function main() {
+  await waitReady()
+  const api = await createApi()
+
+  const faucetAsset = (api.consts.ethDispenser.faucetAsset as any).toNumber()
+  const { alice } = createKeyringAndAccounts()
+
+  const before = await getTokenFree(api, alice.address, faucetAsset)
+  console.log(`\n[validate] Alice = ${alice.address}`)
+  console.log(`[validate] asset ${faucetAsset} BEFORE = ${before.toString()}`)
+
+  const mintAmount = 1_000_000_000_000_000n // 0.001 WETH (18 decimals)
+  const mintCall = (api.tx as any).currencies.updateBalance(
+    alice.address,
+    faucetAsset,
+    mintAmount.toString(),
+  )
+
+  console.log(`[validate] minting ${mintAmount} via executeAsRoot (TC → referendum fallback)...`)
+  await executeAsRoot(api, alice, mintCall, 'VALIDATE mint faucet asset to Alice')
+
+  const after = await getTokenFree(api, alice.address, faucetAsset)
+  const delta = after - before
+  console.log(`[validate] asset ${faucetAsset} AFTER  = ${after.toString()}`)
+  console.log(`[validate] delta = ${delta.toString()}`)
+  console.log(
+    `[validate] RESULT = ${
+      delta > 0n
+        ? 'PASS ✅ balance increased — executeAsRoot applied the Root call'
+        : 'NO-CHANGE ❌ Root call did not apply within the poll window (see log above)'
+    }`,
+  )
+
+  await api.disconnect()
+  process.exit(delta > 0n ? 0 : 2)
+}
+
+main().catch((e) => {
+  console.error('[validate] FATAL', e)
+  process.exit(1)
+})