diff --git a/README.md b/README.md index 15edd24..5ada8c2 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,9 @@ while it is built. Each devnet's wallet host also runs: Console devnets can be upgraded (dash-network-go `upgrade-plan`/`upgrade`, Drive, DAPI, gateway, helper or Tenderdash, one validator at a time), have their services re-applied from Settings defaults, and be deleted (instances, disks, BYOIP -addresses, DNS; the journal record keeps the name reserved). +addresses, DNS). A deleted devnet's name can be used again: the new devnet starts from +empty files and a new registry entry, and dash-network-go replaces the EC2 journal +record only when that record shows the old network's addresses were released. **Platform wipe/redeploy** (admins, dashmate devnets including console-created dashnet deployments) follows the Platform reset rulebook: baseline and private backups on every HPMN and the seed, diff --git a/agent/agent.test.js b/agent/agent.test.js index 623340f..c688ad2 100644 --- a/agent/agent.test.js +++ b/agent/agent.test.js @@ -161,7 +161,8 @@ test('devnet requests: admin-only fields, permanent names, placement from settin assert.equal(d.subnetId, s.devnets.subnetId); assert.throws(() => validateDevnetRequest(s, { ...q, devnet: { subnetId: 'subnet-evil' } }, {}), /not settable/); assert.throws(() => validateDevnetRequest(s, { ...q, network: 'devnet-moutai' }, {}), /already exists/); - assert.throws(() => validateDevnetRequest(s, q, { 'devnet-bonsai': { status: 'deleted' } }), /already exists/); + assert.equal(validateDevnetRequest(s, q, { 'devnet-bonsai': { status: 'deleted' } }).validators, 15, 'a deleted devnet releases its name'); + for (const status of ['creating', 'services', 'ready', 'failed', 'deleting']) assert.throws(() => validateDevnetRequest(s, q, { 'devnet-bonsai': { status } }), /already exists/); assert.throws(() => validateDevnetRequest(s, { ...q, network: 'bonsai' }, {}), /devnet-/); assert.throws(() => validateDevnetRequest(s, { ...q, devnet: { validators: 7 } }, {}), /13..25/); assert.throws(() => validateDevnetRequest(s, { ...q, devnet: { images: { drive: 'evil/drive:1' } } }, {}), /images.drive/); @@ -556,3 +557,66 @@ test('dashmate-rendered devnets need an IPAM pool, and their dashmate follows Dr assert.deepEqual(imagesOf('apiVersion: x\nimages:\n core: docker.io/dashpay/dashd:23\n helper: docker.io/dashpay/dashmate-helper:4.2.0-beta.6\n acme: docker.io/goacme/lego:v5.5.2\nnodes: []\n'), { core: 'dashpay/dashd:23', helper: 'dashpay/dashmate-helper:4.2.0-beta.6', acme: 'goacme/lego:v5.5.2' }); }); + +test('a deleted devnet releases its name: the new one reuses none of its files or registry data', async () => { + const { createDevnets } = await import('./devnets.js'); + const root = mkdtempSync(join(tmpdir(), 'reuse-')); + const dirs = { data: join(root, 'data'), private: join(root, 'private') }; + const name = 'devnet-sakura', work = join(dirs.private, 'devnets', name), facts = join(dirs.data, 'devnets', name); + mkdirSync(work, { recursive: true }); mkdirSync(facts, { recursive: true }); + // What the deleted devnet left behind. + for (const f of ['deployment.json', 'bootstrap-plan.json', 'ec2-plan.json', 'known_hosts', 'dashnet']) writeFileSync(join(work, f), 'OLD'); + writeFileSync(join(facts, 'config.json'), JSON.stringify({ hosts: ['OLD'] })); + const deletedAt = '2026-11-10T10:00:00.000Z'; + const old = { status: 'deleted', deletedAt, createdAt: '2026-11-01T10:00:00.000Z', createdBy: 'first-owner', operation: 'old-op', coreNetwork: name, readyAt: '2026-11-01T11:00:00.000Z', + platform: 'ready', walletAddress: 'yOLD', promoCodes: { OLD: 1 }, upgradeScopes: ['core'], dns: { explorer: { host: 'explorer.sakura.networks.dash.org' } }, dnsZoneId: 'Z1' }; + const registryPath = join(dirs.data, 'devnets.json'), entry = () => JSON.parse(readFileSync(registryPath, 'utf8'))[name]; + writeFileSync(registryPath, JSON.stringify({ [name]: old })); + const planId = 'a'.repeat(64), calls = []; + const dashnet = async (r, args) => { + calls.push(args[0]); + const out = args[args.indexOf('--out') + 1]; + if (args[0] === 'resolve') writeFileSync(out, '{}'); + if (args[0] === 'provision-plan') writeFileSync(out, JSON.stringify({ id: planId, targets: [{ group: 'validators', instanceType: 'c7g.large', architecture: 'arm64' }] })); + return args[0] === 'provision' ? 1 : 0; // stop at the first step that would touch AWS + }; + const steps = []; + const ctx = { dashnet, step: (r, n) => { const s = { name: n }; steps.push(s); return (status, detail) => { s.status = status; s.detail = detail; }; }, save: () => {}, write: () => {}, pinBinary: (dir) => join(dir, 'dashnet') }; + const devnets = createDevnets({ ctx, dirs, key: { path: '/k' }, pool: {}, getSettings: () => structuredClone(settings), region: 'us-west-2', log: () => {}, clients: { ec2: {}, r53: {}, ssm: { send: async () => ({ Parameter: { Value: 'ami-1' } }) } }, wait: async () => {} }); + const request = { id: '6c8139ad-e92f-40da-943d-1e001efacc20', network: name, action: 'create-devnet', devnet: { validators: 13 } }; + const op = (id, createdAt) => ({ id, network: name, createdAt, actor: { login: 'second-owner' }, request, steps: [] }); + + // The creation that built the deleted devnet cannot be resumed into the name, + // even with its reviewed plan still on disk. + writeFileSync(join(work, 'request.json'), '{}'); writeFileSync(join(work, 'ec2-plan.json'), JSON.stringify({ id: planId })); + await assert.rejects(devnets.executeCreate({ ...op('old-op', '2026-11-01T10:00:00.000Z'), review: { planId } }), /is deleted; this creation cannot resume/); + const fresh = op('new-op', '2026-11-12T10:00:00.000Z'); + // A new creation that was never prepared must not run on the old files. + await assert.rejects(devnets.executeCreate({ ...fresh, review: { planId } }), /prepare this creation again/); + assert.equal(entry().status, 'deleted', 'nothing was changed by the refused runs'); + + await devnets.prepareCreate(fresh); + assert.deepEqual(steps[0], { name: 'Set aside the files of the deleted devnet of this name', status: 'ok', detail: 'kept, not reused' }); + const kept = readdirSync(join(dirs.private, 'devnets-deleted')); + assert.equal(kept.length, 1); assert.match(kept[0], /^devnet-sakura-/); + assert.equal(readFileSync(join(dirs.private, 'devnets-deleted', kept[0], 'deployment.json'), 'utf8'), 'OLD', 'the old files are kept'); + for (const f of ['deployment.json', 'bootstrap-plan.json', 'known_hosts', 'dashnet']) assert.equal(existsSync(join(work, f)), false, `${f} of the deleted devnet is not in the new work directory`); + assert.equal(JSON.parse(readFileSync(join(work, 'ec2-plan.json'), 'utf8')).id, planId); + assert.equal(existsSync(join(facts, 'config.json')), false, 'the old connection facts are no longer published'); + assert.deepEqual(fresh.review.replaces, { deletedAt, createdBy: 'first-owner' }); + assert.equal(entry().status, 'deleted', 'the name is taken only when the creation is confirmed and runs'); + // Preparing again does not move the new files away. + await devnets.prepareCreate(fresh); + assert.equal(readdirSync(join(dirs.private, 'devnets-deleted')).length, 1); + + await assert.rejects(devnets.executeCreate(fresh), /provision failed/); + assert.deepEqual(calls.at(-1), 'provision'); + const now = entry(); + assert.deepEqual([now.status, now.createdBy, now.operation], ['creating', 'second-owner', 'new-op']); + for (const k of ['readyAt', 'platform', 'walletAddress', 'promoCodes', 'upgradeScopes', 'deletedAt', 'filesSetAsideAt']) assert.equal(now[k], undefined, `${k} of the deleted devnet is not carried over`); + assert.deepEqual(now.previous, [{ createdAt: old.createdAt, createdBy: 'first-owner', deletedAt, operation: 'old-op', coreNetwork: name }]); + // Resuming the new creation continues it; the deleted devnet's operation cannot. + await assert.rejects(devnets.executeCreate(fresh), /provision failed/); + assert.equal(entry().previous.length, 1); + await assert.rejects(devnets.executeCreate({ ...op('old-op', '2026-11-01T10:00:00.000Z'), review: { planId } }), /belongs to another creation/); +}); diff --git a/agent/devnets.js b/agent/devnets.js index 2e84ecd..2e4923f 100644 --- a/agent/devnets.js +++ b/agent/devnets.js @@ -58,7 +58,9 @@ export const coreNetwork = (name, generation = 1) => `devnet-${shortName(name)}$ export function validateDevnetRequest(settings, q, registry) { if (!NAME.test(q.network || '')) throw new Error('name must look like devnet- (lowercase, 2-31 characters after devnet-)'); - if (settings.networks.some((n) => n.name === q.network) || registry[q.network]) throw new Error(`${q.network} already exists; journal records are permanent, pick a new name`); + // A deleted devnet's name is free again. Whether its EC2 journal record may be + // replaced is decided by dash-network-go at provisioning, from the record itself. + if (settings.networks.some((n) => n.name === q.network) || (registry[q.network] && registry[q.network].status !== 'deleted')) throw new Error(`${q.network} already exists; delete it before using the name again`); // -g is how a reset chain of devnet- is named (and its DNS alias). if (/-g\d+$/.test(q.network)) throw new Error('name must not end in -g: that is how a reset devnet chain is named'); // Placement (VPC, subnet, groups, key, IPAM, DNS zone) always comes from Settings. @@ -120,6 +122,33 @@ export function createDevnets({ ctx, dirs, key, pool, getSettings, region, log = const registryPath = join(dirs.data, 'devnets.json'); const registry = () => readJSON(registryPath, {}); const register = (name, patch) => { const r = registry(); r[name] = { ...(r[name] || {}), ...patch, updatedAt: new Date().toISOString() }; writeAtomic(registryPath, JSON.stringify(r, null, 1)); }; + // A name used again starts from an empty entry. Nothing of the deleted devnet + // (addresses, promo codes, wallet, versions, readiness) may carry over; a short + // history of who held the name is kept. + const supersede = (name) => { + const r = registry(), old = r[name] || {}; + const held = { createdAt: old.createdAt || null, createdBy: old.createdBy || null, deletedAt: old.deletedAt || old.updatedAt || null, operation: old.operation || null, coreNetwork: old.coreNetwork || null }; + r[name] = { previous: [...(Array.isArray(old.previous) ? old.previous : []), held].slice(-20), updatedAt: new Date().toISOString() }; + writeAtomic(registryPath, JSON.stringify(r, null, 1)); + }; + // The deleted devnet's working files (plans, host keys, secrets, stage + // journals) must never be resumed by a new devnet of the same name. They are + // moved aside once, not removed. Its published connection facts are derived + // data and are removed, so they are never served for the new devnet. + const setAside = (name) => { + const reg = registry()[name]; + if (reg?.status !== 'deleted' || reg.filesSetAsideAt) return null; + const dir = join(dirs.private, 'devnets', name); + let kept = null; + if (existsSync(dir)) { + mkdirSync(join(dirs.private, 'devnets-deleted'), { recursive: true, mode: 0o700 }); + kept = join(dirs.private, 'devnets-deleted', `${name}-${stamp()}`); + renameSync(dir, kept); + } + rmSync(join(dirs.data, 'devnets', name), { recursive: true, force: true }); + register(name, { filesSetAsideAt: new Date().toISOString() }); + return kept; + }; // Registered before Route 53 has them, so deleting after a failed install removes them too. const registerNames = (name, d, dplan) => register(name, { dns: { ...(registry()[name]?.dns || {}), ...serviceNames(name, d, dplan.coreNetwork) } }); const ec2 = clients.ec2 || new EC2Client({ region }), r53 = clients.r53 || new Route53Client({ region: 'us-east-1' }), ssm = clients.ssm || new SSMClient({ region }); @@ -211,10 +240,17 @@ export function createDevnets({ ctx, dirs, key, pool, getSettings, region, log = async function prepareCreate(r) { const s = getSettings(); const d = validateDevnetRequest(s, r.request, registry()); - const name = r.network, dir = workDir(name); - rmSync(join(dir, 'dashnet'), { force: true }); // nothing is bound to a binary before provisioning + const name = r.network, before = registry()[name]; r.status = 'preparing'; save(r); - let done = step(r, 'Current Ubuntu 24.04 AMIs (Canonical)'); + let done; + if (before?.status === 'deleted') { + done = step(r, 'Set aside the files of the deleted devnet of this name'); + const kept = setAside(name); + done('ok', kept ? 'kept, not reused' : 'already set aside'); + } + const dir = workDir(name); + rmSync(join(dir, 'dashnet'), { force: true }); // nothing is bound to a binary before provisioning + done = step(r, 'Current Ubuntu 24.04 AMIs (Canonical)'); const amis = {}; for (const a of new Set([d.validatorArch, d.walletArch])) amis[a] = await ami(a); done('ok', Object.entries(amis).map(([a, id]) => `${a} ${id}`).join(', ')); @@ -242,6 +278,8 @@ export function createDevnets({ ctx, dirs, key, pool, getSettings, region, log = images: Object.fromEntries([...COMPONENTS, ...(d.images.acme ? ['acme'] : [])].map((c) => [c, { ref: d.images[c], digests: lockDigests(lock, c) }])), protocol: d.protocol, blockTimeSeconds: blockSeconds(d), platformEpochSeconds: epochSeconds(d), coreNetwork: coreNetwork(name), platformChainId: `dash-${coreNetwork(name)}`, dns: serviceNames(name, d, coreNetwork(name)), services: d.services, amis, network: { vpc: d.vpcId, subnet: d.subnetId, securityGroups: d.securityGroupIds, ipamPool: d.ipamPoolId }, + // Shown before confirmation: the name, and so the chain name, was used before. + ...(before?.status === 'deleted' ? { replaces: { deletedAt: before.deletedAt || before.updatedAt || null, createdBy: before.createdBy || null } } : {}), }; } @@ -263,8 +301,18 @@ export function createDevnets({ ctx, dirs, key, pool, getSettings, region, log = // Records created before stage tracking: derive completed stages from their steps. r.done ??= [['provision', 'dashnet provision)'], ['bootstrap', 'dashnet bootstrap)'], ['deploy', 'dashnet deploy)']] .filter(([, tag]) => r.steps.some((st) => st.name.endsWith(tag) && st.status === 'ok')).map(([k]) => k); - const reg = registry()[name]; - if (reg && ['deleting', 'deleted'].includes(reg.status)) throw new Error(`${name} is ${reg.status}; this creation cannot resume`); + let reg = registry()[name]; + if (reg?.status === 'deleting') throw new Error(`${name} is ${reg.status}; this creation cannot resume`); + if (reg?.status === 'deleted') { + // Only a creation requested after the deletion takes the name, and only + // once the deleted devnet's files were set aside by its own preparation. + if (!(Date.parse(r.createdAt) > Date.parse(reg.deletedAt || reg.updatedAt))) throw new Error(`${name} is ${reg.status}; this creation cannot resume`); + if (!reg.filesSetAsideAt) throw new Error(`${name} was deleted; prepare this creation again`); + supersede(name); + reg = registry()[name]; + } + // An operation of the devnet that held the name before cannot continue this one. + if (reg?.operation && reg.operation !== r.id) throw new Error(`${name} belongs to another creation; this one cannot resume`); r.status = 'running'; save(r); // Resume continues at the first stage that has not completed. const once = async (key, fn) => { if (r.done.includes(key)) return; await fn(); r.done.push(key); save(r); }; diff --git a/server/web.js b/server/web.js index 3582b04..8378ff5 100644 --- a/server/web.js +++ b/server/web.js @@ -268,7 +268,7 @@ export function createWeb({ dataDir, origin, auth: authDeps, fetcher = fetch, cl // New devnets (admins; billable). The agent prepares a plan that must be confirmed. app.get('/api/devnets/defaults', (req, res) => { if (!isAdmin(req)) return res.status(403).json({ error: 'Only admins create devnets' }); - res.json({ defaults: reloadSettings().devnets, existing: [...settings.networks.map((n) => n.name), ...Object.keys(registry())] }); + res.json({ defaults: reloadSettings().devnets, existing: [...settings.networks.map((n) => n.name), ...Object.entries(registry()).filter(([, reg]) => reg?.status !== 'deleted').map(([name]) => name)] }); }); app.post('/api/devnets', (req, res, next) => { const s = auth.session(req); if (!s) return res.status(401).json({ error: 'Sign in required' }); req.session = s; next(); }, auth.csrf, (req, res) => { if (!isAdmin(req)) return res.status(403).json({ error: 'Only admins create devnets' }); diff --git a/server/web.test.js b/server/web.test.js index d6fb6dc..5684440 100644 --- a/server/web.test.js +++ b/server/web.test.js @@ -381,3 +381,14 @@ test('Actions queue: private changes are announced to members only', async () => assert.equal(anon.includes('ci-queue'), true); } finally { for (const s of streams) s.abort(); w.close(); } }); + +test('a deleted devnet no longer blocks its name in the new-devnet form', async () => { + const w = await start(); + try { + writeFileSync(join(w.dataDir, 'devnets.json'), JSON.stringify({ 'devnet-sakura': { status: 'deleted' }, 'devnet-bonsai': { status: 'ready' }, 'devnet-stuck': { status: 'deleting' } })); + await w.login(); + const { existing } = await (await w.req('/api/devnets/defaults')).json(); + assert.equal(existing.includes('devnet-sakura'), false); + assert.ok(existing.includes('devnet-bonsai') && existing.includes('devnet-stuck') && existing.includes('testnet')); + } finally { w.close(); } +}); diff --git a/src/pages/NewDevnet.jsx b/src/pages/NewDevnet.jsx index ceed4d0..79125c5 100644 --- a/src/pages/NewDevnet.jsx +++ b/src/pages/NewDevnet.jsx @@ -31,7 +31,7 @@ export default function NewDevnet() { const storage = (form.validators + 1) * form.rootVolumeGiB * 0.08; const problems = []; if (!/^[a-z][a-z0-9-]{1,30}$/.test(name)) problems.push('name: lowercase letters, digits and dashes, 2-31 characters'); - if (existing.includes(full)) problems.push(`${full} already exists; names cannot be reused`); + if (existing.includes(full)) problems.push(`${full} already exists; delete it before using the name again`); if (form.validators < 13 || form.validators > 25) problems.push('13 to 25 validators'); for (const c of COMPONENTS) if ((form.images[c] || '').replace(/^docker\.io\//, '').split(/[@:]/)[0] !== REPOS[c]) problems.push(`${c} image must be ${REPOS[c]}:`); if (form.images.acme && form.images.acme.replace(/^docker\.io\//, '').split(/[@:]/)[0] !== 'goacme/lego') problems.push('ACME client image must be goacme/lego:, or empty for self-signed gateways'); diff --git a/src/pages/Operation.jsx b/src/pages/Operation.jsx index 7d16e3e..f1ed51c 100644 --- a/src/pages/Operation.jsx +++ b/src/pages/Operation.jsx @@ -171,6 +171,10 @@ function CreateReview({ op, review, operator, pending, act, expiresIn }) { const e = review.estimate || {}; return ( <> + {review.replaces &&

+ The name {op.network} was used before{review.replaces.createdBy ? ` (created by ${review.replaces.createdBy})` : ''}; that devnet was deleted{review.replaces.deletedAt ? ` ${new Date(review.replaces.deletedAt).toISOString().slice(0, 16).replace('T', ' ')} UTC` : ''}. + This is a new chain with the same chain name ({review.coreNetwork}): anything still configured for the old one (wallets, peers, saved addresses) will not match it. The old devnet's files are kept aside and are not reused. +

}
expires in {Math.max(0, Math.round(expiresIn / 60))} min}>