diff --git a/README.md b/README.md index f2c0bd3..d9e2fe6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -sorry i'm working on a readme atm \ checkout blockchain.py inside the gymcoin folder to see implementation \ Read more about this project here: https://medium.com/@nathan_149/making-my-own-cryptocurrency-from-scratch-42e05d4460c2 if you "pip install" all the dependencies in blockchain.py, and then run run.py on one terminal and run2.py on another terminal it should work! diff --git a/gymcoin/startbootstrap-sb-admin-gh-pages/startbootstrap-sb-admin-gh-pages/package-lock.json b/gymcoin/startbootstrap-sb-admin-gh-pages/startbootstrap-sb-admin-gh-pages/package-lock.json index f87cf41..6b4a1b0 100644 --- a/gymcoin/startbootstrap-sb-admin-gh-pages/startbootstrap-sb-admin-gh-pages/package-lock.json +++ b/gymcoin/startbootstrap-sb-admin-gh-pages/startbootstrap-sb-admin-gh-pages/package-lock.json @@ -1,6 +1,6 @@ { "name": "startbootstrap-sb-admin", - "version": "5.0.3", + "version": "5.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1837,30 +1837,10 @@ } }, "follow-redirects": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", - "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", - "dev": true, - "requires": { - "debug": "^3.2.6" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } - } + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "dev": true }, "for-in": { "version": "1.0.2", @@ -1956,7 +1936,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1977,12 +1958,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1997,17 +1980,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2124,7 +2110,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2136,6 +2123,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2150,6 +2138,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2157,12 +2146,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2181,6 +2172,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2261,7 +2253,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2273,6 +2266,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2358,7 +2352,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2394,6 +2389,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2413,6 +2409,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2456,12 +2453,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/gymcoin/storage.py b/gymcoin/storage.py deleted file mode 100644 index bc71cc1..0000000 --- a/gymcoin/storage.py +++ /dev/null @@ -1,28 +0,0 @@ -def register_node(self, address): - parsedUrl = urlparse(address) - self.nodes.add(parsedUrl.netloc) - - #consensus algo - def resolveConflicts(self): - neighbors = self.nodes; - newChain = None; - - maxLength = len(self.chain); - - for node in neighbors: - response = requests.get(f'http://{node}/chain'); - - if response.status_code == 200: - length = response.json()['length']; - chain = response.json()['chain']; - - if length > maxLength and self.isValidChain(): - maxLength = length; - newChain = chain; - - if newChain: - self.chain = self.chainJSONdecode(newChain); - print(self.chain); - return True; - - return False;