Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ERC-7092: Move to Review #19

Merged
merged 60 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
dd6646a
Creating new PR for ERC-7092 due to moving to ERC repo
Edoumou Oct 26, 2023
d113629
Update CouponMath - update
Edoumou Oct 26, 2023
4217e89
Update BondStorage - update
Edoumou Oct 26, 2023
8913f82
Update ERC7092 - update
Edoumou Oct 26, 2023
b3d761c
Update IERC7092 - update the standard Interface
Edoumou Oct 26, 2023
c59d848
fix the relative path for ref.
Edoumou Oct 26, 2023
7184744
7092: revert erc ref to eip
lightclient Oct 26, 2023
47a8ca2
revert ref eip-3475 back to erc-3475
Edoumou Oct 26, 2023
91712fd
-
Edoumou Oct 26, 2023
ca1a898
issuer check on callable impl
Edoumou Oct 27, 2023
be74df9
fix ref link
Edoumou Oct 27, 2023
c1b7436
minor fix
Edoumou Oct 27, 2023
77f375b
small fix
Edoumou Oct 27, 2023
b2a840c
minor fix
Edoumou Oct 27, 2023
eafe770
Merge branch 'master' into patch-2
Edoumou Oct 30, 2023
fb3f8da
Update erc-7092.md
SamWilsn Oct 30, 2023
fa50465
Merge branch 'ethereum:master' into patch-2
Edoumou Oct 30, 2023
418c328
Minor nits fix suggested by @SamWilsn
Edoumou Oct 30, 2023
68b8e9d
Create IERC7092Batch.sol
Edoumou Oct 31, 2023
400affd
Create IERC7092CrossChain.sol
Edoumou Oct 31, 2023
f575f91
use interface for optional functions
Edoumou Oct 31, 2023
2ad211f
minor fix
Edoumou Oct 31, 2023
47c5d20
minor fix
Edoumou Oct 31, 2023
2b4c3ef
minor fix
Edoumou Oct 31, 2023
d006c1a
Create IERC7092ESG.sol
Edoumou Oct 31, 2023
75dad4e
Update IERC7092Batch.sol
Edoumou Oct 31, 2023
38c5299
Update erc-7092.md
Edoumou Oct 31, 2023
e8a5177
move batch functions to te ERC7092 interface
Edoumou Oct 31, 2023
ee2739d
move batch functions to IERC7092 interface
Edoumou Oct 31, 2023
b05a68b
Delete IERC7092Batch interface
Edoumou Oct 31, 2023
37a3c2d
add comments
Edoumou Oct 31, 2023
247b4fa
add batch transaction in ERC7092
Edoumou Oct 31, 2023
279bf35
minor fix
Edoumou Oct 31, 2023
76fcb69
minot fix
Edoumou Oct 31, 2023
912dd82
minor fix
Edoumou Oct 31, 2023
c7e01bf
minor fix
Edoumou Oct 31, 2023
5603566
minor fix
Edoumou Oct 31, 2023
b982efd
minor fix
Edoumou Oct 31, 2023
bc7cdaf
minor fix
Edoumou Oct 31, 2023
b0c1e18
minor fix
Edoumou Oct 31, 2023
546cf5a
require ERC165 as suggested by @SamWilsn on [here](https://ethereum-m…
Edoumou Oct 31, 2023
2bb15d6
fix
Edoumou Nov 1, 2023
34ec777
make ERC-7092 compatible with ERC-165 as suggested by @SamWilsn [here…
Edoumou Nov 1, 2023
3de1237
small fix
Edoumou Nov 1, 2023
ddcdb47
fix
Edoumou Nov 1, 2023
01a3dc1
minor fix
Edoumou Nov 1, 2023
886c34a
fix requires 165
Edoumou Nov 1, 2023
9a9e61e
add indexing
Edoumou Nov 1, 2023
c81ea06
minor fix
Edoumou Nov 1, 2023
a35c04b
add indexed
Edoumou Nov 1, 2023
0651709
add indexed k-w on events
Edoumou Nov 1, 2023
58474e4
Update ERCS/erc-7092.md
Edoumou Nov 7, 2023
47ebecb
Update ERCS/erc-7092.md
Edoumou Nov 7, 2023
0890701
Update ERCS/erc-7092.md
Edoumou Nov 7, 2023
0b812eb
Moving function description in erc-7092.md
Edoumou Nov 7, 2023
d1aa452
remove OPTIONAL k-w in function description
Edoumou Nov 7, 2023
d1cfb9c
minor fix - for link
Edoumou Nov 7, 2023
372c33e
fixing proposal reference
Edoumou Nov 7, 2023
4bdafa8
remove reference to function description
Edoumou Nov 7, 2023
8d0dc9f
Merge branch 'master' into patch-2
Edoumou Nov 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
466 changes: 285 additions & 181 deletions ERCS/erc-7092.md

Large diffs are not rendered by default.

31 changes: 4 additions & 27 deletions assets/erc-7092/BondStorage.sol
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
// SPDX-License-Identifier: CC0-1.0
pragma solidity ^0.8.18;
pragma solidity ^0.8.0;

contract BondStorage {
struct Bond {
string isin;
string name;
string symbol;
address currency;
address currencyOfCoupon;
uint8 decimals;
uint256 denomination;
uint256 issueVolume;
uint256 couponRate;
uint256 couponType;
uint256 couponFrequency;
uint256 issueDate;
uint256 maturityDate;
uint256 dayCountBasis;
}

struct Issuer {
address issuerAddress;
string name;
string email;
string country;
string headquarters;
string issuerType;
string creditRating;
uint256 carbonCredit;
address issuerAddress;
}

struct IssueData {
Expand All @@ -37,13 +31,12 @@ contract BondStorage {

enum BondStatus {UNREGISTERED, SUBMITTED, ISSUED, REDEEMED}

mapping(string => Bond) internal _bond;
mapping(string => Bond) internal _bonds;
mapping(string => Issuer) internal _issuer;
mapping(address => uint256) internal _principals;
mapping(address => mapping(address => uint256)) internal _approvals;
mapping(address => mapping(address => uint256)) internal _allowed;

string internal bondISIN;
string internal _countryOfIssuance;

BondStatus internal _bondStatus;
IssueData[] internal _listOfInvestors;
Expand All @@ -57,20 +50,4 @@ contract BondStorage {

event BondIssued(IssueData[] _issueData, Bond _bond);
event BondRedeemed();

function bondStatus() external view returns(BondStatus) {
return _bondStatus;
}

function listOfInvestors() external view returns(IssueData[] memory) {
return _listOfInvestors;
}

function bondInfo() public view returns(Bond memory) {
return _bond[bondISIN];
}

function issuerInfo() public view returns(Issuer memory) {
return _issuer[bondISIN];
}
}
Loading