refactor; enable intellisense for rust via rs_lib

spacebudz · Feb 7, 2025 · 353c855 · 353c855
1 parent 57bef49
commit 353c855
Show file tree

Hide file tree

Showing 62 changed files with 52 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="100px" src="./logo/lucid.svg" align="center"/>
+  <img width="100px" src="./assets/lucid.svg" align="center"/>
   <h1 align="center">Lucid</h1>
   <p align="center">Lucid is a library designed to simplify creating Cardano transactions and writing off-chain code for Plutus contracts.</p>
 

diff --git a/logo/lucid.png → assets/lucid.png b/logo/lucid.png → assets/lucid.png
diff --git a/logo/lucid.svg → assets/lucid.svg b/logo/lucid.svg → assets/lucid.svg
diff --git a/build.ts b/build.ts
@@ -5,19 +5,19 @@ import * as dnt from "jsr:@deno/dnt";
 await dnt.emptyDir("./dist");
 
 try {
-  moveSync("./src/core/core.backup.ts", "./src/core/core.ts", {
+  moveSync("./lib/core/core.backup.ts", "./lib/core/core.ts", {
     overwrite: true,
   });
 } catch (_) {}
-copySync("./src/core/core.ts", "./src/core/core.backup.ts");
-const coreFile = await Deno.readTextFile("./src/core/core.ts");
+copySync("./lib/core/core.ts", "./lib/core/core.backup.ts");
+const coreFile = await Deno.readTextFile("./lib/core/core.ts");
 Deno.writeTextFileSync(
-  "./src/core/core.ts",
+  "./lib/core/core.ts",
   coreFile.replace(
-    `import * as Core from "./libs/lucid_core/pkg/lucid_core.js";`,
+    `import * as Core from "../../rs_lib/pkg/lucid_core.js";`,
     "const Core = {};",
   ).replace(
-    `import * as MessageSigningInstance from "./libs/message_signing/pkg/message_signing.js";`,
+    `import * as MessageSigningInstance from "../../rs_lib/message_signing/pkg/message_signing.js";`,
     "const MessageSigningInstance = {};",
   ),
 );
@@ -47,38 +47,50 @@ try {
     },
     postBuild: async () => {
       const coreFileEsm = await Deno.readTextFile(
-        "./dist/esm/src/core/core.js",
+        "./dist/esm/lib/core/core.js",
       );
       Deno.writeTextFileSync(
-        "./dist/esm/src/core/core.js",
-        coreFileEsm.replace(
-          "const Core = {};",
-          `import * as Core from "./libs/lucid_core/pkg/lucid_core.js";`,
-        ).replace(
-          "const MessageSigningInstance = {};",
-          `import * as MessageSigningInstance from "./libs/message_signing/pkg/message_signing.js";`,
-        ),
+        "./dist/esm/lib/core/core.js",
+        coreFileEsm
+          .replace(
+            "const Core = {};",
+            `import * as Core from "./libs/lucid_core/pkg/lucid_core.js";`,
+          )
+          .replace(
+            "const MessageSigningInstance = {};",
+            `import * as MessageSigningInstance from "./libs/message_signing/pkg/message_signing.js";`,
+          ),
+      );
+
+      const coreTypesFileEsm = await Deno.readTextFile(
+        "./dist/esm/lib/core/core.d.ts",
+      );
+      Deno.writeTextFileSync(
+        "./dist/esm/lib/core/core.d.ts",
+        coreTypesFileEsm
+          .replaceAll(
+            "../../rs_lib/pkg/lucid_core",
+            "./libs/lucid_core/pkg/lucid_core",
+          )
+          .replace(
+            "../../rs_lib/message_signing/pkg/message_signing",
+            "./libs/message_signing/pkg/message_signing",
+          ),
       );
 
       copySync(
-        "./src/core/libs/message_signing/pkg/",
-        "./dist/esm/src/core/libs/message_signing/pkg",
-        {
-          overwrite: true,
-        },
+        "./rs_lib/message_signing/pkg/",
+        "./dist/esm/lib/core/libs/message_signing/pkg",
       );
       copySync(
-        "./src/core/libs/lucid_core/pkg/",
-        "./dist/esm/src/core/libs/lucid_core/pkg",
-        {
-          overwrite: true,
-        },
+        "./rs_lib/pkg/",
+        "./dist/esm/lib/core/libs/lucid_core/pkg",
       );
     },
   });
 } catch (e) {
   console.log(e);
 }
-moveSync("./src/core/core.backup.ts", "./src/core/core.ts", {
+moveSync("./lib/core/core.backup.ts", "./lib/core/core.ts", {
   overwrite: true,
 });
diff --git a/deno.json b/deno.json
@@ -1,10 +1,10 @@
 {
   "tasks": {
     "build": "deno run -A build.ts",
-    "build:core": "cd src/core/libs/lucid_core && wasm-pack build . --no-pack --weak-refs --release && rm ./pkg/.gitignore; cd ../message_signing && wasm-pack build . --no-pack --weak-refs --release && rm ./pkg/.gitignore",
+    "build:core": "cd ./rs_lib && wasm-pack build . --no-pack --weak-refs --release && rm ./pkg/.gitignore; cd ./message_signing && wasm-pack build . --no-pack --weak-refs --release && rm ./pkg/.gitignore",
     "publish": "deno task build && deno task test && npm publish dist",
     "test": "deno test --allow-env --allow-read --allow-net tests",
-    "test:core": "cd src/core/libs/lucid_core && cargo test; cd ../message_signing && RUSTFLAGS=-Awarnings cargo test"
+    "test:core": "cd ./rs_lib && cargo test; cd ./message_signing && RUSTFLAGS=-Awarnings cargo test"
   },
   "lint": {
     "include": ["src/", "tests/", "blueprint.ts"],

diff --git a/src/core/core.ts → lib/core/core.ts b/src/core/core.ts → lib/core/core.ts
@@ -1,7 +1,7 @@
-import * as Core from "./libs/lucid_core/pkg/lucid_core.js";
-import type * as CoreTypes from "./libs/lucid_core/pkg/lucid_core.d.ts";
-import * as MessageSigningInstance from "./libs/message_signing/pkg/message_signing.js";
-import type * as MessageSigningTypes from "./libs/message_signing/pkg/message_signing.d.ts";
+import * as Core from "../../rs_lib/pkg/lucid_core.js";
+import type * as CoreTypes from "../../rs_lib/pkg/lucid_core.d.ts";
+import * as MessageSigningInstance from "../../rs_lib/message_signing/pkg/message_signing.js";
+import type * as MessageSigningTypes from "../../rs_lib/message_signing/pkg/message_signing.d.ts";
 
 export type Addresses = CoreTypes.Addresses;
 export const Addresses: typeof CoreTypes.Addresses = Core.Addresses;
@@ -33,4 +33,4 @@ export type MessageSigning = typeof MessageSigningTypes;
 export const MessageSigning: typeof MessageSigningTypes =
   MessageSigningInstance;
 
-export type * from "./libs/lucid_core/pkg/lucid_core.d.ts";
+export type * from "../../rs_lib/pkg/lucid_core.d.ts";
diff --git a/src/core/mod.ts → lib/core/mod.ts b/src/core/mod.ts → lib/core/mod.ts
diff --git a/src/core/types.ts → lib/core/types.ts b/src/core/types.ts → lib/core/types.ts
@@ -8,7 +8,7 @@ import type {
   RelevantProtocolParameters,
   Script,
   Utxo,
-} from "./libs/lucid_core/pkg/lucid_core.d.ts";
+} from "../../rs_lib/pkg/lucid_core.d.ts";
 
 type OmitInstruction<T extends Instruction, K extends T["type"]> = T extends
   { type: K } ? never : T;

diff --git a/src/lucid/lucid.ts → lib/lucid/lucid.ts b/src/lucid/lucid.ts → lib/lucid/lucid.ts
diff --git a/src/lucid/message.ts → lib/lucid/message.ts b/src/lucid/message.ts → lib/lucid/message.ts
diff --git a/src/lucid/mod.ts → lib/lucid/mod.ts b/src/lucid/mod.ts → lib/lucid/mod.ts
diff --git a/src/lucid/tx.ts → lib/lucid/tx.ts b/src/lucid/tx.ts → lib/lucid/tx.ts
diff --git a/src/lucid/tx_complete.ts → lib/lucid/tx_complete.ts b/src/lucid/tx_complete.ts → lib/lucid/tx_complete.ts
diff --git a/src/lucid/tx_signed.ts → lib/lucid/tx_signed.ts b/src/lucid/tx_signed.ts → lib/lucid/tx_signed.ts
diff --git a/src/misc/crc8.ts → lib/misc/crc8.ts b/src/misc/crc8.ts → lib/misc/crc8.ts
diff --git a/src/misc/sign_message.ts → lib/misc/sign_message.ts b/src/misc/sign_message.ts → lib/misc/sign_message.ts
diff --git a/src/mod.ts → lib/mod.ts b/src/mod.ts → lib/mod.ts
diff --git a/src/plutus/data.ts → lib/plutus/data.ts b/src/plutus/data.ts → lib/plutus/data.ts
diff --git a/src/plutus/mod.ts → lib/plutus/mod.ts b/src/plutus/mod.ts → lib/plutus/mod.ts
diff --git a/src/provider/blockfrost.ts → lib/provider/blockfrost.ts b/src/provider/blockfrost.ts → lib/provider/blockfrost.ts
diff --git a/src/provider/emulator.ts → lib/provider/emulator.ts b/src/provider/emulator.ts → lib/provider/emulator.ts
diff --git a/src/provider/kupmios.ts → lib/provider/kupmios.ts b/src/provider/kupmios.ts → lib/provider/kupmios.ts
diff --git a/src/provider/maestro.ts → lib/provider/maestro.ts b/src/provider/maestro.ts → lib/provider/maestro.ts
diff --git a/src/provider/mod.ts → lib/provider/mod.ts b/src/provider/mod.ts → lib/provider/mod.ts
diff --git a/src/utils/merkle_tree.ts → lib/utils/merkle_tree.ts b/src/utils/merkle_tree.ts → lib/utils/merkle_tree.ts
diff --git a/src/utils/mod.ts → lib/utils/mod.ts b/src/utils/mod.ts → lib/utils/mod.ts
diff --git a/src/utils/script_utility.ts → lib/utils/script_utility.ts b/src/utils/script_utility.ts → lib/utils/script_utility.ts
diff --git a/src/utils/utils.ts → lib/utils/utils.ts b/src/utils/utils.ts → lib/utils/utils.ts
diff --git a/mod.ts b/mod.ts
@@ -1 +1 @@
-export * from "./src/mod.ts";
+export * from "./lib/mod.ts";
diff --git a/src/core/libs/lucid_core/.gitignore → rs_lib/.gitignore b/src/core/libs/lucid_core/.gitignore → rs_lib/.gitignore
diff --git a/src/core/libs/lucid_core/Cargo.toml → rs_lib/Cargo.toml b/src/core/libs/lucid_core/Cargo.toml → rs_lib/Cargo.toml
diff --git a/src/core/libs/message_signing/.gitignore → rs_lib/message_signing/.gitignore b/src/core/libs/message_signing/.gitignore → rs_lib/message_signing/.gitignore
diff --git a/src/core/libs/message_signing/Cargo.toml → rs_lib/message_signing/Cargo.toml b/src/core/libs/message_signing/Cargo.toml → rs_lib/message_signing/Cargo.toml
diff --git a/src/core/libs/message_signing/LICENSE → rs_lib/message_signing/LICENSE b/src/core/libs/message_signing/LICENSE → rs_lib/message_signing/LICENSE
diff --git a/.../message_signing/pkg/message_signing.d.ts → .../message_signing/pkg/message_signing.d.ts b/.../message_signing/pkg/message_signing.d.ts → .../message_signing/pkg/message_signing.d.ts
diff --git a/...bs/message_signing/pkg/message_signing.js → ...ib/message_signing/pkg/message_signing.js b/...bs/message_signing/pkg/message_signing.js → ...ib/message_signing/pkg/message_signing.js
diff --git a/...message_signing/pkg/message_signing_bg.js → ...message_signing/pkg/message_signing_bg.js b/...message_signing/pkg/message_signing_bg.js → ...message_signing/pkg/message_signing_bg.js
diff --git a/...ssage_signing/pkg/message_signing_bg.wasm → ...ssage_signing/pkg/message_signing_bg.wasm b/...ssage_signing/pkg/message_signing_bg.wasm → ...ssage_signing/pkg/message_signing_bg.wasm
diff --git a/..._signing/pkg/message_signing_bg.wasm.d.ts → ..._signing/pkg/message_signing_bg.wasm.d.ts b/..._signing/pkg/message_signing_bg.wasm.d.ts → ..._signing/pkg/message_signing_bg.wasm.d.ts
@@ -240,10 +240,10 @@ export const labels_new: () => number;
 export const cosesignatures_new: () => number;
 export const __wbg_countersignature_free: (a: number, b: number) => void;
 export const countersignature_signatures: (a: number) => number;
-export const __wbg_coserecipient_free: (a: number, b: number) => void;
 export const __wbg_passwordencryption_free: (a: number, b: number) => void;
-export const __wbg_pubkeyencryption_free: (a: number, b: number) => void;
 export const __wbg_cosesignbuilder_free: (a: number, b: number) => void;
+export const __wbg_pubkeyencryption_free: (a: number, b: number) => void;
+export const __wbg_coserecipient_free: (a: number, b: number) => void;
 export const cosesignbuilder_set_external_aad: (a: number, b: number, c: number) => void;
 export const cosesignbuilder_hash_payload: (a: number) => void;
 export const coserecipient_ciphertext: (a: number, b: number) => void;

diff --git a/...core/libs/message_signing/src/builders.rs → rs_lib/message_signing/src/builders.rs b/...core/libs/message_signing/src/builders.rs → rs_lib/message_signing/src/builders.rs
diff --git a/src/core/libs/message_signing/src/cbor.rs → rs_lib/message_signing/src/cbor.rs b/src/core/libs/message_signing/src/cbor.rs → rs_lib/message_signing/src/cbor.rs
diff --git a/src/core/libs/message_signing/src/crypto.rs → rs_lib/message_signing/src/crypto.rs b/src/core/libs/message_signing/src/crypto.rs → rs_lib/message_signing/src/crypto.rs
diff --git a/src/core/libs/message_signing/src/error.rs → rs_lib/message_signing/src/error.rs b/src/core/libs/message_signing/src/error.rs → rs_lib/message_signing/src/error.rs
diff --git a/src/core/libs/message_signing/src/lib.rs → rs_lib/message_signing/src/lib.rs b/src/core/libs/message_signing/src/lib.rs → rs_lib/message_signing/src/lib.rs
diff --git a/...libs/message_signing/src/serialization.rs → rs_lib/message_signing/src/serialization.rs b/...libs/message_signing/src/serialization.rs → rs_lib/message_signing/src/serialization.rs
diff --git a/src/core/libs/message_signing/src/tests.rs → rs_lib/message_signing/src/tests.rs b/src/core/libs/message_signing/src/tests.rs → rs_lib/message_signing/src/tests.rs
diff --git a/src/core/libs/message_signing/src/utils.rs → rs_lib/message_signing/src/utils.rs b/src/core/libs/message_signing/src/utils.rs → rs_lib/message_signing/src/utils.rs
diff --git a/src/core/libs/lucid_core/pkg/lucid_core.d.ts → rs_lib/pkg/lucid_core.d.ts b/src/core/libs/lucid_core/pkg/lucid_core.d.ts → rs_lib/pkg/lucid_core.d.ts
diff --git a/src/core/libs/lucid_core/pkg/lucid_core.js → rs_lib/pkg/lucid_core.js b/src/core/libs/lucid_core/pkg/lucid_core.js → rs_lib/pkg/lucid_core.js
diff --git a/...core/libs/lucid_core/pkg/lucid_core_bg.js → rs_lib/pkg/lucid_core_bg.js b/...core/libs/lucid_core/pkg/lucid_core_bg.js → rs_lib/pkg/lucid_core_bg.js
diff --git a/...re/libs/lucid_core/pkg/lucid_core_bg.wasm → rs_lib/pkg/lucid_core_bg.wasm b/...re/libs/lucid_core/pkg/lucid_core_bg.wasm → rs_lib/pkg/lucid_core_bg.wasm
diff --git a/...bs/lucid_core/pkg/lucid_core_bg.wasm.d.ts → rs_lib/pkg/lucid_core_bg.wasm.d.ts b/...bs/lucid_core/pkg/lucid_core_bg.wasm.d.ts → rs_lib/pkg/lucid_core_bg.wasm.d.ts
@@ -57,10 +57,10 @@ export const utils_applyParamsToScript: (a: number, b: number, c: number, d: num
 export const utils_encodeBech32: (a: number, b: number, c: number, d: number) => [number, number, number, number];
 export const utils_applySingleCborEncoding: (a: number, b: number) => [number, number, number, number];
 export const utils_applyDoubleCborEncoding: (a: number, b: number) => [number, number, number, number];
-export const __wbg_codec_free: (a: number, b: number) => void;
+export const __wbg_hasher_free: (a: number, b: number) => void;
 export const __wbg_crypto_free: (a: number, b: number) => void;
 export const __wbg_utils_free: (a: number, b: number) => void;
-export const __wbg_hasher_free: (a: number, b: number) => void;
+export const __wbg_codec_free: (a: number, b: number) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;

diff --git a/src/core/libs/lucid_core/src/addresses.rs → rs_lib/src/addresses.rs b/src/core/libs/lucid_core/src/addresses.rs → rs_lib/src/addresses.rs
diff --git a/src/core/libs/lucid_core/src/codec.rs → rs_lib/src/codec.rs b/src/core/libs/lucid_core/src/codec.rs → rs_lib/src/codec.rs
diff --git a/src/core/libs/lucid_core/src/crypto.rs → rs_lib/src/crypto.rs b/src/core/libs/lucid_core/src/crypto.rs → rs_lib/src/crypto.rs
diff --git a/...ore/libs/lucid_core/src/emulator_state.rs → rs_lib/src/emulator_state.rs b/...ore/libs/lucid_core/src/emulator_state.rs → rs_lib/src/emulator_state.rs
diff --git a/src/core/libs/lucid_core/src/error.rs → rs_lib/src/error.rs b/src/core/libs/lucid_core/src/error.rs → rs_lib/src/error.rs
diff --git a/src/core/libs/lucid_core/src/hasher.rs → rs_lib/src/hasher.rs b/src/core/libs/lucid_core/src/hasher.rs → rs_lib/src/hasher.rs
diff --git a/...ibs/lucid_core/src/instruction_builder.rs → rs_lib/src/instruction_builder.rs b/...ibs/lucid_core/src/instruction_builder.rs → rs_lib/src/instruction_builder.rs
diff --git a/...libs/lucid_core/src/instruction_signer.rs → rs_lib/src/instruction_signer.rs b/...libs/lucid_core/src/instruction_signer.rs → rs_lib/src/instruction_signer.rs
diff --git a/src/core/libs/lucid_core/src/lib.rs → rs_lib/src/lib.rs b/src/core/libs/lucid_core/src/lib.rs → rs_lib/src/lib.rs
diff --git a/src/core/libs/lucid_core/src/utils.rs → rs_lib/src/utils.rs b/src/core/libs/lucid_core/src/utils.rs → rs_lib/src/utils.rs
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from "./src/mod.ts";
		export * from "./lib/mod.ts";