From c036d8e2de0170fbaad54310f5cf6c7edddb1af5 Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Tue, 30 Mar 2021 14:59:55 -0500
Subject: [PATCH 1/7] Adding eosio structure attribute -- WIP (not tested)

---
 .../eosiolib/contracts/eosio/contract.hpp     |  1 +
 tools/include/eosio/abi.hpp                   |  7 +++
 tools/include/eosio/abigen.hpp                | 52 ++++++++++++++++++-
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/libraries/eosiolib/contracts/eosio/contract.hpp b/libraries/eosiolib/contracts/eosio/contract.hpp
index d60d47241c..3505aa0f91 100644
--- a/libraries/eosiolib/contracts/eosio/contract.hpp
+++ b/libraries/eosiolib/contracts/eosio/contract.hpp
@@ -18,6 +18,7 @@
 #define CONTRACT class [[eosio::contract]]
 #define ACTION   [[eosio::action]] void
 #define TABLE struct [[eosio::table]]
+#define STRUCTURE struct [[eosio::structure]]
 
 namespace eosio {
 
diff --git a/tools/include/eosio/abi.hpp b/tools/include/eosio/abi.hpp
index b2813f4322..506402726e 100644
--- a/tools/include/eosio/abi.hpp
+++ b/tools/include/eosio/abi.hpp
@@ -39,6 +39,12 @@ struct abi_table {
    bool operator<(const abi_table& t) const { return name < t.name; }
 };
 
+struct abi_structure {
+   std::string name;
+   std::string type;
+   bool operator<(const abi_structure& s) const { return name < s.name; }
+};
+
 struct abi_kv_index {
    std::string name;
    std::string type;
@@ -82,6 +88,7 @@ struct abi {
    std::set<abi_typedef>                  typedefs;
    std::set<abi_action>                   actions;
    std::set<abi_table>                    tables;
+   std::set<abi_structure>                structures;
    std::set<abi_kv_table>                 kv_tables;
    std::set<abi_variant>                  variants;
    std::vector<abi_ricardian_clause_pair> ricardian_clauses;
diff --git a/tools/include/eosio/abigen.hpp b/tools/include/eosio/abigen.hpp
index e27ac94a19..aacbc528b0 100644
--- a/tools/include/eosio/abigen.hpp
+++ b/tools/include/eosio/abigen.hpp
@@ -257,6 +257,31 @@ namespace eosio { namespace cdt {
          _abi.tables.insert(t);
       }
 
+      void add_structure( const clang::CXXRecordDecl* decl ) {
+         structures.insert(decl);
+         abi_structure t;
+         t.type = decl->getNameAsString();
+         auto structure_name = decl->getEosioStructureAttr()->getName();
+         if (!structure_name.empty()) {
+            validate_name( structure_name.str(), [&](auto s) { CDT_ERROR("abigen_error", decl->getLocation(), s); } );
+            t.name = structure_name.str();
+         }
+         else {
+            t.name = t.type;
+         }
+         cstructures.insert(t);
+      }
+
+      void add_structure( uint64_t name, const clang::CXXRecordDecl* decl ) {
+         if ( !decl->isEosioStructure() )
+            return;
+
+         abi_structure t;
+         t.type = decl->getNameAsString();
+         t.name = name_to_string(name);
+         _abi.structures.insert(t);
+      }
+
       void add_kv_map(const clang::ClassTemplateSpecializationDecl* decl) {
           abi_kv_table akt;
           const auto& first_arg  = decl->getTemplateArgs()[0];
@@ -470,6 +495,13 @@ namespace eosio { namespace cdt {
          return o;
       }
 
+      ojson structure_to_json( const abi_structure& s ) {
+         ojson o;
+         o["name"] = s.name;
+         o["type"] = s.type;
+         return o;
+      }
+
       std::pair<std::string, ojson> kv_table_to_json( const abi_kv_table& t ) {
          ojson o;
          o["type"] = t.type;
@@ -516,7 +548,7 @@ namespace eosio { namespace cdt {
             set_of_tables.insert(t);
          }
 
-         return _abi.structs.empty() && _abi.typedefs.empty() && _abi.actions.empty() && set_of_tables.empty() && _abi.ricardian_clauses.empty() && _abi.variants.empty();
+         return _abi.structs.empty() && _abi.typedefs.empty() && _abi.actions.empty() && set_of_tables.empty() && _abi.structures.empty() && _abi.ricardian_clauses.empty() && _abi.variants.empty();
       }
 
       ojson to_json() {
@@ -585,6 +617,10 @@ namespace eosio { namespace cdt {
                if (as.name == _translate_type(t.type))
                   return true;
             }
+            for ( auto s : _abi.structures ) {
+               if (as.name == _translate_type(s.type))
+                  return true;
+            }
             for ( const auto t : _abi.kv_tables ) {
                if (as.name == _translate_type(t.type))
                   return true;
@@ -619,6 +655,9 @@ namespace eosio { namespace cdt {
             for ( auto t : _abi.tables )
                if ( t.type == td.new_type_name )
                   return true;
+            for ( auto s : _abi.structures )
+               if ( s.type == td.new_type_name )
+                  return true;
             for ( auto a : _abi.actions )
                if ( a.type == td.new_type_name )
                   return true;
@@ -650,6 +689,10 @@ namespace eosio { namespace cdt {
          for ( auto t : set_of_tables ) {
             o["tables"].push_back(table_to_json( t ));
          }
+         o["structures"]     = ojson::array();
+         for ( auto s : _abi.structures ) {
+            o["structures"].push_back(structure_to_json( s ));
+         }
          o["kv_tables"]  = ojson::object();
          for ( const auto& t : _abi.kv_tables ) {
             auto kv_table = kv_table_to_json(t);
@@ -677,6 +720,8 @@ namespace eosio { namespace cdt {
          abi                                   _abi;
          std::set<const clang::CXXRecordDecl*> tables;
          std::set<abi_table>                   ctables;
+         std::set<const clang::CXXRecordDecl*> structures;
+         std::set<abi_structure>               cstructures;
          std::map<std::string, std::string>    rcs;
          std::set<const clang::Type*>          evaluated;
 
@@ -750,12 +795,15 @@ namespace eosio { namespace cdt {
                ag.add_contracts(parse_contracts());
                has_added_clauses = true;
             }
-            if ((decl->isEosioAction() || decl->isEosioTable()) && ag.is_eosio_contract(decl, ag.get_contract_name())) {
+            if ((decl->isEosioAction() || decl->isEosioTable() || decl->isEosioStructure()) 
+                    && ag.is_eosio_contract(decl, ag.get_contract_name())) {
                ag.add_struct(decl);
                if (decl->isEosioAction())
                   ag.add_action(decl);
                if (decl->isEosioTable())
                   ag.add_table(decl);
+               if (decl->isEosioStructure())
+                  ag.add_structure(decl);
                for (auto field : decl->fields()) {
                   ag.add_type( field->getType() );
                }

From 36d0f2ef80f446f73cb185c18ff54c4dd4673f0f Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Thu, 8 Apr 2021 14:16:25 -0500
Subject: [PATCH 2/7] Updating llvm submodule with clang changes

---
 eosio_llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eosio_llvm b/eosio_llvm
index 423a4ac7a7..82d049e1d4 160000
--- a/eosio_llvm
+++ b/eosio_llvm
@@ -1 +1 @@
-Subproject commit 423a4ac7a7074e139c4f4c2f786d6b71d1b0965e
+Subproject commit 82d049e1d469b32a070307b966e9fdf328e3842c

From 872d8ccced5679160df3faf3429d0004aa6d6b1a Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Fri, 9 Apr 2021 13:13:59 -0500
Subject: [PATCH 3/7] Adding unit test for eosio::structure attribute

---
 .../toolchain/abigen-pass/structure_test.abi  |  43 ++++++++++++++++++
 .../toolchain/abigen-pass/structure_test.cpp  |  18 ++++++++
 .../toolchain/abigen-pass/structure_test.wasm | Bin 0 -> 34373 bytes
 3 files changed, 61 insertions(+)
 create mode 100644 tests/toolchain/abigen-pass/structure_test.abi
 create mode 100644 tests/toolchain/abigen-pass/structure_test.cpp
 create mode 100755 tests/toolchain/abigen-pass/structure_test.wasm

diff --git a/tests/toolchain/abigen-pass/structure_test.abi b/tests/toolchain/abigen-pass/structure_test.abi
new file mode 100644
index 0000000000..160c78dff6
--- /dev/null
+++ b/tests/toolchain/abigen-pass/structure_test.abi
@@ -0,0 +1,43 @@
+{
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
+    "version": "eosio::abi/1.2",
+    "types": [],
+    "structs": [
+        {
+            "name": "fee_payer",
+            "base": "",
+            "fields": [
+                {
+                    "name": "payer",
+                    "type": "name"
+                },
+                {
+                    "name": "quantity",
+                    "type": "uint64"
+                }
+            ]
+        },
+        {
+            "name": "printfeepyr",
+            "base": "",
+            "fields": [
+                {
+                    "name": "pyr",
+                    "type": "fee_payer"
+                }
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "name": "printfeepyr",
+            "type": "printfeepyr",
+            "ricardian_contract": ""
+        }
+    ],
+    "tables": [],
+    "kv_tables": {},
+    "ricardian_clauses": [],
+    "variants": [],
+    "action_results": []
+}
\ No newline at end of file
diff --git a/tests/toolchain/abigen-pass/structure_test.cpp b/tests/toolchain/abigen-pass/structure_test.cpp
new file mode 100644
index 0000000000..15d3ca535a
--- /dev/null
+++ b/tests/toolchain/abigen-pass/structure_test.cpp
@@ -0,0 +1,18 @@
+#include <eosio/eosio.hpp>
+
+using namespace eosio;
+
+struct [[eosio::structure]] fee_payer {
+   name payer;
+   uint64_t quantity;
+};
+
+class [[eosio::contract]] structure_test : public eosio::contract {
+public:
+   using contract::contract;
+
+   [[eosio::action]]
+   void printfeepyr(fee_payer pyr) {
+      print(pyr.payer, pyr.quantity);
+   }
+};
diff --git a/tests/toolchain/abigen-pass/structure_test.wasm b/tests/toolchain/abigen-pass/structure_test.wasm
new file mode 100755
index 0000000000000000000000000000000000000000..1cb6c6891fd87251fbcf771c85d8853b19c46c41
GIT binary patch
literal 34373
zcmdU&3zS{gS>N|L=iWQ_-g9T>&gfxD<HY;k*o~dU$>=qbAgOgG*p44bOyYzD0`hp~
zD%Q+sMw*8rr?O_8D6ZQT8bP5AEGQyn)uFXnS_Mi70Z$N%nDVGtK$Dg%P$1AyC@5=D
zRwxDa_y6{}kC8^P6)2C9?mg%1$G5-zz4o`iz0baGV)1C?oQr-vYChuJBgx9jO0>e|
z^h$L4kpfRE?h!{ytQ)?#jZTNV(`1|`?Fsitapg3BN<QTtDd=8R_&#OdPmn=wVr3$O
z0W?8B4FqcwK&Mvn;xuuJ+X6uIMg>5*DoQILw?dox<0iG6@WrDc9h!IXPZnODwB}CK
zCnlGU%+DQ~npm1Rw0PwGEmu%-tu?=RWd6{^;$mxI$rY7UI@&tA*jjRt9{PAVI)9=S
zp6Uy&iK#<9kX)%<WAfPJp-k!6!jZY9IoD^^?P2*yc=CWf^yuvT<jmw_6G!F_9h+E~
zINDljEi7_7In$a72>AEDSTSpLtDqfQm_IhZ*qYMK)bb>tTv-hlCmx-rLr(X#$>oKG
z*4)yer6WgMuA-#PYC`=u(dwybVEYdpYMoqa%}p&HUOK$XRaLxv=+M#S*`>p~U8=|Q
z(4oV#^Ak&pN0tr;lqoPVHPtE5fiYz;YO2(C=n#zpv0qP=Fc8ag>wruhIne<^h1T&-
z1)gTR)p?rhKGFK(@}r%KwL^!N7MABGmkv+S+<=<vCM}XQsHC#7X7SK$=)q90ARL;U
zpK7^!@@?PhhK5U<T%i;VZ;FN^{`lIosW80Bx#8jZ@a8RBqNp^yCE~I*y(!(cJt^-P
zxp_x4a&xKlvgGB-Er}<;6!Fh4RDb!+KJukaeVZDEVstF(>nkRai%MIQl_*<XbLoo9
zUif_H(pQO!6UUCtKJIR*)FPKfY3c5FeCwfaS*rfbm!fYixcV#7)6Tp4$@<H^^U*gJ
z4vw#W{%3yU*T4I}{PA-uKIU1;_4gOO8(-Dm+9yBy8}4m|gPA@5w_p3w|Mh`CarKv_
zX|X3i2So87`9Ht)KYu6yqQ;Y}t35T+%+()H7oub(rj>q|xj~XLcYFL{p0oOiW;ET5
z$9M{<XAU+K@20cC>Fn6?rW=dT9He5L)t9_`K-IaArd8fY+%%$;?C7A&R_;}9c6QCx
zqtqwqKaWD2k$1Dr=&FVzH5^YjlXVS4gm%M)yx~L*7ed2HyJ2C_h}Cd>b;I3G(m4?|
z-r-#uyL2pyR$f7WXPTss#WgaaLGAX~b-TKHP^oG;b9Zt5@WHg?vOk62PsdTo2nf`b
z>En0zyZWu!)-ftWPPLh>Ec)oJmR##iu7f&Q_;x91O(*NVO%V~#D@iTSKyaw&BP$(c
zryvjrHVawb@n%eh%T7*1_LI}3ddkhfJX$0D)U;PolI(df1#BTZd3>76C#Rc5@){+d
z(3Dl{Tj*3P&@L>G^As8=S#v&=DN-e|yr|xUl)Io~wzZK6@vLxPzY9I6-=-ebZ>1gD
zrVS%PBatNRj^Y(ijJz9ZMDf9dnh?PCN11Ctz}w?9Su?)7A36*<S92-#p*#B0Oz%U6
zD5cgYL0eRIcREPoBVCI3QZ2}#T9|G~JXauczpKRnD){0|K;p+Fj@}6Y{iAduHtG&Q
zqAhd~>L%2}(Fy>a>;@bny_qyX^6viFkQ9F!k(De=HzRu9r0qozxbl~O@xJNf+3J%Y
zICD~sn51S`qT}MNHKSU0x@aBT9OVT34P^?Z-w_MzICJ-k207}Igt$?tnd+$@ooBG5
zl}0h4sP)T3pimf2pf-TvLIZHUO|Ix3XjlN101B!lFvFypt_P5UVv-Krg0VfMXLPYV
z+eqjSd~`lp+>i$S0$vbz3KHr<mY^15j~dF6j=M<5d2?+X3u0+OHL{?{U?FjUooX5L
zP1_RaM2+yM3!KU&!36395rQiMdb%`|#mhcMUA;=hOQvb60tf)CgBjQiXt*7S*O9Ip
z#o;xE!d0mE;JpsvCWRru)iMSZK-#GX>FZohh(J0qAnKCN=-mYg={D3R$t~KXORh~u
zyqsU{`d4XF1=?rQ@zm}_{Iuq>r$6oLyRx&NMt_ApLgdn)k_g8K>wDCKgKKSMAI#jF
z#KZdD9VTqI$D1WYH@{hl8jSRG>rmv{*@Y$@zdbHDjdRAknP)RgyL~98m~!`HSP+!>
zpbX1*W!558;^79`Q}GvVEj01b|DR2y_zwHhCnGbUQt11e5kl>wg|Bn>hhANmW}@L(
zd^0YE+n3ZsVMq0XERu(MnU`75R?J@0;n%3wqvi~h$;T%^EV7ZM?3U&9AQ*(vGrE;3
zjacyN2Xa983dRKwv#>FwV%!E9p{ZY=z7<&MJ#oxbMa}L@j&Y$W_!#J%%sksH>`P7p
zGkS>1H2X~k8BKnM@$E6g5PTj>KNH2#X^B(N<U5jMO{?PWNKX3b-LfXG{&liJ_uIWl
z@L1>~4F((PDNMC-_l-hSPbbG$K6DD<!toK`3p3BY+u8>aYadGs%J?deAy;6TD3_9E
zgVh<e-l>dTefAXHkx<7NJZzVSn0pLl{B;fmj?-UElVqjH{3~?Dz((1v<}GAcWG5{F
zKtM>B$7HT#KsDqSd;ySo`}Nm13TYNKij*&8UJVtp_f2QT`x?d67f}a>(2`}o16Lr6
zX@#faK;j~>$rxd&aOXWER_G<SnBzRJ;ir&|!uA`(IAFVweMLUcjaAL+4Y@Zz_-Qu{
z8M69){RN<jNKJ+mkx9LP@=(gyK;pP-^l8A6Y<F|V&0QIH^{=<P2&bgnh-!?MQC9WQ
z2vX5$Cy-68T+@cMtp4@6PZ%I&ReY1sX!a0Vl~o?-PhbRtvoB`VS+Of1jl{hK275fQ
z>72)Hcn(P4^P|82OVNEuJFI?=F6IqY8<FoDubys}ef(^*f`q@bKfY0+@?~E+)#wAw
zg8EQY9~@x6mp0Yz_HVXFYo*w3MUDx$WR*ALC?#nRQGgRc*Wf^lG?vhzZ?lN$heDvK
z&iZH;FaHLK)B$FcinE{p-7oJK&XF%ZU^I%Mkw#G35`h?`o@-WDo9R3IBbx2=p)b#k
zUx_~0rrHgn5NJjd9bDA07})8%avv|sZko-CC-AegA6|3QuR)b-FHVoz(!yVx9#^hh
zx$AoLa8RT6T(k0Yv+DaEmI(sq%2UWx(df}A-ykLWeEAHuuc8EG_f;r?ko4rh`Wu$c
zp6c{TlGc<rRmw2d<Ix8n!l3yCb|YpRYAxw~KB1@FB+q2#pO<V7XK<47l~W8o6am{d
z@WfI|&o;{+^5rKaOMU4|OtkDY<KtOoWC`OPW5F2Xsa*=Vj`EMVtc=AE>cY?rAFlLG
zYm9!=$XHwkU+f1J;w&0pslTBidlt#eM4p-$Gkq~P<GVbgIUim+&1rBgq)#&{{!Joa
zF$jI#FeYdIhA|PD25*oY&!m6TScnwm8^$8T1#WZE{CLC+m6BuKL>!qd+ML&1c1=-`
z+IS>5WA)cDDVa`hl3?P_TFmDB1&41l&QvfxADK6Wz+G$$TqfbG$4sq|wX!eB>C>=m
zB3H;>KNgSTR}~~OSpmQAHQeLBdz#g}2D~(PvT#HFjp!1E@pm2;Amp;pkxTg)xm+f`
zAi3nLJfm;I44O+J)bzt7v;cmR&|><ZqNs@2-yT2QOtK$aGm$150Je=Hp9H96jw0}S
zVm4X=qmqc!CnAxDHck7!jH-RvYINTSeiVw%R0S2csks3l9wAa%g=R^95=5W?XsI_;
z0Sp9+4~AJ7GhLVAIVmT1tcd&JQ<$4pOn>t4hSCx^`;!8GjU@l^zZ=xs8vC_j{Y?6I
zgtn+H75`e%CcKn~7YGoSZC?8g&i*c~e5@foj<P3BLsrXg!K}wPnaqz|Zy}2O<xTeW
zrjhIe$B0L0;-Px?Q=?t<k)#dp7y6`ePo8`*ho@Oe4$lfv_3~r(b^l2AorA!WY7ipo
zn|^M5&r{ETEZqxO&B$~qjE_G3Ot!ijANR4{ULlmU@Z9+5Q#^~Scn%*tvo9&94=@KK
zq8D{i8^KG9I@M5eYBLeZm?JS=in2IkZ1e8SL$Yvo!<>bo>x-pAfuSo}Ni=@0V$O=U
zLM?MNumj`rtG8+#<e~lm%5Jzd`vm`Zvz#~MOPcK!nQZz9=qfvi3t7A)sW%A$lAe{P
z??_ye9G}#;kYvvUy(kmrQDTuVU)|qkMbNq(t6G6Vr|V~$Y5k_m!62)z(rJC04cyGm
z;BYa!><laG3Rp4U5h|hSV|f^l%H?(?>&YdnRH2gDfz`F2T65}C_9d&0YbtI%O(d_Z
zE<6G?fl-A}#q1(=LF3xGp9^)<PTi{NKBQ=4rPHH!gYFD{Pd7@gJs~PS{M-}G{_&M}
zz!RRHXsG?NuOf^|U>^oGkFfUp^vt+>n<3}d6XW(SEj+YfzM78T^>m}+`^TfF8vRm$
zf)e_{kc0|D0|uTaVFw~9sj&E3Y<yW0ZxDht3J3X;=-Us36p`%3XmmYB`@0y8=G^I0
z=bh?Zz$md6Ab&xKfr4QOS{(x7Sb{6V6*^^8>#_+79Kz>^XkD5E3aRiVQ#VM}265po
z<M|6c5_8aST35GSPXQP7IH+@srqa@?2H<oU1^?-smFThi;PdJ4$04M1k?4ORs2t<u
z>S`q0MHHb;lpubqR00*HcQmJPN8%e1lufcHSD`hHtwyqK#YQ5@FXZaj=}rzL$^P;R
zI;wBkxz*E(tEzA>WG49Hy@8hXD;UjC?k=<gh7hFet#>fT=-aP2VFY5bj>1Tily!KW
zcS|sm>`PBR5x%jL-}_grA_$++b#O;zJc$Ph0m?!SZ0P7yR2Ob$Ohj-V(Cy%Qp@xwD
zhu%<SU^rdjqpSS%5^LlbyYp3}{5UR9jK<(%#Y}>DECsWVrfc#fABQ<SE=;qMed_0&
z)_xjQU&+qr_i3(gWw}cg-^WFvBBr6{(KuhhpJ}i#$yh?DsG?9&jrJ-bR8+}BMYYt|
z5Lhz%Et61DtsN?=wL?V_weGwpi<V}r)Jtws9elBWLTG_D|DY2Oddc9`BdebMF>y8<
zS!>+h+aD<VlHmjxU!Wo$DOBjGh-VqdCpunDTkI#eTZ;+O!D`JwO$PZ!KxA>d55K<=
z0ls?sSt6DOrY>wu!50BgXv;+ChPy%Ji*4jL<lc+4U20eU)32fDeeKGB4(l;H35?2F
zkiY`dhh{~_zij-ps2~%ZT3E)?48VtMDOLsZUZDu%L`?%oEi6@u<6%nU`~Tw`om*Y`
zuKGY*@ihW!L@(CrvRLB2z-x`m*9Ho)b5Y#J<QhEk@EC!zt114~l{n}2?Zi$c{YYg#
zXk5ZJfsxF>-TnRRI$i6(VOs$)o`)KPd2<g<XH_wCFx#O^CHnzoa{X<KZ<G91d15sz
zkKuF`QkCqEd-`R2gxy9=8PII6c6UG8tS{+bqc00=k%mXp%?dr11`?XmT6Yb*RZ;Z0
zN7ZXRMo_3w%-3WDMJCf?89QmLV$X#eBRtp)sD`YrT2{EdlD!t$8+VO5xe9uc)nhy0
zBs?0B5N&Ldm8&)78^c8Hb#MSgOz&=VEbw)LT#b6(5n2CO$h7&kcIB?d5Pce^trDM2
zd^YpEg)0O%W$_Cg+e3_a&;-QLf+o;iB9ak&#odQYFwe)t!D)w4xh{UxvL9wiOG0$u
z{*gw-XiyyQdxz-ihqJ=cbYqxufGm#RtW+DuH~XQEE3o#L@{@v#P^s6s!+k*|N1L0i
za2TJPLrOas%7rAW#iXI+H!06s%{+_JU7y6V>tSTxBE+P}h3pbeTQ4H3R{|pPz;l?7
zgkn8F$qY}8O^{)W8h)rzVx}-2ogx|{>eJWt;&Xk`31Z_1Yyxr}wK9^n4IPu59C)yV
z3WO-FlAV^Kn1(3mBX{XC{pkORd`{`y$Lhl*=JOXbddDz&wZIx<SaJO1sm2gQ7T+4f
z@F+S36NbJSd%C$X<SXV9*8qGk5ph=B>JK%Ca>Ip7w(_=q#!v7;yoPcUhM#Tt25h?v
z3e0ba+fY(VH*lt+gm$H?j6L)mHiqF2U)!OlBXjw!L#qUXYGw7Pt~H2}@%Sk}bZY#O
zQ#g~(S7)Bn%48usFE}P?=eUD|=M{@4HE?!(C3m);Z~M)}-Bj$Hicw|5V(k!fh|+}#
zsv&hYAO%9z?BAT8e)jGCOt>Mj*3V6#&l4L%-nt5L<@uHR(7Ggv<|fUbvU8y@xx$-i
z3vim{5vf21pn#e$j{u-3<4_EB+A?e1NEl&;aRaHma{oeeSnI7}npMoa$aD&AOP|v+
z>d-Sy%nI`Y%tl&6&eQD6ATFq9!6Z=eqlvMg4hy%cfwM^i^=@od`7n}Q#ZiE13s=>r
z)6JV^8r!rhukNpBnJK*;aK-CbW(FEM62^(EoMqIpcH@>A?u3zn>Y-tVXWGAE>zp$n
z05iv35VfAW!w-aIg$gTkjbW*H_(#jHy{9=CW)d)oWjK+33!f2`8#GuSX^iAaJ93l;
zJCpV8@T_EZXuD={Q2Aa+fb}lPK9%U&mhAryYEGtMm%+dEOyg!hKq^62b0SB~rSi77
zt~xty_@(}4zrzoXfOpLgV`oHI7&u}>I-n}|G%F*G5x>P(rW;#ih4Qg=zz^IWU%o4g
zh+1>`{70gOHiUr3OEr-KB^q%Flz}SpVwjv4(Sq$G7WKpHP?vBDelK{TKA5LX>&z3r
z<=y>+r5c+ymP@p#h{`CC5hw>pq@C_;D8@{=;@ktg+Md}A`clWv5J{I}T#^AHH8&ug
zNI{sLuZ2PvRfq~36zbX-%H}F<hG0!L#)3$Y8{Z6KFrZ37ueSd$1YHfa5^CAlTpF)v
zY=)r3d0>t<4rQ@9i9S6c0)RK*Ds_#?mpht&kvsZzSyOIO14`CYrBEZJ*ho#;UX(9(
z8kb=_ee~I2o6i;6R^=>rz&@vi4^l(jYi;vtD0bG?N3K(>OE*gQBC%R%Q=n~~W%M9_
z2aB};{-VH>nqzSl=gx;hYbr#A4GMKJplmM&=Q|ik@gV(3R+f5>FtNwr=bC976dPrR
zi?TK!1cTSar+zCzh8pGi<W}PdpqnYmj03*~{dh*E#qY=}3heCg!vZ{<4RIkE<05|!
z#&tToTAY@?I^*)C(5cJn6h#8k;>fD3KSe`|@s_f^ow}q>*{o?e^aip3I*b+<dmA~=
z10dG~k|NzkE-HnhJ&l~xlOJaD+){QngimY`KO112R}J8GVVqNn)zbJx;Fv+Hogb!s
zXN!iYbz07=Pa(?_SiKRVkJ-!3PWp1L0B1{W1vtlD=*%j25>oUjBemQ1S*1{;2mj09
zIV|MAbiv|4hWw>~{HlrrtP9|>kf%xy0Lq4^fczyPk7^pb%Vxs;01Jf3jR}f{mn&=_
zwmCLCHzNc^b{#>}AQa;Mh{3!J1_?I7s$lafLUaXx{^nq+LoOxCw3n@Z*B^d9ffG0P
za-zBAXk!N@2K_(-qiOTL8fXAc7HPZRGDrM=kST`da|rD{3>SSGKUfVIJkGc>;s@_O
z-eizrh(Y-Mum&8NeRarhCq%ntcE<0Rr3vPbHjf;X)sMV^EKBIi@K1O#3Jo)xLVbvW
zF|cjPXMDrit%{Ixkq5g4%(9Dr@aODM$6m7>!79t3aQEe~HMkM>Objq%21g=zz-mT&
zV>kY?r+go7QgQrA5rd61swQTzZZU2IT5XoX&FLp_!Wd@5#+7FR0q~0Dw$MesYWL_{
zA#XKvFZ-<Nb(os_nsqeJCfQBnSx$BGZWY`xjA~)a=m3GnzhWOBwGG8Ubb7DtI##f(
zbh@iegOYI(s7)Q;M<Tcb+2n?y1wgQeId5Lyh={k5;b>9&PDG<GkW|<}7?B4@OmoJZ
z=Hhyk{VLSeFcR*x-&?Ml6~|hI;;b(jZWRCQC;#j>Y}m<fLxuSI6;{9S3;)N32JALe
zV5AX38?|ud%3u7XwO}$3ftaPJUKtk)kChAyML}-Sye#c8RCCGqeJ2{**#^?L#D4Kc
z0^{jaL$W?V=OiJ6eo(z1q@+i{wbRzP%yhBSd$^9b6e00ZkHmA2*!$$T-##m_zHIDg
z%|3$ABS?x7*tluC^!*4r$qLX8zeB<-H;b{uG}+coa-OJb2<Hgs$wZvug#{I)ZyMRp
zRWbWPQvhPdpQPN>V1}@7Rr4J?*q8l?#tyn0D18-R0X+-Q63P&U%HR9mpZFKH28NZh
z*4hFY9108$t(>ifdR-&9suU{ZMsSFy%awJQU9RMq<(PCZ%Vl5#%r4Q|hL~L>Loy%4
z(J)&Jm|fD;i+WwmE-HlzJ(y88JO%T-R%vX4X_YL;q=Ok_rKIy}%y3I>1f#`Gxa-%@
z?cBB4oekKX7cS@9tsB2=s@P6pE(jGV8^)~5<v?wf0YbM=t4g6<-X{fRDBIho%VqV6
zUd2oknF(r?M2s?b{|G~8*{5$poC&*r*~#NzNH0(4@dup$FAyA@so!T|h)V&7H5TAh
zD93?**Y6kpUn&#T;(Dpvki&Vt7tEIlOSQpV1Pql_^t?b(Fh~ADp3Zf1FP57o$e$}W
zhw9tOJ4@bX!UWVjr<#<_Yl>Lp_ICR$-9~@lkj-nk5-X0?f7=DAA<9@f=todcBap_7
z+^jKp{KAj_aYR5F!ZEc&BpApM0hP9i!Z|jRbv*TpcZEpJSrUsLY`~DcuNj4UF>F5(
zHKD}WzP2Mfn63V2T9cuGne?&)_)9t9%U!^$>N<sb0F#?{-2h(>fPvC@nMrdSb?HC6
z1J=uO7GKKYpYOt76XKNVflqEP{PQ_{)T;+n8`X<lP?rRXGCiQk?FDraP@1^?i5B$L
zuTZ%su5wo$vA}@^)E&vwedM_MHY<A>KMrEAD=R_xO36YSffP)vZ6ZWj2_5B4vn~c7
z@RD4(OC1*u;W9xZH%HRM^kT`Zg0?`ghwylI+TS$8A}6Gk@b9R<xgD>&_iz?11{#O<
zI=F>6rIgKAeQi4X2m#pm-s6lHM1M786|xrs+ScM4Ey^!Z=jg7vxiPC<(|()zw}c41
z*7~FN7EJZ=eBQ^n{ua^d6Qy9&&Kn5^>dml3d@1hOl(<LH&qh9NYv^h|Lljn*vC$S7
z6Ua-kLb@3sLRzyPRR8HjDi4#A##Ui+kv4`IltB@iD@sNugmaqtHyy_*n+}GWVnacn
zFRCr71-LdpIUjPzwS}xQ!etW|%Q;8RRxAN6uBqNyr=GAoOD;L*l>>|}_UDvB-MkHz
zT@7W=Du;S`Szy<<!(H_#Zc0Qb7xJ2UXFA(c)!oYk0Tg^LJ`*Val_*gDGBbQ_5GaNX
z0wt|igHu(j)GribZNo9U!)Ciecr_z`<v=o_t#q-LP_)RvKE&6v*+8YkKg5RR;-tM?
zoaD>JU2utZ<mKR!99$xB+AMD12r$JgE!zM_u!i+lA4zs;PzDZ}Ocb<<3{ZbOo-g1N
zGuDP8#dqXK(ZNKU)FbW_{3)x&HuA8X`;vPGkQ@g=W>cl@drvZLdbel}%{*&fL&#D~
z&obgxPg{fx++TWArSXSCSk0O;?2)nYANk0KKKq%U{lkA7y&bj6d*u?N_YD9S%skc=
zkh=EO1xfT12uzXP(jv7p@ObTdccO>P2$6WG`BHC@o)R#klzxAdXfs#z1Unqgv7IYs
z|7Wa)l(0c{2M_E?eGi<$e|&v-+7_NRTS1ib>v_)WMD@4&_>P2EcXUBs=tgH>G>|dE
zk&pH27+>3Fo@GMy40iaTd;_Xa>e>VzE9MR&UG%g8<FAcgl>PP5+p!M4ABfn=ZCl}l
zTms5TFYRm#`FohhG9h?9Sx|CYc-m|Qjdt3B0KH>FE)nh6oMh|M(2m6(sOBU7kp}J9
zP)^;Pb|q+6%4ydz6l^GBe|n%``fE`k4%=A7;7c1b7|y~{d+!X=2X<=<GR+58*cN0l
zpO?Buue${q<sFNsC{>@nj!<Be+8yg`O704SM1r-QW=U=oLR$(#fft8R=tY@JCKP?^
zcPD>p4WcuN`3JB&xyuZR^WO<GdQ{+RX2y<n%=nEc2@;lfX#*uN`AUL(wN)a>mt-GR
z&*h5&N%CcH@D{Mqyt#}q*96tJxD#NOd`Vlbqd3K&I9l|`6$e%7D2#3;UwtNDyw(!r
z%M?dj!5Cqszb0krpGWMs0}ii#eEPGm3$Ng~`n$22Skr9vXFvP8IX3g^I?EgDVdTuN
z{7XVZp=`{CG&ZGYQA2?iHVZjaIA#ehyGS52i|a++e~mozDYbd_SKJ)IkSkY`<JlLv
zU0;v}@ibKZi*9yCF#bvfJAlY1a*LG_oLLST=mKK!?rD*NczGC+>jNrJr~f?(U5~Pl
z{EE(yfC^FeyPZ25Tj@>cARwb@qY9$6zNuL00T((%w}O|D{f|D8NZmFP83gOwv8y2@
z0rEASFlv02P834RqH4~YD0}|Q8`^#Ofp0IZ!vH49Yk^6Oa-h}Q5142Dzw+$w=vWKO
z?_pC<5A-t7#{9{W+zo>oYiHgtx2^%YPj}Rr_1(|#p(JdvBt$HGao)Z-S<){S^A~b?
z15$#`23df+XC&G5lf)|@{HuTWTVEK;GsY$1tIe1K1lPdE5>7wy4Bn#&ZJ{e`?1ktR
z0D^qD((Gy7m?+S~gcjG?gtiCJdJa%f(=8*>hSJX~pg~UD`0DBz!yb$~_e5iz>1X^5
zo?%;#b01MFZ*4`@E?8s$JtDEUEAn{@bR!6GAs1lrB(NXJ2SEy4#la+OV^zUkaCFEh
zb3Flu^Ln4vCj=7VNSgzH&nSMQ!axl0s|rI+7VM=6!@!FOLw!2c!3_*Y93Ep^rM=ca
zXq~r&6yehA@AaF-QoZb+Uh<{tN`bf3IUZ{z*2wJbtp*emQII=Y#JjfTjj~QR@#Ps-
zCm5@yvFYVTRk9TyOzhihlGIGqT$<fRh&f}8MVSC&cVho*$W5|G6hz~s8RVwXJ1Z*>
z48^5VQVM@j$(2e46Umf-FH(_8K+9YhQ0fh48M3_~QS&K#x;on)G#S#lA~p*G0WFK9
zEFyyQwxw*_vaRs5DPISgB)%UQO~;1)PBpEy(~=g9WD}C?RSGTj+d!t6@d6EMRHi4q
z4N0(Eqxdb$&2-wQiw)70^&6<I`676;hGgo;E^KhJO=dJFoig<M0l8YXJ!z^E0d+n4
z?KMyu>7rl$>gWSIG!Ytom4&Wylz~I=k`+}MUi#fd7u`2@v|GwP%38`T?`t}vWZ*Ld
zaRb#Tc7;MA;lB+JA|<8%$Tn4qpn#=UvADt%w?8yQN=Yed#L%b8m#(T3sQ`29PL(xF
zVI=5+EvO9S>!zq7o<(r27U>_oGio&lvTxB;|JTC!-R^|=I`D8Y7q#nNIAQCmKV&lh
zbFtG2Tp@wuybxUOT`@->M?$atB-zIi{z~Q<K#^Y*lg*Wtfkx!oe{uUp*QEUr(aBmi
zf1I5s)v!m`OZJlNbB@Cgv@bQuzRw`*O>{qighD7T058Q6f3c|#>tD5O5iq)**2<$q
z?znAU%t0jD^5~2zC8wGkw7^p(TMg%LXpMCKII=<j^5pR*u^m=>ct@t0jD$^0+Q*#f
zUC04}*8U0i91(36hQ{yur_G^Le&|EQZ3i-cJo|!M%>E1+VZ(_9J@8tmvr(`bQao$5
zIqd5iU@KxEVUvp}nXky11XpwwUBh&!sCMZM1GT~$q13J{wJZ6EAR)UoQA^r>`WcUv
zB2+(6|2AaaWF}$bbLd=bhl{j3Ck5Fw(%5XQ+hqM=8(_OXoBSqeInlj@MKIEPx}x1m
zmE<6evX(H)G8ZPn<HrtgnAi-f13f*dSx>aCL=UYelzb~zWB{PGyeDQrx;?3==@WTJ
zHecNl>&lw5t`xAa7P)U*sQOY?Uj`XC8NqSlqIqxsfpyf}v#%<SM0;OU9RGIZFLN8o
zUb`pP${xBD)|!GYiR-y8ZTj03whr2xdL>P0uah(z-pn-&1B+$_T|v`3dckJ=z3$aO
z+FpIYLCTHW=2v6fw*DYN@~xfB$>vQXjjd?8Y-Bkr<rWlUByRyfhIG?^=C%x)qq0^c
z>s2Ub`~-A)GG)j7lcG5!CQF+Q@)65#{hqwBOWCCSr>+0qg3Ypkt0(PsNm^#J=}-J1
z^^>LS+|RpdA-e5j&Fy*3%h{xF-#d5M48r#Rz*c?yCEfxE4BYMqKJkN{Dwpn>3X3k=
zu+5mHflsvbY%>6?sj7*^ZK#*-dQ<}qOA~(J?gbXsfl8UOQEH9#o!`!;^uh$FBExNj
zn{7IFT4R0zbd6T*wd#=h(p?kBl^k9RfMOoMCG%leD-tVUt$HA<&fz^)nF)<@s#H#8
z(bT9s0BPBDP-cK--@9Baf1d`ZKz@pev{sgvYJtd}b_OBi-6k7`+QW?eBPD<*pnRf3
z=M>e&g1~TiryH^uT*N}i0boJQUfabAiX#*`=dA<UT2?(Ou~7$XC@?XR^sz$)X<-N}
zXTv5RU9@>S=Xf}&%K4PnGuoookuzK=6ECt2JyrFo+&+!@wc}box@lpi0j9iRa@-;j
zRs|+e_NE{NhX0-54+}`;l_QfOOMZ1oCb3Ln6#D8(%>7t{%!{K1UzNja?=^AfIR{TE
zLI=b_$IY}y{>*!g)r_dIFAWiVl5e9C9=ub_(Do+RU#;Pcvz5zGirIF9RK$$^%vR|v
z7h^p|*fs?_U2-sojKt)S6Sx3m?UWT{7+*#9UgMl$kQb^7f)<%<_+^7F!@007f^`Mj
z<#2hsF`yeZU;!B)%rR#u$qSJ&95B5$)~iu0rOBcn;51L15kB{g@NHgLb4yk|5nM6m
z7S_2K$IJML0ac%*frbHZN#AHEfi*z;?Q`YyGKdu29IxC(zJ>&_genc>-%9F856y?V
z6?ykNqTA+RZ&2IJ8lrqP5Ru1d3sUgV#3Fad?4^vn(~_1>@_N$Cu`@|AR>8-d^zgJ>
ziDqh9V*ye-^I63a!sCb!?a~)%Jd_PXs~%uf@IkYERAHkEvqcz`UgL9;`9MSRUN`}D
zQnLfOv~-=dB*Vc+huQ4bJAPJ~5ckkZJY}~UvKV?q4@7L_J@0x6!y5AGql$r1-g(|x
z(CSc?@M3x`6Y|#qbF-4OFwjd=WIEf2{0Gs$o+yh`GHASyJ`?no-eBjhs{s=8-1OiX
zn<Jk0gC^O4_Z`I$Q>{wGAshrR%N!JCwg9WxNIq;5M&ngzWn*M=YYXG59TSLFe)Xzk
zcdLr7Ont<B6M$+~mr*l_5&>`sk2I-yKG2C<uzi5{i!AcNOZmKQ!UoK&&a5j;@AQBv
zF(96E9XdS;{rC!z7WEB=YFDt%N)SS3p{=8z>n%WIgydzb12qDS-{~nLY`T@r=;y$N
zs7Z9bt=+I^{ztEa(Jx{2nSzJ<GU|4&fFU76Plh3B_P(0id&`x*@8$weW?xYx_$0HR
z=dqY==3e^Dos`0^Ig=_n&=%p<PVP+R9<$(`Y<+G#tJ2`AG$}r4oWMk2&Z~$-m8RNa
zy1tSEQce18l`PtXAkUaspfoW(zPdG-E3sm8P$dlC<#emq$C{mFDI(0Q@E8zZ-5Wcj
zyR7Lk4tguY^6Y!C9U*Y$lk}CHvaI@K*bv3mIBCSkl#6(@(<GyG1>wig#5Bm7^n>;y
z6uSua=9?01=K!O`{T43`g`SQ;%VleyaoNZDP|dMi^ECWc!6x1nxomdzgxKyMX(k-7
zsa1C~$&E-o6SrJ_j7Vzw9`K|GR#O{fdk^GvESCh<(nVe;VV7h$fRgnpHc?QE!;G|}
zlcPDcj>`d_bdbbRR@`}iG(8(}U}}gq+Tyv72s4_hQK&9VIe-)X)hAH`C0Ue7cbjz*
zhLK;Pu_k3+;~tO>${W%i4mPO>n%t29gC&Oc;hj2ZHMm5v4)0{Xp@mniK&Q{f^fx28
z7az3HCl{7s6aW(Lz{~8!>iD3M)zp|%a8@`0`FZ?29i8^;+AJ!~?JX}LgE^4wE=ucI
zQ@TWY=|o1LN|57xo&>=2iM$hT4pMdvr$)@<xm`83r`ict+=3??0JXC@(AlPn09a-F
zYJL!2F8~NemEjX?q1gyP2Ywe~VNhG1tanCHL?+$rV#p*Tk}qSqdMo{6WCw_o!=iLx
zBAXeIYcWwtfr+g7h>gV=J4_sH0wE=dIfI%R*is~1HIdh|2Mkw@xhROd>O>X@rSe>~
z;|<l;7Jxo(?u4KmONq-CASW#Tu|D2z0r4qmi%prT0)py;4O?;&>NaE=g%2x@R96ng
zBvTC4%rY3^(x>96&=p-t!)j(y6TQaWpV_85Ef_z#!^UE*o{mvMvaNrfwb2k&)Exp$
z7jgmScw(sHxzvMsk(pK7V1$(TLc=M_8KD(Z+?w^ZI`Squ)zH5BVb*Ne!ed(?)P;h;
z$a#n}Rt!4%P+iYpP=Bvy|G7j>N8EFb1kbfKyW!LqjM{3}Rv4G=L0{+(<sP&*BaLi2
z#x|0T3QrA32{S5@jEYNNA4c@hb%c~dJ*DZ`BbrmKY(=^pOY4GN%C0=0uxSsl>2|Y7
zU=r0wwRvksCtTBsk@Yr}!Gb06nlM22CTv$#enM{nu<83TJxEg&AJjj|RCehzcF3wH
zu*{ZvA)@6e?X;Kkk51FP5<zzD1q4yHMK_UZBXAAcQiY@uNh`drdO1v|Xj3;)_cqs$
zroXClqJ!DP_^Ww?3828vV1FquHnBNF`G9AlW;R;y=jz1_c&vTtJl#vpm{Bk{O5_xc
zU^2*&<w3`vIgO*0?J_IGGJbaPzlH-=KmaUl?H!V5rP=KL(@SbW)K+x9m?ivzL3V6f
zs+8?mo?ghb3{5r8!C^#TWqb*jxfdzsSi(s4W0j%$U7?CVTw5GU<;4>#j-?Zx$Ydz4
zjua?k+b+!pNnAwIe3<;hd?Z<G?<ErRKZQVH4ibA?*=R*LJ(>;&2HNh4{8pEbVor2r
zKc-2}CrmOjSPFnouu7?=8s2TLGa=S1zMKplxCK+Y!?JjRc0zVk-#ZOej?N!CE>3L#
z3kk^!@d`GPx-f>)ChjXSSGGrX#^Qu=LW5MCUfdehB|qosY>|{A;ec$L&Ic@J?2riS
zZFF5T+N#9M<lEeEo5{dA>2+9a<K@)Eijdk}eT#Wfj)fR4fGHi*LWS%$X=Q5bFw8ZW
z>h}9ohfU+V;kY*`j<2LbrYk^TO5#D1C7ER+FSd)9>2P!4{(h`GfNgcLUoI|da|zFg
zIUVO&2x6m->_DYxD53?#C^bc*0yAL50q+zCi(I%7{083GDm3dXgVCnF4!qJBf=v`d
zm)KGdw%M)sG*i7c)Q=0q%}}PP6gTV-&g8G9BX;mmU4u}^`443Db*(_A*)8EsWA^el
z`uT)I8{&gNN|(s~XTMrtcA!kP9Xi0170<Z=WfmZx@gWE5HTTF1_W;U&gu$ATO4&L2
zC_Ch<XIh@KTL9U?#i<1d1(%L$VnBbiX(y{n0wc)4`@B}TutfMITYbNE78kcs6|&WS
zluk6&>lhd@nym_TzX^tLiiMmdjfhAOr34cR2wkg!6#Uow@u&?;y_$=!t~vUdwyRq>
zQ86Cl(Prb3kD57f%S8@gr^=*Z7b=!OoFeYkO#NowM92jxoq2$@NGL+rSuYaS%}wwX
zQEG#?cb~xtYt}Dz>J86&SV*O0&|lgv(3uV;c`i$Ua!T@8+kldruspP7h1XGXFi<fe
z0?%AFqQO8#OW%lejFp4D9K|Y)$r1HTqN4_<9`O2JDqQNuRh|QJko66T!}%WdUgBsN
z?jg=*5FTt3rye%Ta#n?6rc!m4bvgrwRi^`5CkwJjOJ6sut@D>TR1f_mmoRl%b0M8y
zgC=IY-^8j~#sOq;`w(ncSkZws9I3)cf)ozf)-nBJ44zEFBd47-Yb*xtOU_~LfRZ0A
z_Hm@pak7=B%Q@{TH9~GhZFloE2J;2wNDm~2HH<5%HG(f$!n=Vr^cQ;lv~^<?*^zp5
z|8Y#w&ZKYsUt#@YU)*^v@_R^qeGZ}LXJyV|DrIs~^Vn({1aouR1`qJEi{hkEFP5N=
z)v?o*YH*_Gi9?g}r)SwX$5}<~$FGm<l%G6P(--`Po{A!a5b+hOSjivZyG$iIT;_0)
zyhtYn6|qW?Dp+7vR^iG>eWp=|kO-e%ZKxqS;T@cQTG73Xw%$|H%M&OXMNOS8?vZ`p
z=NM2QhHvC@IMG84c|W(Np@=hI>a#n1o#W?w3_5S{!K`4=&1AzSGw65sSHkWK)zIM5
z-&4yB_WD{FZEU*@1I2*ER0oMiI!IhHBx<}xTC^YPsn0c$ymKKmjXC-L&tcj@ma8SB
zS#_xZCVU-<nw(pMtJTd0xnlNV<PhsupKoqfHntkGg#K)TY`A|4@9+?g{NV_pH}zK}
zusNMmRHz@85a;7xeH~?+n;}8otus;z3P9Y|sME1k9FST2l@KErTUk07LDu>_Lkhh9
zFcma()_lL-XYLs~H!Cuox3JV{fS;+zxyLa$zz@2YBRt#>8B4w{&F!Oyc5>aHeAeQC
zrp@v`kidR^=t_1hI-adzDT1QIE=&0tOL;vl_GkU=VxO|a{g#-v6F+H*dn_?&Cw{^b
zN5LEqEURZf^f}RKbh`csoz$^Q$o5VA=m7jfW|nw*`U4j<29x_`EpN*s21m{SJ!gl&
z7V($#^zrayX93V8FGnkGVa*^q93CKrhYvbG+Oluul0&(@Tau`%6~^_G2ZAgFA(v=l
z!-}w<Kow$CA<{2vp<sW(RwHCouz2!h;TOg&WR~-#iagV=%dA-@2jPX9qw6wx--xC-
z<St~cv69gPceCYkhF!=-TYGc2SuTgvg<RCAH}_`C<rKP*t0R+oAbZQ@E!mKZr1s|C
zYPr1n8**V|$i-%fCK@gnB<uxr4290j;Q?hb=S6N9a-K33t7_h_S(a!_NqMOnFcEd^
z2a7#KZ^$PI58R^0d~~hs2Od-=0gPYNJiwZRubLR(KUdOkFF42^@g_Y@C{WY3=-0dY
zXrPXzFD8XjU%66EYyAU*D1AP@Yv7dpI~!8D!~9>HwI|l`nHy&D*8KIdUV5#3O_~^8
z8yOpIH*RrPblnzrUq5TqUANZG^;tKB%vIfg(Yh~M0Iqg8@}dMx(@#bOD41ZKOKck?
z!YO%F_)`%Dn|EuiPcN>u-}TX}YGd)5-e==5_8-&r3h~0<)D5qNe4Z<JbpU)S+=?k*
zj3sr*ty(Yv)KJ`(QfZ1cg6t%9&L0a;H0kO~JCNQLY!T<fD@b1eSBY{l{i7(#&!1N~
z%4`jj(3=%uVq#`pvCx4<gl5>|L#RdeN4jJoHx0u)*~Bw$6wtep$AM$Cv$%t{Cn;Ow
zFlQk!y|%j0SEtYmbP=LyO2+^u7r9TG=S$%wdUQfDVS-4C33E|QI8ma-gneu)4(NpN
z$*br>X-&@Sl%_0mM0<C?nBGA!C`3}&u1ebqxl<-Gl4-A1C*b~5iVzqSDW;~YvB8hw
z07Ejv7X7B?9jG296#FU5!8AP%(Nvji;vg25)3mou-#F9CxsPG5eo3-We`O;A6!M_K
zgm|<e3v7<#7gJR<T2e5NW<??bJ|tV<A%D3+l4S*mx~48II(=86h=&Sm@6o#0uV8+{
zPhqfGS9`Asp$CT7`I$2@Q554sKkTOmkRm(Q&tw95wX-G)93^HiI!aIpkRLm4FS5yA
z73zf@>wyRW#c+HzQ_EghbNT^Hy>wQ#P^nsyNbBbqGo8lJEu`><6|&c~_@NPOQN85*
z>fAy%HWQ~W+`J8KT65{6hbNBAwx;~jyq}om_h~1VTK?F?ds~YRlUwLZN=4_~K|cCB
zXy4A=_NqmvU(;P&T4+ri^%F}=t)s`50u)lFfUvmammX_*eoPjApZl~+pN!@0-OwKx
zB!!}keqJru{`%1Hrp;Tn-n4Byzqk6bm*3(W%~ym1FP48pt^dszCW>^yrSI}kvBIay
zr=L&Cr^e?)e2_U8@ga2Q5<UpEBN*)n$h$J13ZE(;{2_M-pF?~cBZK|v@FAiK+(UHt
zrNp`VE1f&{ROAkh54zQV^-<@(@V|>-L9yC4itOccoR8B9&}nUkF8|73T)Fa{&vU+@
z-rGrEh(<?8caH8F-95Tzbnocc=)TeYqX%}5?%cU^*UsHL_w3xeb8P3no%?ql*fqLq
z=dNA5cJJD=YwxbHUHf+J-*sU3=<c1nckSN2d(ZB@yT^9#+r5AHfjy&pcJA4=XZM~x
zd-m=b+p}-a{yhiwj_%#Lch}zCd-v?!yLW8wzP<bR9vB-P+c~ytZ1>onvAttsWBbPT
zj~&=Ix^L&cUHf+L+p}-)zOjA#_U+$yVE^d;o%?s~-@Sj&{=NIh_V3%jfB%64pm>1h
z4*>cA)eew^5dOSNA5v$XyL?x;-g+=x-yN<8KN7A_UkKOfuh@0<%xg2p-^JlcyPo;%
zzqV`Zmwy?ZyA0UPzcpO=ZWZa38JC^;j7x7l_6p}Vll8{ezT@G0?%c0Z*Zye%G2M2C
zq8t7xTAse^;YM>i$E_qo58Pa<7t)svzx<Vt&CMS>{-`gO2GNKe<*j|U-+I%wN_Al5
zmfK$O!4Ev~k6!ia*T3N(-}T0O?|<{V-u=zr@}6(~wnL9hOir~9zxT-W%<RJA(&O*{
zC#T>(f%Wvm1NY6&w%$82>mPj_8?e|qzTBFdY`JfkKgthQ`_{t3{DOO1Ympy=_H*+~
zexY@2p|!|wOHVvH+j4IqWx_8lJ?<WAEgU_v$S-Tp`Ki|2k=B%Z>#^3tgnohB>hW;&
z2nJ({I(~6^@-crH1LWry{M3<!*5uOs!sDGBe%X4mwYcc+QHj>cBa2Im?wu2}%Pq{+
zyq}#|cyG%eR!wY?UwZtQ@bHWLpmxj8whk|O!{Njcdhym}o(_9{(p&K9#{BXEr5;^g
zeB9kP$M0}2ESmvae0&jG<|na*-BPk{^9vITM`j=Q%X1Sau$b2A`{qte%pRG7R;?NL
z#)bLC#XF~3YR=CdnVX^h#MGVhb5yb(2GH&s+PySt$ZkIF-Z(!uN7qFn(R2wG_+zcs
zLJ#Tm1Kv}9etBtq;ls=P0=RqAJm&VuqMw?7-(2Tmc@9%N`IupvO-%uK(Zfh8xbcPg
znbw>?b_9yu_qw;{%x&`{?*nw@hrLzJjq8WYVW;(N0m+~bUH*miTm-sIyl)YS=srHo
zPm2da7}4)O*_ssZj!rD)&9|uuSC@|>S1!wMpr%F>aeRL6z3%OgAANLw_Q<3WnWXt+
zCLeSBo_e>?!<0TcG55HiKSoDIf9rhC1A1yKnQARgE*v?A%z<l%t>X+}S7l4CCLcR8
z%gC0CqzbjkbC1NcBayDtwxnQDRYktu7CQ1bg@_n!-#5Pu@cBu8uid?UNrQ0Eu}OY_
ze!*Dy&;sP2UtaX^xFuy-r&*H|=qls5yGOr%-qy7vM~}_6M9aXfqwtcUU5Y@@#lxU9
z_o1juM-CqW>;ejMg3{j*cr7F*d>H1{5mU4-rSejeO-W|1WTE(?MA@`#(LD$u{9_Y~
z{?QiPSZvWJ+IVPTerbMkem3X7D4Js!6u!$H$?c<LFN!j`pe;hv))I&=E*+T*<|XF`
z4d)X2=DfpQ-gMf0-vY8^-8T!8L+fN)$2$_SE_reJ7}h`}eY>F$fT%(@=Pm1=I@J$P
z9F+}OU$(8A8)cdy$jRi|1=r*Dme$hy<`-r<>fe6uRsW6b%Ur0}YfdH}4gG@Ak1iiR
zj5q{a+GTj&V@%CtFj-wH2&-=58z<(hm-v5v;xP8r2MYVe$Cj7OOm#<viCOuKkBiC2
z7Uth;7N?urn~G+jX{MWxP0UR(?z|0oMOnH=>>HQo84Fq`CtIy4kfSTu%_GZ4;qo%R
z=r<YL^Q88OVPhN32Xln-FbHeOHvOe2c5W@<Q{aOqyjJ4V$EVB(A8rk2YYqQx4gYNo
zUv6!H&mf;VpCLZOd^YjH16bR_XDgqZ_~3o5ZRfLt&j_EJ`MiwJ%lX{G2Mm5Ra_$1{
zU!eU9w10v2FVOx4+P^^i7ij+i?O&k%3$%ZM_J57`FVOx4Jj$OUzD@la^=s6x{icOt
z)4tp1mS<=0poawZ(#^NscH3h6->Y8xs@o=Sn<R@EU>d)I8zO{h{AzB9AExZ!VQE`8
zo*M#>X^iWcUF2rlgU(Gq_~3(X8qB%13t!VXNMv73w!5m^zMU@P&+03<z~=kf({?vh
zB|oY5xoD)4LZ3>Bj-`$sZ}>+~+kb@n_~R>f6(v_3-#z*5a`{!hcKZ+BIA>pk#`VW{
zZ@#5<zTj%-4=THYzFZ|F^WB@@DQGvyLFW&-aL&FeA(?OfBMNTE4t;O@w=N&vzv!R5
q&h{TN=bU|2LNedI`R#Jyij;Q#kXq;Ls}hp=)=lQp!kb>}-2VezAJ5|e

literal 0
HcmV?d00001


From b13c77e352f336f38e50d613cf148fd2bfb57773 Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Fri, 9 Apr 2021 13:25:51 -0500
Subject: [PATCH 4/7] Updating unit test with set method

---
 .../toolchain/abigen-pass/structure_test.abi  |  15 +++++++++++++++
 .../toolchain/abigen-pass/structure_test.cpp  |   6 ++++++
 .../toolchain/abigen-pass/structure_test.wasm | Bin 34373 -> 34586 bytes
 3 files changed, 21 insertions(+)

diff --git a/tests/toolchain/abigen-pass/structure_test.abi b/tests/toolchain/abigen-pass/structure_test.abi
index 160c78dff6..6952660093 100644
--- a/tests/toolchain/abigen-pass/structure_test.abi
+++ b/tests/toolchain/abigen-pass/structure_test.abi
@@ -26,6 +26,16 @@
                     "type": "fee_payer"
                 }
             ]
+        },
+        {
+            "name": "setfeepyr",
+            "base": "",
+            "fields": [
+                {
+                    "name": "pyr",
+                    "type": "fee_payer"
+                }
+            ]
         }
     ],
     "actions": [
@@ -33,6 +43,11 @@
             "name": "printfeepyr",
             "type": "printfeepyr",
             "ricardian_contract": ""
+        },
+        {
+            "name": "setfeepyr",
+            "type": "setfeepyr",
+            "ricardian_contract": ""
         }
     ],
     "tables": [],
diff --git a/tests/toolchain/abigen-pass/structure_test.cpp b/tests/toolchain/abigen-pass/structure_test.cpp
index 15d3ca535a..64d6c184a7 100644
--- a/tests/toolchain/abigen-pass/structure_test.cpp
+++ b/tests/toolchain/abigen-pass/structure_test.cpp
@@ -11,6 +11,12 @@ class [[eosio::contract]] structure_test : public eosio::contract {
 public:
    using contract::contract;
 
+   [[eosio::action]]
+   void setfeepyr(fee_payer pyr) {
+      pyr.payer = "respyr"_n;
+      pyr.quantity = 10;
+   }
+
    [[eosio::action]]
    void printfeepyr(fee_payer pyr) {
       print(pyr.payer, pyr.quantity);
diff --git a/tests/toolchain/abigen-pass/structure_test.wasm b/tests/toolchain/abigen-pass/structure_test.wasm
index 1cb6c6891fd87251fbcf771c85d8853b19c46c41..657143a5fc8daea957b7b2a44654bbc8a233113e 100755
GIT binary patch
delta 103
zcmX@w!!)apX@d+iQ+(WHIp)~ORm}GKlU^~#u`mcIb5CVtP+$<K5Rg+~P+$yXad2vA
zc<^=g(zQ386qtZqkf=Zv>*R~fqKws(pEE0M=3r4OX5Gce$XY+yuzVwnqd=C*W{q-L
FegOFa9W4L=

delta 81
zcmbQ$$8@xZX@d+iQ(Ww1Ip)~OHOzK;`(7}{vM>lJbJsB_FbGr#$SE)=Fb1+XI5pha
jclFBD^Y7NyD=-21AYp;3$^V&^HY>3x7H|GvF3k@B@x>X1


From 3ae8c8452adac53584441d153fcdcb0adedc3c33 Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Tue, 13 Apr 2021 09:51:17 -0500
Subject: [PATCH 5/7] Adding structure_test.json

---
 tests/toolchain/abigen-pass/structure_test.json | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 tests/toolchain/abigen-pass/structure_test.json

diff --git a/tests/toolchain/abigen-pass/structure_test.json b/tests/toolchain/abigen-pass/structure_test.json
new file mode 100644
index 0000000000..6d99272cd2
--- /dev/null
+++ b/tests/toolchain/abigen-pass/structure_test.json
@@ -0,0 +1,9 @@
+{
+    "tests": [
+        {
+            "expected": {
+                "abi-file": "structure_test.abi"
+            }
+        }
+    ]
+}

From 9bae28bae66a6688343626831f5f2cca272a1772 Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Thu, 15 Apr 2021 08:58:04 -0500
Subject: [PATCH 6/7] Adding another action to structure test, and deleting
 wasm file

---
 .../toolchain/abigen-pass/structure_test.abi  |  17 +++++++++++++-
 .../toolchain/abigen-pass/structure_test.cpp  |  21 +++++++++++++-----
 .../toolchain/abigen-pass/structure_test.wasm | Bin 34586 -> 0 bytes
 3 files changed, 31 insertions(+), 7 deletions(-)
 delete mode 100755 tests/toolchain/abigen-pass/structure_test.wasm

diff --git a/tests/toolchain/abigen-pass/structure_test.abi b/tests/toolchain/abigen-pass/structure_test.abi
index 6952660093..bac11228d5 100644
--- a/tests/toolchain/abigen-pass/structure_test.abi
+++ b/tests/toolchain/abigen-pass/structure_test.abi
@@ -17,6 +17,11 @@
                 }
             ]
         },
+        {
+            "name": "getpayer",
+            "base": "",
+            "fields": []
+        },
         {
             "name": "printfeepyr",
             "base": "",
@@ -39,6 +44,11 @@
         }
     ],
     "actions": [
+        {
+            "name": "getpayer",
+            "type": "getpayer",
+            "ricardian_contract": ""
+        },
         {
             "name": "printfeepyr",
             "type": "printfeepyr",
@@ -54,5 +64,10 @@
     "kv_tables": {},
     "ricardian_clauses": [],
     "variants": [],
-    "action_results": []
+    "action_results": [
+        {
+            "name": "getpayer",
+            "result_type": "fee_payer"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/tests/toolchain/abigen-pass/structure_test.cpp b/tests/toolchain/abigen-pass/structure_test.cpp
index 64d6c184a7..2404d5807a 100644
--- a/tests/toolchain/abigen-pass/structure_test.cpp
+++ b/tests/toolchain/abigen-pass/structure_test.cpp
@@ -2,17 +2,26 @@
 
 using namespace eosio;
 
-struct [[eosio::structure]] fee_payer {
-   name payer;
-   uint64_t quantity;
-};
-
 class [[eosio::contract]] structure_test : public eosio::contract {
 public:
    using contract::contract;
 
+   struct [[eosio::structure]] fee_payer {
+      name payer;
+      uint64_t quantity;
+   };
+
+   [[eosio::action]]
+   fee_payer getpayer() {
+      fee_payer pyr;
+      pyr.payer = _self;
+      pyr.quantity = 1000;
+
+      return pyr;
+   }
+
    [[eosio::action]]
-   void setfeepyr(fee_payer pyr) {
+   void setfeepyr(fee_payer& pyr) {
       pyr.payer = "respyr"_n;
       pyr.quantity = 10;
    }
diff --git a/tests/toolchain/abigen-pass/structure_test.wasm b/tests/toolchain/abigen-pass/structure_test.wasm
deleted file mode 100755
index 657143a5fc8daea957b7b2a44654bbc8a233113e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34586
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
UI%i*%kj%GkGM5(K_!{T_AI6LDCIA2c


From b78de73ccfd011617da3cbf44ba999a950cb8374 Mon Sep 17 00:00:00 2001
From: Venu Kailasa <venu.kailasa-ext@block.one>
Date: Tue, 20 Apr 2021 11:01:30 -0500
Subject: [PATCH 7/7] Removing ABI generation of structures section avoiding
 duplication

---
 tools/include/eosio/abi.hpp    |  7 -----
 tools/include/eosio/abigen.hpp | 52 ++--------------------------------
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/tools/include/eosio/abi.hpp b/tools/include/eosio/abi.hpp
index 506402726e..b2813f4322 100644
--- a/tools/include/eosio/abi.hpp
+++ b/tools/include/eosio/abi.hpp
@@ -39,12 +39,6 @@ struct abi_table {
    bool operator<(const abi_table& t) const { return name < t.name; }
 };
 
-struct abi_structure {
-   std::string name;
-   std::string type;
-   bool operator<(const abi_structure& s) const { return name < s.name; }
-};
-
 struct abi_kv_index {
    std::string name;
    std::string type;
@@ -88,7 +82,6 @@ struct abi {
    std::set<abi_typedef>                  typedefs;
    std::set<abi_action>                   actions;
    std::set<abi_table>                    tables;
-   std::set<abi_structure>                structures;
    std::set<abi_kv_table>                 kv_tables;
    std::set<abi_variant>                  variants;
    std::vector<abi_ricardian_clause_pair> ricardian_clauses;
diff --git a/tools/include/eosio/abigen.hpp b/tools/include/eosio/abigen.hpp
index aacbc528b0..e27ac94a19 100644
--- a/tools/include/eosio/abigen.hpp
+++ b/tools/include/eosio/abigen.hpp
@@ -257,31 +257,6 @@ namespace eosio { namespace cdt {
          _abi.tables.insert(t);
       }
 
-      void add_structure( const clang::CXXRecordDecl* decl ) {
-         structures.insert(decl);
-         abi_structure t;
-         t.type = decl->getNameAsString();
-         auto structure_name = decl->getEosioStructureAttr()->getName();
-         if (!structure_name.empty()) {
-            validate_name( structure_name.str(), [&](auto s) { CDT_ERROR("abigen_error", decl->getLocation(), s); } );
-            t.name = structure_name.str();
-         }
-         else {
-            t.name = t.type;
-         }
-         cstructures.insert(t);
-      }
-
-      void add_structure( uint64_t name, const clang::CXXRecordDecl* decl ) {
-         if ( !decl->isEosioStructure() )
-            return;
-
-         abi_structure t;
-         t.type = decl->getNameAsString();
-         t.name = name_to_string(name);
-         _abi.structures.insert(t);
-      }
-
       void add_kv_map(const clang::ClassTemplateSpecializationDecl* decl) {
           abi_kv_table akt;
           const auto& first_arg  = decl->getTemplateArgs()[0];
@@ -495,13 +470,6 @@ namespace eosio { namespace cdt {
          return o;
       }
 
-      ojson structure_to_json( const abi_structure& s ) {
-         ojson o;
-         o["name"] = s.name;
-         o["type"] = s.type;
-         return o;
-      }
-
       std::pair<std::string, ojson> kv_table_to_json( const abi_kv_table& t ) {
          ojson o;
          o["type"] = t.type;
@@ -548,7 +516,7 @@ namespace eosio { namespace cdt {
             set_of_tables.insert(t);
          }
 
-         return _abi.structs.empty() && _abi.typedefs.empty() && _abi.actions.empty() && set_of_tables.empty() && _abi.structures.empty() && _abi.ricardian_clauses.empty() && _abi.variants.empty();
+         return _abi.structs.empty() && _abi.typedefs.empty() && _abi.actions.empty() && set_of_tables.empty() && _abi.ricardian_clauses.empty() && _abi.variants.empty();
       }
 
       ojson to_json() {
@@ -617,10 +585,6 @@ namespace eosio { namespace cdt {
                if (as.name == _translate_type(t.type))
                   return true;
             }
-            for ( auto s : _abi.structures ) {
-               if (as.name == _translate_type(s.type))
-                  return true;
-            }
             for ( const auto t : _abi.kv_tables ) {
                if (as.name == _translate_type(t.type))
                   return true;
@@ -655,9 +619,6 @@ namespace eosio { namespace cdt {
             for ( auto t : _abi.tables )
                if ( t.type == td.new_type_name )
                   return true;
-            for ( auto s : _abi.structures )
-               if ( s.type == td.new_type_name )
-                  return true;
             for ( auto a : _abi.actions )
                if ( a.type == td.new_type_name )
                   return true;
@@ -689,10 +650,6 @@ namespace eosio { namespace cdt {
          for ( auto t : set_of_tables ) {
             o["tables"].push_back(table_to_json( t ));
          }
-         o["structures"]     = ojson::array();
-         for ( auto s : _abi.structures ) {
-            o["structures"].push_back(structure_to_json( s ));
-         }
          o["kv_tables"]  = ojson::object();
          for ( const auto& t : _abi.kv_tables ) {
             auto kv_table = kv_table_to_json(t);
@@ -720,8 +677,6 @@ namespace eosio { namespace cdt {
          abi                                   _abi;
          std::set<const clang::CXXRecordDecl*> tables;
          std::set<abi_table>                   ctables;
-         std::set<const clang::CXXRecordDecl*> structures;
-         std::set<abi_structure>               cstructures;
          std::map<std::string, std::string>    rcs;
          std::set<const clang::Type*>          evaluated;
 
@@ -795,15 +750,12 @@ namespace eosio { namespace cdt {
                ag.add_contracts(parse_contracts());
                has_added_clauses = true;
             }
-            if ((decl->isEosioAction() || decl->isEosioTable() || decl->isEosioStructure()) 
-                    && ag.is_eosio_contract(decl, ag.get_contract_name())) {
+            if ((decl->isEosioAction() || decl->isEosioTable()) && ag.is_eosio_contract(decl, ag.get_contract_name())) {
                ag.add_struct(decl);
                if (decl->isEosioAction())
                   ag.add_action(decl);
                if (decl->isEosioTable())
                   ag.add_table(decl);
-               if (decl->isEosioStructure())
-                  ag.add_structure(decl);
                for (auto field : decl->fields()) {
                   ag.add_type( field->getType() );
                }