Updating JS hooks.

metaplex-foundation · Apr 25, 2024 · 2fbc51e · 2fbc51e
1 parent 4ea1b2b
commit 2fbc51e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 30 deletions.
diff --git a/clients/js/src/hooked/pluginRegistryV1Data.ts b/clients/js/src/hooked/pluginRegistryV1Data.ts
@@ -133,13 +133,18 @@ export function getExternalRegistryRecordSerializer(): Serializer<
         buffer,
         lifecycleChecksOffset
       );
+
+      const [dataOffset, dataOffsetOffset] = option(u64()).deserialize(buffer, pluginOffsetOffset);
+      const [dataLen] = option(u64()).deserialize(buffer, dataOffsetOffset);
       return [
         {
           pluginType,
           authority,
           lifecycleChecks,
           offset: pluginOffset,
           isUnknown,
+          dataOffset,
+          dataLen,
         },
         pluginOffsetOffset,
       ];

diff --git a/clients/js/src/instructions/create.ts b/clients/js/src/instructions/create.ts
@@ -61,8 +61,6 @@ export const create = (
             authority: plugin.initPluginAuthority || {
               type: 'UpdateAuthority',
             },
-            dataLen: 0n,
-            dataOffset: 0n,
             type: 'LifecycleHook',
             schema: plugin.schema || ExternalPluginSchema.Binary,
           });

diff --git a/clients/js/src/plugins/dataStore.ts b/clients/js/src/plugins/dataStore.ts
@@ -3,6 +3,7 @@ import {
   BaseDataStoreInitInfoArgs,
   BaseDataStoreUpdateInfoArgs,
   ExternalPluginSchema,
+  ExternalRegistryRecord,
 } from '../generated';
 import { ExternalPluginKey } from './externalPluginKey';
 import { ExternalPluginManifest } from './externalPluginManifest';
@@ -66,14 +67,13 @@ export function dataStoreUpdateInfoArgsToBase(
 
 export function dataStoreFromBase(
   s: BaseDataStore,
+  r: ExternalRegistryRecord,
   account: Uint8Array
 ): DataStore {
   return {
     ...s,
     dataAuthority: pluginAuthorityFromBase(s.dataAuthority),
-    dataOffset: s.dataOffset,
-    dataLen: s.dataLen,
-    data: parseExternalPluginData(s, account),
+    data: parseExternalPluginData(s, r, account),
   };
 }
 

diff --git a/clients/js/src/plugins/externalPluginManifest.ts b/clients/js/src/plugins/externalPluginManifest.ts
@@ -1,3 +1,4 @@
+import { ExternalRegistryRecord } from 'src/generated';
 import { ExternalPluginTypeString } from './externalPlugins';
 
 export type ExternalPluginManifest<
@@ -9,7 +10,7 @@ export type ExternalPluginManifest<
   UpdateBase extends Object
 > = {
   type: ExternalPluginTypeString;
-  fromBase: (input: Base, account: Uint8Array) => T;
+  fromBase: (input: Base, record: ExternalRegistryRecord, account: Uint8Array) => T;
   initToBase: (input: Init) => InitBase;
   updateToBase: (input: Update) => UpdateBase;
 };
diff --git a/clients/js/src/plugins/externalPlugins.ts b/clients/js/src/plugins/externalPlugins.ts
@@ -1,4 +1,4 @@
-import { AccountMeta, Context, PublicKey } from '@metaplex-foundation/umi';
+import { AccountMeta, Context, PublicKey, Option } from '@metaplex-foundation/umi';
 import {
   lifecycleHookFromBase,
   LifecycleHookInitInfoArgs,
@@ -50,25 +50,25 @@ export type ExternalPluginsList = {
 
 export type ExternalPluginInitInfoArgs =
   | ({
-      type: 'Oracle';
-    } & OracleInitInfoArgs)
+    type: 'Oracle';
+  } & OracleInitInfoArgs)
   | ({
-      type: 'LifecycleHook';
-    } & LifecycleHookInitInfoArgs)
+    type: 'LifecycleHook';
+  } & LifecycleHookInitInfoArgs)
   | ({
-      type: 'DataStore';
-    } & DataStoreInitInfoArgs);
+    type: 'DataStore';
+  } & DataStoreInitInfoArgs);
 
 export type ExternalPluginUpdateInfoArgs =
   | ({
-      type: 'Oracle';
-    } & OracleUpdateInfoArgs)
+    type: 'Oracle';
+  } & OracleUpdateInfoArgs)
   | ({
-      type: 'LifecycleHook';
-    } & LifecycleHookUpdateInfoArgs)
+    type: 'LifecycleHook';
+  } & LifecycleHookUpdateInfoArgs)
   | ({
-      type: 'DataStore';
-    } & DataStoreUpdateInfoArgs);
+    type: 'DataStore';
+  } & DataStoreUpdateInfoArgs);
 
 export const externalPluginManifests = {
   Oracle: oracleManifest,
@@ -110,7 +110,7 @@ export function externalRegistryRecordsToExternalPluginList(
       result.oracles.push({
         type: 'Oracle',
         ...mappedPlugin,
-        ...oracleFromBase(deserializedPlugin.fields[0], accountData),
+        ...oracleFromBase(deserializedPlugin.fields[0], record, accountData),
       });
     } else if (deserializedPlugin.__kind === 'DataStore') {
       if (!result.dataStores) {
@@ -119,7 +119,7 @@ export function externalRegistryRecordsToExternalPluginList(
       result.dataStores.push({
         type: 'DataStore',
         ...mappedPlugin,
-        ...dataStoreFromBase(deserializedPlugin.fields[0], accountData),
+        ...dataStoreFromBase(deserializedPlugin.fields[0], record, accountData),
       });
     } else if (deserializedPlugin.__kind === 'LifecycleHook') {
       if (!result.lifecycleHooks) {
@@ -128,7 +128,7 @@ export function externalRegistryRecordsToExternalPluginList(
       result.lifecycleHooks.push({
         type: 'LifecycleHook',
         ...mappedPlugin,
-        ...lifecycleHookFromBase(deserializedPlugin.fields[0], accountData),
+        ...lifecycleHookFromBase(deserializedPlugin.fields[0], record, accountData),
       });
     }
   });
@@ -232,15 +232,17 @@ export const findExtraAccounts = (
 export function parseExternalPluginData(
   plugin: {
     schema: ExternalPluginSchema;
-    dataLen: bigint | number;
-    dataOffset: bigint | number;
+  },
+  record: {
+    dataLen: Option<bigint | number>;
+    dataOffset: Option<bigint | number>;
   },
   account: Uint8Array
 ): any {
   let data;
   const dataSlice = account.slice(
-    Number(plugin.dataOffset),
-    Number(plugin.dataOffset) + Number(plugin.dataLen)
+    Number(record.dataOffset),
+    Number(record.dataOffset) + Number(record.dataLen)
   );
 
   if (plugin.schema === ExternalPluginSchema.Binary) {

diff --git a/clients/js/src/plugins/lifecycleHook.ts b/clients/js/src/plugins/lifecycleHook.ts
@@ -9,6 +9,7 @@ import {
   BaseLifecycleHookInitInfoArgs,
   BaseLifecycleHookUpdateInfoArgs,
   ExternalPluginSchema,
+  ExternalRegistryRecord,
 } from '../generated';
 import { LifecycleChecks, lifecycleChecksToBase } from './lifecycleChecks';
 import {
@@ -95,17 +96,16 @@ export function lifecycleHookUpdateInfoArgsToBase(
 
 export function lifecycleHookFromBase(
   s: BaseLifecycleHook,
+  r: ExternalRegistryRecord,
   account: Uint8Array
 ): LifecycleHook {
   return {
     ...s,
-    dataOffset: s.dataOffset,
-    dataLen: s.dataLen,
     extraAccounts:
       s.extraAccounts.__option === 'Some'
         ? s.extraAccounts.value.map(extraAccountFromBase)
         : undefined,
-    data: parseExternalPluginData(s, account),
+    data: parseExternalPluginData(s, r, account),
     dataAuthority:
       s.dataAuthority.__option === 'Some'
         ? pluginAuthorityFromBase(s.dataAuthority.value)

diff --git a/clients/js/src/plugins/oracle.ts b/clients/js/src/plugins/oracle.ts
@@ -7,6 +7,7 @@ import {
   BaseOracle,
   BaseOracleInitInfoArgs,
   BaseOracleUpdateInfoArgs,
+  ExternalRegistryRecord,
 } from '../generated';
 import { LifecycleChecks, lifecycleChecksToBase } from './lifecycleChecks';
 import { PluginAuthority, pluginAuthorityToBase } from './pluginAuthority';
@@ -82,7 +83,7 @@ export function oracleUpdateInfoArgsToBase(
   };
 }
 
-export function oracleFromBase(s: BaseOracle, account: Uint8Array): Oracle {
+export function oracleFromBase(s: BaseOracle, r: ExternalRegistryRecord, account: Uint8Array): Oracle {
   return {
     ...s,
     pda: