bug fix: AVM contract storage incorrectly encoded

aionnetwork · Apr 10, 2019 · 0d313cb · 0d313cb
1 parent 380d2e3
commit 0d313cb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionContractDetailsImpl.java b/modAionImpl/src/org/aion/zero/impl/db/AionContractDetailsImpl.java
@@ -349,9 +349,15 @@ public byte[] getEncoded() {
 
             byte[] rlpAddress = RLP.encodeElement(address.toBytes());
             byte[] rlpIsExternalStorage = RLP.encodeByte((byte) (externalStorage ? 1 : 0));
-            byte[] rlpStorageRoot =
-                    RLP.encodeElement(
-                            externalStorage ? storageTrie.getRootHash() : EMPTY_BYTE_ARRAY);
+            byte[] rlpStorageRoot;
+            // encoding for AVM
+            if (vmType == TransactionTypes.AVM_CREATE_CODE) {
+                rlpStorageRoot = RLP.encodeElement(computeAvmStorageHash());
+            } else {
+                rlpStorageRoot =
+                        RLP.encodeElement(
+                                externalStorage ? storageTrie.getRootHash() : EMPTY_BYTE_ARRAY);
+            }
             byte[] rlpStorage =
                     RLP.encodeElement(externalStorage ? EMPTY_BYTE_ARRAY : storageTrie.serialize());
             byte[][] codes = new byte[getCodes().size()][];