Merge remote-tracking branch 'origin/develop' into mitch/same-wallets

Plutonomicon · Feb 15, 2024 · 2da3f9a · 2da3f9a
2 parents db44bb2 + 2493eb5
commit 2da3f9a
Show file tree

Hide file tree

Showing 37 changed files with 178 additions and 304 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,6 +76,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Fixed
 
+- WebAssembly memory leaks (`csl-gc-wrapper` used to depend on unstable `wasm-bidngen` API [that got changed](https://github.com/mlabs-haskell/csl-gc-wrapper/commit/2dea38228b77f7c904aafef12eece7e5af195977)) ([#1595](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1595))
+
 ### Removed
 
 - `ModifyTx` error: made conversion functions total and removed the need to handle it

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,9 +36,7 @@
   "dependencies": {
     "@emurgo/cardano-message-signing-browser": "1.0.1",
     "@emurgo/cardano-message-signing-nodejs": "1.0.1",
-    "@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6",
-    "@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6",
-    "@mlabs-haskell/csl-gc-wrapper": "^1.0.1",
+    "@mlabs-haskell/cardano-serialization-lib-gc": "^1.0.9",
     "@mlabs-haskell/json-bigint": "2.0.0",
     "@noble/secp256k1": "^1.7.0",
     "apply-args-browser": "0.0.1",

diff --git a/src/Internal/ApplyArgs.js b/src/Internal/ApplyArgs.js
@@ -1,12 +1,11 @@
 /* global BROWSER_RUNTIME */
 
-let lib;
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
+
 let apply_args;
 if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
   apply_args = await import("apply-args-browser");
 } else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
   apply_args = await import("apply-args-nodejs");
 }
 

diff --git a/src/Internal/BalanceTx/UtxoMinAda.js b/src/Internal/BalanceTx/UtxoMinAda.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function minAdaForOutput(maybe) {
   return txOutput => dataCost => {

diff --git a/src/Internal/Deserialization/FromBytes.js b/src/Internal/Deserialization/FromBytes.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _fromBytes(helper) {
   return name => bytes => {

diff --git a/src/Internal/Deserialization/Keys.js b/src/Internal/Deserialization/Keys.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function freshPrivateKey() {
   return lib.PrivateKey.generate_ed25519();

diff --git a/src/Internal/Deserialization/Language.js b/src/Internal/Deserialization/Language.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _convertLanguage(langCtors) {
   return cslLang => {

diff --git a/src/Internal/Deserialization/NativeScript.js b/src/Internal/Deserialization/NativeScript.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _convertNativeScript(handler) {
   return ns => {

diff --git a/src/Internal/Deserialization/PlutusData.js b/src/Internal/Deserialization/PlutusData.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _convertPlutusData(handle) {
   return pd => {

diff --git a/src/Internal/Deserialization/Transaction.js b/src/Internal/Deserialization/Transaction.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 const call = property => object => object[property]();
 const callMaybe = property => maybe => object => {

diff --git a/src/Internal/Deserialization/UnspentOutput.js b/src/Internal/Deserialization/UnspentOutput.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 const call = property => object => object[property]();
 const callMaybe = property => maybe => object => {

diff --git a/src/Internal/Hashing.js b/src/Internal/Hashing.js
@@ -1,16 +1,7 @@
-/* global BROWSER_RUNTIME */
-
 import Blake2 from "blakejs";
-
 import SHA256 from "jssha/sha256";
 import SHA3 from "jssha/sha3";
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function blake2b224Hash(bytesToHash) {
   return Blake2.blake2b(bytesToHash, null, 28);

diff --git a/src/Internal/Serialization.js b/src/Internal/Serialization.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 const setter = prop => obj => value => () => obj["set_" + prop](value);
 

diff --git a/src/Internal/Serialization/Address.js b/src/Internal/Serialization/Address.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 const callClassStaticMaybe = (classname, functionname) => maybe => input => {
   let ret = null;

diff --git a/src/Internal/Serialization/AuxiliaryData.js b/src/Internal/Serialization/AuxiliaryData.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 const setter = prop => obj => value => () => obj["set_" + prop](value);
 

diff --git a/src/Internal/Serialization/BigInt.js b/src/Internal/Serialization/BigInt.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _BigInt_from_str(helper) {
   return str => {

diff --git a/src/Internal/Serialization/Hash.js b/src/Internal/Serialization/Hash.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function hashToBytes(hash) {
   return hash.to_bytes();

diff --git a/src/Internal/Serialization/Keys.js b/src/Internal/Serialization/Keys.js
@@ -1,5 +1,3 @@
-/* global BROWSER_RUNTIME */
-
 const bytesFromKey = key => key.as_bytes();
 
 export { bytesFromKey as bytesFromPublicKey };

diff --git a/src/Internal/Serialization/MinFee.js b/src/Internal/Serialization/MinFee.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _minFee(maybe) {
   return tx => txFeeFixed => txFeePerByte => {

diff --git a/src/Internal/Serialization/NativeScript.js b/src/Internal/Serialization/NativeScript.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 const mkScript = prop => arg => lib.NativeScript[prop](arg);
 

diff --git a/src/Internal/Serialization/PlutusData.js b/src/Internal/Serialization/PlutusData.js
@@ -1,11 +1,4 @@
-/* global BROWSER_RUNTIME */
-
-let lib;
-if (typeof BROWSER_RUNTIME != "undefined" && BROWSER_RUNTIME) {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-browser");
-} else {
-  lib = await import("@mlabs-haskell/cardano-serialization-lib-gc-nodejs");
-}
+import * as lib from "@mlabs-haskell/cardano-serialization-lib-gc";
 
 export function _mkPlutusData_bytes(bytes) {
   return lib.PlutusData.new_bytes(bytes);