Merge branch 'development' into feature/setstats-function

sadiabbasi · web-flow · commit 1a43ee434220 · 2025-10-20T22:52:18.000+03:00
diff --git a/contracts/compile_contract.sh b/contracts/compile_contract.sh
@@ -24,4 +24,7 @@ function compile_contract {
     else
         docker run -v "${PARENT_PATH}:${WORKING_DIR}" antelope_blockchain bash -c "${BUILD_COMMAND}"
     fi
+
+    echo ""
+    echo "Compiled ${CONTRACT_NAME} successfully"
 }
diff --git a/contracts/tonomy/build.sh b/contracts/tonomy/build.sh
@@ -24,4 +24,7 @@ if [ "$BUILD_METHOD" == "local" ]; then
     bash -c "${BUILD_COMMAND}"
 else
     docker run -v "${PARENT_PATH}:${WORKING_DIR}" antelope_blockchain bash -c "${BUILD_COMMAND}"
-fi
+fi
+
+echo ""
+echo "Compiled ${CONTRACT_NAME} successfully"
diff --git a/contracts/tonomy/include/tonomy/tonomy.hpp b/contracts/tonomy/include/tonomy/tonomy.hpp
@@ -92,19 +92,26 @@ namespace tonomysystem
           checksum256 username_hash,
           public_key password_key,
           checksum256 password_salt);
-         /**
-            * Manually sets the details of an app (admin only)
-            *
-            * @param account_name - name of the account
-            * @param json_data - JSON string containing app details (name,description, logo_url, background_color, accent_color)
-            * @param username_hash - hash of the username
-            * @param origin - domain associated with the app
-          */
-         [[eosio::action]] void adminsetapp(
-             name account_name,
-             string json_data,
-             checksum256 username_hash,
-             string origin);
+      /**
+      * Manually sets the details of an app (admin only)
+      *
+      * @param account_name - name of the account
+      * @param json_data - JSON string containing app details (name,description, logo_url, background_color, accent_color)
+      * @param username_hash - hash of the username
+      * @param origin - domain associated with the app
+      */
+      [[eosio::action]] void adminsetapp(
+            name account_name,
+            string json_data,
+            checksum256 username_hash,
+            string origin);
+      
+      /**
+       * Removes an app (admin only)
+       * @param account_name - name of the account
+       */
+      [[eosio::action]] void deleteapp(name account_name);
+
       /**
        * Create a new account for an app and registers its details
        *
@@ -118,7 +125,6 @@ namespace tonomysystem
           checksum256 username_hash,
           string origin,
           public_key key);
-      
     
       /**
        * Adds a new key to a person's account to log into an app with
diff --git a/contracts/tonomy/src/native.cpp b/contracts/tonomy/src/native.cpp
@@ -92,13 +92,15 @@ namespace tonomysystem
    void native::setcode(name account, uint8_t vmtype, uint8_t vmversion, const std::vector<char> &code)
    {
       special_governance_check(account);
+      require_auth(account);
       native::setcode_action action("eosio"_n, {account, "active"_n});
       action.send(account, vmtype, vmversion, code);
    }
 
    void native::setabi(name account, const std::vector<char> &abi)
    {
       special_governance_check(account);
+      require_auth(account);
       native::setabi_action action("eosio"_n, {account, "active"_n});
       action.send(account, abi);
    }
diff --git a/contracts/tonomy/src/tonomy.cpp b/contracts/tonomy/src/tonomy.cpp
@@ -257,6 +257,8 @@ namespace tonomysystem
    {
       eosio::require_auth(get_self()); // signed by tonomy@active permission
 
+      eosio::check(is_account(account_name), "Account does not exist");
+
       // Add to the account_type table
       account_type_table account_type(get_self(), get_self().value);
 
@@ -301,6 +303,22 @@ namespace tonomysystem
       }
    }
 
+   void tonomy::deleteapp(name account_name) {
+      eosio::require_auth(get_self()); // signed by tonomy@active permission
+
+      auto itr1 = _apps.find(account_name.value);
+      if (itr1 != _apps.end())
+      {
+         _apps.erase(itr1);
+      }
+
+      auto itr2 = _appsv2.find(account_name.value);
+      if (itr2 != _appsv2.end())
+      {
+          _appsv2.erase(itr2);
+      }
+   }
+
    void tonomy::updatekeyper(name account,
                              permission_level_name permission_level,
                              public_key key,
diff --git a/contracts/vesting.tmy/include/vesting.tmy/vesting.tmy.hpp b/contracts/vesting.tmy/include/vesting.tmy/vesting.tmy.hpp
@@ -29,29 +29,38 @@ namespace vestingtoken
     };
 
     static const std::map<int, vesting_category> vesting_categories = {
-        // DEPRECIATED:
-        {1, {days(6 * 30), days(0 * 30), days(2 * 365), 0.0}}, // Seed Private Sale (DEPRECIATED),
-        {2, {days(6 * 30), days(6 * 30), days(2 * 365), 0.0}}, // Strategic Partnerships Private Sale (DEPRECIATED),
-        {3, {days(0 * 30), days(0 * 30), days(0 * 30), 0.0}},   // Public Sale (DEPRECIATED),
-        {5, {days(0 * 30), days(0 * 30), days(1 * 365), 0.0}},  // Legal and Compliance
-        {8, {days(0 * 30), days(6 * 30), days(12 * 30), 0.05}},  // Seed
-        {9, {days(0 * 30), days(4 * 30), days(12 * 30), 0.075}}, // Pre-sale
-        {11, {days(0 * 30), days(3 * 30), days(9 * 30), 0.125}}, // Private
-        {15, {days(0 * 30), days(1 * 30), days(1 * 30), 1.0}},   // Special Token Round
-        // Unchanged:
+        // OLD:
+        {1, {days(6 * 30), days(0 * 30), days(2 * 365), 0.0}}, // Seed Private Sale,
+        {2, {days(6 * 30), days(6 * 30), days(2 * 365), 0.0}}, // Strategic Partnerships Private Sale,
+        {3, {days(0 * 30), days(0 * 30), days(0 * 30), 0.0}},   // Public Sale,
         {4, {days(0 * 30), days(1 * 365), days(5 * 365), 0.0}}, // Team
+        {5, {days(0 * 30), days(0 * 30), days(1 * 365), 0.0}},  // Legal and Compliance
         {6, {days(0 * 30), days(0 * 30), days(2 * 365), 0.0}},  // Reserves, Partnerships
         {7, {days(0 * 30), days(0 * 30), days(5 * 365), 0.0}},  // Community & Marketing, Platform Dev, Staking & Infra Rewards, Ecosystem
+        {8, {days(0 * 30), days(6 * 30), days(12 * 30), 0.05}},  // Seed
+        {9, {days(0 * 30), days(4 * 30), days(12 * 30), 0.075}}, // Pre-sale
         {10, {days(0 * 30), days(1 * 30), days(3 * 30), 0.25}},  // Public (TGE)
-        // New (replacing depreciated):
-        {16, {days(0 * 30), days(6 * 30), days(12 * 30), 0.05}},  // Seed
-        {17, {days(0 * 30), days(4 * 30), days(12 * 30), 0.075}}, // Pre-sale
-        {18, {days(0 * 30), days(3 * 30), days(9 * 30), 0.125}}, // Private
-        {19, {days(0 * 30), days(1 * 30), days(1 * 30), 1.0}},   // Special Token Round
-        // New:
+        {11, {days(0 * 30), days(3 * 30), days(9 * 30), 0.125}}, // Private
         {12, {days(0 * 30), days(1 * 30), days(3 * 30), 0.25}},  // KOL
         {13, {days(0 * 30), days(0 * 30), days(6 * 30), 0.7}},   // Incubator
-        {14, {days(0 * 30), days(0 * 30), days(6 * 30), 0.0}},  // Liquidity (there is actually a 25% TGE unlock, but we handle that manually in the migration script)
+        {14, {days(0 * 30), days(0 * 30), days(6 * 30), 0.25}},   // Liquidity
+        {15, {days(0 * 30), days(1 * 30), days(1 * 30), 1.0}},   // Special Token Round
+        // New:
+        {16, {days(0 * 30), days(4 * 30), days(9 * 30), 0.05}},  // Seed
+        {17, {days(0 * 30), days(4 * 30), days(9 * 30), 0.05}},  // Pre-sale
+        {18, {days(0 * 30), days(2 * 30), days(0 * 30), 0.5}},   // Special Token Round
+        {19, {days(0 * 30), days(0 * 30), days(3 * 30), 0.4}},   // Private
+        {20, {days(0 * 30), days(1 * 30), days(3 * 30), 0.4}},   // Public (TGE)
+        {21, {days(0 * 30), days(0 * 30), days(6 * 30), 1.0 / 3.0}},  // Liquidity
+        // NOTE: there is actually a 25% TGE unlock, but we handle that manually in the migration script
+        // The TGE + 72 hour unlock is increased from 25% to 33.33% to account for the fact that 25% is not vested at TGE (to give the 25% unlock)
+        {22, {days(0 * 30), days(1 * 365), days(5 * 365), 0.0}}, // Team
+        {23, {days(0 * 30), days(0 * 30), days(2 * 365), 0.0}},  // Reserves
+        {24, {days(0 * 30), days(0 * 30), days(2 * 365), 0.0}},  // Partnerships
+        {25, {days(0 * 30), days(0 * 30), days(5 * 365), 0.0}},  // Community & Marketing
+        {26, {days(0 * 30), days(0 * 30), days(5 * 365), 0.0}},  // Platform Dev
+        {27, {days(0 * 30), days(0 * 30), days(5 * 365), 0.0}},  // Staking & Infra Rewards
+        {28, {days(0 * 30), days(0 * 30), days(5 * 365), 0.0}},  // Ecosystem
         // Testing categories:
         #ifdef BUILD_TEST
         {997, {days(6 * 30), days(0 * 30), days(2 * 365), 0.0}},                  // TESTING ONLY
@@ -60,14 +69,17 @@ namespace vestingtoken
         #endif
     };
 
-    static const std::map<int, bool> depreciated_categories = {{1, true}, {2, true}, {8, true}, {9, true}, {10, true}, {11, true}, {15, true}};
+    static const std::map<int, bool> depreciated_categories = {
+        {1, true}, {2, true}, {3, true}, {4, true}, {5, true},
+        {6, true}, {7, true}, {8, true}, {9, true}, {10, true},
+        {11, true}, {12, true}, {13, true}, {14, true}, {15, true}
+    };
 
     class [[eosio::contract("vesting.tmy")]] vestingToken : public eosio::contract
     {
     public:
         using contract::contract;
         static constexpr eosio::symbol system_resource_currency = eosio::symbol("TONO", 6);
-        static constexpr eosio::symbol SYSTEM_RESOURCE_CURRENCY_OLD = eosio::symbol("LEOS", 6);
         static constexpr eosio::name token_contract_name = "eosio.token"_n;
         #ifdef BUILD_TEST
             static const uint8_t MAX_ALLOCATIONS = 5;
@@ -105,13 +117,13 @@ namespace vestingtoken
         /**
          * @details Updates the start date for vesting schedules to a new specified date
          *
-         * @param sales_start_date {string} - The new start date for vesting schedules.
-         * @param launch_date {string} - The new start date for vesting schedules.
+         * @param sales_start_date {string} - The new start date for vesting schedules (ISO format).
+         * @param launch_date {string} - The new start date for vesting schedules (ISO format).
          * @details
          * Before any allocations can be executed, the start date should be set using this action.
          * If the launch date is not known when the sale starts, set it to a long time in the future.
          *
-         * Example of the string format expected: "2024-04-01T24:00:00"
+         * Example of the ISO string format expected: "2024-04-01T24:00:00.000Z"
          */
         [[eosio::action]] void setsettings(string sales_start_date, string launch_date);
 
@@ -145,11 +157,6 @@ namespace vestingtoken
          */
         [[eosio::action]] void migratealloc(eosio::name sender, name holder, uint64_t allocation_id, eosio::asset old_amount, eosio::asset new_amount, int old_category_id, int new_category_id);
 
-        /**
-         * Migrates the allocation symbols of an account from the old symbol to the new symbol
-         */
-        [[eosio::action]] void migrateacc(const name &account);
-
         using setsettings_action = action_wrapper<"setsettings"_n, &vestingToken::setsettings>;
         using assigntokens_action = action_wrapper<"assigntokens"_n, &vestingToken::assigntokens>;
         using withdraw_action = action_wrapper<"withdraw"_n, &vestingToken::withdraw>;
diff --git a/contracts/vesting.tmy/src/vesting.tmy.cpp b/contracts/vesting.tmy/src/vesting.tmy.cpp
@@ -13,8 +13,8 @@ namespace vestingtoken
 
     void check_category(int category_id)
     {
-        eosio::check(vesting_categories.contains(category_id), "Invalid new vesting category");
-        eosio::check(!depreciated_categories.contains(category_id), "New category is depreciated");
+        eosio::check(vesting_categories.contains(category_id), "Invalid new vesting category: " + std::to_string(category_id));
+        eosio::check(!depreciated_categories.contains(category_id), "New category is depreciated: " + std::to_string(category_id));
     }
 
     void vestingToken::setsettings(string sales_date_str, string launch_date_str)
@@ -208,24 +208,4 @@ namespace vestingtoken
                 .send();
         }
     }
-
-    void vestingToken::migrateacc(const name &account)
-    {
-        // Admin only
-        require_auth(get_self());
-
-        vesting_allocations vesting_table(get_self(), account.value);
-
-        for (auto iter = vesting_table.begin(); iter != vesting_table.end(); ++iter)
-        {
-            if (iter->tokens_allocated.symbol == SYSTEM_RESOURCE_CURRENCY_OLD)
-            {
-                vesting_table.modify(iter, get_self(), [&](auto &row)
-                                 {
-                    row.tokens_allocated = asset(row.tokens_allocated.amount, system_resource_currency);
-                    row.tokens_claimed = asset(row.tokens_claimed.amount, system_resource_currency);
-                });
-            }            
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,7 @@ function compile_contract {`
`24`	`24`	`else`
`25`	`25`	`docker run -v "${PARENT_PATH}:${WORKING_DIR}" antelope_blockchain bash -c "${BUILD_COMMAND}"`
`26`	`26`	`fi`
	`27`	`+`
	`28`	`+ echo ""`
	`29`	`+ echo "Compiled ${CONTRACT_NAME} successfully"`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,15 @@ namespace tonomysystem`
`92`	`92`	`void native::setcode(name account, uint8_t vmtype, uint8_t vmversion, const std::vector<char> &code)`
`93`	`93`	`{`
`94`	`94`	`special_governance_check(account);`
	`95`	`+ require_auth(account);`
`95`	`96`	`native::setcode_action action("eosio"_n, {account, "active"_n});`
`96`	`97`	`action.send(account, vmtype, vmversion, code);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`void native::setabi(name account, const std::vector<char> &abi)`
`100`	`101`	`{`
`101`	`102`	`special_governance_check(account);`
	`103`	`+ require_auth(account);`
`102`	`104`	`native::setabi_action action("eosio"_n, {account, "active"_n});`
`103`	`105`	`action.send(account, abi);`
`104`	`106`	`}`