fix: records v2 methods for subdomains

Additional fixes for subdomains and record v2 instructions: - updateRecordV2Instruction - deleteRecordV2 - validateRecordV2Content - writRoaRecordV2 - ethValidateRecordV2Content
Bonfida · Dec 6, 2023 · d02dbb8 · d02dbb8
1 parent 9a595cb
commit d02dbb8
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 8 deletions.
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bonfida/spl-name-service",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "MIT",
   "files": [
     "dist"

diff --git a/js/src/bindings.ts b/js/src/bindings.ts
@@ -626,10 +626,15 @@ export const updateRecordV2Instruction = (
   owner: PublicKey,
   payer: PublicKey,
 ) => {
-  const { pubkey, parent } = getDomainKeySync(
+  let { pubkey, parent, isSub } = getDomainKeySync(
     `${record}.${domain}`,
     RecordVersion.V2,
   );
+
+  if (isSub) {
+    parent = getDomainKeySync(domain).pubkey;
+  }
+
   if (!parent) {
     throw new Error("Invalid parent");
   }
@@ -662,11 +667,15 @@ export const deleteRecordV2 = (
   owner: PublicKey,
   payer: PublicKey,
 ) => {
-  const { pubkey, parent } = getDomainKeySync(
+  let { pubkey, parent, isSub } = getDomainKeySync(
     `${record}.${domain}`,
     RecordVersion.V2,
   );
 
+  if (isSub) {
+    parent = getDomainKeySync(domain).pubkey;
+  }
+
   if (!parent) {
     throw new Error("Invalid parent");
   }
@@ -690,11 +699,15 @@ export const validateRecordV2Content = (
   payer: PublicKey,
   verifier: PublicKey,
 ) => {
-  const { pubkey, parent } = getDomainKeySync(
+  let { pubkey, parent, isSub } = getDomainKeySync(
     `${record}.${domain}`,
     RecordVersion.V2,
   );
 
+  if (isSub) {
+    parent = getDomainKeySync(domain).pubkey;
+  }
+
   if (!parent) {
     throw new Error("Invalid parent");
   }
@@ -719,11 +732,15 @@ export const writRoaRecordV2 = (
   payer: PublicKey,
   roaId: PublicKey,
 ) => {
-  const { pubkey, parent } = getDomainKeySync(
+  let { pubkey, parent, isSub } = getDomainKeySync(
     `${record}.${domain}`,
     RecordVersion.V2,
   );
 
+  if (isSub) {
+    parent = getDomainKeySync(domain).pubkey;
+  }
+
   if (!parent) {
     throw new Error("Invalid parent");
   }
@@ -747,11 +764,15 @@ export const ethValidateRecordV2Content = (
   signature: Buffer,
   expectedPubkey: Buffer,
 ) => {
-  const { pubkey, parent } = getDomainKeySync(
+  let { pubkey, parent, isSub } = getDomainKeySync(
     `${record}.${domain}`,
     RecordVersion.V2,
   );
 
+  if (isSub) {
+    parent = getDomainKeySync(domain).pubkey;
+  }
+
   if (!parent) {
     throw new Error("Invalid parent");
   }

diff --git a/js/tests/records-v2.test.ts b/js/tests/records-v2.test.ts
@@ -221,3 +221,45 @@ test("Create record for sub", async () => {
   const { value } = await connection.simulateTransaction(tx);
   expect(value.err).toBe(null);
 });
+
+test("Create record for sub & update & verify staleness & delete", async () => {
+  const domain = "sub-0.wallet-guide-9";
+  const owner = new PublicKey("Fxuoy3gFjfJALhwkRcuKjRdechcgffUApeYAfMWck6w8");
+  const tx = new Transaction();
+  const ix_create = createRecordV2Instruction(
+    domain,
+    Record.Github,
+    "bonfida",
+    owner,
+    owner,
+  );
+  tx.add(ix_create);
+
+  const ix_update = updateRecordV2Instruction(
+    domain,
+    Record.Github,
+    "somethingelse",
+    owner,
+    owner,
+  );
+  tx.add(ix_update);
+
+  const ix_verify = validateRecordV2Content(
+    true,
+    domain,
+    Record.Github,
+    owner,
+    owner,
+    owner,
+  );
+  tx.add(ix_verify);
+
+  const ix_delete = deleteRecordV2(domain, Record.Github, owner, owner);
+  tx.add(ix_delete);
+
+  tx.feePayer = owner;
+  tx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
+
+  const { value } = await connection.simulateTransaction(tx);
+  expect(value.err).toBe(null);
+});