Merge pull request #69 from Havven/simple_call_proxy

nUSD System A initial contracts

.gitignore

@@ -1,4 +1,4 @@
 /**/__pycache__/*
 test_settings.py
+deploy_settings.py
 *.pyc
-

README.md

@@ -62,16 +62,15 @@ come at the expense of clarity or simplicity.
 * `deploy.py` for deploying Havven contracts to the blockchain.
 * `run_tests.py` runs the test suite.
 * `contracts/` contains smart contract code to be deployed.
-* `contracts/Court.sol` a court of arbitration to enable the balance of malicious contracts to be democratically confiscated and frozen.
-* `contracts/ExternStateProxyToken.sol` a foundation for generic ERC20 tokens with external state, and which exist behind a proxy.
-* `contracts/TokenState.sol` The balances of the ExternStateProxyToken contract.
-* `contracts/ExternStateProxyFeeToken.sol` a foundation for generic ERC20 tokens which also charge fees on transfers, with external state, and which exist behind a proxy.
-* `contracts/EtherNomin.sol` ether-backed nomin contract, with liquidation and confiscation logic.
-* `contracts/Havven.sol` havven collateral token, including calculations involving entitlements to fees being generated by nomins.
-* `contracts/HavvenEscrow.sol` vesting schedule manager, allows vested havvens to be freed up after certain dates.
 * `contracts/Owned.sol` a contract with an owner.
-* `contracts/Proxy.sol` a proxy contract that can pass function calls through to an underlying contract which implements the "proxyable" interface.
 * `contracts/SafeDecimalMath.sol` a math library for unsigned fixed point decimal arithmetic, with built-in safety checking.
+* `contracts/TokenState.sol` The balances of the DestructibleExternStateToken contract.
+* `contracts/DestructibleExternStateToken.sol` a foundation for generic ERC20 tokens with external state.
+* `contracts/ExternStateFeeToken.sol` a foundation for generic ERC20 tokens which also charge fees on transfers, with external state.
+* `contracts/Nomin.sol` ether-backed nomin contract, with liquidation and confiscation logic.
+* `contracts/Havven.sol` havven collateral token, including calculations involving entitlements to fees being generated by nomins.
+* `contracts/HavvenEscrow.sol` vesting schedule manager, allows vested havvens to be freed up after certain dates.
+* `contracts/Court.sol` a court of arbitration to enable the balance of malicious contracts to be democratically confiscated and frozen.
 * `tests/` test cases.
 * `tests/contracts` contracts used by the test suite.
 * `utils/` helper functions for testing and deployment.