Minor fixes in name-service (#1895)

* Fix reverse twitter registries and program space allocation

* Small fixes and address update

* Fix the package name

Author: Lcchy

name-service/.gitignore

@@ -19,3 +19,4 @@ js/dist
 js/lib
 js/docs
 js/src/secret.ts
+js/src/test.ts

name-service/js/package.json

@@ -18,7 +18,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "dev": "tsc && node --trace-warnings dist/test.js",
+    "dev": "tsc && node --trace-warnings dist/transfer.js",
     "build": "tsc",
     "prepublish": "tsc",
     "lint": "yarn pretty && eslint .",
@@ -55,6 +55,7 @@
     "@solana/web3.js": "^1.11.0",
     "bip32": "^2.0.6",
     "bn.js": "^5.1.3",
+    "borsh": "^0.4.0",
     "bs58": "4.0.1",
     "buffer-layout": "^1.2.0",
     "core-util-is": "^1.0.2",

name-service/js/src/bindings.ts

@@ -26,7 +26,6 @@ export const NAME_PROGRAM_ID = new PublicKey(
   'namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX'
 );
 export const HASH_PREFIX = 'SPL Name Service';
-export const VERIFICATION_AUTHORITY_OFFSET = 64;
 
 ////////////////////////////////////////////////////////////
 /**
@@ -59,8 +58,6 @@ export async function createNameRegistry(
     parentName
   );
 
-  space += 96; // Accounting for the Registry State Header
-
   const balance = lamports
     ? lamports
     : await connection.getMinimumBalanceForRentExemption(space);

name-service/js/src/state.ts

@@ -1,47 +1,56 @@
 import { Connection, PublicKey } from '@solana/web3.js';
+import { deserializeUnchecked, Schema } from 'borsh';
 
 export class NameRegistryState {
+  static HEADER_LEN = 96;
   parentName: PublicKey;
   owner: PublicKey;
   class: PublicKey;
-  data: Buffer;
+  data: Buffer | undefined;
 
+  static schema: Schema = new Map([
+    [
+      NameRegistryState,
+      {
+        kind: 'struct',
+        fields: [
+          ['parentName', [32]],
+          ['owner', [32]],
+          ['class', [32]],
+        ],
+      },
+    ],
+  ]);
   constructor(obj: {
     parentName: Uint8Array;
     owner: Uint8Array;
     class: Uint8Array;
-    data: Uint8Array;
   }) {
     this.parentName = new PublicKey(obj.parentName);
     this.owner = new PublicKey(obj.owner);
     this.class = new PublicKey(obj.class);
-    this.data = Buffer.from(obj.data);
   }
 
-  static deserialize(buffer: Buffer): NameRegistryState {
-    return new NameRegistryState({
-      parentName: buffer.slice(0, 32),
-      owner: buffer.slice(32, 64),
-      class: buffer.slice(64, 96),
-      data: buffer.slice(96, buffer.length),
-    });
-  }
-
-  static async retrieve(
+  public static async retrieve(
     connection: Connection,
     nameAccountKey: PublicKey
   ): Promise<NameRegistryState> {
-    const nameAccount = await connection.getAccountInfo(
+    let nameAccount = await connection.getAccountInfo(
       nameAccountKey,
       'processed'
     );
     if (!nameAccount) {
       throw new Error('Invalid name account provided');
     }
 
-    const res: NameRegistryState = NameRegistryState.deserialize(
+    let res: NameRegistryState = deserializeUnchecked(
+      this.schema,
+      NameRegistryState,
       nameAccount.data
     );
+
+    res.data = nameAccount.data?.slice(this.HEADER_LEN);
+
     return res;
   }
 }