Merge pull request #2120 from trufflesuite/fix-constant-keys

Fix bugs relating to constant mapping keys

Author: haltman-at

packages/truffle-debugger/lib/data/sagas/index.js

@@ -403,7 +403,7 @@ function* variablesAndMappingsSaga() {
           indexValue = yield* decode(splicedDefinition, indexReference);
         } else if (
           indexDefinition.referencedDeclaration &&
-          scopes[indexDefinition.referenceDeclaration]
+          scopes[indexDefinition.referencedDeclaration]
         ) {
           //there's one more reason we might have failed to decode it: it might be a
           //constant state variable.  Unfortunately, we don't know how to decode all
@@ -426,7 +426,11 @@ function* variablesAndMappingsSaga() {
               indexValue = yield* decode(keyDefinition, {
                 definition: indexConstantDeclaration.value
               });
+            } else {
+              indexValue = null; //can't decode; see below for more explanation
             }
+          } else {
+            indexValue = null; //can't decode; see below for more explanation
           }
         }
         //there's still one more reason we might have failed to decode it:

packages/truffle-debugger/test/data/more-decoding.js

@@ -97,6 +97,9 @@ contract ElementaryTest {
   mapping(string => string) stringMap;
   mapping(address => address) addressMap;
 
+  //constant state variables to try as mapping keys
+  uint constant two = 2;
+
   function run() public {
     //local variables to be tested
     byte oneByte;
@@ -114,6 +117,7 @@ contract ElementaryTest {
     bytesMap[hex"01"] = hex"01";
 
     uintMap[1] = 1;
+    uintMap[two] = two;
 
     intMap[-1] = -1;
 
@@ -340,7 +344,7 @@ describe("Further Decoding", function() {
       boolMap: new Map([[true, true]]),
       byteMap: new Map([["0x01", "0x01"]]),
       bytesMap: new Map([["0x01", "0x01"]]),
-      uintMap: new Map([[1, 1]]),
+      uintMap: new Map([[1, 1], [2, 2]]),
       intMap: new Map([[-1, -1]]),
       stringMap: new Map([["0xdeadbeef", "0xdeadbeef"], ["12345", "12345"]]),
       addressMap: new Map([[address, address]]),