Merge pull request #528 from Emurgo/evgenii/remove_datum_fromto_json

Fix to_from_json for datum types

Author: lisicky

rust/json-gen/src/main.rs

@@ -128,19 +128,18 @@ fn main() {
     // plutus.rs
     gen_json_schema!(PlutusScript);
     gen_json_schema!(PlutusScripts);
-    gen_json_schema!(ConstrPlutusData);
+    // gen_json_schema!(ConstrPlutusData);
     gen_json_schema!(CostModel);
     gen_json_schema!(Costmdls);
     gen_json_schema!(ExUnitPrices);
     gen_json_schema!(ExUnits);
     gen_json_schema!(Language);
     gen_json_schema!(LanguageKind);
     gen_json_schema!(Languages);
-    gen_json_schema!(PlutusMap);
-    gen_json_schema!(PlutusData);
-    gen_json_schema!(PlutusList);
-    gen_json_schema!(PlutusData);
-    //gen_json_schema!(PlutusDataEnum);
+    // gen_json_schema!(PlutusMap);
+    // gen_json_schema!(PlutusData);
+    // gen_json_schema!(PlutusList);
+    // gen_json_schema!(PlutusDataEnum);
     gen_json_schema!(Redeemer);
     gen_json_schema!(RedeemerTag);
     gen_json_schema!(RedeemerTagKind);

rust/pkg/cardano_serialization_lib.js.flow

@@ -194,26 +194,6 @@ declare export function encode_json_str_to_native_script(
   schema: number
 ): NativeScript;
 
-/**
- * @param {string} json
- * @param {number} schema
- * @returns {PlutusData}
- */
-declare export function encode_json_str_to_plutus_datum(
-  json: string,
-  schema: number
-): PlutusData;
-
-/**
- * @param {PlutusData} datum
- * @param {number} schema
- * @returns {string}
- */
-declare export function decode_plutus_datum_to_json_str(
-  datum: PlutusData,
-  schema: number
-): string;
-
 /**
  * @param {Uint8Array} bytes
  * @returns {TransactionMetadatum}
@@ -250,6 +230,26 @@ declare export function decode_metadatum_to_json_str(
   schema: number
 ): string;
 
+/**
+ * @param {string} json
+ * @param {number} schema
+ * @returns {PlutusData}
+ */
+declare export function encode_json_str_to_plutus_datum(
+  json: string,
+  schema: number
+): PlutusData;
+
+/**
+ * @param {PlutusData} datum
+ * @param {number} schema
+ * @returns {string}
+ */
+declare export function decode_plutus_datum_to_json_str(
+  datum: PlutusData,
+  schema: number
+): string;
+
 /**
  */
 
@@ -348,6 +348,26 @@ declare export var ScriptSchema: {|
   +Node: 1, // 1
 |};
 
+/**
+ */
+
+declare export var TransactionMetadatumKind: {|
+  +MetadataMap: 0, // 0
+  +MetadataList: 1, // 1
+  +Int: 2, // 2
+  +Bytes: 3, // 3
+  +Text: 4, // 4
+|};
+
+/**
+ */
+
+declare export var MetadataJsonSchema: {|
+  +NoConversions: 0, // 0
+  +BasicConversions: 1, // 1
+  +DetailedSchema: 2, // 2
+|};
+
 /**
  */
 
@@ -394,26 +414,6 @@ declare export var PlutusDatumSchema: {|
   +DetailedSchema: 1, // 1
 |};
 
-/**
- */
-
-declare export var TransactionMetadatumKind: {|
-  +MetadataMap: 0, // 0
-  +MetadataList: 1, // 1
-  +Int: 2, // 2
-  +Bytes: 3, // 3
-  +Text: 4, // 4
-|};
-
-/**
- */
-
-declare export var MetadataJsonSchema: {|
-  +NoConversions: 0, // 0
-  +BasicConversions: 1, // 1
-  +DetailedSchema: 2, // 2
-|};
-
 /**
  */
 declare export class Address {
@@ -1779,22 +1779,6 @@ declare export class ConstrPlutusData {
    */
   static from_hex(hex_str: string): ConstrPlutusData;
 
-  /**
-   * @returns {string}
-   */
-  to_json(): string;
-
-  /**
-   * @returns {ConstrPlutusDataJSON}
-   */
-  to_js_value(): ConstrPlutusDataJSON;
-
-  /**
-   * @param {string} json
-   * @returns {ConstrPlutusData}
-   */
-  static from_json(json: string): ConstrPlutusData;
-
   /**
    * @returns {BigNum}
    */
@@ -4428,22 +4412,6 @@ declare export class PlutusData {
    */
   static from_hex(hex_str: string): PlutusData;
 
-  /**
-   * @returns {string}
-   */
-  to_json(): string;
-
-  /**
-   * @returns {PlutusDataJSON}
-   */
-  to_js_value(): PlutusDataJSON;
-
-  /**
-   * @param {string} json
-   * @returns {PlutusData}
-   */
-  static from_json(json: string): PlutusData;
-
   /**
    * @param {ConstrPlutusData} constr_plutus_data
    * @returns {PlutusData}
@@ -4512,6 +4480,19 @@ declare export class PlutusData {
    * @returns {Uint8Array | void}
    */
   as_bytes(): Uint8Array | void;
+
+  /**
+   * @param {number} schema
+   * @returns {string}
+   */
+  to_json(schema: number): string;
+
+  /**
+   * @param {string} json
+   * @param {number} schema
+   * @returns {PlutusData}
+   */
+  static from_json(json: string, schema: number): PlutusData;
 }
 /**
  */
@@ -4540,22 +4521,6 @@ declare export class PlutusList {
    */
   static from_hex(hex_str: string): PlutusList;
 
-  /**
-   * @returns {string}
-   */
-  to_json(): string;
-
-  /**
-   * @returns {PlutusListJSON}
-   */
-  to_js_value(): PlutusListJSON;
-
-  /**
-   * @param {string} json
-   * @returns {PlutusList}
-   */
-  static from_json(json: string): PlutusList;
-
   /**
    * @returns {PlutusList}
    */
@@ -4604,22 +4569,6 @@ declare export class PlutusMap {
    */
   static from_hex(hex_str: string): PlutusMap;
 
-  /**
-   * @returns {string}
-   */
-  to_json(): string;
-
-  /**
-   * @returns {PlutusMapJSON}
-   */
-  to_js_value(): PlutusMapJSON;
-
-  /**
-   * @param {string} json
-   * @returns {PlutusMap}
-   */
-  static from_json(json: string): PlutusMap;
-
   /**
    * @returns {PlutusMap}
    */
@@ -10139,10 +10088,6 @@ export type CertificateEnumJSON =
       ...
     };
 export type CertificatesJSON = CertificateJSON[];
-export interface ConstrPlutusDataJSON {
-  alternative: string;
-  data: PlutusListJSON;
-}
 export type CostModelJSON = string[];
 export interface CostmdlsJSON {
   [k: string]: CostModelJSON;
@@ -10156,7 +10101,7 @@ export type DataOptionJSON =
       ...
     }
   | {
-      Data: PlutusDataJSON,
+      Data: string,
       ...
     };
 export type Ed25519KeyHashJSON = string;
@@ -10338,25 +10283,8 @@ export interface OperationalCertJSON {
   sequence_number: number;
   sigma: string;
 }
-export interface PlutusDataJSON {
-  datum: PlutusDataEnum;
-  original_bytes?: number[] | null;
-}
-export interface PlutusListJSON {
-  definite_encoding?: boolean | null;
-  elems: PlutusDataJSON[];
-}
-export interface PlutusMapJSON {
-  [k: string]: PlutusDataJSON;
-}
 export type PlutusScriptJSON = string;
 export type PlutusScriptsJSON = string[];
-export interface PlutusWitnessJSON {
-  datum: PlutusDataJSON;
-  redeemer: RedeemerJSON;
-  script: string;
-}
-export type PlutusWitnessesJSON = PlutusWitnessJSON[];
 export interface PoolMetadataJSON {
   pool_metadata_hash: string;
   url: URLJSON;
@@ -10413,10 +10341,9 @@ export interface ProtocolVersionJSON {
   major: number;
   minor: number;
 }
-export type ProtocolVersionsJSON = ProtocolVersionJSON[];
 export type PublicKeyJSON = string;
 export interface RedeemerJSON {
-  data: PlutusDataJSON;
+  data: string;
   ex_units: ExUnitsJSON;
   index: string;
   tag: RedeemerTagJSON;
@@ -10554,7 +10481,7 @@ export type TransactionUnspentOutputsJSON = TransactionUnspentOutputJSON[];
 export interface TransactionWitnessSetJSON {
   bootstraps?: BootstrapWitnessesJSON | null;
   native_scripts?: NativeScriptsJSON | null;
-  plutus_data?: PlutusListJSON | null;
+  plutus_data?: PlutusList | null;
   plutus_scripts?: PlutusScriptsJSON | null;
   redeemers?: RedeemersJSON | null;
   vkeys?: VkeywitnessesJSON | null;