Merge branch 'release/3.0' into antelope-3.0

tests/toolchain/abigen-pass/nested_container.abi

@@ -0,0 +1,110 @@
+{
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+    "version": "eosio::abi/1.2",
+    "types": [
+        {
+            "new_type_name": "B_map_string_string_E",
+            "type": "pair_string_string[]"
+        },
+        {
+            "new_type_name": "B_vector_int32_E",
+            "type": "int32[]"
+        }
+    ],
+    "structs": [
+        {
+            "name": "map2map",
+            "base": "",
+            "fields": [
+                {
+                    "name": "m",
+                    "type": "pair_string_string[]"
+                },
+                {
+                    "name": "m2m",
+                    "type": "pair_string_B_map_string_string_E[]"
+                }
+            ]
+        },
+        {
+            "name": "pair_string_B_map_string_string_E",
+            "base": "",
+            "fields": [
+                {
+                    "name": "key",
+                    "type": "string"
+                },
+                {
+                    "name": "value",
+                    "type": "B_map_string_string_E"
+                }
+            ]
+        },
+        {
+            "name": "pair_string_string",
+            "base": "",
+            "fields": [
+                {
+                    "name": "key",
+                    "type": "string"
+                },
+                {
+                    "name": "value",
+                    "type": "string"
+                }
+            ]
+        },
+        {
+            "name": "settuple2",
+            "base": "",
+            "fields": [
+                {
+                    "name": "user",
+                    "type": "name"
+                },
+                {
+                    "name": "tp2",
+                    "type": "tuple_int32_float64_string_B_vector_int32_E"
+                }
+            ]
+        },
+        {
+            "name": "tuple_int32_float64_string_B_vector_int32_E",
+            "base": "",
+            "fields": [
+                {
+                    "name": "field_0",
+                    "type": "int32"
+                },
+                {
+                    "name": "field_1",
+                    "type": "float64"
+                },
+                {
+                    "name": "field_2",
+                    "type": "string"
+                },
+                {
+                    "name": "field_3",
+                    "type": "B_vector_int32_E"
+                }
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "name": "map2map",
+            "type": "map2map",
+            "ricardian_contract": ""
+        },
+        {
+            "name": "settuple2",
+            "type": "settuple2",
+            "ricardian_contract": ""
+        }
+    ],
+    "tables": [],
+    "ricardian_clauses": [],
+    "variants": [],
+    "action_results": []
+}

tests/toolchain/abigen-pass/nested_container.cpp

@@ -0,0 +1,20 @@
+#include <eosio/eosio.hpp>
+#include <tuple>
+#include <vector>
+
+using namespace eosio;
+using std::map;
+using std::string;
+using std::tuple;
+using std::vector;
+
+class [[eosio::contract]] nested_container : public contract {
+public:
+   using contract::contract;
+
+    [[eosio::action]] 
+    void map2map(map<string, string> m, map<string, map<string, string>> m2m) {}
+
+    [[eosio::action]]
+    void settuple2(name user, const tuple  <int, double, string, vector<int> >& tp2) {}
+};

tests/toolchain/abigen-pass/nested_container.json

@@ -0,0 +1,9 @@
+{
+    "tests" : [
+       {
+          "expected" : {
+             "abi-file" : "nested_container.abi"
+          }
+       }
+    ]
+}

tests/toolchain/abigen-pass/using_std_array.abi

@@ -0,0 +1,50 @@
+{
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+    "version": "eosio::abi/1.2",
+    "types": [],
+    "structs": [
+        {
+            "name": "greeting",
+            "base": "",
+            "fields": [
+                {
+                    "name": "id",
+                    "type": "uint64"
+                },
+                {
+                    "name": "t",
+                    "type": "int32[32]"
+                }
+            ]
+        },
+        {
+            "name": "hi",
+            "base": "",
+            "fields": [
+                {
+                    "name": "user",
+                    "type": "name"
+                }
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "name": "hi",
+            "type": "hi",
+            "ricardian_contract": ""
+        }
+    ],
+    "tables": [
+        {
+            "name": "greeting",
+            "type": "greeting",
+            "index_type": "i64",
+            "key_names": [],
+            "key_types": []
+        }
+    ],
+    "ricardian_clauses": [],
+    "variants": [],
+    "action_results": []
+}

tests/toolchain/abigen-pass/using_std_array.cpp

@@ -0,0 +1,24 @@
+#include <eosio/eosio.hpp>
+#include <eosio/print.hpp>
+#include <array>
+
+using std::array;
+using namespace eosio;
+
+class[[eosio::contract("using_std_array")]] using_std_array : public contract
+{
+public:
+   using contract::contract;
+
+   [[eosio::action]] void hi(name user) {
+      require_auth(user);
+      print("Hello, ", user);
+   }
+
+   struct [[eosio::table]] greeting {
+      uint64_t id;
+      array<int, 32> t;
+      uint64_t primary_key() const { return id; }
+   };
+   typedef multi_index<"greeting"_n, greeting> greeting_index;
+};

tests/toolchain/abigen-pass/using_std_array.json

@@ -0,0 +1,9 @@
+{
+   "tests" : [
+      {
+         "expected" : {
+            "abi-file" : "using_std_array.abi"
+         }
+      }
+   ]
+}