From b46543e0e2f3fc32e9f595d3dcdfcd4deb28f4b7 Mon Sep 17 00:00:00 2001
From: Nhan Phan <nhan.phan@gmail.com>
Date: Wed, 3 Jul 2024 18:45:22 -0700
Subject: [PATCH] update das package dep

---
 package.json     |  4 ++--
 pnpm-lock.yaml   | 17 +++++++++++------
 test/das.test.ts |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index cdbcddb..ec91329 100644
--- a/package.json
+++ b/package.json
@@ -24,14 +24,14 @@
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {
-    "@metaplex-foundation/digital-asset-standard-api": ">=1.0.4-alpha.0",
+    "@metaplex-foundation/digital-asset-standard-api": ">=1.0.4",
     "@metaplex-foundation/mpl-core": ">=1.0.1",
     "@metaplex-foundation/umi": ">=0.8.2 < 1"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@metaplex-foundation/mpl-core": "1.0.1",
-    "@metaplex-foundation/digital-asset-standard-api": "^1.0.4-alpha.0",
+    "@metaplex-foundation/digital-asset-standard-api": "^1.0.4",
     "@metaplex-foundation/umi": "^0.9.1",
     "@metaplex-foundation/umi-bundle-tests": "^0.9.1",
     "@typescript-eslint/eslint-plugin": "^7.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9acff75..29d1615 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,12 +1,16 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 devDependencies:
   '@ava/typescript':
     specifier: ^4.1.0
     version: 4.1.0
   '@metaplex-foundation/digital-asset-standard-api':
-    specifier: ^1.0.4-alpha.0
-    version: 1.0.4-alpha.0(@metaplex-foundation/umi@0.9.1)
+    specifier: ^1.0.4
+    version: 1.0.4(@metaplex-foundation/umi@0.9.1)
   '@metaplex-foundation/mpl-core':
     specifier: 1.0.1
     version: 1.0.1(@metaplex-foundation/umi@0.9.1)(@noble/hashes@1.4.0)
@@ -162,8 +166,13 @@ packages:
       - supports-color
     dev: true
 
+<<<<<<< Updated upstream
   /@metaplex-foundation/digital-asset-standard-api@1.0.4-alpha.0(@metaplex-foundation/umi@0.9.1):
     resolution: {integrity: sha512-xVhvDhpF/5jBxJ+rlMJh70C129G64pQ6YyylFnm1iHgMmsjmun0PlX87Jp8DQLpac8fdveQ862SVotELkyHV1g==}
+=======
+  /@metaplex-foundation/digital-asset-standard-api@1.0.4(@metaplex-foundation/umi@0.9.1):
+    resolution: {integrity: sha512-YSYyMnIoKNykDZTXsSCeiIOJ7NT5Ke2pzghXDsinRwHvwIZWv+zY5kJQBvTglAzYlt/GaI+noAhUZXXmSbp07A==}
+>>>>>>> Stashed changes
     peerDependencies:
       '@metaplex-foundation/umi': '>= 0.8.2 < 1'
     dependencies:
@@ -3821,7 +3830,3 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: true
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
diff --git a/test/das.test.ts b/test/das.test.ts
index 8c73d8c..bbcc283 100644
--- a/test/das.test.ts
+++ b/test/das.test.ts
@@ -241,4 +241,4 @@ test.serial('das: it can fetch derived asset', async (t) => {
 
 // TODO
 test.skip('das: lifecycle hooks', async (t) => {});
-test.skip('das: data store', async (t) => {});
+test.skip('das: app data', async (t) => {});