From 831ca05641bc8cd8c180bc166e1407d19be71ae2 Mon Sep 17 00:00:00 2001
From: Jamie Hewitt <jamie.hewitt15@gmail.com>
Date: Mon, 9 Dec 2024 15:43:00 +0300
Subject: [PATCH 1/3] Adding feeToken from the stats.price if it is available

---
 src/helpers.ts |  4 +--
 src/json       | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 src/json

diff --git a/src/helpers.ts b/src/helpers.ts
index 4e38a11..c613069 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -78,7 +78,7 @@ export async function createAsset(
 	aquariusInstance: Aquarius,
 	templateIndex: number = 1,
 	macOsProviderUrl?: string,
-	encryptDDO: boolean = true,
+	encryptDDO: boolean = true
 ) {
 	const { chainId } = await owner.provider.getNetwork();
 	const nft = new Nft(owner, chainId);
@@ -118,7 +118,7 @@ export async function createAsset(
 		cap: "100000",
 		feeAmount: "0",
 		paymentCollector: await owner.getAddress(),
-		feeToken: config.oceanTokenAddress,
+		feeToken: ddo.stats.price.tokenAddress ? ddo.stats.price.tokenAddress : config.oceanTokenAddress,	
 		minter: await owner.getAddress(),
 		mpFeeAddress: ZERO_ADDRESS,
 	};
diff --git a/src/json b/src/json
new file mode 100644
index 0000000..2547215
--- /dev/null
+++ b/src/json
@@ -0,0 +1,79 @@
+{
+    "@context": [
+      "https://w3id.org/did/v1"
+    ],
+    "id": "",
+    "nftAddress": "",
+    "version": "4.1.0",
+    "chainId": 80001,
+    "metadata": {
+      "created": "2021-12-20T14:35:20Z",
+      "updated": "2021-12-20T14:35:20Z",
+      "type": "dataset",
+      "name": "January 2024 NYC MTA Hourly Subway",
+      "description": "MTA hourly subway data",
+      "tags": [
+        "parquet"
+      ],
+      "author": "FastOpenData",
+      "license": "https://docs.google.com/document/d/17TuIQgjOkqby8x8jFNF0Rx5rx9ZVJYOK6lwP9oUXjGI/edit?usp=sharing",
+      "additionalInformation": {
+        "termsAndConditions": true
+      }
+    },
+    "services": [
+      {
+        "id": "ccb398c50d6abd5b456e8d7242bd856a1767a890b537c2f8c10ba8b8a10e6025",
+        "type": "access",
+        "files": {
+          "datatokenAddress": "0x0",
+          "nftAddress": "0x0",
+          "files": [
+            {
+              "type": "url",
+              "url": "https://fastopendata.org/mta/raw/hourly_subway/year%3D2024/month%3D01/2024_01.parquet",
+              "method": "GET"
+            }
+          ]
+        },
+        "datatokenAddress": "",
+        "serviceEndpoint": "https://v4.provider.oceanprotocol.com",
+        "timeout": 86400
+      }
+    ],
+    "event": {
+    },
+    "nft": {
+      "address": "",
+      "name": "Ocean Data NFT",
+      "symbol": "OCEAN-NFT",
+      "state": 5,
+      "tokenURI": "",
+      "owner": "",
+      "created": ""
+    },
+    "purgatory": {
+      "state": false
+    },
+    "datatokens": [
+    ],
+    "stats": {
+      "allocated": 0,
+      "orders": 0,
+      "price": {
+        "value": "2",
+        "tokenAddress":  "0xf08A50178dfcDe18524640EA6618a1f965821715",
+        "tokenSymbol": "USDC"
+      }
+    },
+
+    "accessDetails": {
+        "baseToken": {
+            "address": "0xf08A50178dfcDe18524640EA6618a1f965821715",
+            "name": "USDC",
+            "symbol": "USDC",
+            "decimals": 6
+          }
+      }
+  }
+  
\ No newline at end of file

From 622c491d7743b53c5e5e02f75c72c56534cc4306 Mon Sep 17 00:00:00 2001
From: Jamie Hewitt <jamie.hewitt15@gmail.com>
Date: Mon, 9 Dec 2024 15:46:06 +0300
Subject: [PATCH 2/3] Adding test asset with USDC payment token

---
 src/json => metadata/downloadAssetPaymentUSDC.json | 0
 src/helpers.ts                                     | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/json => metadata/downloadAssetPaymentUSDC.json (100%)

diff --git a/src/json b/metadata/downloadAssetPaymentUSDC.json
similarity index 100%
rename from src/json
rename to metadata/downloadAssetPaymentUSDC.json
diff --git a/src/helpers.ts b/src/helpers.ts
index c613069..d2ee616 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -78,7 +78,7 @@ export async function createAsset(
 	aquariusInstance: Aquarius,
 	templateIndex: number = 1,
 	macOsProviderUrl?: string,
-	encryptDDO: boolean = true
+	encryptDDO: boolean = true,
 ) {
 	const { chainId } = await owner.provider.getNetwork();
 	const nft = new Nft(owner, chainId);

From 29cf4398f5c56d0157c6b478c4c6ca61f36ea900 Mon Sep 17 00:00:00 2001
From: Jamie Hewitt <jamie.hewitt15@gmail.com>
Date: Thu, 12 Dec 2024 17:04:06 +0300
Subject: [PATCH 3/3] Fix for when token address is not present in price

---
 src/helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helpers.ts b/src/helpers.ts
index d2ee616..b3fb860 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -118,7 +118,7 @@ export async function createAsset(
 		cap: "100000",
 		feeAmount: "0",
 		paymentCollector: await owner.getAddress(),
-		feeToken: ddo.stats.price.tokenAddress ? ddo.stats.price.tokenAddress : config.oceanTokenAddress,	
+		feeToken: ddo?.stats?.price?.tokenAddress ? ddo.stats.price.tokenAddress : config.oceanTokenAddress,	
 		minter: await owner.getAddress(),
 		mpFeeAddress: ZERO_ADDRESS,
 	};