Merge pull request #493 from Plutonomicon/bladyjoker/use-emurgo-csl

Switched to using emurgo/cardano-serialization-lib
Plutonomicon · Jun 9, 2022 · a30f8c7 · a30f8c7
2 parents 28cc281 + 4098359
commit a30f8c7
Show file tree

Hide file tree

Showing 40 changed files with 50,377 additions and 345 deletions.
diff --git a/fixtures/test/ogmios-datum-cache/plutus-data-samples.json b/fixtures/test/ogmios-datum-cache/plutus-data-samples.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/expected/t1.json b/fixtures/test/parsing/json_stringify_numbers/expected/t1.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/expected/t2.json b/fixtures/test/parsing/json_stringify_numbers/expected/t2.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/expected/t3.json b/fixtures/test/parsing/json_stringify_numbers/expected/t3.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/expected/t4.json b/fixtures/test/parsing/json_stringify_numbers/expected/t4.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/input/t1.json b/fixtures/test/parsing/json_stringify_numbers/input/t1.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/input/t2.json b/fixtures/test/parsing/json_stringify_numbers/input/t2.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/input/t3.json b/fixtures/test/parsing/json_stringify_numbers/input/t3.json
diff --git a/fixtures/test/parsing/json_stringify_numbers/input/t4.json b/fixtures/test/parsing/json_stringify_numbers/input/t4.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ngua/cardano-serialization-lib-browser": "^9.1.2",
-    "@ngua/cardano-serialization-lib-nodejs": "^9.1.2",
+    "@emurgo/cardano-serialization-lib-browser": "10.1.0",
+    "@emurgo/cardano-serialization-lib-nodejs": "10.1.0",
     "big-integer": "1.6.51",
     "blakejs": "1.2.1",
     "bufferutil": "4.0.5",

diff --git a/spago.dhall b/spago.dhall
@@ -39,6 +39,7 @@ You can edit this file as you like.
   , "node-buffer"
   , "node-fs"
   , "node-fs-aff"
+  , "node-path"
   , "nonempty"
   , "ordered-collections"
   , "partial"

diff --git a/src/Deserialization/FromBytes.js b/src/Deserialization/FromBytes.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const fromBytes = name => helper => bytes => {

diff --git a/src/Deserialization/NativeScript.js b/src/Deserialization/NativeScript.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const getNativeScriptAs = prop => maybe => ns => {

diff --git a/src/Deserialization/PlutusData.js b/src/Deserialization/PlutusData.js
@@ -1,9 +1,9 @@
 /* global require exports BROWSER_RUNTIME */
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const plutusDataAs = what => helper => data => {

diff --git a/src/Deserialization/UnspentOutput.js b/src/Deserialization/UnspentOutput.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const call = property => object => object[property]();

diff --git a/src/Deserialization/WitnessSet.js b/src/Deserialization/WitnessSet.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const call = property => object => object[property]();

diff --git a/src/Hashing.js b/src/Hashing.js
@@ -6,9 +6,9 @@ const SHA3 = require('jssha/dist/sha3');
 
 let lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const DIGEST_LENGTH_256 = 32;

diff --git a/src/Serialization.js b/src/Serialization.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const setter = prop => obj => value => () =>

diff --git a/src/Serialization/Address.js b/src/Serialization/Address.js
@@ -2,9 +2,9 @@
 
 var CardanoWasm;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    CardanoWasm = require('@ngua/cardano-serialization-lib-browser');
+    CardanoWasm = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    CardanoWasm = require('@ngua/cardano-serialization-lib-nodejs');
+    CardanoWasm = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 

diff --git a/src/Serialization/AuxiliaryData.js b/src/Serialization/AuxiliaryData.js
@@ -2,16 +2,14 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const setter = prop => obj => value => () =>
       obj['set_' + prop](value);
 
-exports.setTxAuxiliaryData = setter('auxiliary_data');
-
 exports.newAuxiliaryData = () =>
     lib.AuxiliaryData.new();
 

diff --git a/src/Serialization/AuxiliaryData.purs b/src/Serialization/AuxiliaryData.purs
@@ -25,7 +25,6 @@ import Serialization.Types
   , GeneralTransactionMetadata
   , NativeScripts
   , PlutusScripts
-  , Transaction
   , TransactionMetadatum
   )
 import Serialization.WitnessSet

diff --git a/src/Serialization/BigInt.js b/src/Serialization/BigInt.js
@@ -1,9 +1,9 @@
 /* global require exports BROWSER_RUNTIME */
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 exports._BigInt_from_str = helper => str => {

diff --git a/src/Serialization/BigNum.js b/src/Serialization/BigNum.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 exports.bigNumFromString = helper => str => {

diff --git a/src/Serialization/Hash.js b/src/Serialization/Hash.js
@@ -2,9 +2,9 @@
 
 var CardanoWasm;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    CardanoWasm = require('@ngua/cardano-serialization-lib-browser');
+    CardanoWasm = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    CardanoWasm = require('@ngua/cardano-serialization-lib-nodejs');
+    CardanoWasm = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const hashFromImpl = hashClassFrom => maybe => input => {

diff --git a/src/Serialization/NativeScript.js b/src/Serialization/NativeScript.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 const mkScript = prop => arg => lib.NativeScript[prop](arg);

diff --git a/src/Serialization/PlutusData.js b/src/Serialization/PlutusData.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 exports._mkPlutusData_bytes = bytes => lib.PlutusData.new_bytes(bytes);

diff --git a/src/Serialization/WitnessSet.js b/src/Serialization/WitnessSet.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 exports.newTransactionWitnessSet = () =>

diff --git a/src/Types/Int.js b/src/Types/Int.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 exports.newPositive = lib.Int.new;

diff --git a/src/Types/PlutusData.purs b/src/Types/PlutusData.purs
@@ -5,10 +5,12 @@ module Types.PlutusData
 import Prelude
 
 import Aeson
-  ( class DecodeAeson
+  ( class EncodeAeson
+  , class DecodeAeson
   , JsonDecodeError(UnexpectedValue)
   , decodeAeson
   , encodeAeson
+  , encodeAeson'
   , toStringifiedNumbersJson
   , (.:)
   )
@@ -38,6 +40,7 @@ derive instance Generic PlutusData _
 instance Show PlutusData where
   show x = genericShow x
 
+-- Ogmios Datum Cache Json format
 instance DecodeAeson PlutusData where
   decodeAeson aeson = decodeConstr
     <|> decodeMap
@@ -77,3 +80,21 @@ instance DecodeAeson PlutusData where
         Nothing -> Left $ UnexpectedValue $ toStringifiedNumbersJson $
           encodeAeson bytesHex
         Just res -> pure $ Bytes res
+
+instance EncodeAeson PlutusData where
+  encodeAeson' (Constr constr fields) = encodeAeson'
+    { "constr": encodeAeson constr
+    , "fields": encodeAeson fields
+    }
+  encodeAeson' (Map elems) = encodeAeson'
+    { "map": encodeAeson $ map
+        ( \(k /\ v) ->
+            { "key": encodeAeson k
+            , "value": encodeAeson v
+            }
+        )
+        elems
+    }
+  encodeAeson' (List elems) = encodeAeson' elems
+  encodeAeson' (Integer bi) = encodeAeson' bi
+  encodeAeson' (Bytes ba) = encodeAeson' ba
diff --git a/src/Wallet.js b/src/Wallet.js
@@ -2,9 +2,9 @@
 
 var lib;
 if (typeof BROWSER_RUNTIME != 'undefined' && BROWSER_RUNTIME) {
-    lib = require('@ngua/cardano-serialization-lib-browser');
+    lib = require('@emurgo/cardano-serialization-lib-browser');
 } else {
-    lib = require('@ngua/cardano-serialization-lib-nodejs');
+    lib = require('@emurgo/cardano-serialization-lib-nodejs');
 }
 
 // _enableNami :: Effect (Promise Cip30Connection)