mnemonics.json fixes for Core moved to bug-fixes.json

Author: trendscharts

configs/forknote.json

@@ -33,7 +33,8 @@
     "multiply/bugged-zawy-difficulty-algorithm.json",
     "daemon-getrandom_outs-json.json",
     "simplewallet-import-keys.json",
-    "simplewallet-export-keys.json"
+    "simplewallet-export-keys.json",
+    "mnemonics.json"
   ],
   "base_coin": {
     "name": "bytecoin",

extensions/bug-fixes.json

@@ -125,6 +125,38 @@
             ]
           }
         },
+        {
+          "action": "add_above",
+          "marker": "struct rs_comm {",
+          "parameters": {
+            "text": [
+              "  struct ec_point_pair {",
+              "    EllipticCurvePoint a, b;",
+              "  };"
+            ]
+          }
+        },
+        {
+          "action": "add_below",
+          "marker": "struct rs_comm {",
+          "parameters": {
+            "text": [
+              "  Hash h;",
+              "  struct ec_point_pair ab[];",
+              "};",
+              "/*"
+            ]
+          }
+        },
+        {
+          "action": "add_above",
+          "marker": "static inline size_t rs_comm_size(size_t pubs_count) {",
+          "parameters": {
+            "text": [
+              "*/"
+            ]
+          }
+        },
         {
           "action": "add_above",
           "marker": "void crypto_ops::hash_data_to_ec(const uint8_t* data, std::size_t len, PublicKey& key) {",
@@ -146,24 +178,20 @@
         }
       ]
     },
-
     {
-      "path": "/src/crypto/crypto.cpp",
-      "description": "NOT WORKING",
-      "multiline": true,
+      "path": "/src/crypto/keccak.c",
       "changes": [
         {
-          "action": "replace",
-          "marker": "\\s+struct\\s+rs_comm\\s+{[^}]+}\\s+ab\\[\\];",
+          "action": "add_above",
+          "marker": "rsiz = sizeof(state_t) == mdlen ? HASH_DATA_AREA : 200 - 2 * mdlen;",
           "parameters": {
             "text": [
+              "/* for some reason the enum from hash-ops.h is not valid here when",
+              "   compiling - is this a C vs C++ thing? Anyhow, lets just redefine it for",
+              "   now. */",
               "",
-              "  struct ec_point_pair {",
-              "    EllipticCurvePoint a, b;",
-              "  };",
-              "  struct rs_comm {",
-              "    Hash h;",
-              "    struct ec_point_pair ab[];"
+              "const int HASH_DATA_AREA = 136;",
+              ""
             ]
           }
         }

extensions/mnemonics.json

@@ -235,66 +235,6 @@
               ""
             ]
           }
-        },
-        {
-          "action": "add_above",
-          "marker": "struct rs_comm {",
-          "parameters": {
-            "text": [
-              "  struct ec_point_pair {",
-              "    EllipticCurvePoint a, b;",
-              "  };"
-            ]
-          }
-        },
-        {
-          "action": "add_below",
-          "marker": "struct rs_comm {",
-          "parameters": {
-            "text": [
-              "  Hash h;",
-              "  struct ec_point_pair ab[];",
-              "};",
-              "/*"
-            ]
-          }
-        },
-        {
-          "action": "add_above",
-          "marker": "static inline size_t rs_comm_size(size_t pubs_count) {",
-          "parameters": {
-            "text": [
-              "*/"
-            ]
-          }
-        },
-        {
-          "action": "replace",
-          "marker": "return sizeof(rs_comm) + pubs_count * sizeof(rs_comm().ab[0]);",
-          "parameters": {
-            "text": [
-              "return sizeof(rs_comm) + pubs_count * sizeof(ec_point_pair);"
-            ]
-          }
-        }
-      ]
-    },
-    {
-      "path": "/src/crypto/keccak.c",
-      "changes": [
-        {
-          "action": "add_above",
-          "marker": "rsiz = sizeof(state_t) == mdlen ? HASH_DATA_AREA : 200 - 2 * mdlen;",
-          "parameters": {
-            "text": [
-              "/* for some reason the enum from hash-ops.h is not valid here when",
-              "   compiling - is this a C vs C++ thing? Anyhow, lets just redefine it for",
-              "   now. */",
-              "",
-              "const int HASH_DATA_AREA = 136;",
-              ""
-            ]
-          }
         }
       ]
     },

generator.sh

@@ -27,7 +27,7 @@ function finish {
 }
 trap finish EXIT
 
-# Generate source code and compile 
+# Generate source code and compile
 function generate_coin {
 	# Define coin paths
 	export BASE_COIN_PATH="${WORK_FOLDERS_PATH}/${__CONFIG_base_coin_name}"
@@ -59,7 +59,7 @@ function generate_coin {
 	for extension in "${__CONFIG_extensions[@]}"
 	do
 		echo "${bold}Execute ${EXTENSIONS_PATH}/${extension}${normal}"
-		python2 "lib/file-modification.py" --extension "${EXTENSIONS_PATH}/${extension}" --config=$CONFIG_FILE --source=${TEMP_PATH}
+		python "lib/file-modification.py" --extension "${EXTENSIONS_PATH}/${extension}" --config=$CONFIG_FILE --source=${TEMP_PATH}
 	done
 
 	[ -d "${NEW_COIN_PATH}" ] || mkdir -p "${NEW_COIN_PATH}"
@@ -93,7 +93,7 @@ Reads a config file and creates and compiles Cryptonote coin. "config.json" as d
     -f          config file
     -c          compile arguments
 EOF
-}   
+}
 
 # A POSIX variable
 OPTIND=1         # Reset in case getopts has been used previously in the shell.
@@ -123,14 +123,14 @@ if [[ "${CONFIG_FILE}" != /* ]]; then
 fi
 
 if [ ! -f ${CONFIG_FILE} ]; then
-	echo "ERROR: config file does not exist"	
+	echo "ERROR: config file does not exist"
 	exit
 fi
 
 [ -d "${WORK_FOLDERS_PATH}" ] || mkdir -p "${WORK_FOLDERS_PATH}"
 
 # Get environment environment_variables
-python2 "lib/environment_variables.py" --config=$CONFIG_FILE --output=$BASH_CONFIG
+python "lib/environment_variables.py" --config=$CONFIG_FILE --output=$BASH_CONFIG
 if [ ! -f ${BASH_CONFIG} ]; then
 	echo "Config file was not translated to bash."
 	echo "Abort coin generation"