build(deps): bump borsh from 0.7.0 to 2.0.0

account-compression/sdk/package.json

@@ -57,7 +57,6 @@
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "bn.js": "^5.2.1",
-    "borsh": "^0.7.0",
     "js-sha3": "^0.9.2",
     "typescript-collections": "^1.3.3"
   },

name-service/js/package.json

@@ -59,7 +59,7 @@
   "dependencies": {
     "@solana/web3.js": "^1.87.6",
     "bn.js": "^5.1.3",
-    "borsh": "^0.7.0"
+    "borsh": "^2.0.0"
   },
   "mocha": {
     "require": [

name-service/js/src/state.ts

@@ -1,5 +1,11 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { deserializeUnchecked, Schema } from 'borsh';
+import { deserialize, Schema } from 'borsh';
+
+type InitArgs = {
+  parentName: Uint8Array;
+  owner: Uint8Array;
+  class: Uint8Array;
+};
 
 export class NameRegistryState {
   static HEADER_LEN = 96;
@@ -8,24 +14,14 @@ export class NameRegistryState {
   class: PublicKey;
   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;
-  }) {
+  static schema: Schema = {
+    struct: {
+      parentName: { array: { type: 'u8', len: 32 } },
+      owner: { array: { type: 'u8', len: 32 } },
+      class: { array: { type: 'u8', len: 32 } },
+    },
+  };
+  constructor(obj: InitArgs) {
     this.parentName = new PublicKey(obj.parentName);
     this.owner = new PublicKey(obj.owner);
     this.class = new PublicKey(obj.class);
@@ -43,11 +39,8 @@ export class NameRegistryState {
       throw new Error('Invalid name account provided');
     }
 
-    const res: NameRegistryState = deserializeUnchecked(
-      this.schema,
-      NameRegistryState,
-      nameAccount.data,
-    );
+    const deserialized = deserialize(this.schema, nameAccount.data) as InitArgs;
+    const res = new NameRegistryState(deserialized);
 
     res.data = nameAccount.data?.slice(this.HEADER_LEN);
 

name-service/js/src/twitter.ts

@@ -4,7 +4,7 @@ import {
   SystemProgram,
   TransactionInstruction,
 } from '@solana/web3.js';
-import { deserialize, deserializeUnchecked, Schema, serialize } from 'borsh';
+import { deserialize, Schema, serialize } from 'borsh';
 
 import { deleteNameRegistry, NAME_PROGRAM_ID } from './bindings';
 import {
@@ -291,11 +291,10 @@ export async function getTwitterHandleandRegistryKeyViaFilters(
   for (const f of filteredAccounts) {
     if (f.accountInfo.data.length > NameRegistryState.HEADER_LEN + 32) {
       const data = f.accountInfo.data.slice(NameRegistryState.HEADER_LEN);
-      const state: ReverseTwitterRegistryState = deserialize(
+      const state = deserialize(
         ReverseTwitterRegistryState.schema,
-        ReverseTwitterRegistryState,
         data,
-      );
+      ) as ReverseTwitterRegistryState;
       return [state.twitterHandle, new PublicKey(state.twitterRegistryKey)];
     }
   }
@@ -351,18 +350,12 @@ export class ReverseTwitterRegistryState {
   twitterRegistryKey: Uint8Array;
   twitterHandle: string;
 
-  static schema: Schema = new Map([
-    [
-      ReverseTwitterRegistryState,
-      {
-        kind: 'struct',
-        fields: [
-          ['twitterRegistryKey', [32]],
-          ['twitterHandle', 'string'],
-        ],
-      },
-    ],
-  ]);
+  static schema: Schema = {
+    struct: {
+      twitterRegistryKey: { array: { type: 'u8', len: 32 } },
+      twitterHandle: 'string',
+    },
+  };
   constructor(obj: { twitterRegistryKey: Uint8Array; twitterHandle: string }) {
     this.twitterRegistryKey = obj.twitterRegistryKey;
     this.twitterHandle = obj.twitterHandle;
@@ -380,11 +373,10 @@ export class ReverseTwitterRegistryState {
       throw new Error('Invalid reverse Twitter account provided');
     }
 
-    const res: ReverseTwitterRegistryState = deserializeUnchecked(
+    const res = deserialize(
       this.schema,
-      ReverseTwitterRegistryState,
       reverseTwitterAccount.data.slice(NameRegistryState.HEADER_LEN),
-    );
+    ) as ReverseTwitterRegistryState;
 
     return res;
   }