Merge branch 'platforms_multi_index' into 'master'

Platforms multi index

See merge request snax/blockchain/eos/snax!89

Author: ant-mad

.gitlab-ci.yml

@@ -30,7 +30,7 @@ cleanup:
     changes:
       - "*.md"
   tags:
-    - build3
+    - build2
 
 build:
   stage: build
@@ -50,8 +50,7 @@ build:
     changes:
       - "*.md"
   tags:
-    - build3
-
+    - build2
 
 build:tag:
   stage: build
@@ -68,7 +67,7 @@ build:tag:
   only:
   - tags
   tags:
-    - build3
+    - build2
 
 build:tag:macos:
   stage: build
@@ -87,6 +86,7 @@ build:tag:macos:
   tags:
   - macos
 
+
 build:tag:elastic:
   stage: build
   script:
@@ -109,7 +109,7 @@ build:tag:elastic:
   only:
   - tags
   tags:
-  - build3
+  - build2
 
 test:jest:
   stage: test
@@ -123,7 +123,7 @@ test:jest:
     changes:
       - "*.md"
   tags:
-  - build3
+  - build2
 
 test:core:
   stage: test
@@ -140,8 +140,10 @@ test:core:
       - contracts/platform/*
       - jest_tests/*
       - "*.md"
+      - contracts/*
+      - .gitlab-ci.yml
   tags:
-  - build3
+  - build2
 
 build:docker:
   stage: build-docker
@@ -157,7 +159,7 @@ build:docker:
     changes:
       - "*.md"
   tags:
-  - build3
+  - build2
 
 build:docker:tag:
   stage: build-docker
@@ -173,7 +175,7 @@ build:docker:tag:
   only:
   - tags
   tags:
-  - build3
+  - build2
 
 build:docker:tag:elastic:
   stage: build-docker
@@ -189,7 +191,7 @@ build:docker:tag:elastic:
   only:
   - tags
   tags:
-  - build3
+  - build2
 
 publish:
   stage: publish

contracts/snax.airdrop/snax.airdrop.cpp

@@ -59,11 +59,9 @@ namespace snax {
     }
 
     void airdrop::check_platform_registered(const account_name platform) {
-        _snax_global_state _state(N(snax), N(snax));
-        const auto& state = _state.get();
-        for (auto& platform_config: state.platforms) {
-            if (platform_config.account == platform) return;
-        }
+        _platforms_table _platforms(N(snax), N(snax));
+        for (auto platform_config = _platforms.begin(); platform_config != _platforms.end(); platform_config++)
+            if (platform_config->account == platform) return;
         snax_assert(false, "platform doesnt exist in snax global state");
     }
 

contracts/snax.airdrop/snax.airdrop.hpp

@@ -72,7 +72,7 @@ namespace snax {
         typedef multi_index<N(accounts), account_with_balance> _accounts_balances;
         typedef multi_index<N(requested), account_n> _requested_accounts_table;
         typedef multi_index<N(platforms), platform_def> _platform_definitions_table;
-        typedef singleton<N(global), snaxsystem::snax_global_state> _snax_global_state;
+        typedef multi_index<N(platforms), snax::platform_config> _platforms_table;
 
         _platform_definitions_table _platform_definitions;
 

contracts/snax.system/producer_pay.cpp

@@ -37,11 +37,7 @@ namespace snaxsystem {
 
          const asset system_supply_soft_limit = system_supply_limit / 10;
 
-         asset platform_full_balance;
-
-         for (auto& config: _gstate.platforms) {
-            platform_full_balance += get_balance(config.account);
-         };
+         asset platform_full_balance = get_platform_full_balance();
 
          const asset issued_supply = snax::token(N(snax.token)).get_supply(snax::symbol_type(system_token_symbol).name());
 

contracts/snax.system/snax.system.abi

@@ -262,14 +262,6 @@
     },{
       "name": "platform_config",
       "base": "",
-      "fields": [
-         {"name": "account", "type": "account_name"},
-         {"name": "weight", "type": "float64"},
-         {"name": "period", "type": "uint32"}
-      ]
-    },{
-      "name": "platform_config_extended",
-      "base": "",
       "fields": [
          {"name": "account", "type": "account_name"},
          {"name": "weight", "type": "float64"},
@@ -301,8 +293,7 @@
          {"name":"max_transaction_delay",                     "type":"uint32"},
          {"name":"max_inline_action_size",                    "type":"uint32"},
          {"name":"max_inline_action_depth",                   "type":"uint16"},
-         {"name":"max_authority_depth",                       "type":"uint16"},
-         {"name":"platforms",                                 "type":"platform_config[]"}
+         {"name":"max_authority_depth",                       "type":"uint16"}
       ]
     },{
       "name": "snax_global_state",
@@ -460,7 +451,7 @@
       "name": "setplatforms",
       "base": "",
       "fields": [
-        {"name":"platforms", "type":"platform_config_extended[]"}
+        {"name":"platforms", "type":"platform_config[]"}
       ]
     },{
       "name": "setparams",
@@ -651,6 +642,12 @@
       "index_type": "i64",
       "key_names" : ["owner"],
       "key_types" : ["account_name"]
+    },{
+      "name": "platforms",
+      "type": "platform_config",
+      "index_type": "i64",
+      "key_names" : ["account"],
+      "key_types" : ["account_name"]
     },{
       "name": "userres",
       "type": "user_resources",