Feat/mpl core alpha (#5)

* feat(mpl-core): update to mpl-core alpha
metaplex-foundation · May 21, 2024 · ef9de9f · ef9de9f
1 parent b87ec5e
commit ef9de9f
Show file tree

Hide file tree

Showing 7 changed files with 211 additions and 139 deletions.
diff --git a/.github/file-filters.yml b/.github/file-filters.yml
@@ -8,4 +8,4 @@ js_client: &js_client
  - ".github/test-js-client.yml"
  - ".github/file-filters.yml"
  - ".github/.env"
- - "**/"
+ - "/**"
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
  },
  "peerDependencies": {
  "@metaplex-foundation/digital-asset-standard-api": "^1.0.3",
- "@metaplex-foundation/mpl-core": "^0.4.7",
+ "@metaplex-foundation/mpl-core": "1.0.0-alpha.6",
  "@metaplex-foundation/umi": ">=0.8.2 < 1"
  },
  "devDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -8,7 +8,7 @@ import {
  AddBlocker,
  AssetV1,
  Attributes,
- BaseUpdateAuthority,
+ UpdateAuthority,
  BurnDelegate,
  CollectionV1,
  Edition,
@@ -17,7 +17,7 @@ import {
  ImmutableMetadata,
  Key,
  mapPlugin,
- MasterEdition,
+ BaseMasterEdition,
  MPL_CORE_PROGRAM_ID,
  PermanentBurnDelegate,
  PermanentFreezeDelegate,
@@ -60,8 +60,8 @@ function base64ToUInt8Array(base64: string) {
 function getUpdateAuthority(
  groupingItem: DasApiAssetGrouping | undefined,
  authority: DasApiAssetAuthority
-): Record<'updateAuthority', BaseUpdateAuthority> {
- const result: { updateAuthority: BaseUpdateAuthority } = {
+): Record<'updateAuthority', UpdateAuthority> {
+ const result: { updateAuthority: UpdateAuthority } = {
  updateAuthority: { type: 'None' },
  };
 
@@ -84,13 +84,14 @@ function getAccountHeader(
  executable?: boolean,
  lamps?: BigIntInput,
  rentEpoch?: number
-): Record<'header', AccountHeader> {
+): Record<'header', AccountHeader & { exists: boolean }> {
  return {
  header: {
  executable: executable ?? false,
  owner: MPL_CORE_PROGRAM_ID,
  lamports: lamports(lamps ?? -1),
  ...(rentEpoch !== undefined ? { rentEpoch: BigInt(rentEpoch) } : {}),
+ exists: true,
  },
  };
 }
@@ -105,15 +106,27 @@ function getRuleSet(dasRuleSet: string | Record<string, any>): RuleSet {
  )
  : [];
 
+ // RuleSet has both __kind and type for backwards compatibility
  if (ruleSetKind === 'program_allow_list') {
- return ruleSet('ProgramAllowList', [ruleSetData]);
+ return {
+ ...ruleSet('ProgramAllowList', [ruleSetData]),
+ type: 'ProgramAllowList',
+ addresses: ruleSetData,
+ };
  }
 
  if (ruleSetKind === 'program_deny_list') {
- return ruleSet('ProgramDenyList', [ruleSetData]);
+ return {
+ ...ruleSet('ProgramDenyList', [ruleSetData]),
+ type: 'ProgramDenyList',
+ addresses: ruleSetData,
+ };
  }
 
- return ruleSet('None');
+ return {
+ ...ruleSet('None'),
+ type: 'None',
+ };
 }
 
 function dasPluginDataToCorePluginData(
@@ -129,7 +142,7 @@ function dasPluginDataToCorePluginData(
  | PermanentTransferDelegate
  | PermanentBurnDelegate
  | Edition
- | MasterEdition
+ | BaseMasterEdition
  | AddBlocker
  | ImmutableMetadata {
  // TODO: Refactor when DAS types are defined