From 73ac5eb19bc7e3c0850a57cefd1228e5f85fd0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?=
 <jedrzej.stuczynski@gmail.com>
Date: Wed, 24 Jul 2024 09:17:12 +0100
Subject: [PATCH] post rebase fixes

---
 Cargo.lock                                    |  2 +-
 contracts/ecash/schema/nym-ecash.json         | 31 ++++++++++++++++---
 contracts/ecash/schema/raw/instantiate.json   | 31 ++++++++++++++++---
 .../src/config/old_configs/old_config_v2.rs   |  2 ++
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5fd80849e8..17d2eca1cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4312,7 +4312,7 @@ dependencies = [
  "bincode",
  "bs58 0.5.1",
  "bytes",
- "clap 4.5.4",
+ "clap 4.5.7",
  "fastrand 2.1.0",
  "futures",
  "ipnetwork 0.16.0",
diff --git a/contracts/ecash/schema/nym-ecash.json b/contracts/ecash/schema/nym-ecash.json
index 542c518df4..ac73be5fb1 100644
--- a/contracts/ecash/schema/nym-ecash.json
+++ b/contracts/ecash/schema/nym-ecash.json
@@ -7,26 +7,47 @@
     "title": "InstantiateMsg",
     "type": "object",
     "required": [
+      "deposit_amount",
       "group_addr",
       "holding_account",
-      "mix_denom",
       "multisig_addr"
     ],
     "properties": {
+      "deposit_amount": {
+        "$ref": "#/definitions/Coin"
+      },
       "group_addr": {
         "type": "string"
       },
       "holding_account": {
         "type": "string"
       },
-      "mix_denom": {
-        "type": "string"
-      },
       "multisig_addr": {
         "type": "string"
       }
     },
-    "additionalProperties": false
+    "additionalProperties": false,
+    "definitions": {
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
   },
   "execute": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/ecash/schema/raw/instantiate.json b/contracts/ecash/schema/raw/instantiate.json
index 0b228df79c..cddf0ba473 100644
--- a/contracts/ecash/schema/raw/instantiate.json
+++ b/contracts/ecash/schema/raw/instantiate.json
@@ -3,24 +3,45 @@
   "title": "InstantiateMsg",
   "type": "object",
   "required": [
+    "deposit_amount",
     "group_addr",
     "holding_account",
-    "mix_denom",
     "multisig_addr"
   ],
   "properties": {
+    "deposit_amount": {
+      "$ref": "#/definitions/Coin"
+    },
     "group_addr": {
       "type": "string"
     },
     "holding_account": {
       "type": "string"
     },
-    "mix_denom": {
-      "type": "string"
-    },
     "multisig_addr": {
       "type": "string"
     }
   },
-  "additionalProperties": false
+  "additionalProperties": false,
+  "definitions": {
+    "Coin": {
+      "type": "object",
+      "required": [
+        "amount",
+        "denom"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "denom": {
+          "type": "string"
+        }
+      }
+    },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    }
+  }
 }
diff --git a/nym-node/src/config/old_configs/old_config_v2.rs b/nym-node/src/config/old_configs/old_config_v2.rs
index 5516a8d326..d9c2254407 100644
--- a/nym-node/src/config/old_configs/old_config_v2.rs
+++ b/nym-node/src/config/old_configs/old_config_v2.rs
@@ -925,6 +925,8 @@ pub async fn try_upgrade_config_v2<P: AsRef<Path>>(
             announce_wss_port: old_cfg.entry_gateway.announce_wss_port,
             debug: EntryGatewayConfigDebug {
                 message_retrieval_limit: old_cfg.entry_gateway.debug.message_retrieval_limit,
+                // \/ ADDED
+                zk_nym_tickets: Default::default(),
             },
         },
         exit_gateway: ExitGatewayConfig {