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

merge latest dylus changes #5

Merged
merged 88 commits into from
Dec 14, 2021
Merged
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
a30b7a3
Update README.md
ErichDylus Jul 7, 2021
d6a49d9
Update README.md
ErichDylus Jul 9, 2021
db1f17b
Update EscrowStablecoin.sol
ErichDylus Jul 12, 2021
af87981
Update Disclosure.md
ErichDylus Jul 13, 2021
2346359
Create AccessByERC20.sol
ErichDylus Jul 14, 2021
6d644f8
Update AccessByERC20.sol
ErichDylus Jul 15, 2021
ef2f540
Update AccessByERC20.sol
ErichDylus Jul 16, 2021
cdebf7d
Update README.md
ErichDylus Jul 16, 2021
bf69d52
Create Foundation Bylaws (DAO).md
ErichDylus Jul 20, 2021
ce10279
Update Foundation Bylaws (DAO).md
ErichDylus Jul 22, 2021
a880f46
Update README.md
ErichDylus Jul 23, 2021
d1c5a8b
Update taxWithholding.sol
ErichDylus Jul 24, 2021
4b82360
Update EscrowStablecoin.sol
ErichDylus Jul 24, 2021
3a6c82f
Delete taxWithholding.sol
ErichDylus Jul 24, 2021
ec37017
Update README.md
ErichDylus Jul 24, 2021
2d7390d
Update ETHescrow.sol
ErichDylus Jul 26, 2021
660aafc
Create NDA.md
ErichDylus Jul 28, 2021
ce3b6b5
Update Grant Agreement (DAO).md
ErichDylus Jul 29, 2021
b3da78c
Create Notice of Termination.md
ErichDylus Aug 9, 2021
4ee8da0
Create Foundation Memorandum of Association.md
ErichDylus Aug 11, 2021
cb48f9e
Update Grant Agreement (DAO).md
ErichDylus Aug 12, 2021
4509bd7
Update EscrowStablecoin.sol
ErichDylus Aug 13, 2021
ad13139
Update EscrowStablecoin.sol
ErichDylus Aug 13, 2021
c99ce7e
Update EscrowStablecoin.sol
ErichDylus Aug 16, 2021
1f12097
Update README.md
ErichDylus Aug 16, 2021
b8a8dbf
Fixing link to https://github.com/lexDAO/LexCorpus/tree/master/contra…
HazardJ Aug 16, 2021
d197d11
Merge pull request #1 from CommonAccord/main
ErichDylus Aug 16, 2021
c721ba8
Adding a Prose Object version of the Open-Source-Law NDA.md
HazardJ Aug 17, 2021
7bea94d
Very rough Prose Objectification of the Foundation Bylaws (DAO).md
HazardJ Aug 17, 2021
38e3d6d
Open-Source-Law - Adding a /PO/Grant_Agreement_DAO - rough Prose Object
HazardJ Aug 20, 2021
b01b0d0
A bit of parameterization of the Grant_Agreement -
HazardJ Aug 20, 2021
1f4e1ea
Update Grant Agreement (DAO).md
ErichDylus Aug 20, 2021
17730f2
Merge branch 'ErichDylus:main' into main
HazardJ Aug 20, 2021
e5843a4
Further Object-ification of Grant Agreement - semantic section names,…
HazardJ Aug 20, 2021
904e47f
Merge branch 'main' of https://github.com/CommonAccord/Open-Source-La…
HazardJ Aug 20, 2021
7808ea2
Parameterizing the Section cross-references {*.Xnum} as hyperlinks.
HazardJ Aug 21, 2021
e927662
Update Grant Agreement (DAO).md
ErichDylus Aug 21, 2021
eda964c
Grant Agreement - making a Demo Acme-Ang - a few cleanup tweaks. (Re…
HazardJ Aug 21, 2021
b01beec
Merge branch 'ErichDylus:main' into main
HazardJ Aug 21, 2021
caea39c
Incorporating updates from https://github.com/ErichDylus/Open-Source-…
HazardJ Aug 21, 2021
1154adf
Deepening for an example of ICC Arbitration.
HazardJ Aug 22, 2021
0b6f448
Merge pull request #2 from CommonAccord/main
ErichDylus Aug 23, 2021
f60aa38
Update stablecoinSplitter.sol
ErichDylus Aug 23, 2021
21aa490
Update Grant Agreement (DAO).md
ErichDylus Aug 24, 2021
3406fb8
Update EscrowStablecoin.sol
ErichDylus Aug 25, 2021
f3a46fc
Update EscrowStablecoin.sol
ErichDylus Aug 28, 2021
7b1abb8
Update EscrowStablecoin.sol
ErichDylus Aug 31, 2021
1f8ec9c
Create taxWithholding.sol
ErichDylus Sep 9, 2021
35d4e2f
Update EscrowStablecoin.sol
ErichDylus Sep 17, 2021
1c9f6f8
Update DE Series LLC Operating Agreement.md
ErichDylus Sep 21, 2021
1a474c0
Update ETHescrow.sol
ErichDylus Sep 23, 2021
e442a00
Update AccessByERC20.sol
ErichDylus Sep 24, 2021
f5e6656
Update AccessByERC20.sol
ErichDylus Sep 24, 2021
4a9112f
Update AccessByERC20.sol
ErichDylus Sep 24, 2021
47b5348
Create InstallmentERC20Escrow.sol
ErichDylus Sep 28, 2021
0c61981
Update InstallmentERC20Escrow.sol
ErichDylus Sep 28, 2021
8b76ed8
Update EscrowStablecoin.sol
ErichDylus Sep 29, 2021
8dc0603
Update EscrowStablecoin.sol
ErichDylus Oct 4, 2021
279699e
Update InstallmentERC20Escrow.sol
ErichDylus Oct 7, 2021
335d225
Create Invoice.md
ErichDylus Oct 12, 2021
f239c91
Update InstallmentERC20Escrow.sol
ErichDylus Oct 13, 2021
26d5275
Update InstallmentERC20Escrow.sol
ErichDylus Oct 14, 2021
40b7ede
Create DealStamp.sol
ErichDylus Oct 19, 2021
177a4f2
Create Single Member LLC Operating Agreement.md
ErichDylus Oct 19, 2021
83e0e30
Update DealStamp.sol
ErichDylus Oct 20, 2021
034cb2f
Update DealStamp.sol
ErichDylus Oct 20, 2021
d254784
Update DealStamp.sol
ErichDylus Oct 21, 2021
839bdda
Create IDealStamp.sol
ErichDylus Oct 22, 2021
c16ec5e
Update DealStamp.sol
ErichDylus Oct 25, 2021
b3b6ee9
Update DealStamp.sol
ErichDylus Oct 26, 2021
c2f9486
Update IDealStamp.sol
ErichDylus Oct 27, 2021
c0d0c8f
Update taxWithholding.sol
ErichDylus Oct 29, 2021
c5f1aab
Update taxWithholding.sol
ErichDylus Nov 2, 2021
2f94d38
Update taxWithholding.sol
ErichDylus Nov 2, 2021
7f58f06
Update taxWithholding.sol
ErichDylus Nov 3, 2021
9cecb76
Update DealStamp.sol
ErichDylus Nov 5, 2021
1be9d1b
Update EscrowStablecoin.sol
ErichDylus Nov 7, 2021
844b00c
Update ETHescrow.sol
ErichDylus Nov 8, 2021
7bd2f32
Update README.md
ErichDylus Nov 12, 2021
f3a30f6
Update Foundation Bylaws (DAO).md
ErichDylus Nov 22, 2021
cd87f23
Update README.md
ErichDylus Nov 30, 2021
913cc99
Update IDealStamp.sol
ErichDylus Dec 1, 2021
5a3816a
Update DealStamp.sol
ErichDylus Dec 1, 2021
d00b097
Update and rename taxWithholding.sol to taxPayment.sol
ErichDylus Dec 2, 2021
d6b95a9
Update DealStamp.sol
ErichDylus Dec 3, 2021
604a109
Update DealStamp.sol
ErichDylus Dec 13, 2021
f83e1fa
Merge branch 'main' into main
ErichDylus Dec 14, 2021
a3e0e69
Revert "Merge branch 'main' into main"
ErichDylus Dec 14, 2021
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
Prev Previous commit
Next Next commit
Update EscrowStablecoin.sol
  • Loading branch information
ErichDylus authored Jul 24, 2021
commit 4b823609bebb14fbddb24b6624212688045805cb
2 changes: 1 addition & 1 deletion solidity/EscrowStablecoin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ contract EscrowStablecoin {
_;
}

//creator initiates escrow with description, deposit amount in USD, seconds until expiry, and designate recipient seller
//creator initiates escrow with description, deposit amount in USD, address of stablecoin, seconds until expiry, and designate recipient seller
constructor(string memory _description, uint256 _deposit, address payable _seller, address _stablecoin, uint256 _secsUntilExpiration) payable {
require(_seller != msg.sender, "Designate different party as seller");
buyer = payable(address(msg.sender));
Expand Down