Merge branch 'main' into commonjs

* main:
  Limited Byron support added
  Bump
  Fixed datum resolution
  Move to new maestro submit endpoint

# Conflicts:
#	package.json
#	src/lucid/tx.ts

README.md

@@ -25,14 +25,14 @@ npm install lucid-cardano
 For JavaScript and TypeScript
 
 ```js
-import { Lucid } from "https://deno.land/x/lucid@0.10.5/mod.ts";
+import { Lucid } from "https://deno.land/x/lucid@0.10.6/mod.ts";
 ```
 
 #### Web
 
 ```html
 <script type="module">
-import { Lucid } from "https://unpkg.com/lucid-cardano@0.10.5/web/mod.js"
+import { Lucid } from "https://unpkg.com/lucid-cardano@0.10.6/web/mod.js"
 // ...
 </script>
 ```
@@ -57,7 +57,7 @@ Outputs a `dist` folder
 ### Basic usage
 
 ```js
-// import { Blockfrost, Lucid } from "https://deno.land/x/lucid@0.10.5/mod.ts"; Deno
+// import { Blockfrost, Lucid } from "https://deno.land/x/lucid@0.10.6/mod.ts"; Deno
 import { Blockfrost, Lucid } from "lucid-cardano"; // NPM
 
 const lucid = await Lucid.new(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vespr-wallet/lucid-cardano",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "license": "MIT",
   "description": "This is a fork of the original Lucid repo compiled into CommonJS, based on jpg-store's lucid fork. For more information check https://github.com/spacebudz/lucid",
   "repository": "https://github.com/vespr-wallet/lucid"

src/lucid/tx.ts

@@ -1,4 +1,5 @@
 import { C, Core } from "../core/mod.ts";
+import { Data } from "../mod.ts";
 import {
   Address,
   Assets,
@@ -49,7 +50,7 @@ export class Tx {
     this.tasks.push(async (that) => {
       for (const utxo of utxos) {
         if (utxo.datumHash) {
-          utxo.datum = await that.lucid.datumOf(utxo);
+          utxo.datum = Data.to(await that.lucid.datumOf(utxo));
           // Add datum to witness set, so it can be read from validators
           const plutusData = C.PlutusData.from_bytes(fromHex(utxo.datum!));
           that.txBuilder.add_plutus_data(plutusData);
@@ -69,7 +70,7 @@ export class Tx {
     this.tasks.push(async (that) => {
       for (const utxo of utxos) {
         if (utxo.datumHash && !utxo.datum) {
-          utxo.datum = await that.lucid.datumOf(utxo);
+          utxo.datum = Data.to(await that.lucid.datumOf(utxo));
         }
         const coreUtxo = utxoToCore(utxo);
         that.txBuilder.add_input(
@@ -715,13 +716,15 @@ function addressFromWithNetworkCheck(
   address: Address | RewardAddress,
   lucid: Lucid,
 ): Core.Address {
-  const addressDetails = lucid.utils.getAddressDetails(address);
+  const { type, networkId } = lucid.utils.getAddressDetails(address);
 
   const actualNetworkId = networkToId(lucid.network);
-  if (addressDetails.networkId !== actualNetworkId) {
+  if (networkId !== actualNetworkId) {
     throw new Error(
-      `Invalid address: Expected address with network id ${actualNetworkId}, but got ${addressDetails.networkId}`,
+      `Invalid address: Expected address with network id ${actualNetworkId}, but got ${networkId}`,
     );
   }
-  return C.Address.from_bech32(address);
+  return type === "Byron"
+    ? C.ByronAddress.from_base58(address).to_address()
+    : C.Address.from_bech32(address);
 }

src/provider/maestro.ts

@@ -35,10 +35,11 @@ export class Maestro implements Provider {
     const result = await fetch(`${this.url}/protocol-params`, {
       headers: this.commonHeaders(),
     }).then((res) => res.json());
-    // Read two numbers which are given in format of number one, then a seperator '/', then number two.
-    const readTwoNumbers = (str: string): number =>
-      parseInt(str.substring(0, str.indexOf("/"))) /
-      parseInt(str.slice(str.indexOf("/") + 1));
+    // Decimal numbers in Maestro are given as ratio of two numbers represented by string of format "firstNumber/secondNumber".
+    const decimalFromRationalString = (str: string): number => {
+      const forwardSlashIndex = str.indexOf("/");
+      return parseInt(str.slice(0, forwardSlashIndex)) / parseInt(str.slice(forwardSlashIndex + 1));
+    }
     // To rename keys in an object by the given key-map.
     // deno-lint-ignore no-explicit-any
     const renameKeysAndSort = (obj: any, newKeys: any) => {
@@ -61,8 +62,8 @@ export class Maestro implements Provider {
       maxValSize: parseInt(result.max_value_size),
       keyDeposit: BigInt(result.stake_key_deposit),
       poolDeposit: BigInt(result.pool_deposit),
-      priceMem: readTwoNumbers(result.prices.memory),
-      priceStep: readTwoNumbers(result.prices.steps),
+      priceMem: decimalFromRationalString(result.prices.memory),
+      priceStep: decimalFromRationalString(result.prices.steps),
       maxTxExMem: BigInt(result.max_execution_units_per_transaction.memory),
       maxTxExSteps: BigInt(result.max_execution_units_per_transaction.steps),
       coinsPerUtxoByte: BigInt(result.coins_per_utxo_byte),
@@ -198,7 +199,7 @@ export class Maestro implements Provider {
   }
 
   async submitTx(tx: Transaction): Promise<TxHash> {
-    const response = await fetch(`${this.url}/transactions`, {
+    const response = await fetch(`${this.url}/txmanager`, {
       method: "POST",
       headers: {
         "Content-Type": "application/cbor",
@@ -233,7 +234,7 @@ export class Maestro implements Provider {
       datumHash: result.datum
         ? result.datum.type == "inline" ? undefined : result.datum.hash
         : undefined,
-      datum: result?.datum?.bytes ? result.datum.bytes : undefined,
+      datum: result.datum?.bytes,
       scriptRef: result.reference_script
         ? result.reference_script.type == "native" ? undefined : {
           type: result.reference_script.type == "plutusv1"

src/types/types.ts

@@ -137,7 +137,12 @@ export type UTxO = {
 
 export type OutRef = { txHash: TxHash; outputIndex: number };
 
-export type AddressType = "Base" | "Enterprise" | "Pointer" | "Reward";
+export type AddressType =
+  | "Base"
+  | "Enterprise"
+  | "Pointer"
+  | "Reward"
+  | "Byron";
 
 export type Network = "Mainnet" | "Preview" | "Preprod" | "Custom";
 

src/utils/utils.ts

@@ -384,6 +384,30 @@ export function getAddressDetails(address: string): AddressDetails {
     /* pass */
   }
 
+  // Limited support for Byron addresses
+  try {
+    const parsedAddress = ((address: string): Core.ByronAddress => {
+      try {
+        return C.ByronAddress.from_bytes(fromHex(address));
+      } catch (_e) {
+        try {
+          return C.ByronAddress.from_base58(address);
+        } catch (_e) {
+          throw new Error("Could not deserialize address.");
+        }
+      }
+    })(address);
+
+    return {
+      type: "Byron",
+      networkId: parsedAddress.network_id(),
+      address: {
+        bech32: "",
+        hex: toHex(parsedAddress.to_address().to_bytes()),
+      },
+    };
+  } catch (_e) { /* pass */ }
+
   throw new Error("No address type matched for: " + address);
 }