Merge branch 'bump-multisig-accounts-limit'

Author: benma

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Add securechip_model to DeviceInfo: ATECCC608A or ATECC608B.
 - Added reboot purpose for clearer UX: "Proceed to upgrade?" vs. "Go to startup settings?"
 - Allow creation of 128 bit seeds (12 BIP39 recovery words)
+- Increase maximum number of registered multisig accounts from 10 to 25.
 
 ## 9.5.0 [released 2021-03-10]
 - RestoreFrommnemonic: ported to Rust. Will now return UserAbortError on user abort instead of GenericError.

src/memory/memory.h

@@ -27,7 +27,7 @@
 #define MEMORY_MULTISIG_NAME_MAX_LEN (31)
 
 // How many multisig configurations (accounts) can be registered.
-#define MEMORY_MULTISIG_NUM_ENTRIES 10
+#define MEMORY_MULTISIG_NUM_ENTRIES 25
 
 typedef struct {
     void (*const random_32_bytes)(uint8_t* buf_out);

test/unit-test/test_memory_functional.c

@@ -104,38 +104,19 @@ static void _test_memory_multisig_invalid(void** state)
 static void _test_memory_multisig_full(void** state)
 {
     _reset_memory();
-    const uint8_t hashes[][32] = {
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-        "cccccccccccccccccccccccccccccccc",
-        "dddddddddddddddddddddddddddddddd",
-        "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
-        "ffffffffffffffffffffffffffffffff",
-        "gggggggggggggggggggggggggggggggg",
-        "hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
-        "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
-        "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
-        "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk",
-    };
-    const char* names[] = {
-        "name1",
-        "name2",
-        "name3",
-        "name4",
-        "name5",
-        "name6",
-        "name7",
-        "name8",
-        "name9",
-        "name10",
-        "name11",
-    };
+    // Only 25 slots available.
+    const size_t limit = 25;
+    uint8_t hashes[limit + 1][32];
+    char names[limit + 1][10];
+    for (size_t i = 0; i < limit + 1; i++) {
+        memset(hashes[i], i + i, 32);
+        snprintf(names[i], sizeof(names[i]), "name%ld", i);
+    }
 
-    // Only 5 slots available.
-    for (int i = 0; i < 10; i++) {
+    for (size_t i = 0; i < limit; i++) {
         assert_int_equal(MEMORY_OK, memory_multisig_set_by_hash(hashes[i], names[i]));
     }
-    assert_int_equal(MEMORY_ERR_FULL, memory_multisig_set_by_hash(hashes[10], names[10]));
+    assert_int_equal(MEMORY_ERR_FULL, memory_multisig_set_by_hash(hashes[limit], names[limit]));
 }
 
 int main(void)