Rename Oracle pda - stacked onto rename external plugin

clients/js/src/generated/types/baseOracle.ts

@@ -24,13 +24,13 @@ import {
 
 export type BaseOracle = {
   baseAddress: PublicKey;
-  pda: Option<BaseExtraAccount>;
+  baseAddressConfig: Option<BaseExtraAccount>;
   resultsOffset: BaseValidationResultsOffset;
 };
 
 export type BaseOracleArgs = {
   baseAddress: PublicKey;
-  pda: OptionOrNullable<BaseExtraAccountArgs>;
+  baseAddressConfig: OptionOrNullable<BaseExtraAccountArgs>;
   resultsOffset: BaseValidationResultsOffsetArgs;
 };
 
@@ -41,7 +41,7 @@ export function getBaseOracleSerializer(): Serializer<
   return struct<BaseOracle>(
     [
       ['baseAddress', publicKeySerializer()],
-      ['pda', option(getBaseExtraAccountSerializer())],
+      ['baseAddressConfig', option(getBaseExtraAccountSerializer())],
       ['resultsOffset', getBaseValidationResultsOffsetSerializer()],
     ],
     { description: 'BaseOracle' }

clients/js/src/generated/types/baseOracleInitInfo.ts

@@ -37,15 +37,15 @@ export type BaseOracleInitInfo = {
   baseAddress: PublicKey;
   initPluginAuthority: Option<BasePluginAuthority>;
   lifecycleChecks: Array<[HookableLifecycleEvent, AdapterCheckResult]>;
-  pda: Option<BaseExtraAccount>;
+  baseAddressConfig: Option<BaseExtraAccount>;
   resultsOffset: Option<BaseValidationResultsOffset>;
 };
 
 export type BaseOracleInitInfoArgs = {
   baseAddress: PublicKey;
   initPluginAuthority: OptionOrNullable<BasePluginAuthorityArgs>;
   lifecycleChecks: Array<[HookableLifecycleEventArgs, AdapterCheckResultArgs]>;
-  pda: OptionOrNullable<BaseExtraAccountArgs>;
+  baseAddressConfig: OptionOrNullable<BaseExtraAccountArgs>;
   resultsOffset: OptionOrNullable<BaseValidationResultsOffsetArgs>;
 };
 
@@ -66,7 +66,7 @@ export function getBaseOracleInitInfoSerializer(): Serializer<
           ])
         ),
       ],
-      ['pda', option(getBaseExtraAccountSerializer())],
+      ['baseAddressConfig', option(getBaseExtraAccountSerializer())],
       ['resultsOffset', option(getBaseValidationResultsOffsetSerializer())],
     ],
     { description: 'BaseOracleInitInfo' }

clients/js/src/generated/types/baseOracleUpdateInfo.ts

@@ -31,15 +31,15 @@ import {
 
 export type BaseOracleUpdateInfo = {
   lifecycleChecks: Option<Array<[HookableLifecycleEvent, AdapterCheckResult]>>;
-  pda: Option<BaseExtraAccount>;
+  baseAddressConfig: Option<BaseExtraAccount>;
   resultsOffset: Option<BaseValidationResultsOffset>;
 };
 
 export type BaseOracleUpdateInfoArgs = {
   lifecycleChecks: OptionOrNullable<
     Array<[HookableLifecycleEventArgs, AdapterCheckResultArgs]>
   >;
-  pda: OptionOrNullable<BaseExtraAccountArgs>;
+  baseAddressConfig: OptionOrNullable<BaseExtraAccountArgs>;
   resultsOffset: OptionOrNullable<BaseValidationResultsOffsetArgs>;
 };
 
@@ -60,7 +60,7 @@ export function getBaseOracleUpdateInfoSerializer(): Serializer<
           )
         ),
       ],
-      ['pda', option(getBaseExtraAccountSerializer())],
+      ['baseAddressConfig', option(getBaseExtraAccountSerializer())],
       ['resultsOffset', option(getBaseValidationResultsOffsetSerializer())],
     ],
     { description: 'BaseOracleUpdateInfo' }

clients/js/src/helpers/lifecycle.ts

@@ -106,15 +106,19 @@ export async function validateTransfer(
       )
       .filter((o) => {
         // there's no PDA to derive, we can check the oracle account
-        if (!o.pda) {
+        if (!o.baseAddressConfig) {
           return true;
         }
         // If there's a recipient in the inputs, we can try to check the oracle account
         if (recipient) {
           return true;
         }
 
-        if (!getExtraAccountRequiredInputs(o.pda).includes('recipient')) {
+        if (
+          !getExtraAccountRequiredInputs(o.baseAddressConfig).includes(
+            'recipient'
+          )
+        ) {
           return true;
         }
         // we skip the check if there's a recipient required but no recipient provided

clients/js/src/plugins/oracle.ts

@@ -24,8 +24,8 @@ import {
   validationResultsOffsetToBase,
 } from './validationResultsOffset';
 
-export type Oracle = Omit<BaseOracle, 'pda' | 'resultsOffset'> & {
-  pda?: ExtraAccount;
+export type Oracle = Omit<BaseOracle, 'baseAddressConfig' | 'resultsOffset'> & {
+  baseAddressConfig?: ExtraAccount;
   resultsOffset: ValidationResultsOffset;
 };
 
@@ -36,22 +36,25 @@ export type OraclePlugin = BasePluginAdapter &
 
 export type OracleInitInfoArgs = Omit<
   BaseOracleInitInfoArgs,
-  'initPluginAuthority' | 'lifecycleChecks' | 'pda' | 'resultsOffset'
+  | 'initPluginAuthority'
+  | 'lifecycleChecks'
+  | 'baseAddressConfig'
+  | 'resultsOffset'
 > & {
   type: 'Oracle';
   initPluginAuthority?: PluginAuthority;
   lifecycleChecks: LifecycleChecks;
-  pda?: ExtraAccount;
+  baseAddressConfig?: ExtraAccount;
   resultsOffset?: ValidationResultsOffset;
 };
 
 export type OracleUpdateInfoArgs = Omit<
   BaseOracleUpdateInfoArgs,
-  'lifecycleChecks' | 'pda' | 'resultsOffset'
+  'lifecycleChecks' | 'baseAddressConfig' | 'resultsOffset'
 > & {
   key: PluginAdapterKey;
   lifecycleChecks?: LifecycleChecks;
-  pda?: ExtraAccount;
+  baseAddressConfig?: ExtraAccount;
   resultsOffset?: ValidationResultsOffset;
 };
 
@@ -60,7 +63,9 @@ export function oracleInitInfoArgsToBase(
 ): BaseOracleInitInfoArgs {
   return {
     baseAddress: o.baseAddress,
-    pda: o.pda ? extraAccountToBase(o.pda) : null,
+    baseAddressConfig: o.baseAddressConfig
+      ? extraAccountToBase(o.baseAddressConfig)
+      : null,
     lifecycleChecks: lifecycleChecksToBase(o.lifecycleChecks),
     initPluginAuthority: o.initPluginAuthority
       ? pluginAuthorityToBase(o.initPluginAuthority)
@@ -75,7 +80,9 @@ export function oracleUpdateInfoArgsToBase(
   o: OracleUpdateInfoArgs
 ): BaseOracleUpdateInfoArgs {
   return {
-    pda: o.pda ? extraAccountToBase(o.pda) : null,
+    baseAddressConfig: o.baseAddressConfig
+      ? extraAccountToBase(o.baseAddressConfig)
+      : null,
     lifecycleChecks: o.lifecycleChecks
       ? lifecycleChecksToBase(o.lifecycleChecks)
       : null,
@@ -92,27 +99,29 @@ export function oracleFromBase(
 ): Oracle {
   return {
     ...s,
-    pda:
-      s.pda.__option === 'Some' ? extraAccountFromBase(s.pda.value) : undefined,
+    baseAddressConfig:
+      s.baseAddressConfig.__option === 'Some'
+        ? extraAccountFromBase(s.baseAddressConfig.value)
+        : undefined,
     resultsOffset: validationResultsOffsetFromBase(s.resultsOffset),
   };
 }
 
 export function findOracleAccount(
   context: Pick<Context, 'eddsa'>,
-  oracle: Pick<Oracle, 'baseAddress' | 'pda'>,
+  oracle: Pick<Oracle, 'baseAddress' | 'baseAddressConfig'>,
   inputs: {
     asset?: PublicKey;
     collection?: PublicKey;
     recipient?: PublicKey;
     owner?: PublicKey;
   }
 ): PublicKey {
-  if (!oracle.pda) {
+  if (!oracle.baseAddressConfig) {
     return oracle.baseAddress;
   }
 
-  return extraAccountToAccountMeta(context, oracle.pda, {
+  return extraAccountToAccountMeta(context, oracle.baseAddressConfig, {
     ...inputs,
     program: oracle.baseAddress,
   }).pubkey;

clients/js/src/plugins/pluginAdapters.ts

@@ -187,9 +187,9 @@ export const findExtraAccounts = (
 
   pluginAdapters.oracles?.forEach((oracle) => {
     if (oracle.lifecycleChecks?.[lifecycle]) {
-      if (oracle.pda) {
+      if (oracle.baseAddressConfig) {
         accounts.push(
-          extraAccountToAccountMeta(context, oracle.pda, {
+          extraAccountToAccountMeta(context, oracle.baseAddressConfig, {
             ...inputs,
             program: oracle.baseAddress,
           })