@lucid-evolution/provider 0.1.95 → 0.1.97

package/dist/index.cjs

@@ -52,7 +52,7 @@ var import_utils2 = require("@lucid-evolution/utils");
 // package.json
 var package_default = {
   name: "@lucid-evolution/provider",
-  version: "0.1.95",
+  version: "0.1.97",
   description: "",
   main: "./dist/index.js",
   types: "./dist/index.d.ts",
@@ -111,8 +111,8 @@ var toAditionalUTXOs = (utxos) => (utxos || []).map((utxo) => [
   {
     address: utxo.address,
     value: {
-      coins: Number(utxo.assets["lovelace"]),
-      assets: fromAssets(utxo.assets)
+      ada: { lovelace: Number(utxo.assets["lovelace"]) },
+      ...fromAssets(utxo.assets)
     },
     datumHash: utxo.datumHash,
     datum: utxo.datum,
@@ -133,14 +133,16 @@ var toTxOutScript = (scriptRef) => {
     }
   }
 };
-var fromAssets = (assets) => (0, import_effect.pipe)(
-  import_effect.Record.remove(assets, "lovelace"),
-  import_effect.Record.mapEntries((amount, unit) => [
-    unit.length === 56 ? unit.slice(0, 56) : unit.slice(0, 56) + "." + unit.slice(56),
-    Number(amount)
-  ]),
-  (r) => import_effect.Record.isEmptyRecord(r) ? void 0 : r
-);
+var fromAssets = (assets) => (0, import_effect.pipe)(import_effect.Record.remove(assets, "lovelace"), (nativeAssets) => {
+  const result = {};
+  for (const [unit, amount] of Object.entries(nativeAssets)) {
+    const policyId = unit.slice(0, 56);
+    const assetName = unit.slice(56);
+    result[policyId] ??= {};
+    result[policyId][assetName] = Number(amount);
+  }
+  return result;
+});
 var fromLegacyRedeemerTag = (redeemerTag) => {
   switch (redeemerTag) {
     case "certificate":
@@ -174,6 +176,8 @@ var Blockfrost = class {
       headers: { project_id: this.projectId, lucid }
     }).then((res) => res.json());
     return {
+      protocolMajorVersion: parseInt(result.protocol_major_ver),
+      protocolMinorVersion: parseInt(result.protocol_minor_ver),
       minFeeA: parseInt(result.min_fee_a),
       minFeeB: parseInt(result.min_fee_b),
       maxTxSize: parseInt(result.max_tx_size),
@@ -404,29 +408,33 @@ var Blockfrost = class {
     return utxos;
   }
   async evaluateTx(tx, additionalUTxOs) {
-    const payload = {
-      cbor: tx,
-      additionalUtxoSet: toAditionalUTXOs(additionalUTxOs)
+    const evaluate = async (utxos) => {
+      const payload = {
+        cbor: tx,
+        ...utxos?.length ? { additionalUtxoSet: toAditionalUTXOs(utxos) } : {}
+      };
+      const res = await fetch(`${this.url}/utils/txs/evaluate/utxos`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          project_id: this.projectId,
+          lucid
+        },
+        body: JSON.stringify(payload)
+      }).then((res2) => res2.json());
+      if (!res || res.fault) {
+        const message = res?.status_code === 400 ? res.message : `Could not evaluate the transaction: ${JSON.stringify(res)}. Transaction: ${tx}`;
+        throw new Error(message);
+      }
+      const blockfrostRedeemer2 = res;
+      if (!("EvaluationResult" in blockfrostRedeemer2.result)) {
+        throw new Error(
+          `EvaluateTransaction fails: ${JSON.stringify(blockfrostRedeemer2.result)}`
+        );
+      }
+      return blockfrostRedeemer2;
     };
-    const res = await fetch(`${this.url}/utils/txs/evaluate/utxos`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        project_id: this.projectId,
-        lucid
-      },
-      body: JSON.stringify(payload)
-    }).then((res2) => res2.json());
-    if (!res || res.fault) {
-      const message = res?.status_code === 400 ? res.message : `Could not evaluate the transaction: ${JSON.stringify(res)}. Transaction: ${tx}`;
-      throw new Error(message);
-    }
-    const blockfrostRedeemer = res;
-    if (!("EvaluationResult" in blockfrostRedeemer.result)) {
-      throw new Error(
-        `EvaluateTransaction fails: ${JSON.stringify(blockfrostRedeemer.result)}`
-      );
-    }
+    const blockfrostRedeemer = additionalUTxOs?.length ? await evaluate().catch(() => evaluate(additionalUTxOs)) : await evaluate();
     const evalRedeemers = [];
     Object.entries(blockfrostRedeemer.result.EvaluationResult).forEach(
       ([redeemerPointer, data]) => {
@@ -519,6 +527,28 @@ var TupleNumberFromString = import_effect2.Schema.compose(
   import_effect2.Schema.split("/"),
   import_effect2.Schema.Array(import_effect2.Schema.NumberFromString)
 );
+var MaxReferenceScriptsSizeSchema = import_effect2.Schema.Struct({
+  bytes: import_effect2.Schema.Number
+});
+function normalizeProtocolParameters(value) {
+  const legacy = value.maxReferenceScriptsSize;
+  const current = value.maxReferenceScriptsSizePerTransaction;
+  if (legacy === void 0 && current === void 0) {
+    return value;
+  }
+  const decode = import_effect2.Schema.decodeUnknownSync(MaxReferenceScriptsSizeSchema);
+  const legacyValue = legacy === void 0 ? void 0 : decode(legacy);
+  const currentValue = current === void 0 ? void 0 : decode(current);
+  if (legacyValue !== void 0 && currentValue !== void 0 && legacyValue.bytes !== currentValue.bytes) {
+    throw new Error(
+      "Conflicting Ogmios protocol parameters: maxReferenceScriptsSize and maxReferenceScriptsSizePerTransaction differ"
+    );
+  }
+  return {
+    ...value,
+    maxReferenceScriptsSize: legacyValue ?? currentValue
+  };
+}
 var ProtocolParametersSchema = import_effect2.Schema.Struct({
   minFeeCoefficient: import_effect2.Schema.Number,
   minFeeReferenceScripts: import_effect2.Schema.Struct({
@@ -526,9 +556,7 @@ var ProtocolParametersSchema = import_effect2.Schema.Struct({
     range: import_effect2.Schema.Number,
     multiplier: import_effect2.Schema.Number
   }),
-  maxReferenceScriptsSize: import_effect2.Schema.Struct({
-    bytes: import_effect2.Schema.Number
-  }),
+  maxReferenceScriptsSize: MaxReferenceScriptsSizeSchema,
   stakePoolVotingThresholds: import_effect2.Schema.Struct({
     noConfidence: TupleNumberFromString,
     constitutionalCommittee: import_effect2.Schema.Struct({
@@ -842,7 +870,7 @@ var Kupmios = class {
       id: null
     };
     const schema = JSONRPCResponseSchema(
-      ProtocolParametersSchema
+      import_effect5.Schema.Record({ key: import_effect5.Schema.String, value: import_effect5.Schema.Unknown })
     );
     const response = await (0, import_effect6.pipe)(
       makePostAsJson(
@@ -857,7 +885,10 @@ var Kupmios = class {
       import_effect6.Effect.runPromise
     );
     const result = getJSONRPCResult(response);
-    return toProtocolParameters(result);
+    const protocolParameters = import_effect5.Schema.decodeUnknownSync(
+      ProtocolParametersSchema
+    )(normalizeProtocolParameters(result));
+    return toProtocolParameters(protocolParameters);
   }
   async getTreasury() {
     const data = {

package/dist/index.js

@@ -11,7 +11,7 @@ import {
 // package.json
 var package_default = {
   name: "@lucid-evolution/provider",
-  version: "0.1.95",
+  version: "0.1.97",
   description: "",
   main: "./dist/index.js",
   types: "./dist/index.d.ts",
@@ -70,8 +70,8 @@ var toAditionalUTXOs = (utxos) => (utxos || []).map((utxo) => [
   {
     address: utxo.address,
     value: {
-      coins: Number(utxo.assets["lovelace"]),
-      assets: fromAssets(utxo.assets)
+      ada: { lovelace: Number(utxo.assets["lovelace"]) },
+      ...fromAssets(utxo.assets)
     },
     datumHash: utxo.datumHash,
     datum: utxo.datum,
@@ -92,14 +92,16 @@ var toTxOutScript = (scriptRef) => {
     }
   }
 };
-var fromAssets = (assets) => pipe(
-  Record.remove(assets, "lovelace"),
-  Record.mapEntries((amount, unit) => [
-    unit.length === 56 ? unit.slice(0, 56) : unit.slice(0, 56) + "." + unit.slice(56),
-    Number(amount)
-  ]),
-  (r) => Record.isEmptyRecord(r) ? void 0 : r
-);
+var fromAssets = (assets) => pipe(Record.remove(assets, "lovelace"), (nativeAssets) => {
+  const result = {};
+  for (const [unit, amount] of Object.entries(nativeAssets)) {
+    const policyId = unit.slice(0, 56);
+    const assetName = unit.slice(56);
+    result[policyId] ??= {};
+    result[policyId][assetName] = Number(amount);
+  }
+  return result;
+});
 var fromLegacyRedeemerTag = (redeemerTag) => {
   switch (redeemerTag) {
     case "certificate":
@@ -133,6 +135,8 @@ var Blockfrost = class {
       headers: { project_id: this.projectId, lucid }
     }).then((res) => res.json());
     return {
+      protocolMajorVersion: parseInt(result.protocol_major_ver),
+      protocolMinorVersion: parseInt(result.protocol_minor_ver),
       minFeeA: parseInt(result.min_fee_a),
       minFeeB: parseInt(result.min_fee_b),
       maxTxSize: parseInt(result.max_tx_size),
@@ -363,29 +367,33 @@ var Blockfrost = class {
     return utxos;
   }
   async evaluateTx(tx, additionalUTxOs) {
-    const payload = {
-      cbor: tx,
-      additionalUtxoSet: toAditionalUTXOs(additionalUTxOs)
+    const evaluate = async (utxos) => {
+      const payload = {
+        cbor: tx,
+        ...utxos?.length ? { additionalUtxoSet: toAditionalUTXOs(utxos) } : {}
+      };
+      const res = await fetch(`${this.url}/utils/txs/evaluate/utxos`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          project_id: this.projectId,
+          lucid
+        },
+        body: JSON.stringify(payload)
+      }).then((res2) => res2.json());
+      if (!res || res.fault) {
+        const message = res?.status_code === 400 ? res.message : `Could not evaluate the transaction: ${JSON.stringify(res)}. Transaction: ${tx}`;
+        throw new Error(message);
+      }
+      const blockfrostRedeemer2 = res;
+      if (!("EvaluationResult" in blockfrostRedeemer2.result)) {
+        throw new Error(
+          `EvaluateTransaction fails: ${JSON.stringify(blockfrostRedeemer2.result)}`
+        );
+      }
+      return blockfrostRedeemer2;
     };
-    const res = await fetch(`${this.url}/utils/txs/evaluate/utxos`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        project_id: this.projectId,
-        lucid
-      },
-      body: JSON.stringify(payload)
-    }).then((res2) => res2.json());
-    if (!res || res.fault) {
-      const message = res?.status_code === 400 ? res.message : `Could not evaluate the transaction: ${JSON.stringify(res)}. Transaction: ${tx}`;
-      throw new Error(message);
-    }
-    const blockfrostRedeemer = res;
-    if (!("EvaluationResult" in blockfrostRedeemer.result)) {
-      throw new Error(
-        `EvaluateTransaction fails: ${JSON.stringify(blockfrostRedeemer.result)}`
-      );
-    }
+    const blockfrostRedeemer = additionalUTxOs?.length ? await evaluate().catch(() => evaluate(additionalUTxOs)) : await evaluate();
     const evalRedeemers = [];
     Object.entries(blockfrostRedeemer.result.EvaluationResult).forEach(
       ([redeemerPointer, data]) => {
@@ -478,6 +486,28 @@ var TupleNumberFromString = S.compose(
   S.split("/"),
   S.Array(S.NumberFromString)
 );
+var MaxReferenceScriptsSizeSchema = S.Struct({
+  bytes: S.Number
+});
+function normalizeProtocolParameters(value) {
+  const legacy = value.maxReferenceScriptsSize;
+  const current = value.maxReferenceScriptsSizePerTransaction;
+  if (legacy === void 0 && current === void 0) {
+    return value;
+  }
+  const decode = S.decodeUnknownSync(MaxReferenceScriptsSizeSchema);
+  const legacyValue = legacy === void 0 ? void 0 : decode(legacy);
+  const currentValue = current === void 0 ? void 0 : decode(current);
+  if (legacyValue !== void 0 && currentValue !== void 0 && legacyValue.bytes !== currentValue.bytes) {
+    throw new Error(
+      "Conflicting Ogmios protocol parameters: maxReferenceScriptsSize and maxReferenceScriptsSizePerTransaction differ"
+    );
+  }
+  return {
+    ...value,
+    maxReferenceScriptsSize: legacyValue ?? currentValue
+  };
+}
 var ProtocolParametersSchema = S.Struct({
   minFeeCoefficient: S.Number,
   minFeeReferenceScripts: S.Struct({
@@ -485,9 +515,7 @@ var ProtocolParametersSchema = S.Struct({
     range: S.Number,
     multiplier: S.Number
   }),
-  maxReferenceScriptsSize: S.Struct({
-    bytes: S.Number
-  }),
+  maxReferenceScriptsSize: MaxReferenceScriptsSizeSchema,
   stakePoolVotingThresholds: S.Struct({
     noConfidence: TupleNumberFromString,
     constitutionalCommittee: S.Struct({
@@ -806,7 +834,7 @@ var Kupmios = class {
       id: null
     };
     const schema = JSONRPCResponseSchema(
-      ProtocolParametersSchema
+      S3.Record({ key: S3.String, value: S3.Unknown })
     );
     const response = await pipe3(
       makePostAsJson(
@@ -821,7 +849,10 @@ var Kupmios = class {
       Effect2.runPromise
     );
     const result = getJSONRPCResult(response);
-    return toProtocolParameters(result);
+    const protocolParameters = S3.decodeUnknownSync(
+      ProtocolParametersSchema
+    )(normalizeProtocolParameters(result));
+    return toProtocolParameters(protocolParameters);
   }
   async getTreasury() {
     const data = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/provider",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,10 +30,10 @@
     "@effect/platform": "^0.71.3",
     "@effect/schema": "^0.68.26",
     "effect": "^3.11.7",
-    "@lucid-evolution/core-types": "0.2.0",
+    "@lucid-evolution/core-types": "0.2.2",
     "@lucid-evolution/core-utils": "0.1.16",
-    "@lucid-evolution/utils": "0.1.69",
-    "@lucid-evolution/wallet": "0.1.75"
+    "@lucid-evolution/utils": "0.1.71",
+    "@lucid-evolution/wallet": "0.1.77"
   },
   "devDependencies": {
     "@types/node": "^20.12.8",