Overall Updates

README.md

@@ -1,49 +1,38 @@
 # uCollateral
-v1.0
+v0.9.1
+
 uCollateral is a dapp that lets people receive bounties for providing UCASH collateral to the smart contract.  
 
-The collateral provided will be used as a signal of long-term support for the UCASH ecosystem.  3rd party providers will use this information towards issuance of digital currency liquidity to vetted UCASH converters globally.  Although this contract refers to the UCASH input as "collateral", in true usage, only the UCASH liquidity bounty pool will pay any "defaults" in this Version 0.9 of the uCollateral contract.  All user funds input are inaccessible to anyone but the smart-contract and can be reclaimed by the depositing user only (plus/minus any fees accrued).
+The collateral provided will be used as a signal of long-term support for the UCASH ecosystem.  3rd party providers will use this information towards issuance of digital currency liquidity to vetted UCASH converters globally.  Although this contract refers to the UCASH input as "collateral", in true usage, only the UCASH liquidity bounty pool will pay any "defaults" in this Version 0.9 of the uCollateral contract.  All user UCASH input are inaccessible to anyone but the smart-contract and can be reclaimed by the depositing user only (plus/minus any fees accrued).
 
-Periodically, the liquidity bounty pool (not user input funds), will be adjusted to increase or decrease the amount of UCASH in the pool according to liquidity fees, user fees, or defaults received.  Version 1.0 will have additional features to make this process more effective and streamlined.
+Periodically, the liquidity bounty pool will be adjusted to increase or decrease the amount of UCASH in the pool according to liquidity fees, user fees, or defaults received.  Version 1.0 will have additional features which will make this process more effective and streamlined and also have fees on user input UCASH for a more structured collateral type setup.
 
 ---------------------------------------------------------------------------
-# try the Dapp
-
-- Simply go to https://udotcash.github.io/uCollateral/uCollateral.html
-
 # run the Dapp without an oracle
+This option requires the user to call Approve on UCASH contract, then call the uCollateral contract which calls TransferFrom
 
-- clone the repository
+- go to approveAndTransferFrom
 
 ```python -m SimpleHTTPServer 8080```
+to serve ucollateral.html
 
-to serve uCollateral.html
-
-- or simply go to https://udotcash.github.io/uCollateral/uCollateral.html.
-
-
+Only works with web3 provider (i.e. metamask)
 
 ---------------------------------------------------------------------------
 
 # run the Dapp with an oracle
-The oracle allows the user send UCASH directly to the uCollateral contract without a web3 provider (e.g. Metamask).
+This option lets the user send UCASH directly to the uCollateral contract.
 
-- clone the repository
-
-- deploy your own instance of UCOLLATERAL.sol
-
-- modify the contract address in contractInit.js and oracle.js
+- go to DirecttTransfers folder
 
 ```python -m SimpleHTTPServer 8080```
-
 to serve ucollateral.html
 
-- import your private key into oracle.js
-
 ```node oracle.js```
-
 to run the oracle
 
+Works with or without web3 provider. Can send UCASH directly to contract while the oracle is running.
+
 ---------------------------------------------------------------------------
 
 # main link for the dapp: <a href="https://udotcash.github.io/uCollateral/ucollateral.html">Github Link</a>

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

adminPanel.html

@@ -5,14 +5,7 @@
       <script src="../js/contractInit.js"></script>
       <script src="../js/contractFunctions.js"></script>
       <script>
-          var provider = new ethers.providers.Web3Provider(web3.currentProvider,'rinkeby');
-          var _ethers = ethers;
-          provider.listAccounts().then(function(accounts) {
-          initialize(_ethers, accounts);
-          });
-      </script>
-      <script>
-          var provider = new ethers.providers.Web3Provider(web3.currentProvider,'rinkeby');
+          var provider = new ethers.providers.Web3Provider(web3.currentProvider,'mainnet');
           var _ethers = ethers;
           provider.listAccounts().then(function(accounts) {
           initialize(_ethers, accounts);
@@ -22,7 +15,7 @@
       </script>
       <script>
           var counter = 0;
-          window.setInterval("refreshDiv()", 2000);
+          window.setInterval("refreshDiv()", 10000);
           function refreshDiv(){
               updateDapp();
           }
@@ -112,7 +105,7 @@
               signer = provider.getSigner(accounts[0]);
               var _address = signer._address;
               updateContractInfo();
-              document.getElementById("YourAddress").innerHTML = "<span><B>Your Address: </b><a href='https://rinkeby.etherscan.io/address/"+_address+"'>" +_address+ "</a></span>";
+              document.getElementById("YourAddress").innerHTML = "<span><B>Your Address: </b><a href='https://etherscan.io/address/"+_address+"'>" +_address+ "</a></span>";
 
           });
       }