removed usunsed contract bits

morkeltry · Jun 7, 2020 · 5025032 · 5025032
1 parent 12152d5
commit 5025032
Show file tree

Hide file tree

Showing 24 changed files with 1,848 additions and 2,820 deletions.
diff --git a/app/src/Web3/adminPanel.js b/app/src/Web3/adminPanel.js
@@ -1,7 +1,5 @@
 import Web3 from "web3";
 import TokenProxyArtifacts from "../contracts/TokenProxy.json";
-import TokenV0Artifacts from "../contracts/Token_V0.json";
-import TokenV1Artifacts from "../contracts/Token_V1.json";
 import PollArtifacts from "../contracts/PollReference.json";
 import ValidatorArtifacts from "../contracts/MutualAgreement.json";
 
@@ -17,15 +15,9 @@ if (!web3.eth.net)
   console.log(`Did not get web3.eth.net from ${providerUrl}. Maybe check the port number?`);
 
 let NETWORK_ID;
-let TokenV0ABI;
-let TokenV1ABI;
-let TokenV0Address;
-let TokenV1Address;
 let ProxyABI;
 let ProxyAddress;
 let ProxyInstance;
-let TokenV0Instance;
-let TokenV1Instance;
 let PollABI;
 let PollAddress;
 let PollInstance;
@@ -45,14 +37,16 @@ export function connectToWeb3() {
     let unImplementedAddress;
         web3.eth.net.getId(function (err, Id) {
             if (err) reject(err);
+        console.log('err',err);
+        console.log('Id',Id);
             NETWORK_ID = Id;
             console.log(`NETWORK_ID = ${NETWORK_ID}`);
             if (!TokenProxyArtifacts.networks[NETWORK_ID])
               console.log(`TokenProxyArtifacts does not have the current network! ${NETWORK_ID}`);
-            if (!TokenV0Artifacts.networks[NETWORK_ID])
-              console.log(`TokenV0Artifacts does not have the current network! ${NETWORK_ID}`);
-            if (!TokenV1Artifacts.networks[NETWORK_ID])
-              console.log(`TokenV1Artifacts does not have the current network! ${NETWORK_ID}`);
+            // if (!TokenV0Artifacts.networks[NETWORK_ID])
+            //   console.log(`TokenV0Artifacts does not have the current network! ${NETWORK_ID}`);
+            // if (!TokenV1Artifacts.networks[NETWORK_ID])
+            //   console.log(`TokenV1Artifacts does not have the current network! ${NETWORK_ID}`);
             if (!PollArtifacts.networks[NETWORK_ID])
               console.log(`PollArtifacts does not have the current network! ${NETWORK_ID}`);
             if (!ValidatorArtifacts.networks[NETWORK_ID])
@@ -69,47 +63,30 @@ export function connectToWeb3() {
             // console.log(Object.keys(ValidatorArtifacts.networks));
 
             ProxyAddress = TokenProxyArtifacts.networks[NETWORK_ID].address;
-            TokenV0Address = TokenV0Artifacts.networks[NETWORK_ID].address;
-            TokenV1Address = TokenV1Artifacts.networks[NETWORK_ID].address;
             PollAddress = PollArtifacts.networks[NETWORK_ID].address;
             ValidatorAddress = ValidatorArtifacts.networks[NETWORK_ID].address;
 
             ProxyABI = TokenProxyArtifacts.abi;
-            TokenV0ABI = TokenV0Artifacts.abi;
-            TokenV1ABI = TokenV1Artifacts.abi;
             PollABI = PollArtifacts.abi;
             ValidatorABI = ValidatorArtifacts.abi;
 
             ProxyInstance = new web3.eth.Contract(ProxyABI, ProxyAddress);
-            TokenV0Instance = new web3.eth.Contract(TokenV0ABI, ProxyAddress);
-            TokenV1Instance = new web3.eth.Contract(TokenV1ABI, ProxyAddress);
             PollInstance = new web3.eth.Contract(PollABI, ProxyAddress);
             ValidatorInstance = new web3.eth.Contract(ValidatorABI, ProxyAddress);
             getImplementationAddress().then(implementationAddress => {
                 switch (implementationAddress) {
-                    case TokenV0Address:
-                        IMPLEMENTATION_ABI = TokenV0ABI;
-                        IMPLEMENTATION_ADDRESS = TokenV0Address;
-                        IMPLEMENTATION_INSTANCE = TokenV0Instance;
-                        unImplementedAddress = TokenV1Address;
-                        break;
-                    case TokenV1Address:
-                        IMPLEMENTATION_ABI = TokenV1ABI;
-                        IMPLEMENTATION_ADDRESS = TokenV1Address;
-                        IMPLEMENTATION_INSTANCE = TokenV1Instance;
-                        unImplementedAddress = TokenV0Address;
-                        break;
+                    case 'TokenV0Address':
                     case PollAddress:
                         IMPLEMENTATION_ABI = PollABI;
                         IMPLEMENTATION_ADDRESS = PollAddress;
                         IMPLEMENTATION_INSTANCE = PollInstance;
-                        unImplementedAddress = TokenV0Address;
+                        unImplementedAddress = ValidatorAddress;
                         break;
                     case ValidatorAddress:
                         IMPLEMENTATION_ABI = ValidatorABI;
                         IMPLEMENTATION_ADDRESS = ValidatorAddress;
                         IMPLEMENTATION_INSTANCE = ValidatorInstance;
-                        unImplementedAddress = TokenV0Address;
+                        unImplementedAddress = PollAddress;
                         break;
                     default:
                         break;

diff --git a/app/src/contracts/Address.json b/app/src/contracts/Address.json
@@ -2130,7 +2130,7 @@
   },
   "networks": {},
   "schemaVersion": "3.2.0",
-  "updatedAt": "2020-06-07T09:28:55.783Z",
+  "updatedAt": "2020-06-07T10:33:05.607Z",
   "devdoc": {
     "details": "Collection of functions related to the address type",
     "methods": {}

diff --git a/app/src/contracts/BytesLib.json b/app/src/contracts/BytesLib.json
diff --git a/app/src/contracts/Migrations.json b/app/src/contracts/Migrations.json
@@ -68,15 +68,15 @@
       "type": "function"
     }
   ],
-  "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"constant\":true,\"inputs\":[],\"name\":\"last_completed_migration\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"completed\",\"type\":\"uint256\"}],\"name\":\"setCompleted\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"new_address\",\"type\":\"address\"}],\"name\":\"upgrade\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/teide/randomCode/truffletings/proxyBox/contracts/Migrations.sol\":\"Migrations\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/teide/randomCode/truffletings/proxyBox/contracts/Migrations.sol\":{\"keccak256\":\"0xe1e4167faef46be0b46047869de4369183763ba69c852da4e1885b25d198ee1d\",\"urls\":[\"bzz-raw://0ad63e256b5c2a0b0546655d4e7bb16a90920540beb30651b9c2c94568275c1d\",\"dweb:/ipfs/QmXD7Wna7D6KRR6ujKxWcRrAoZdetnSbrcR3EkgVSSdSYi\"]}},\"version\":1}",
-  "bytecode": "0x608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506102b7806100606000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630900f01014610051578063445df0ac146100955780638da5cb5b146100b3578063fdacd576146100fd575b600080fd5b6100936004803603602081101561006757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061012b565b005b61009d6101f7565b6040518082815260200191505060405180910390f35b6100bb6101fd565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101296004803603602081101561011357600080fd5b8101908080359060200190929190505050610222565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156101f45760008190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b1580156101da57600080fd5b505af11580156101ee573d6000803e3d6000fd5b50505050505b50565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561027f57806001819055505b5056fea265627a7a72315820b80b03724a67a567fea1beb68066347f632e249eb69c045a7cb3974cf76d184064736f6c63430005100032",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630900f01014610051578063445df0ac146100955780638da5cb5b146100b3578063fdacd576146100fd575b600080fd5b6100936004803603602081101561006757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061012b565b005b61009d6101f7565b6040518082815260200191505060405180910390f35b6100bb6101fd565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101296004803603602081101561011357600080fd5b8101908080359060200190929190505050610222565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156101f45760008190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b1580156101da57600080fd5b505af11580156101ee573d6000803e3d6000fd5b50505050505b50565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561027f57806001819055505b5056fea265627a7a72315820b80b03724a67a567fea1beb68066347f632e249eb69c045a7cb3974cf76d184064736f6c63430005100032",
+  "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"constant\":true,\"inputs\":[],\"name\":\"last_completed_migration\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"completed\",\"type\":\"uint256\"}],\"name\":\"setCompleted\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"new_address\",\"type\":\"address\"}],\"name\":\"upgrade\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/teide/randomCode/lunchcoin/contracts.v1/contracts/Migrations.sol\":\"Migrations\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/teide/randomCode/lunchcoin/contracts.v1/contracts/Migrations.sol\":{\"keccak256\":\"0xe1e4167faef46be0b46047869de4369183763ba69c852da4e1885b25d198ee1d\",\"urls\":[\"bzz-raw://0ad63e256b5c2a0b0546655d4e7bb16a90920540beb30651b9c2c94568275c1d\",\"dweb:/ipfs/QmXD7Wna7D6KRR6ujKxWcRrAoZdetnSbrcR3EkgVSSdSYi\"]}},\"version\":1}",
+  "bytecode": "0x608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506102b7806100606000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630900f01014610051578063445df0ac146100955780638da5cb5b146100b3578063fdacd576146100fd575b600080fd5b6100936004803603602081101561006757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061012b565b005b61009d6101f7565b6040518082815260200191505060405180910390f35b6100bb6101fd565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101296004803603602081101561011357600080fd5b8101908080359060200190929190505050610222565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156101f45760008190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b1580156101da57600080fd5b505af11580156101ee573d6000803e3d6000fd5b50505050505b50565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561027f57806001819055505b5056fea265627a7a72315820e7392361d571763040d453d523ef2b34ef5177525823e2e7c0b227a2bcc9f13664736f6c63430005100032",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630900f01014610051578063445df0ac146100955780638da5cb5b146100b3578063fdacd576146100fd575b600080fd5b6100936004803603602081101561006757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061012b565b005b61009d6101f7565b6040518082815260200191505060405180910390f35b6100bb6101fd565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101296004803603602081101561011357600080fd5b8101908080359060200190929190505050610222565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156101f45760008190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b1580156101da57600080fd5b505af11580156101ee573d6000803e3d6000fd5b50505050505b50565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561027f57806001819055505b5056fea265627a7a72315820e7392361d571763040d453d523ef2b34ef5177525823e2e7c0b227a2bcc9f13664736f6c63430005100032",
   "sourceMap": "35:480:1:-;;;124:50;8:9:-1;5:2;;;30:1;27;20:12;5:2;124:50:1;159:10;151:5;;:18;;;;;;;;;;;;;;;;;;35:480;;;;;;",
   "deployedSourceMap": "35:480:1:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;35:480:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;348:165;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;348:165:1;;;;;;;;;;;;;;;;;;;:::i;:::-;;83:36;;;:::i;:::-;;;;;;;;;;;;;;;;;;;59:20;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;241:103;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;241:103:1;;;;;;;;;;;;;;;;;:::i;:::-;;348:165;224:5;;;;;;;;;;;210:19;;:10;:19;;;206:26;;;410:19;443:11;410:45;;461:8;:21;;;483:24;;461:47;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;461:47:1;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;461:47:1;;;;231:1;206:26;348:165;:::o;83:36::-;;;;:::o;59:20::-;;;;;;;;;;;;;:::o;241:103::-;224:5;;;;;;;;;;;210:19;;:10;:19;;;206:26;;;330:9;303:24;:36;;;;206:26;241:103;:::o",
   "source": "\npragma solidity >=0.4.21 <0.6.0;\n\ncontract Migrations {\n  address public owner;\n  uint public last_completed_migration;\n\n  constructor() public {\n    owner = msg.sender;\n  }\n\n  modifier restricted() {\n    if (msg.sender == owner) _;\n  }\n\n  function setCompleted(uint completed) public restricted {\n    last_completed_migration = completed;\n  }\n\n  function upgrade(address new_address) public restricted {\n    Migrations upgraded = Migrations(new_address);\n    upgraded.setCompleted(last_completed_migration);\n  }\n}\n",
-  "sourcePath": "/home/teide/randomCode/truffletings/proxyBox/contracts/Migrations.sol",
+  "sourcePath": "/home/teide/randomCode/lunchcoin/contracts.v1/contracts/Migrations.sol",
   "ast": {
-    "absolutePath": "/home/teide/randomCode/truffletings/proxyBox/contracts/Migrations.sol",
+    "absolutePath": "/home/teide/randomCode/lunchcoin/contracts.v1/contracts/Migrations.sol",
     "exportedSymbols": {
       "Migrations": [
         390
@@ -725,7 +725,7 @@
     "src": "1:515:1"
   },
   "legacyAST": {
-    "absolutePath": "/home/teide/randomCode/truffletings/proxyBox/contracts/Migrations.sol",
+    "absolutePath": "/home/teide/randomCode/lunchcoin/contracts.v1/contracts/Migrations.sol",
     "exportedSymbols": {
       "Migrations": [
         390
@@ -1378,39 +1378,15 @@
     "version": "0.5.16+commit.9c3226ce.Emscripten.clang"
   },
   "networks": {
-    "1591056847470": {
+    "1591524599898": {
       "events": {},
       "links": {},
-      "address": "0x61496964f95D4189CAA17274aADD87ac8220D827",
-      "transactionHash": "0x1b610bc3e88707e3dea20e4afb161a3e7f4dbefc7ce3e3b44c9a55d2c98ce4ad"
-    },
-    "1591094846222": {
-      "events": {},
-      "links": {},
-      "address": "0xd49448637374CF53E4EDe45fA8417354d48fc2c1",
-      "transactionHash": "0xce8f9bcbeda163fe58fe8901ca730ec6cce1ee73ac7a6945de235a1e60b90518"
-    },
-    "1591203711132": {
-      "events": {},
-      "links": {},
-      "address": "0x2A369BE5DC11cb6f3B6109826098f7De6409EA5f",
-      "transactionHash": "0x9bf94b338e835a658e309b830a185641e0ff92bd5764fada73a7278e34682b7f"
-    },
-    "1591271821857": {
-      "events": {},
-      "links": {},
-      "address": "0xaA6A8634f36d57253e5518826F4BF023fa95Fb7B",
-      "transactionHash": "0x3a31af9e29347866dd6cf1cee51e5b1d344b4efd8274060da4d48eb16e841490"
-    },
-    "1591285569172": {
-      "events": {},
-      "links": {},
-      "address": "0xF528b5067bF112c50f5dD9bBdBad9391EF8DB050",
-      "transactionHash": "0x910df6c8fa7a712a29044c686581feeec1512dc55e765c5dade3bd932d1e2788"
+      "address": "0x72cFAEf3AB047F9ce651cEFCb895abbAD874e1eb",
+      "transactionHash": "0x09b6ebb7d77fad176039f23e9e73fee15e137b451e96b1d8089451f9f93e011d"
     }
   },
   "schemaVersion": "3.2.0",
-  "updatedAt": "2020-06-07T09:29:13.487Z",
+  "updatedAt": "2020-06-07T10:33:11.456Z",
   "networkType": "ethereum",
   "devdoc": {
     "methods": {}