Merge pull request #160 from Zondax/fix-democracy

Zondax · Nov 2, 2022 · 004f80e · 004f80e
2 parents 9e1ed48 + 39d3b23
commit 004f80e
Show file tree

Hide file tree

Showing 28 changed files with 23,616 additions and 36,379 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=15
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=9300
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/app/rust/Cargo.lock b/app/rust/Cargo.lock
diff --git a/app/src/substrate/substrate_coin.h b/app/src/substrate/substrate_coin.h
@@ -53,7 +53,7 @@ typedef enum {
 #define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION
 #define SUPPORTED_TX_VERSION_PREVIOUS (LEDGER_MAJOR_VERSION - 1)
 #define SUPPORTED_SPEC_VERSION (LEDGER_MINOR_VERSION + 0)
-#define SUPPORTED_MINIMUM_SPEC_VERSION 9000
+#define SUPPORTED_MINIMUM_SPEC_VERSION 9300
 
 #define COIN_AMOUNT_DECIMAL_PLACES 10
 

diff --git a/app/src/substrate/substrate_dispatch.c b/app/src/substrate/substrate_dispatch.c
@@ -28,8 +28,6 @@ parser_error_t _readMethod(
     switch (c->tx_obj->transactionVersion) {
     case 15:
         return _readMethod_V15(c, moduleIdx, callIdx, &method->V15);
-    case 14:
-        return _readMethod_V14(c, moduleIdx, callIdx, &method->V14);
     default:
         return parser_tx_version_not_supported;
     }
@@ -40,8 +38,6 @@ uint8_t _getMethod_NumItems(uint32_t transactionVersion, uint8_t moduleIdx, uint
     switch (transactionVersion) {
     case 15:
         return _getMethod_NumItems_V15(moduleIdx, callIdx);
-    case 14:
-        return _getMethod_NumItems_V14(moduleIdx, callIdx);
     default:
         return parser_tx_version_not_supported;
     }
@@ -52,8 +48,6 @@ const char* _getMethod_ModuleName(uint32_t transactionVersion, uint8_t moduleIdx
     switch (transactionVersion) {
     case 15:
         return _getMethod_ModuleName_V15(moduleIdx);
-    case 14:
-        return _getMethod_ModuleName_V14(moduleIdx);
     default:
         return NULL;
     }
@@ -64,8 +58,6 @@ const char* _getMethod_Name(uint32_t transactionVersion, uint8_t moduleIdx, uint
     switch (transactionVersion) {
     case 15:
         return _getMethod_Name_V15(moduleIdx, callIdx);
-    case 14:
-        return _getMethod_Name_V14(moduleIdx, callIdx);
     default:
         return 0;
     }
@@ -76,8 +68,6 @@ const char* _getMethod_ItemName(uint32_t transactionVersion, uint8_t moduleIdx,
     switch (transactionVersion) {
     case 15:
         return _getMethod_ItemName_V15(moduleIdx, callIdx, itemIdx);
-    case 14:
-        return _getMethod_ItemName_V14(moduleIdx, callIdx, itemIdx);
     default:
         return NULL;
     }
@@ -91,9 +81,6 @@ parser_error_t _getMethod_ItemValue(uint32_t transactionVersion, pd_Method_t* m,
     case 15:
         return _getMethod_ItemValue_V15(&m->V15, moduleIdx, callIdx, itemIdx, outValue,
             outValueLen, pageIdx, pageCount);
-    case 14:
-        return _getMethod_ItemValue_V14(&m->V14, moduleIdx, callIdx, itemIdx, outValue,
-            outValueLen, pageIdx, pageCount);
     default:
         return parser_tx_version_not_supported;
     }
@@ -104,8 +91,6 @@ bool _getMethod_ItemIsExpert(uint32_t transactionVersion, uint8_t moduleIdx, uin
     switch (transactionVersion) {
     case 15:
         return _getMethod_ItemIsExpert_V15(moduleIdx, callIdx, itemIdx);
-    case 14:
-        return _getMethod_ItemIsExpert_V14(moduleIdx, callIdx, itemIdx);
     default:
         return false;
     }
@@ -116,8 +101,6 @@ bool _getMethod_IsNestingSupported(uint32_t transactionVersion, uint8_t moduleId
     switch (transactionVersion) {
     case 15:
         return _getMethod_IsNestingSupported_V15(moduleIdx, callIdx);
-    case 14:
-        return _getMethod_IsNestingSupported_V14(moduleIdx, callIdx);
     default:
         return false;
     }

diff --git a/app/src/substrate/substrate_dispatch.h b/app/src/substrate/substrate_dispatch.h
@@ -21,7 +21,6 @@ extern "C" {
 
 #include "parser_common.h"
 #include "stdbool.h"
-#include "substrate_dispatch_V14.h"
 #include "substrate_dispatch_V15.h"
 #include <stddef.h>
 #include <stdint.h>
@@ -36,9 +35,6 @@ extern "C" {
         case 15:                                   \
             return PD_CALL_##CALL##_V15;           \
                                                    \
-        case 14:                                   \
-            return PD_CALL_##CALL##_V14;           \
-                                                   \
         default:                                   \
             return 0;                              \
         }                                          \