name service: allow parent name owner to update records

Author: dr497

name-service/js/src/bindings.ts

@@ -123,7 +123,8 @@ export async function updateNameRegistryData(
     nameAccountKey,
     new Numberu32(offset),
     input_data,
-    signer
+    signer,
+    nameParent
   );
 
   return updateInstr;

name-service/js/src/instructions.ts

@@ -94,7 +94,8 @@ export function updateInstruction(
   nameAccountKey: PublicKey,
   offset: Numberu32,
   input_data: Buffer,
-  nameUpdateSigner: PublicKey
+  nameUpdateSigner: PublicKey,
+  parentNameKey: PublicKey | undefined
 ): TransactionInstruction {
   const buffers = [
     Buffer.from(Int8Array.from([1])),
@@ -104,7 +105,7 @@ export function updateInstruction(
   ];
 
   const data = Buffer.concat(buffers);
-  const keys = [
+  let keys = [
     {
       pubkey: nameAccountKey,
       isSigner: false,
@@ -117,6 +118,14 @@ export function updateInstruction(
     },
   ];
 
+  if (parentNameKey) {
+    keys.push({
+      pubkey: parentNameKey,
+      isSigner: false,
+      isWritable: false,
+    });
+  }
+
   return new TransactionInstruction({
     keys,
     programId: nameProgramId,

name-service/js/src/twitter.ts

@@ -103,7 +103,8 @@ export async function changeTwitterRegistryData(
       twitterHandleRegistryKey,
       new Numberu32(offset),
       input_data,
-      verifiedPubkey
+      verifiedPubkey,
+      undefined
     ),
   ];
 
@@ -441,7 +442,8 @@ export async function createReverseTwitterRegistry(
       reverseRegistryKey,
       new Numberu32(0),
       Buffer.from(reverseTwitterRegistryStateBuff),
-      TWITTER_VERIFICATION_AUTHORITY
+      TWITTER_VERIFICATION_AUTHORITY,
+      undefined
     ),
   ];
 }

name-service/program/src/instruction.rs

@@ -53,6 +53,10 @@ pub enum NameRegistryInstruction {
     ///   0. `[writeable]` Name record to be updated
     ///   1. `[signer]` Account class
     ///
+    ///   * If the signer is the parent name account owner
+    ///   0. `[writeable]` Name record to be updated
+    ///   1. `[signer]` Parent name account owner
+    ///   2. `[]` Parent name record
     Update { offset: u32, data: Vec<u8> },
 
     /// Transfer ownership of a name record
@@ -127,14 +131,19 @@ pub fn update(
     data: Vec<u8>,
     name_account_key: Pubkey,
     name_update_signer: Pubkey,
+    name_parent: Option<Pubkey>,
 ) -> Result<Instruction, ProgramError> {
     let instruction_data = NameRegistryInstruction::Update { offset, data };
     let data = instruction_data.try_to_vec().unwrap();
-    let accounts = vec![
+    let mut accounts = vec![
         AccountMeta::new(name_account_key, false),
         AccountMeta::new_readonly(name_update_signer, true),
     ];
 
+    if let Some(name_parent_key) = name_parent {
+        accounts.push(AccountMeta::new(name_parent_key, false))
+    }
+
     Ok(Instruction {
         program_id: name_service_program_id,
         accounts,

name-service/program/src/processor.rs

@@ -124,10 +124,22 @@ impl Processor {
 
         let name_account = next_account_info(accounts_iter)?;
         let name_update_signer = next_account_info(accounts_iter)?;
+        let parent_name = next_account_info(accounts_iter).ok();
 
         let name_record_header = NameRecordHeader::unpack_from_slice(&name_account.data.borrow())?;
 
         // Verifications
+        let is_parent_owner = if let Some(parent_name) = parent_name {
+            if name_record_header.parent_name != *parent_name.key {
+                msg!("Invalid parent name account");
+                return Err(ProgramError::InvalidArgument);
+            }
+            let parent_name_record_header =
+                NameRecordHeader::unpack_from_slice(&parent_name.data.borrow())?;
+            parent_name_record_header.owner == *name_update_signer.key
+        } else {
+            false
+        };
         if !name_update_signer.is_signer {
             msg!("The given name class or owner is not a signer.");
             return Err(ProgramError::InvalidArgument);
@@ -140,6 +152,7 @@ impl Processor {
         }
         if name_record_header.class == Pubkey::default()
             && *name_update_signer.key != name_record_header.owner
+            && !is_parent_owner
         {
             msg!("The given name owner account is incorrect.");
             return Err(ProgramError::InvalidArgument);

name-service/program/tests/functional.rs

@@ -130,6 +130,7 @@ async fn test_name_service() {
         data,
         name_account_key,
         sol_subdomains_class.pubkey(),
+        Some(name_record_header.parent_name),
     )
     .unwrap();
     sign_send_instruction(&mut ctx, update_instruction, vec![&sol_subdomains_class])