@lucid-evolution/provider 0.1.20 → 0.1.22

package/dist/index.cjs

@@ -48,7 +48,7 @@ var import_utils = require("@lucid-evolution/utils");
 // package.json
 var package_default = {
   name: "@lucid-evolution/provider",
-  version: "0.1.20",
+  version: "0.1.22",
   description: "",
   main: "./dist/index.js",
   types: "./dist/index.d.ts",
@@ -83,7 +83,8 @@ var package_default = {
     "@effect/schema": "^0.67.16",
     "@lucid-evolution/core-types": "workspace:*",
     "@lucid-evolution/core-utils": "workspace:*",
-    "@lucid-evolution/utils": "workspace:*"
+    "@lucid-evolution/utils": "workspace:*",
+    effect: "^3.1.2"
   },
   devDependencies: {
     "@types/node": "^20.12.8",
@@ -876,7 +877,7 @@ var ProtocolParametersSchema = S.Struct({
   min_utxo_value: S.String,
   min_pool_cost: S.String,
   nonce: S.String,
-  block_hash: S.String,
+  block_hash: S.NullOr(S.String),
   cost_models: S.Struct({
     PlutusV1: S.Array(S.Number),
     PlutusV2: S.Array(S.Number)
@@ -920,7 +921,7 @@ var KoiosUTxOSchema = S.Struct({
       value: S.NullOr(S.Object)
     })
   ),
-  asset_list: S.Array(KoiosAssetSchema)
+  asset_list: S.NullOr(S.Array(KoiosAssetSchema))
 });
 var KoiosAddressInfoSchema = S.Array(
   S.NullishOr(
@@ -958,7 +959,7 @@ var KoiosInputOutputSchema = S.Struct({
       value: S.NullOr(S.Object)
     })
   ),
-  asset_list: S.Array(KoiosAssetSchema)
+  asset_list: S.Union(S.Array(KoiosAssetSchema), S.String)
 });
 var KoiosTxInfoSchema = S.Struct({
   tx_hash: S.String,
@@ -1011,7 +1012,7 @@ var KoiosTxInfoSchema = S.Struct({
     S.Array(
       S.Struct({
         address: S.String,
-        spends_inputs: S.NullOr(
+        spends_input: S.NullOr(
           S.Struct({
             tx_hash: S.String,
             tx_index: S.Number
@@ -1023,17 +1024,21 @@ var KoiosTxInfoSchema = S.Struct({
         valid_contract: S.Boolean,
         input: S.Struct({
           redeemer: S.Struct({
-            purpose: S.Literal("spend", "mint", "cert", "reward")
+            purpose: S.Literal("spend", "mint", "cert", "reward"),
+            fee: S.String,
+            unit: S.Struct({
+              steps: S.String,
+              mem: S.String
+            }),
+            datum: S.Struct({
+              hash: S.NullOr(S.String),
+              value: S.NullOr(S.Object)
+            })
+          }),
+          datum: S.Struct({
+            hash: S.NullOr(S.String),
+            value: S.NullOr(S.Object)
           })
-        }),
-        fee: S.String,
-        unit: S.Struct({
-          steps: S.String,
-          mem: S.String
-        }),
-        datum: S.Struct({
-          hash: S.NullOr(S.String),
-          value: S.NullOr(S.Object)
         })
       })
     )
@@ -1041,6 +1046,8 @@ var KoiosTxInfoSchema = S.Struct({
 });
 
 // src/koios/koios.ts
+var import_effect = require("effect");
+var import_schema2 = require("@effect/schema");
 var Koios = class {
   baseUrl;
   constructor(baseUrl) {
@@ -1171,7 +1178,8 @@ var Koios = class {
             datum_hash: koiosInputOutput.datum_hash,
             inline_datum: koiosInputOutput.inline_datum,
             reference_script: koiosInputOutput.reference_script,
-            asset_list: koiosInputOutput.asset_list
+            //NOTE: Koios api returns collateral_output like  asset_list: "[]", instead of asset_list: []
+            asset_list: typeof koiosInputOutput.asset_list === "string" ? [] : koiosInputOutput.asset_list
           },
           koiosInputOutput.payment_addr.bech32
         )
@@ -1219,27 +1227,48 @@ var Koios = class {
       throw new Error("No Datum Found by Datum Hash");
     }
   }
-  awaitTx(txHash, checkInterval = 3e3) {
-    return new Promise((res) => {
-      const confirmation = setInterval(async () => {
-        const body = {
-          _tx_hashes: [txHash]
-        };
-        const result = await fetch(`${this.baseUrl}/tx_info`, {
-          headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json"
-          },
-          method: "POST",
-          body: JSON.stringify(body)
-        }).then((res2) => res2.json());
-        if (Array.isArray(result) && result.length > 0) {
-          clearInterval(confirmation);
-          await new Promise((res2) => setTimeout(() => res2(1), 1e3));
-          return res(true);
-        }
-      }, checkInterval);
-    });
+  awaitTx(txHash, checkInterval = 2e4) {
+    const body = {
+      _tx_hashes: [txHash]
+    };
+    const request = {
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json"
+      },
+      method: "POST",
+      body: JSON.stringify(body)
+    };
+    const program = (0, import_effect.pipe)(
+      import_effect.Effect.tryPromise({
+        //TODO: use tx_status api
+        try: () => fetch(`${this.baseUrl}/tx_info`, request),
+        catch: (error) => new Error(String(error))
+      }),
+      import_effect.Effect.flatMap(
+        (response) => !response.ok ? import_effect.Effect.fail(new Error(`${response.status} ${response.statusText}`)) : import_effect.Effect.succeed(response)
+      ),
+      import_effect.Effect.flatMap(
+        (response) => import_effect.Effect.tryPromise({
+          try: () => response.json(),
+          catch: (error) => new Error(String(error))
+        })
+      ),
+      import_effect.Effect.flatMap(
+        (json) => S2.decodeUnknown(S2.Array(KoiosTxInfoSchema), { errors: "first" })(json)
+      ),
+      import_effect.Effect.catchTag(
+        "ParseError",
+        (e) => import_effect.Effect.fail(import_schema2.ArrayFormatter.formatErrorSync(e))
+      ),
+      import_effect.Effect.repeat({
+        schedule: import_effect.Schedule.exponential(checkInterval),
+        until: (result) => result.length > 0
+      }),
+      import_effect.Effect.orDie,
+      import_effect.Effect.as(true)
+    );
+    return import_effect.Effect.runPromise(program);
   }
   async submitTx(tx) {
     const result = await fetch(`${this.baseUrl}/submittx`, {
@@ -1250,11 +1279,10 @@ var Koios = class {
       method: "POST",
       body: (0, import_core_utils3.fromHex)(tx)
     }).then((res) => res.json());
-    if (!result || result.error) {
-      if (result?.status_code === 400)
-        throw new Error(result.message);
-      else
-        throw new Error("Could not submit transaction.");
+    const TxHashSchema = S2.String;
+    const isTxHash = S2.is(TxHashSchema);
+    if (!isTxHash(result)) {
+      throw new Error(JSON.stringify(result));
     }
     return result;
   }
@@ -1264,9 +1292,11 @@ var toUTxO = (koiosUTxO, address) => ({
   outputIndex: koiosUTxO.tx_index,
   assets: (() => {
     const a = {};
-    koiosUTxO.asset_list.forEach((am) => {
-      a[am.policy_id + am.asset_name] = BigInt(am.quantity);
-    });
+    if (koiosUTxO.asset_list) {
+      koiosUTxO.asset_list.forEach((am) => {
+        a[am.policy_id + am.asset_name] = BigInt(am.quantity);
+      });
+    }
     a["lovelace"] = BigInt(koiosUTxO.value);
     return a;
   })(),

package/dist/index.js

@@ -8,7 +8,7 @@ import { applyDoubleCborEncoding } from "@lucid-evolution/utils";
 // package.json
 var package_default = {
   name: "@lucid-evolution/provider",
-  version: "0.1.20",
+  version: "0.1.22",
   description: "",
   main: "./dist/index.js",
   types: "./dist/index.d.ts",
@@ -43,7 +43,8 @@ var package_default = {
     "@effect/schema": "^0.67.16",
     "@lucid-evolution/core-types": "workspace:*",
     "@lucid-evolution/core-utils": "workspace:*",
-    "@lucid-evolution/utils": "workspace:*"
+    "@lucid-evolution/utils": "workspace:*",
+    effect: "^3.1.2"
   },
   devDependencies: {
     "@types/node": "^20.12.8",
@@ -836,7 +837,7 @@ var ProtocolParametersSchema = S.Struct({
   min_utxo_value: S.String,
   min_pool_cost: S.String,
   nonce: S.String,
-  block_hash: S.String,
+  block_hash: S.NullOr(S.String),
   cost_models: S.Struct({
     PlutusV1: S.Array(S.Number),
     PlutusV2: S.Array(S.Number)
@@ -880,7 +881,7 @@ var KoiosUTxOSchema = S.Struct({
       value: S.NullOr(S.Object)
     })
   ),
-  asset_list: S.Array(KoiosAssetSchema)
+  asset_list: S.NullOr(S.Array(KoiosAssetSchema))
 });
 var KoiosAddressInfoSchema = S.Array(
   S.NullishOr(
@@ -918,7 +919,7 @@ var KoiosInputOutputSchema = S.Struct({
       value: S.NullOr(S.Object)
     })
   ),
-  asset_list: S.Array(KoiosAssetSchema)
+  asset_list: S.Union(S.Array(KoiosAssetSchema), S.String)
 });
 var KoiosTxInfoSchema = S.Struct({
   tx_hash: S.String,
@@ -971,7 +972,7 @@ var KoiosTxInfoSchema = S.Struct({
     S.Array(
       S.Struct({
         address: S.String,
-        spends_inputs: S.NullOr(
+        spends_input: S.NullOr(
           S.Struct({
             tx_hash: S.String,
             tx_index: S.Number
@@ -983,17 +984,21 @@ var KoiosTxInfoSchema = S.Struct({
         valid_contract: S.Boolean,
         input: S.Struct({
           redeemer: S.Struct({
-            purpose: S.Literal("spend", "mint", "cert", "reward")
+            purpose: S.Literal("spend", "mint", "cert", "reward"),
+            fee: S.String,
+            unit: S.Struct({
+              steps: S.String,
+              mem: S.String
+            }),
+            datum: S.Struct({
+              hash: S.NullOr(S.String),
+              value: S.NullOr(S.Object)
+            })
+          }),
+          datum: S.Struct({
+            hash: S.NullOr(S.String),
+            value: S.NullOr(S.Object)
           })
-        }),
-        fee: S.String,
-        unit: S.Struct({
-          steps: S.String,
-          mem: S.String
-        }),
-        datum: S.Struct({
-          hash: S.NullOr(S.String),
-          value: S.NullOr(S.Object)
         })
       })
     )
@@ -1001,6 +1006,8 @@ var KoiosTxInfoSchema = S.Struct({
 });
 
 // src/koios/koios.ts
+import { Effect, pipe, Schedule } from "effect";
+import { ArrayFormatter } from "@effect/schema";
 var Koios = class {
   baseUrl;
   constructor(baseUrl) {
@@ -1131,7 +1138,8 @@ var Koios = class {
             datum_hash: koiosInputOutput.datum_hash,
             inline_datum: koiosInputOutput.inline_datum,
             reference_script: koiosInputOutput.reference_script,
-            asset_list: koiosInputOutput.asset_list
+            //NOTE: Koios api returns collateral_output like  asset_list: "[]", instead of asset_list: []
+            asset_list: typeof koiosInputOutput.asset_list === "string" ? [] : koiosInputOutput.asset_list
           },
           koiosInputOutput.payment_addr.bech32
         )
@@ -1179,27 +1187,48 @@ var Koios = class {
       throw new Error("No Datum Found by Datum Hash");
     }
   }
-  awaitTx(txHash, checkInterval = 3e3) {
-    return new Promise((res) => {
-      const confirmation = setInterval(async () => {
-        const body = {
-          _tx_hashes: [txHash]
-        };
-        const result = await fetch(`${this.baseUrl}/tx_info`, {
-          headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json"
-          },
-          method: "POST",
-          body: JSON.stringify(body)
-        }).then((res2) => res2.json());
-        if (Array.isArray(result) && result.length > 0) {
-          clearInterval(confirmation);
-          await new Promise((res2) => setTimeout(() => res2(1), 1e3));
-          return res(true);
-        }
-      }, checkInterval);
-    });
+  awaitTx(txHash, checkInterval = 2e4) {
+    const body = {
+      _tx_hashes: [txHash]
+    };
+    const request = {
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json"
+      },
+      method: "POST",
+      body: JSON.stringify(body)
+    };
+    const program = pipe(
+      Effect.tryPromise({
+        //TODO: use tx_status api
+        try: () => fetch(`${this.baseUrl}/tx_info`, request),
+        catch: (error) => new Error(String(error))
+      }),
+      Effect.flatMap(
+        (response) => !response.ok ? Effect.fail(new Error(`${response.status} ${response.statusText}`)) : Effect.succeed(response)
+      ),
+      Effect.flatMap(
+        (response) => Effect.tryPromise({
+          try: () => response.json(),
+          catch: (error) => new Error(String(error))
+        })
+      ),
+      Effect.flatMap(
+        (json) => S2.decodeUnknown(S2.Array(KoiosTxInfoSchema), { errors: "first" })(json)
+      ),
+      Effect.catchTag(
+        "ParseError",
+        (e) => Effect.fail(ArrayFormatter.formatErrorSync(e))
+      ),
+      Effect.repeat({
+        schedule: Schedule.exponential(checkInterval),
+        until: (result) => result.length > 0
+      }),
+      Effect.orDie,
+      Effect.as(true)
+    );
+    return Effect.runPromise(program);
   }
   async submitTx(tx) {
     const result = await fetch(`${this.baseUrl}/submittx`, {
@@ -1210,11 +1239,10 @@ var Koios = class {
       method: "POST",
       body: fromHex3(tx)
     }).then((res) => res.json());
-    if (!result || result.error) {
-      if (result?.status_code === 400)
-        throw new Error(result.message);
-      else
-        throw new Error("Could not submit transaction.");
+    const TxHashSchema = S2.String;
+    const isTxHash = S2.is(TxHashSchema);
+    if (!isTxHash(result)) {
+      throw new Error(JSON.stringify(result));
     }
     return result;
   }
@@ -1224,9 +1252,11 @@ var toUTxO = (koiosUTxO, address) => ({
   outputIndex: koiosUTxO.tx_index,
   assets: (() => {
     const a = {};
-    koiosUTxO.asset_list.forEach((am) => {
-      a[am.policy_id + am.asset_name] = BigInt(am.quantity);
-    });
+    if (koiosUTxO.asset_list) {
+      koiosUTxO.asset_list.forEach((am) => {
+        a[am.policy_id + am.asset_name] = BigInt(am.quantity);
+      });
+    }
     a["lovelace"] = BigInt(koiosUTxO.value);
     return a;
   })(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/provider",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -28,9 +28,10 @@
     "@dcspark/cardano-multiplatform-lib-browser": "^5.3.0",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^5.3.0",
     "@effect/schema": "^0.67.16",
+    "effect": "^3.1.2",
     "@lucid-evolution/core-types": "0.1.6",
-    "@lucid-evolution/utils": "0.1.15",
-    "@lucid-evolution/core-utils": "0.1.6"
+    "@lucid-evolution/core-utils": "0.1.6",
+    "@lucid-evolution/utils": "0.1.15"
   },
   "devDependencies": {
     "@types/node": "^20.12.8",