Skip to content

Commit eb5e76d

Browse files
feat: erc 20 votes (#606)
Signed-off-by: Mario Francia <[email protected]>
1 parent c0d4367 commit eb5e76d

File tree

146 files changed

+8550
-861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+8550
-861
lines changed

apps/ats/web/src/views/CreateBond/Components/StepReview.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ export const StepReview = () => {
311311
isin,
312312
decimals,
313313
isWhiteList: !isBlocklist,
314+
erc20VotesActivated: false,
314315
isControllable,
315316
clearingActive: isClearing,
316317
arePartitionsProtected: false,

apps/ats/web/src/views/CreateEquity/Components/StepReview.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ export const StepReview = () => {
304304
isin: isin,
305305
decimals: decimals,
306306
isWhiteList: !isBlocklist,
307+
erc20VotesActivated: false,
307308
isControllable: isControllable,
308309
clearingActive: isClearing,
309310
arePartitionsProtected: false,

packages/ats/contracts/Configuration.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export const CONTRACT_NAMES = [
232232
'PauseFacet',
233233
'ERC20',
234234
'ERC20Permit',
235-
'ERC1410ScheduledTasks',
235+
'ERC20Votes',
236236
'ERC1410ReadFacet',
237237
'ERC1410ManagementFacet',
238238
'ERC1410TokenHolderFacet',
@@ -242,6 +242,7 @@ export const CONTRACT_NAMES = [
242242
'DiamondFacet',
243243
'EquityUSA',
244244
'BondUSA',
245+
'BondUSARead',
245246
'ScheduledSnapshots',
246247
'ScheduledBalanceAdjustments',
247248
'ScheduledTasks',
@@ -267,7 +268,9 @@ export const CONTRACT_NAMES = [
267268
'ExternalKycListManagement',
268269
'ERC3643',
269270
'FreezeFacet',
270-
'ERC3643Facet',
271+
'ERC3643ManagementFacet',
272+
'ERC3643ReadFacet',
273+
'ERC3643OperationsFacet',
271274
'ERC3643BatchFacet',
272275
'FreezeFacet',
273276
'TREXFactoryAts',
Lines changed: 273 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,273 @@
1+
/*
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.
203+
204+
*/
205+
206+
// SPDX-License-Identifier: UNLICENSED
207+
pragma solidity ^0.8.17;
208+
209+
interface TRexIBondRead {
210+
struct BondDetailsData {
211+
bytes3 currency;
212+
uint256 nominalValue;
213+
uint256 startingDate;
214+
uint256 maturityDate;
215+
}
216+
217+
struct CouponDetailsData {
218+
uint256 couponFrequency;
219+
uint256 couponRate;
220+
uint256 firstCouponDate;
221+
}
222+
223+
struct Coupon {
224+
uint256 recordDate;
225+
uint256 executionDate;
226+
uint256 rate;
227+
}
228+
229+
struct RegisteredCoupon {
230+
Coupon coupon;
231+
uint256 snapshotId;
232+
}
233+
234+
struct CouponFor {
235+
uint256 tokenBalance;
236+
uint256 rate;
237+
uint256 recordDate;
238+
uint256 executionDate;
239+
uint8 decimals;
240+
bool recordDateReached;
241+
}
242+
243+
function getBondDetails()
244+
external
245+
view
246+
returns (BondDetailsData memory bondDetailsData_);
247+
248+
function getCouponDetails()
249+
external
250+
view
251+
returns (CouponDetailsData memory couponDetails_);
252+
253+
function getCoupon(
254+
uint256 _couponID
255+
) external view returns (RegisteredCoupon memory registeredCoupon_);
256+
257+
function getCouponFor(
258+
uint256 _couponID,
259+
address _account
260+
) external view returns (CouponFor memory couponFor_);
261+
262+
function getCouponCount() external view returns (uint256 couponCount_);
263+
264+
function getCouponHolders(
265+
uint256 _couponID,
266+
uint256 _pageIndex,
267+
uint256 _pageLength
268+
) external view returns (address[] memory holders_);
269+
270+
function getTotalCouponHolders(
271+
uint256 _couponID
272+
) external view returns (uint256);
273+
}

packages/ats/contracts/contracts/factory/ERC3643/interfaces/IBusinessLogicResolver.sol

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,6 @@
204204
*/
205205

206206
pragma solidity ^0.8.17;
207-
import {
208-
TRexIDiamondCutManager as IDiamondCutManager
209-
} from './IDiamondCutManager.sol';
210207

211208
// SPDX-License-Identifier: BSD-3-Clause-Attribution
212209

packages/ats/contracts/contracts/factory/ERC3643/interfaces/IDiamondLoupe.sol

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@
206206
pragma solidity ^0.8.17;
207207
// SPDX-License-Identifier: BSD-3-Clause-Attribution
208208

209-
import {
210-
TRexIStaticFunctionSelectors as IStaticFunctionSelectors
211-
} from './IStaticFunctionSelectors.sol';
212-
213209
// A loupe is a small magnifying glass used to look at resolverProxys.
214210
// These functions look at resolverProxys
215211
/// #### Structs

packages/ats/contracts/contracts/factory/ERC3643/interfaces/IFactory.sol

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ import {
211211
TRexIBusinessLogicResolver as IBusinessLogicResolver
212212
} from './IBusinessLogicResolver.sol';
213213
import {TRexIERC20 as IERC20} from './IERC20.sol';
214-
import {TRexIBond as IBond} from './IBond.sol';
214+
import {TRexIBondRead as IBondRead} from './IBondRead.sol';
215215
import {TRexIEquity as IEquity} from './IEquity.sol';
216216
import {
217217
FactoryRegulationData,
@@ -247,6 +247,7 @@ interface TRexIFactory {
247247
address[] externalPauses;
248248
address[] externalControlLists;
249249
address[] externalKycLists;
250+
bool erc20VotesActivated;
250251
address compliance;
251252
address identityRegistry;
252253
}
@@ -258,8 +259,8 @@ interface TRexIFactory {
258259

259260
struct BondData {
260261
SecurityData security;
261-
IBond.BondDetailsData bondDetails;
262-
IBond.CouponDetailsData couponDetails;
262+
IBondRead.BondDetailsData bondDetails;
263+
IBondRead.CouponDetailsData couponDetails;
263264
}
264265

265266
event EquityDeployed(

packages/ats/contracts/contracts/factory/Factory.sol

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ import {
214214
import {_DEFAULT_ADMIN_ROLE} from '../layer_1/constants/roles.sol';
215215
import {IControlList} from '../layer_1/interfaces/controlList/IControlList.sol';
216216
import {IERC20} from '../layer_1/interfaces/ERC1400/IERC20.sol';
217+
import {IERC20Permit} from '../layer_1/interfaces/ERC1400/IERC20Permit.sol';
218+
import {IERC20Votes} from '../layer_1/interfaces/ERC1400/IERC20Votes.sol';
217219
import {IERC1644} from '../layer_1/interfaces/ERC1400/IERC1644.sol';
218220
import {IERC1410} from '../layer_1/interfaces/ERC1400/IERC1410.sol';
219221
import {ICap} from '../layer_1/interfaces/cap/ICap.sol';
@@ -456,6 +458,11 @@ contract Factory is IFactory, LocalContext {
456458
IExternalKycListManagement(securityAddress_)
457459
.initialize_ExternalKycLists(_securityData.externalKycLists);
458460

461+
IERC20Votes(securityAddress_).initialize_ERC20Votes(
462+
_securityData.erc20VotesActivated
463+
);
464+
465+
IERC20Permit(securityAddress_).initialize_ERC20Permit();
459466
IERC3643(securityAddress_).initialize_ERC3643(
460467
_securityData.compliance,
461468
_securityData.identityRegistry

0 commit comments

Comments
 (0)