AppLayerLabs
diff --git a/‎CMakeLists.txt
+1-1 b/‎CMakeLists.txt
+1-1
diff --git a/‎README.md
+2-6 b/‎README.md
+2-6
diff --git a/‎scripts/AIO-setup.sh
+14-14 b/‎scripts/AIO-setup.sh
+14-14
diff --git a/‎src/contract/CMakeLists.txt
+13 b/‎src/contract/CMakeLists.txt
+13
diff --git a/‎src/contract/abi.h
+7-2 b/‎src/contract/abi.h
+7-2
diff --git a/‎src/contract/contract.cpp
+5 b/‎src/contract/contract.cpp
+5
diff --git a/‎src/contract/contract.h
+1 b/‎src/contract/contract.h
+1
diff --git a/‎src/contract/contractmanager.h
+13-8 b/‎src/contract/contractmanager.h
+13-8
diff --git a/‎src/contract/customcontracts.h
+4-1 b/‎src/contract/customcontracts.h
+4-1
@@ -17,7 +17,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
 endif()
 
 # Project data
-project(orbitersdk VERSION 0.1.1 DESCRIPTION "Sparq subnet")
+project(orbitersdk VERSION 0.1.2 DESCRIPTION "Sparq subnet")
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -20,7 +20,7 @@
             alt="chat on Telegram"></a>
 </p>
 
-Sparq subnet source code. See [Chapter 3.3 on the docs](https://github.com/SparqNet/sparq-docs/blob/main/Sparq_en-US/ch3/3-3.md) for an expanded version of this file.
+Sparq subnet source code. [See the docs](https://github.com/SparqNet/sparq-docs) for a more thorough look at the project.
 
 If you are a developer, fill this form out for free support and additional incentives: https://forms.gle/m83ceG3XoJY3fpwU9
 
@@ -65,13 +65,9 @@ If building with AvalancheGo support, you'll also need:
 
 ### One-liners
 
-For **Debian 11 Bullseye or newer**:
+For **Debian 12 Bookworm or newer**:
 * `sudo apt install build-essential cmake tmux clang-tidy autoconf libtool pkg-config libabsl-dev libboost-all-dev libc-ares-dev libcrypto++-dev libgrpc-dev libgrpc++-dev libscrypt-dev libssl-dev zlib1g-dev openssl protobuf-compiler protobuf-compiler-grpc`
 
-#### Caveats
-
-* **Debian 11 Bullseye and older**: CMake version from repos is too old (3.18.4), has to be installed manually from [their website](https://cmake.org/download)
-
 ## Documentation
 
 We use [Doxygen](https://www.doxygen.nl/index.html) to generate documentation over the current source code. Run `doxygen` inside the project's root folder. Docs should be inside `docs/html`.
 
@@ -130,7 +130,7 @@ if [ "$DEPLOY" = true ]; then
   # Create the JSON files for the Discovery Node, Validators and Normal Nodes
   echo '{
     "rootPath": "discoveryNode",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8080,
@@ -141,7 +141,7 @@ if [ "$DEPLOY" = true ]; then
   # Create the JSON file for the Validators
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8081,
@@ -157,7 +157,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8082,
@@ -173,7 +173,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8083,
@@ -189,7 +189,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8084,
@@ -205,7 +205,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8085,
@@ -222,7 +222,7 @@ if [ "$DEPLOY" = true ]; then
   # Create the json file for the Normal Nodes
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8086,
@@ -237,7 +237,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8087,
@@ -252,7 +252,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8088,
@@ -267,7 +267,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8089,
@@ -282,7 +282,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8110,
@@ -297,7 +297,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8111,
@@ -312,7 +312,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8110,
@@ -327,7 +327,7 @@ if [ "$DEPLOY" = true ]; then
 
   echo '{
     "rootPath": "blockchain",
-    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.1",
+    "web3clientVersion": "OrbiterSDK/cpp/linux_x86-64/0.1.2",
     "version": 1,
     "chainID": 808080,
     "wsPort": 8111,
 
@@ -5,13 +5,16 @@ set(CONTRACT_HEADERS
   ${CMAKE_SOURCE_DIR}/src/contract/contractmanager.h
   ${CMAKE_SOURCE_DIR}/src/contract/erc20wrapper.h
   ${CMAKE_SOURCE_DIR}/src/contract/nativewrapper.h
+  ${CMAKE_SOURCE_DIR}/src/contract/variables/reentrancyguard.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safebase.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint8_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint16_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint32_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint64_t.h
+  ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint112_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint128_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint160_t.h
+  ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint224_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeuint256_t.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safevector.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safearray.h
@@ -20,16 +23,26 @@ set(CONTRACT_HEADERS
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safeunorderedmap.h
   ${CMAKE_SOURCE_DIR}/src/contract/variables/safebool.h
   ${CMAKE_SOURCE_DIR}/src/contract/erc20.h
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2pair.h
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2factory.h
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2library.h
   ${CMAKE_SOURCE_DIR}/src/contract/customcontracts.h
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2router02.h
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/uq112x112.h
   PARENT_SCOPE
 )
 
 set(CONTRACT_SOURCES
   ${CMAKE_SOURCE_DIR}/src/contract/abi.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/contract.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/contractmanager.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/dynamiccontract.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/nativewrapper.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/erc20.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2pair.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2factory.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2library.cpp
+  ${CMAKE_SOURCE_DIR}/src/contract/dexv2/dexv2router02.cpp
   ${CMAKE_SOURCE_DIR}/src/contract/erc20wrapper.cpp
   PARENT_SCOPE
 )
 
@@ -88,6 +88,11 @@ struct ABIType<Address> {
   static constexpr Types value = Types::address; ///< ABI type is address.
 };
 
+template <>
+struct ABIType<std::vector<Address>> {
+  static constexpr Types value = Types::addressArr; ///< ABI type is address.
+};
+
 /**
 * Specialization for bool.
 */
@@ -247,7 +252,7 @@ Types inline getABIEnumFromString(const std::string& type) {
   if (it != typeMappings.end()) {
     return it->second;
   } else {
-    throw std::runtime_error("Invalid type");
+    throw std::runtime_error("Invalid type: " + type);
   }
 }
 
@@ -546,7 +551,7 @@ Types inline getABIEnumFromString(const std::string& type) {
         case Types::bytesArr: return this->getData<std::vector<Bytes>>(index);
         case Types::string: return this->getData<std::string>(index);
         case Types::stringArr: return this->getData<std::vector<std::string>>(index);
-        default: throw std::runtime_error("Invalid ABI::Types type");
+        default: throw std::runtime_error("Invalid ABI::Types type: " + getStringFromABIEnum(type));
       }
     }
 
 
@@ -0,0 +1,5 @@
+#include "contract.h"
+
+Address ContractGlobals::coinbase = Address(Hex::toBytes("0x0000000000000000000000000000000000000000"));
+uint256_t ContractGlobals::blockHeight = 0;
+uint256_t ContractGlobals::blockTimestamp = 0;
@@ -75,6 +75,7 @@ class BaseContract : public ContractLocals {
   Address contractCreator;  ///< Address of the creator of the contract.
   uint64_t contractChainId; ///< Chain where the contract is deployed.
 protected:
+  bool reentrancyLock = false;    ///< Lock (for reentrancy).
   const std::unique_ptr<DB> &db; ///< Pointer to the DB instance.
 public:
   /**
 
@@ -102,7 +102,7 @@ class ContractManager : BaseContract {
     template <typename TContract>
     std::pair<Address, ABI::Decoder> setupNewContract(const ethCallInfo &callInfo) {
       // Check if caller is creator
-      if (this->caller != this->getContractCreator()) {
+      if (this->origin != this->getContractCreator()) {
         throw std::runtime_error("Only contract creator can create new contracts");
       }
 
@@ -112,7 +112,7 @@ class ContractManager : BaseContract {
         throw std::runtime_error("Contract already exists");
       }
 
-      std::unique_lock lock(this->contractsMutex);
+      /// std::unique_lock lock(this->contractsMutex);
       for (const auto &[protocolContractName, protocolContractAddress] : ProtocolContractAddresses) {
         if (protocolContractAddress == derivedContractAddress) {
           throw std::runtime_error("Contract already exists");
@@ -128,18 +128,21 @@ class ContractManager : BaseContract {
      * @tparam TContract The contract type to create.
      * @tparam TTuple The tuple type of the contract constructor arguments.
      * @tparam Is The indices of the tuple.
+     * @param creator The address of the contract creator.
      * @param derivedContractAddress The address of the contract to create.
      * @param dataVec The vector of arguments to pass to the contract constructor.
      * @return A unique pointer to the newly created contract.
      * @throw runtime_error if any argument type mismatches.
      */
     template <typename TContract, typename TTuple, std::size_t... Is>
-    std::unique_ptr<TContract> createContractWithTuple(const Address& derivedContractAddress,
+    std::unique_ptr<TContract> createContractWithTuple(
+        const Address& creator,
+        const Address& derivedContractAddress,
         const std::vector<std::any>& dataVec,
         std::index_sequence<Is...>) {
       try {
         return std::make_unique<TContract>(std::any_cast<typename std::tuple_element<Is, TTuple>::type>(dataVec[Is])...,
-          *this->interface, derivedContractAddress, this->getCaller(), this->options->getChainID(), this->db
+          *this->interface, derivedContractAddress, creator, this->options->getChainID(), this->db
         );
       } catch (const std::bad_any_cast& ex) {
         throw std::runtime_error("Mismatched argument types for contract constructor. Expected: " +
@@ -150,21 +153,23 @@ class ContractManager : BaseContract {
 
     /**
      * Helper function to create a new contract from a given call info.
+     * @param creator The address of the contract creator.
      * @param derivedContractAddress The address of the contract to create.
      * @param dataVec The vector of arguments to pass to the contract constructor.
      * @throw runtime_error if the size of the vector does not match the number of
      * arguments of the contract constructor.
      */
     template <typename TContract, typename TTuple>
-    std::unique_ptr<TContract> createContractWithTuple(const Address& derivedContractAddress, const std::vector<std::any>& dataVec) {
+    std::unique_ptr<TContract> createContractWithTuple(const Address& creator,
+      const Address& derivedContractAddress, const std::vector<std::any>& dataVec) {
       constexpr std::size_t TupleSize = std::tuple_size<TTuple>::value;
       if (TupleSize != dataVec.size()) {
         throw std::runtime_error("Not enough arguments provided for contract constructor. Expected: " +
           std::to_string(TupleSize) + ", got: " + std::to_string(dataVec.size())
         );
       }
       return createContractWithTuple<TContract, TTuple>(
-        derivedContractAddress, dataVec, std::make_index_sequence<TupleSize>{}
+        creator, derivedContractAddress, dataVec, std::make_index_sequence<TupleSize>{}
       );
     }
 
@@ -203,11 +208,11 @@ class ContractManager : BaseContract {
         }
       }
 
-      auto contract = createContractWithTuple<TContract, ConstructorArguments>(derivedContractAddress, dataVector);
+      auto contract = createContractWithTuple<TContract, ConstructorArguments>(std::get<0>(callInfo), derivedContractAddress, dataVector);
       /// Update the inner variables of the contract.
       /// The constructor can set SafeVariables values from the constructor.
       /// We need to take account of that and set the variables accordingly.
-      this->updateState(true);
+      // this->updateState(true);
       this->recentlyCreatedContracts.insert(derivedContractAddress);
       this->contracts.insert(std::make_pair(derivedContractAddress, std::move(contract)));
     }
 
@@ -1,5 +1,8 @@
 #include "erc20.h"
 #include "erc20wrapper.h"
 #include "nativewrapper.h"
+#include "dexv2/dexv2pair.h"
+#include "dexv2/dexv2factory.h"
+#include "dexv2/dexv2router02.h"
 
-using ContractTypes = std::tuple<ERC20, ERC20Wrapper, NativeWrapper>;
+using ContractTypes = std::tuple<ERC20, ERC20Wrapper, NativeWrapper, DEXV2Pair, DEXV2Factory, DEXV2Router02>;