fix lombard decoder

Se7en-Seas · Dec 2, 2024 · 0e39170 · 0e39170
1 parent fbfae88
commit 0e39170
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 43 deletions.
diff --git a/src/base/DecodersAndSanitizers/LombardBtcDecoderAndSanitizer.sol b/src/base/DecodersAndSanitizers/LombardBtcDecoderAndSanitizer.sol
@@ -176,7 +176,7 @@ contract LombardBtcDecoderAndSanitizer is
     function burn(uint256) 
         external 
         pure
-        override(UniswapV3DecoderAndSanitizer, LombardBTCMinterDecoderAndSanitizer) 
+        override(UniswapV3DecoderAndSanitizer) 
         returns (bytes memory addressesFound) 
     {
         // Nothing to sanitize or return

diff --git a/test/resources/MerkleTreeHelper/MerkleTreeHelper.sol b/test/resources/MerkleTreeHelper/MerkleTreeHelper.sol
@@ -5736,6 +5736,48 @@ contract MerkleTreeHelper is CommonBase, ChainValues {
             leafs[leafIndex].argumentAddresses[0] = address(assets[i]); 
         }
 
+        for (uint256 i; i < assets.length; i++) {
+            unchecked{
+                leafIndex++; 
+            }
+            leafs[leafIndex] = ManageLeaf(
+                vault, //target
+                false, //can send value
+                "withdraw((address,uint256)[])", //func sig
+                new address[](1), //argumentAddresses
+                string.concat("Withdraw ", assets[i].symbol(), " from Aera vault"), //description
+                getAddress(sourceChain, "rawDataDecoderAndSanitizer") //d&s address
+            );
+            leafs[leafIndex].argumentAddresses[0] = address(assets[i]); 
+        }
+
+        unchecked{
+            leafIndex++; 
+        }
+
+        leafs[leafIndex] = ManageLeaf(
+            vault, //target
+            false, //can send value
+            "pause()", //func sig
+            new address[](0), //argumentAddresses
+            string.concat("Pause the Aera vault"), //description
+            getAddress(sourceChain, "rawDataDecoderAndSanitizer") //d&s address
+        );
+
+        unchecked{
+            leafIndex++; 
+        }
+
+        leafs[leafIndex] = ManageLeaf(
+            vault, //target
+            false, //can send value
+            "resume()", //func sig
+            new address[](0), //argumentAddresses
+            string.concat("Resume the Aera vault"), //description
+            getAddress(sourceChain, "rawDataDecoderAndSanitizer") //d&s address
+        );
+
+    }
 
     // ========================================= Lombard BTC  =========================================
 
@@ -5834,48 +5876,6 @@ contract MerkleTreeHelper is CommonBase, ChainValues {
     } 
 
 
-        for (uint256 i; i < assets.length; i++) {
-            unchecked{
-                leafIndex++; 
-            }
-            leafs[leafIndex] = ManageLeaf(
-                vault, //target
-                false, //can send value
-                "withdraw((address,uint256)[])", //func sig
-                new address[](1), //argumentAddresses
-                string.concat("Withdraw ", assets[i].symbol(), " from Aera vault"), //description
-                getAddress(sourceChain, "rawDataDecoderAndSanitizer") //d&s address
-            );
-            leafs[leafIndex].argumentAddresses[0] = address(assets[i]); 
-        }
-
-        unchecked{
-            leafIndex++; 
-        }
-
-        leafs[leafIndex] = ManageLeaf(
-            vault, //target
-            false, //can send value
-            "pause()", //func sig
-            new address[](0), //argumentAddresses
-            string.concat("Pause the Aera vault"), //description
-            getAddress(sourceChain, "rawDataDecoderAndSanitizer") //d&s address
-        );
-
-        unchecked{
-            leafIndex++; 
-        }
-
-        leafs[leafIndex] = ManageLeaf(
-            vault, //target
-            false, //can send value
-            "resume()", //func sig
-            new address[](0), //argumentAddresses
-            string.concat("Resume the Aera vault"), //description
-            getAddress(sourceChain, "rawDataDecoderAndSanitizer") //d&s address
-        );
-
-    }
 
     // ============================================= WeETH ==================================================