@ar.io/sdk 4.0.0-solana.21 → 4.0.0-solana.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -264,21 +264,37 @@ export class SolanaANTWriteable extends SolanaANTReadable {
264
264
  const newOwnerDest = await this.registry.resolveDestinationAclAccounts({
265
265
  user: newOwner,
266
266
  });
267
- // Resolve the old owner's source ACL accounts. The current owner
268
- // *must* have a live `(asset, Owner)` entry every spawn /
269
- // import path seeds it, so a missing entry indicates state
270
- // corruption. We surface that as `AclEntryNotFound` from the
271
- // contract by passing the derived PDAs as a fallback rather than
272
- // failing client-side here.
267
+ // Resolve the old owner's source ACL accounts. If the entry is
268
+ // missing (e.g. the ANT was acquired via a marketplace transfer or
269
+ // before the ACL system existed), heal it by bootstrapping the
270
+ // config/page and recording the owner entry so the on-chain
271
+ // transfer handler can successfully remove it.
273
272
  const oldOwnerSource = await this.registry.resolveSourceAclAccountsForEntry({
274
273
  user: oldOwner,
275
274
  asset: this.mint,
276
275
  role: 'owner',
277
276
  });
278
- const oldOwnerAclConfigPda = oldOwnerSource?.aclConfigPda ??
279
- (await this.registry.deriveAclConfigPda(oldOwner));
280
- const oldOwnerAclPagePda = oldOwnerSource?.aclPagePda ??
281
- (await this.registry.deriveAclPagePda(oldOwner, 0n));
277
+ let oldOwnerAclConfigPda;
278
+ let oldOwnerAclPagePda;
279
+ const oldOwnerHealIxs = [];
280
+ if (oldOwnerSource) {
281
+ oldOwnerAclConfigPda = oldOwnerSource.aclConfigPda;
282
+ oldOwnerAclPagePda = oldOwnerSource.aclPagePda;
283
+ }
284
+ else {
285
+ const dest = await this.registry.resolveDestinationAclAccounts({
286
+ user: oldOwner,
287
+ });
288
+ oldOwnerAclConfigPda = dest.aclConfigPda;
289
+ oldOwnerAclPagePda = dest.aclPagePda;
290
+ oldOwnerHealIxs.push(...dest.prepIxs);
291
+ oldOwnerHealIxs.push(await this.registry.buildRecordIx({
292
+ user: oldOwner,
293
+ asset: this.mint,
294
+ role: 'owner',
295
+ pageIdx: dest.pageIdx,
296
+ }));
297
+ }
282
298
  const transferIx = await getTransferInstructionAsync({
283
299
  asset: this.mint,
284
300
  caller: this.signer,
@@ -306,6 +322,7 @@ export class SolanaANTWriteable extends SolanaANTReadable {
306
322
  controllers: exControllers,
307
323
  });
308
324
  const sig = await this.sendTransaction([
325
+ ...oldOwnerHealIxs,
309
326
  ...newOwnerDest.prepIxs,
310
327
  transferIx,
311
328
  ...cleanupIxs,
@@ -19,10 +19,10 @@
19
19
  * surface for them.
20
20
  */
21
21
  import { AccountRole, address, fetchEncodedAccount, getAddressDecoder, } from '@solana/kit';
22
- import { PurchaseType, getBuyNameFromDelegationInstructionAsync, getBuyNameFromFundingPlanInstructionAsync, getBuyNameFromOperatorStakeInstructionAsync, getBuyNameFromWithdrawalInstructionAsync, getBuyNameInstructionAsync, getBuyReturnedNameFromDelegationInstructionAsync, getBuyReturnedNameFromFundingPlanInstructionAsync, getBuyReturnedNameFromOperatorStakeInstructionAsync, getBuyReturnedNameFromWithdrawalInstructionAsync, getBuyReturnedNameInstructionAsync, getExtendLeaseFromDelegationInstructionAsync, getExtendLeaseFromFundingPlanInstructionAsync, getExtendLeaseFromOperatorStakeInstructionAsync, getExtendLeaseFromWithdrawalInstructionAsync, getExtendLeaseInstructionAsync, getIncreaseUndernameLimitFromDelegationInstructionAsync, getIncreaseUndernameLimitFromFundingPlanInstructionAsync, getIncreaseUndernameLimitFromOperatorStakeInstructionAsync, getIncreaseUndernameLimitFromWithdrawalInstructionAsync, getIncreaseUndernameLimitInstructionAsync, getPruneExpiredNamesInstructionAsync, getPruneExpiredReservationInstruction, getPruneNameToReturnedInstructionAsync, getPruneReturnedNamesInstructionAsync, getReassignNameInstructionAsync, getReleaseNameInstructionAsync, getUpgradeNameFromDelegationInstructionAsync, getUpgradeNameFromFundingPlanInstructionAsync, getUpgradeNameFromOperatorStakeInstructionAsync, getUpgradeNameFromWithdrawalInstructionAsync, getUpgradeNameInstructionAsync, } from '@ar.io/solana-contracts/arns';
22
+ import { PurchaseType, getBuyNameFromDelegationInstructionAsync, getBuyNameFromFundingPlanInstructionAsync, getBuyNameFromOperatorStakeInstructionAsync, getBuyNameFromWithdrawalInstructionAsync, getBuyNameInstructionAsync, getBuyReturnedNameFromDelegationInstructionAsync, getBuyReturnedNameFromFundingPlanInstructionAsync, getBuyReturnedNameFromOperatorStakeInstructionAsync, getBuyReturnedNameFromWithdrawalInstructionAsync, getBuyReturnedNameInstructionAsync, getExtendLeaseFromDelegationInstructionAsync, getExtendLeaseFromFundingPlanInstructionAsync, getExtendLeaseFromOperatorStakeInstructionAsync, getExtendLeaseFromWithdrawalInstructionAsync, getExtendLeaseInstructionAsync, getIncreaseUndernameLimitFromDelegationInstructionAsync, getIncreaseUndernameLimitFromFundingPlanInstructionAsync, getIncreaseUndernameLimitFromOperatorStakeInstructionAsync, getIncreaseUndernameLimitFromWithdrawalInstructionAsync, getIncreaseUndernameLimitInstructionAsync, getMigrateArnsRecordInstruction, getPruneExpiredNamesInstructionAsync, getPruneExpiredReservationInstruction, getPruneNameToReturnedInstructionAsync, getPruneReturnedNamesInstructionAsync, getReassignNameInstructionAsync, getReleaseNameInstructionAsync, getUpgradeNameFromDelegationInstructionAsync, getUpgradeNameFromFundingPlanInstructionAsync, getUpgradeNameFromOperatorStakeInstructionAsync, getUpgradeNameFromWithdrawalInstructionAsync, getUpgradeNameInstructionAsync, } from '@ar.io/solana-contracts/arns';
23
23
  import { FundingSourceKind as GeneratedFundingSourceKindEnum } from '@ar.io/solana-contracts/gar';
24
24
  import { buildCreateAtaIdempotentIx, getAssociatedTokenAddressKit, } from './ata.js';
25
- import { deserializeArnsRecord, deserializeEpochSettingsFull, } from './deserialize.js';
25
+ import { deserializeArnsRecord, deserializeEpochSettingsFull, deserializePrimaryName, } from './deserialize.js';
26
26
  import { buildFundingPlan as buildFundingPlanCore, buildFundingPlanRemainingAccounts, computeResidueIndexes, predictResidueVaults, } from './funding-plan.js';
27
27
  /** Maps the SDK's user-facing FundingSourceKind string union to the
28
28
  * Codama-generated enum used by the on-chain ix payload. */
@@ -36,7 +36,7 @@ function toGeneratedFundingSourceSpec(s) {
36
36
  return { kind: kindMap[s.kind], amount: s.amount };
37
37
  }
38
38
  import { getSyncAttributesInstruction } from '@ar.io/solana-contracts/ant';
39
- import { getApprovePrimaryNameInstructionAsync, getCloseExpiredRequestInstruction, getCreateVaultInstructionAsync, getExtendVaultInstructionAsync, getIncreaseVaultInstructionAsync, getReleaseVaultInstructionAsync, getRequestAndSetPrimaryNameFromFundingPlanInstructionAsync, getRequestAndSetPrimaryNameInstructionAsync, getRequestPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameInstructionAsync, getRevokeVaultInstructionAsync, getVaultedTransferInstructionAsync, } from '@ar.io/solana-contracts/core';
39
+ import { getApprovePrimaryNameInstructionAsync, getCloseExpiredRequestInstruction, getCreateVaultInstructionAsync, getExtendVaultInstructionAsync, getIncreaseVaultInstructionAsync, getReleaseVaultInstructionAsync, getRemovePrimaryNameInstructionAsync, getRequestAndSetPrimaryNameFromFundingPlanInstructionAsync, getRequestAndSetPrimaryNameInstructionAsync, getRequestPrimaryNameFromFundingPlanInstructionAsync, getRequestPrimaryNameInstructionAsync, getRevokeVaultInstructionAsync, getVaultedTransferInstructionAsync, } from '@ar.io/solana-contracts/core';
40
40
  import { getDelegationDecoder, getGatewayDecoder, } from '@ar.io/solana-contracts/gar';
41
41
  import { Protocol, getAllowDelegateInstructionAsync, getCancelWithdrawalInstruction, getClaimDelegateFromLeavingGatewayInstructionAsync, getClaimWithdrawalInstructionAsync, getCloseDrainedWithdrawalInstruction, getCloseEmptyDelegationInstruction, getCloseEpochInstructionAsync, getCloseObservationInstructionAsync, getCreateEpochInstructionAsync, getDecreaseDelegateStakeInstructionAsync, getDecreaseOperatorStakeInstructionAsync, getDelegateStakeInstructionAsync, getDisallowDelegateInstructionAsync, getDistributeEpochInstructionAsync, getFinalizeGoneInstructionAsync, getIncreaseOperatorStakeInstructionAsync, getInstantWithdrawalInstructionAsync, getJoinNetworkInstructionAsync, getLeaveNetworkInstructionAsync, getPrescribeEpochInstructionAsync, getPruneGatewayInstructionAsync, getRedelegateStakeInstructionAsync, getSaveObservationsInstructionAsync, getSetAllowlistEnabledInstructionAsync, getTallyWeightsInstructionAsync, getUpdateGatewaySettingsInstructionAsync, } from '@ar.io/solana-contracts/gar';
42
42
  import { getTransferCheckedInstruction } from '@solana-program/token';
@@ -280,6 +280,35 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
280
280
  const [nameRegistry] = await getArnsRegistryPDA(this.arnsProgram);
281
281
  return { config, demandFactor, nameRegistry, ...input };
282
282
  }
283
+ /**
284
+ * If the on-chain ArnsRecord for `name` hasn't been migrated to the
285
+ * current schema (name_hash at offset 8 doesn't match the expected
286
+ * hash), return a `migrate_arns_record` instruction that must be
287
+ * prepended to any operation referencing the record with PDA seed
288
+ * verification.
289
+ *
290
+ * Returns an empty array when the record is already up-to-date or
291
+ * doesn't exist.
292
+ */
293
+ async _buildMigrateArnsRecordIxIfNeeded(name) {
294
+ const [arnsRecordPda] = await getArnsRecordPDA(name, this.arnsProgram);
295
+ const account = await fetchEncodedAccount(this.rpc, arnsRecordPda, {
296
+ commitment: this.commitment,
297
+ });
298
+ if (!account.exists)
299
+ return [];
300
+ const data = Buffer.from(account.data);
301
+ const expectedHash = hashName(name);
302
+ const storedHash = data.subarray(8, 40);
303
+ if (storedHash.equals(expectedHash))
304
+ return [];
305
+ return [
306
+ getMigrateArnsRecordInstruction({
307
+ record: arnsRecordPda,
308
+ payer: this.signer,
309
+ }, { programAddress: this.arnsProgram }),
310
+ ];
311
+ }
283
312
  /** Inject ARIO core default PDAs (config). */
284
313
  async withCoreDefaults(input) {
285
314
  const [config] = await getArioConfigPDA(this.coreProgram);
@@ -1046,12 +1075,13 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1046
1075
  return pda;
1047
1076
  }
1048
1077
  async upgradeRecord(params, _options) {
1078
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
1049
1079
  const ix = await this._buildManageStakeIx({
1050
1080
  params,
1051
1081
  operation: 'upgrade',
1052
1082
  });
1053
1083
  const syncIx = await this._buildSyncAttributesIxIfOwner(params.name);
1054
- const sig = await this.sendTransaction(syncIx ? [ix, syncIx] : [ix]);
1084
+ const sig = await this.sendTransaction(syncIx ? [...migrateIxs, ix, syncIx] : [...migrateIxs, ix]);
1055
1085
  return { id: sig };
1056
1086
  }
1057
1087
  async syncAttributes(params, _options) {
@@ -1061,8 +1091,9 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1061
1091
  // `_buildSyncAttributesIxIfOwner`, which skips when not the owner so
1062
1092
  // the wrapping arns ix can still succeed for non-holder management
1063
1093
  // — see BD-095.)
1094
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
1064
1095
  const ix = await this._buildSyncAttributesIxUnconditional(params.name);
1065
- const sig = await this.sendTransaction([ix]);
1096
+ const sig = await this.sendTransaction([...migrateIxs, ix]);
1066
1097
  return { id: sig };
1067
1098
  }
1068
1099
  /**
@@ -1130,6 +1161,7 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1130
1161
  }, { programAddress: this.antProgram });
1131
1162
  }
1132
1163
  async extendLease(params, _options) {
1164
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
1133
1165
  const ix = await this._buildManageStakeIx({
1134
1166
  params,
1135
1167
  operation: 'extend',
@@ -1137,17 +1169,18 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1137
1169
  });
1138
1170
  // BD-095: extend_lease changes only `end_timestamp`, which isn't
1139
1171
  // mirrored in any Metaplex Attributes plugin trait. No bundle.
1140
- const sig = await this.sendTransaction([ix]);
1172
+ const sig = await this.sendTransaction([...migrateIxs, ix]);
1141
1173
  return { id: sig };
1142
1174
  }
1143
1175
  async increaseUndernameLimit(params, _options) {
1176
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
1144
1177
  const ix = await this._buildManageStakeIx({
1145
1178
  params,
1146
1179
  operation: 'increaseUndername',
1147
1180
  quantity: params.increaseCount,
1148
1181
  });
1149
1182
  const syncIx = await this._buildSyncAttributesIxIfOwner(params.name);
1150
- const sig = await this.sendTransaction(syncIx ? [ix, syncIx] : [ix]);
1183
+ const sig = await this.sendTransaction(syncIx ? [...migrateIxs, ix, syncIx] : [...migrateIxs, ix]);
1151
1184
  return { id: sig };
1152
1185
  }
1153
1186
  /**
@@ -1312,6 +1345,60 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1312
1345
  // =========================================
1313
1346
  // Primary name operations (ario-core)
1314
1347
  // =========================================
1348
+ /**
1349
+ * If the signer already has a primary name set, build the instruction(s)
1350
+ * needed to remove it so they can be prepended to a request/set tx —
1351
+ * enabling single-tx "change primary name" flows.
1352
+ *
1353
+ * Returns an empty array when the signer has no existing primary name.
1354
+ *
1355
+ * Throws when the signer has a legacy primary-name state (forward
1356
+ * `PrimaryName` PDA exists but its paired `PrimaryNameReverse` PDA does
1357
+ * NOT). Both `remove_primary_name` AND `request_and_set_primary_name`
1358
+ * require the reverse PDA on-chain — the latter rejects with
1359
+ * `MustRemoveExistingPrimaryName` (0x1786, code 6022) any time a
1360
+ * forward record already exists for the signer, regardless of reverse
1361
+ * state. Silently skipping the remove would queue a tx guaranteed to
1362
+ * fail with that opaque error. Surfacing it at the client with a clear
1363
+ * remediation pointer is the only safe behavior.
1364
+ *
1365
+ * The legacy state should not exist on any cluster post-snapshot/import
1366
+ * PR #159 (which emits PrimaryNameReverse in lockstep with PrimaryName)
1367
+ * — it's a relic of pre-#159 imports. Operators on affected clusters
1368
+ * must run `yarn workspace @ar-io/migration-import backfill:primary-name-reverse`
1369
+ * (in the solana-ar-io repo) before this method can succeed.
1370
+ */
1371
+ async _buildRemoveExistingPrimaryNameIxs() {
1372
+ const [primaryNamePda] = await getPrimaryNamePDA(this.signer.address, this.coreProgram);
1373
+ const account = await fetchEncodedAccount(this.rpc, primaryNamePda, {
1374
+ commitment: this.commitment,
1375
+ });
1376
+ if (!account.exists)
1377
+ return [];
1378
+ const { name: oldName } = deserializePrimaryName(Buffer.from(account.data));
1379
+ const [primaryNameReversePda] = await getPrimaryNameReversePDA(oldName, this.coreProgram);
1380
+ const reverseAccount = await fetchEncodedAccount(this.rpc, primaryNameReversePda, { commitment: this.commitment });
1381
+ if (!reverseAccount.exists) {
1382
+ // Fail fast with an actionable message. See method docstring for
1383
+ // why request_and_set would reject this regardless.
1384
+ throw new Error(`Cannot change primary name: signer "${this.signer.address}" has a ` +
1385
+ `legacy PrimaryName ("${oldName}") with no paired PrimaryNameReverse PDA ` +
1386
+ `(${primaryNameReversePda}). The on-chain remove_primary_name and ` +
1387
+ `request_and_set_primary_name ixs both require the reverse PDA — ` +
1388
+ `request_and_set will reject with MustRemoveExistingPrimaryName (code 6022). ` +
1389
+ `Run \`yarn workspace @ar-io/migration-import backfill:primary-name-reverse\` ` +
1390
+ `against this cluster's ario-core program to materialize the missing reverse ` +
1391
+ `PDA, then retry.`);
1392
+ }
1393
+ return [
1394
+ await getRemovePrimaryNameInstructionAsync({
1395
+ primaryName: primaryNamePda,
1396
+ primaryNameReverse: primaryNameReversePda,
1397
+ owner: this.signer,
1398
+ reverseLookupHash: hashName(oldName),
1399
+ }, { programAddress: this.coreProgram }),
1400
+ ];
1401
+ }
1315
1402
  /**
1316
1403
  * Build the `remaining_accounts` slice + the `antProgramId` arg the
1317
1404
  * four ario-core primary-name instructions consume. Sprint 2/5
@@ -1399,6 +1486,11 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1399
1486
  return { remaining, antProgram };
1400
1487
  }
1401
1488
  async requestPrimaryName(params, _options) {
1489
+ // If the caller already has a primary name, prepend remove ixs so
1490
+ // the on-chain handler doesn't reject with MustRemoveExistingPrimaryName.
1491
+ const removeIxs = await this._buildRemoveExistingPrimaryNameIxs();
1492
+ const { baseName } = splitPrimaryName(params.name);
1493
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(baseName);
1402
1494
  const coreConfig = await this.getCoreConfig();
1403
1495
  const signerATA = await getAssociatedTokenAddressKit(coreConfig.mint, this.signer.address);
1404
1496
  const { remaining } = await this._buildPrimaryNameValidationAccounts(params.name, 'request');
@@ -1424,13 +1516,18 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1424
1516
  operation: 'request',
1425
1517
  });
1426
1518
  }
1427
- const sig = await this.sendTransaction([ix]);
1519
+ const sig = await this.sendTransaction([...removeIxs, ...migrateIxs, ix]);
1428
1520
  return { id: sig };
1429
1521
  }
1430
1522
  async setPrimaryName(params, _options) {
1431
1523
  // setPrimaryName routes to the on-chain `request_and_set_primary_name`
1432
1524
  // path — the auto-approve flow when the caller owns the AntRecord
1433
1525
  // for the matching name (undername part, or "@" for base names).
1526
+ // If the caller already has a primary name, prepend remove ixs so
1527
+ // the "change" is atomic in a single transaction.
1528
+ const removeIxs = await this._buildRemoveExistingPrimaryNameIxs();
1529
+ const { baseName } = splitPrimaryName(params.name);
1530
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(baseName);
1434
1531
  const coreConfig = await this.getCoreConfig();
1435
1532
  const signerATA = await getAssociatedTokenAddressKit(coreConfig.mint, this.signer.address);
1436
1533
  const { remaining, antProgram } = await this._buildPrimaryNameValidationAccounts(params.name, 'requestAndSet');
@@ -1456,7 +1553,7 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1456
1553
  antProgramId: antProgram,
1457
1554
  });
1458
1555
  }
1459
- const sig = await this.sendTransaction([ix]);
1556
+ const sig = await this.sendTransaction([...removeIxs, ...migrateIxs, ix]);
1460
1557
  return { id: sig };
1461
1558
  }
1462
1559
  /**
@@ -1544,6 +1641,8 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1544
1641
  * remaining_accounts: [arns_record(base), ant_record(undername | @)].
1545
1642
  */
1546
1643
  async approvePrimaryName(params, _options) {
1644
+ const { baseName } = splitPrimaryName(params.name);
1645
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(baseName);
1547
1646
  const [requestPda] = await getPrimaryNameRequestPDA(params.initiator, this.coreProgram);
1548
1647
  const [primaryNamePda] = await getPrimaryNamePDA(params.initiator, this.coreProgram);
1549
1648
  const [primaryNameReversePda] = await getPrimaryNameReversePDA(params.name, this.coreProgram);
@@ -1565,7 +1664,7 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1565
1664
  reverseLookupHash: hashName(params.name),
1566
1665
  antProgramId: antProgram,
1567
1666
  }), { programAddress: this.coreProgram }), remaining);
1568
- const sig = await this.sendTransaction([ix]);
1667
+ const sig = await this.sendTransaction([...migrateIxs, ix]);
1569
1668
  return { id: sig };
1570
1669
  }
1571
1670
  // =========================================
@@ -1803,18 +1902,14 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1803
1902
  // =========================================
1804
1903
  /** Reassign an ArNS name to a different ANT. */
1805
1904
  async reassignName(params, _options) {
1905
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
1806
1906
  const newAnt = address(params.processId);
1807
1907
  const [arnsRecord] = await getArnsRecordPDA(params.name, this.arnsProgram);
1808
- // The on-chain `reassign_name` (PR #73 / BD-106 / BD-095) now authorizes
1809
- // against the CURRENT Metaplex Core holder of `record.ant` via a named
1810
- // `ant_asset` account constrained to `arns_record.ant`. We must read the
1811
- // current record to know which asset to pass — that's the OLD ant (the
1812
- // one we're reassigning AWAY FROM), not `newAnt`.
1813
- const currentRecord = await this.getArNSRecord({ name: params.name });
1814
- const currentAnt = address(currentRecord.processId);
1908
+ const record = await this.getArNSRecord({ name: params.name });
1909
+ const antAsset = address(record.processId);
1815
1910
  const ix = await getReassignNameInstructionAsync(await this.withArnsDefaults({
1816
1911
  arnsRecord,
1817
- antAsset: currentAnt,
1912
+ antAsset,
1818
1913
  caller: this.signer,
1819
1914
  newAnt,
1820
1915
  }), { programAddress: this.arnsProgram });
@@ -1828,21 +1923,25 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1828
1923
  // the new ANT's holder; otherwise the ix is sent alone and the new
1829
1924
  // owner runs `syncAttributes()` later (BD-095/096).
1830
1925
  const syncIx = await this._buildSyncAttributesIxIfOwner(params.name, newAnt);
1831
- const sig = await this.sendTransaction(syncIx ? [ix, syncIx] : [ix]);
1926
+ const reassignWithMetas = withRemainingAccounts(ix, [
1927
+ { address: newAnt, role: AccountRole.READONLY },
1928
+ ]);
1929
+ const sig = await this.sendTransaction(syncIx
1930
+ ? [...migrateIxs, reassignWithMetas, syncIx]
1931
+ : [...migrateIxs, reassignWithMetas]);
1832
1932
  return { id: sig };
1833
1933
  }
1834
1934
  /** Release a permabuy name back to the registry (creates a returned name auction). */
1835
1935
  async releaseName(params, _options) {
1936
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
1836
1937
  const [returnedNamePda] = await getReturnedNamePDA(params.name, this.arnsProgram);
1837
1938
  const [arnsRecord] = await getArnsRecordPDA(params.name, this.arnsProgram);
1838
- // PR #73 / BD-106: `release_name` now authorizes against the current
1839
- // Metaplex Core holder of `record.ant` via a named `ant_asset` account
1840
- // constrained to `arns_record.ant`. Fetch the record to know which.
1841
- const currentRecord = await this.getArNSRecord({ name: params.name });
1939
+ const record = await this.getArNSRecord({ name: params.name });
1940
+ const antAsset = address(record.processId);
1842
1941
  const ix = await getReleaseNameInstructionAsync(await this.withArnsDefaults({
1843
1942
  arnsRecord,
1844
1943
  returnedName: returnedNamePda,
1845
- antAsset: address(currentRecord.processId),
1944
+ antAsset,
1846
1945
  caller: this.signer,
1847
1946
  }), { programAddress: this.arnsProgram });
1848
1947
  // Note: no sync_attributes bundle here — release_name closes the
@@ -1850,7 +1949,7 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
1850
1949
  // asset's stale traits remain pointing at the released name; off-chain
1851
1950
  // resolvers should treat ArnsRecord as the source of truth and ignore
1852
1951
  // a "ArNS Name" trait that no longer resolves.
1853
- const sig = await this.sendTransaction([ix]);
1952
+ const sig = await this.sendTransaction([...migrateIxs, ix]);
1854
1953
  return { id: sig };
1855
1954
  }
1856
1955
  // =========================================
@@ -2100,6 +2199,7 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
2100
2199
  * (kicks off the Dutch auction). Permissionless.
2101
2200
  */
2102
2201
  async pruneNameToReturned(params, _options) {
2202
+ const migrateIxs = await this._buildMigrateArnsRecordIxIfNeeded(params.name);
2103
2203
  const [arnsRecord] = await getArnsRecordPDA(params.name, this.arnsProgram);
2104
2204
  const [returnedName] = await getReturnedNamePDA(params.name, this.arnsProgram);
2105
2205
  const ix = await getPruneNameToReturnedInstructionAsync(await this.withArnsDefaults({
@@ -2107,7 +2207,7 @@ export class SolanaARIOWriteable extends SolanaARIOReadable {
2107
2207
  returnedName,
2108
2208
  payer: this.signer,
2109
2209
  }), { programAddress: this.arnsProgram });
2110
- const sig = await this.sendTransaction([ix]);
2210
+ const sig = await this.sendTransaction([...migrateIxs, ix]);
2111
2211
  return { id: sig };
2112
2212
  }
2113
2213
  /**
@@ -14,4 +14,4 @@
14
14
  * limitations under the License.
15
15
  */
16
16
  // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
17
- export const version = '4.0.0-solana.21';
17
+ export const version = '4.0.0-solana.22';
@@ -109,6 +109,17 @@ export declare class SolanaARIOWriteable extends SolanaARIOReadable {
109
109
  * (codama only reads the named keys from `input`).
110
110
  */
111
111
  private withArnsDefaults;
112
+ /**
113
+ * If the on-chain ArnsRecord for `name` hasn't been migrated to the
114
+ * current schema (name_hash at offset 8 doesn't match the expected
115
+ * hash), return a `migrate_arns_record` instruction that must be
116
+ * prepended to any operation referencing the record with PDA seed
117
+ * verification.
118
+ *
119
+ * Returns an empty array when the record is already up-to-date or
120
+ * doesn't exist.
121
+ */
122
+ private _buildMigrateArnsRecordIxIfNeeded;
112
123
  /** Inject ARIO core default PDAs (config). */
113
124
  private withCoreDefaults;
114
125
  /** Inject GAR default PDAs (settings, epochSettings, registry). */
@@ -266,6 +277,30 @@ export declare class SolanaARIOWriteable extends SolanaARIOReadable {
266
277
  * Reads the live DemandFactor account + applies the on-chain pricing math.
267
278
  */
268
279
  private _estimateManageStakeCost;
280
+ /**
281
+ * If the signer already has a primary name set, build the instruction(s)
282
+ * needed to remove it so they can be prepended to a request/set tx —
283
+ * enabling single-tx "change primary name" flows.
284
+ *
285
+ * Returns an empty array when the signer has no existing primary name.
286
+ *
287
+ * Throws when the signer has a legacy primary-name state (forward
288
+ * `PrimaryName` PDA exists but its paired `PrimaryNameReverse` PDA does
289
+ * NOT). Both `remove_primary_name` AND `request_and_set_primary_name`
290
+ * require the reverse PDA on-chain — the latter rejects with
291
+ * `MustRemoveExistingPrimaryName` (0x1786, code 6022) any time a
292
+ * forward record already exists for the signer, regardless of reverse
293
+ * state. Silently skipping the remove would queue a tx guaranteed to
294
+ * fail with that opaque error. Surfacing it at the client with a clear
295
+ * remediation pointer is the only safe behavior.
296
+ *
297
+ * The legacy state should not exist on any cluster post-snapshot/import
298
+ * PR #159 (which emits PrimaryNameReverse in lockstep with PrimaryName)
299
+ * — it's a relic of pre-#159 imports. Operators on affected clusters
300
+ * must run `yarn workspace @ar-io/migration-import backfill:primary-name-reverse`
301
+ * (in the solana-ar-io repo) before this method can succeed.
302
+ */
303
+ private _buildRemoveExistingPrimaryNameIxs;
269
304
  /**
270
305
  * Build the `remaining_accounts` slice + the `antProgramId` arg the
271
306
  * four ario-core primary-name instructions consume. Sprint 2/5
@@ -13,4 +13,4 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- export declare const version = "4.0.0-solana.20";
16
+ export declare const version = "4.0.0-solana.21";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ar.io/sdk",
3
- "version": "4.0.0-solana.21",
3
+ "version": "4.0.0-solana.22",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+https://github.com/ar-io/ar-io-sdk.git"
@@ -122,7 +122,7 @@
122
122
  "typescript": "^5.1.6"
123
123
  },
124
124
  "dependencies": {
125
- "@ar.io/solana-contracts": "^0.4.0",
125
+ "@ar.io/solana-contracts": "0.4.0",
126
126
  "@solana-program/compute-budget": "^0.15.0",
127
127
  "@solana-program/token": "^0.13.0",
128
128
  "@solana/kit": "^6.8.0",