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

rolls back change to article IX #15

Merged
merged 3 commits into from
Jun 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions checksums.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
b15749b745ccbbce4a2ef9e6139c84cad131ddd2582713b1f545b7b489e8f394 ./eosio.system/eosio.system.abi
804533704bfa098d2399808a806cb37cc4256da3ce9b0d9a777b3ab21c4fe778 ./eosio.token/eosio.token.abi
2 changes: 1 addition & 1 deletion eosio.system/eosio.system-clause-constitution-rc.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Each Member who makes available a smart contract on this blockchain shall be a D
Multi-lingual contracts must specify one prevailing language in case of dispute and the author of any translation shall be liable for losses due to their false, misleading, or ambiguous attested translations.

# Article IX - Dispute Resolution
All disputes arising out of or in connection with this Constitution shall be finally settled under the Rules of Arbitration of the International Chamber of Commerce by one or more arbitrators appointed in accordance with the said Rules.
All disputes arising out of or in connection with this Constitution shall be finally settled under the Rules of Dispute Resolution of the EOS Core Arbitration Forum by one or more arbitrators appointed in accordance with the said Rules.

# Article X - Choice of Law
Choice of law for disputes shall be, in order of precedence, this Constitution and the Maxims of Equity.
Expand Down
2 changes: 1 addition & 1 deletion eosio.system/eosio.system.abi
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@
"ricardian_clauses": [
{
"id": "constitution",
"body": "This Constitution is a multi-party contract entered into by the Members by virtue of their use of this blockchain.\n\n# Article I - No Initiation of Violence\nMembers shall not initiate violence or the threat of violence against another Member. Lawful prosecution of crimes with the goal of preserving life, liberty and property does not constitute initiation of violence.\n\n# Article II - No Perjury\nMembers shall be liable for losses caused by false or misleading attestations and shall forfeit any profit gained thereby.\n\n# Article III - Rights\nThe Members grant the right of contract and of private property to each other, therefore no property shall change hands except with the consent of the owner, by a valid Arbitrator\u2019s order, or via community referendum. This Constitution creates no positive rights for or between any Members.\n\n# Article IV - No Vote Buying\nNo Member shall offer nor accept anything of value in exchange for a vote of any type, nor shall any Member unduly influence the vote of another.\n\n# Article V - No Fiduciary\nNo Member nor EOS token holder shall have fiduciary responsibility to support the value of the EOS token. The Members do not authorize anyone to hold assets, borrow, nor contract on behalf of EOS token holders collectively. This blockchain has no owners, managers or fiduciaries; therefore, no Member shall have beneficial interest in more than 10% of the EOS token supply.\n\n# Article VI - Restitution\nEach Member agrees that penalties for breach of contract may include, but are not limited to, fines, loss of account, and other restitution.\n\n# Article VII - Open Source\nEach Member who makes available a smart contract on this blockchain shall be a Developer. Each Developer shall offer their smart contracts via a free and open source license, and each smart contract shall be documented with a Ricardian Contract stating the intent of all parties and naming the Arbitration Forum that will resolve disputes arising from that contract.\n\n# Article VIII - Language\nMulti-lingual contracts must specify one prevailing language in case of dispute and the author of any translation shall be liable for losses due to their false, misleading, or ambiguous attested translations.\n\n# Article IX - Dispute Resolution\nAll disputes arising out of or in connection with this Constitution shall be finally settled under the Rules of Arbitration of the International Chamber of Commerce by one or more arbitrators appointed in accordance with the said Rules.\n\n# Article X - Choice of Law\nChoice of law for disputes shall be, in order of precedence, this Constitution and the Maxims of Equity.\n\n# Article XI - Amending\nThis Constitution and its subordinate documents shall not be amended except by a vote of the token holders with no less than 15% vote participation among tokens and no fewer than 10% more Yes than No votes, sustained for 30 continuous days within a 120 day period.\n\n# Article XII - Publishing\nMembers may only publish information to the Blockchain that is within their right to publish. Furthermore, Members voluntarily consent for all Members to permanently and irrevocably retain a copy, analyze, and distribute all broadcast transactions and derivative information.\n\n# Article XIII - Informed Consent\nAll service providers who produce tools to facilitate the construction and signing of transactions on behalf of other Members shall present to said other Members the full Ricardian contract terms of this Constitution and other referenced contracts. Service providers shall be liable for losses resulting from failure to disclose the full Ricardian contract terms to users.\n\n# Article XIV - Severability\nIf any part of this Constitution is declared unenforceable or invalid, the remainder will continue to be valid and enforceable.\n\n# Article XV - Termination of Agreement\nA Member is automatically released from all revocable obligations under this Constitution 3 years after the last transaction signed by that Member is incorporated into the blockchain. After 3 years of inactivity an account may be put up for auction and the proceeds distributed to all Members according to the system contract provisions then in effect for such redistribution.\n\n# Article XVI - Developer Liability\nMembers agree to hold software developers harmless for unintentional mistakes made in the expression of contractual intent, whether or not said mistakes were due to actual or perceived negligence.\n\n# Article XVII - Consideration\nAll rights and obligations under this Constitution are mutual and reciprocal and of equally significant value and cost to all parties.\n\n# Article XVIII - Acceptance\nA contract is deemed accepted when a member signs a transaction which incorporates a TAPOS proof of a block whose implied state incorporates an ABI of said contract and said transaction is incorporated into the blockchain.\n\n# Article XIX - Counterparts\nThis Constitution may be executed in any number of counterparts, each of which when executed and delivered shall constitute a duplicate original, but all counterparts together shall constitute a single agreement.\n\n# Article XX - Interim Constitution\nThis constitution is interim and is intended to remain in effect until a permanent constitution is written and ratified in a referendum.\n"
"body": "This Constitution is a multi-party contract entered into by the Members by virtue of their use of this blockchain.\n\n# Article I - No Initiation of Violence\nMembers shall not initiate violence or the threat of violence against another Member. Lawful prosecution of crimes with the goal of preserving life, liberty and property does not constitute initiation of violence.\n\n# Article II - No Perjury\nMembers shall be liable for losses caused by false or misleading attestations and shall forfeit any profit gained thereby.\n\n# Article III - Rights\nThe Members grant the right of contract and of private property to each other, therefore no property shall change hands except with the consent of the owner, by a valid Arbitrator\u2019s order, or via community referendum. This Constitution creates no positive rights for or between any Members.\n\n# Article IV - No Vote Buying\nNo Member shall offer nor accept anything of value in exchange for a vote of any type, nor shall any Member unduly influence the vote of another.\n\n# Article V - No Fiduciary\nNo Member nor EOS token holder shall have fiduciary responsibility to support the value of the EOS token. The Members do not authorize anyone to hold assets, borrow, nor contract on behalf of EOS token holders collectively. This blockchain has no owners, managers or fiduciaries; therefore, no Member shall have beneficial interest in more than 10% of the EOS token supply.\n\n# Article VI - Restitution\nEach Member agrees that penalties for breach of contract may include, but are not limited to, fines, loss of account, and other restitution.\n\n# Article VII - Open Source\nEach Member who makes available a smart contract on this blockchain shall be a Developer. Each Developer shall offer their smart contracts via a free and open source license, and each smart contract shall be documented with a Ricardian Contract stating the intent of all parties and naming the Arbitration Forum that will resolve disputes arising from that contract.\n\n# Article VIII - Language\nMulti-lingual contracts must specify one prevailing language in case of dispute and the author of any translation shall be liable for losses due to their false, misleading, or ambiguous attested translations.\n\n# Article IX - Dispute Resolution\nAll disputes arising out of or in connection with this Constitution shall be finally settled under the Rules of Dispute Resolution of the EOS Core Arbitration Forum by one or more arbitrators appointed in accordance with the said Rules.\n\n# Article X - Choice of Law\nChoice of law for disputes shall be, in order of precedence, this Constitution and the Maxims of Equity.\n\n# Article XI - Amending\nThis Constitution and its subordinate documents shall not be amended except by a vote of the token holders with no less than 15% vote participation among tokens and no fewer than 10% more Yes than No votes, sustained for 30 continuous days within a 120 day period.\n\n# Article XII - Publishing\nMembers may only publish information to the Blockchain that is within their right to publish. Furthermore, Members voluntarily consent for all Members to permanently and irrevocably retain a copy, analyze, and distribute all broadcast transactions and derivative information.\n\n# Article XIII - Informed Consent\nAll service providers who produce tools to facilitate the construction and signing of transactions on behalf of other Members shall present to said other Members the full Ricardian contract terms of this Constitution and other referenced contracts. Service providers shall be liable for losses resulting from failure to disclose the full Ricardian contract terms to users.\n\n# Article XIV - Severability\nIf any part of this Constitution is declared unenforceable or invalid, the remainder will continue to be valid and enforceable.\n\n# Article XV - Termination of Agreement\nA Member is automatically released from all revocable obligations under this Constitution 3 years after the last transaction signed by that Member is incorporated into the blockchain. After 3 years of inactivity an account may be put up for auction and the proceeds distributed to all Members according to the system contract provisions then in effect for such redistribution.\n\n# Article XVI - Developer Liability\nMembers agree to hold software developers harmless for unintentional mistakes made in the expression of contractual intent, whether or not said mistakes were due to actual or perceived negligence.\n\n# Article XVII - Consideration\nAll rights and obligations under this Constitution are mutual and reciprocal and of equally significant value and cost to all parties.\n\n# Article XVIII - Acceptance\nA contract is deemed accepted when a member signs a transaction which incorporates a TAPOS proof of a block whose implied state incorporates an ABI of said contract and said transaction is incorporated into the blockchain.\n\n# Article XIX - Counterparts\nThis Constitution may be executed in any number of counterparts, each of which when executed and delivered shall constitute a duplicate original, but all counterparts together shall constitute a single agreement.\n\n# Article XX - Interim Constitution\nThis constitution is interim and is intended to remain in effect until a permanent constitution is written and ratified in a referendum.\n"
}
],
"abi_extensions": []
Expand Down
2 changes: 2 additions & 0 deletions ipfs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
added QmdiEnPy2ZprjGe3vfxikg9fNaJR77bbMcVMBwWh64ajCm eosio.system.abi
added QmTgfMfMw2zQgtkeSu7iJfaVcWbmU8werBjYuf6iVseFXL eosio.token.abi
6 changes: 6 additions & 0 deletions scripts/create-checksums.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

# Create sha256 checksums
shasum -a 256 \
./eosio.system/eosio.system.abi \
./eosio.token/eosio.token.abi > checksums.txt
6 changes: 6 additions & 0 deletions scripts/upload-ipfs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

# Upload to ipfs
ipfs add ./eosio.system/eosio.system.abi > ipfs.txt
ipfs add ./eosio.token/eosio.token.abi >> ipfs.txt