rebrand wip

kapucoin · Oct 11, 2016 · be8bba3 · be8bba3
1 parent df6dd18
commit be8bba3
Show file tree

Hide file tree

Showing 27 changed files with 293 additions and 1,751 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "test/lisk-js"]
-	path = test/lisk-js
-	url = https://github.com/LiskHQ/lisk-js.git
+[submodule "test/ark-js"]
+	path = test/ark-js
+	url = https://bitbucket.org/arkio/ark-js.git
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Install node modules:
 npm install
 ```
 
-Load git submodule [ark-js](https://github.com/LiskHQ/ark-js):
+Load git submodule [ark-js](PLACEHOLDER):
 
 ```
 git submodule init

diff --git a/app.js b/app.js
@@ -272,12 +272,12 @@ d.run(function () {
 			});
 
 			scope.network.server.listen(scope.config.port, scope.config.address, function (err) {
-				scope.logger.info('Lisk started: ' + scope.config.address + ':' + scope.config.port);
+				scope.logger.info('Ark started: ' + scope.config.address + ':' + scope.config.port);
 
 				if (!err) {
 					if (scope.config.ssl.enabled) {
 						scope.network.https.listen(scope.config.ssl.options.port, scope.config.ssl.options.address, function (err) {
-							scope.logger.info('Lisk https started: ' + scope.config.ssl.options.address + ':' + scope.config.ssl.options.port);
+							scope.logger.info('Ark https started: ' + scope.config.ssl.options.address + ':' + scope.config.ssl.options.port);
 
 							cb(err, scope.network);
 						});

diff --git a/config.json b/config.json
@@ -1,13 +1,9 @@
 {
     "port": 4000,
     "address": "0.0.0.0",
-<<<<<<< HEAD
     "version": "0.1.0",
-=======
-    "version": "0.4.0",
->>>>>>> 0dac98a5277b8a5085f4c76abc54e9dd0a7637e2
     "fileLogLevel": "info",
-    "logFileName": "logs/lisk.log",
+    "logFileName": "logs/ark.log",
     "consoleLogLevel": "debug",
     "trustProxy": false,
     "db": {
@@ -170,8 +166,8 @@
         "options": {
             "port": 443,
             "address": "0.0.0.0",
-            "key": "./ssl/lisk.key",
-            "cert": "./ssl/lisk.crt"
+            "key": "./ssl/ark.key",
+            "cert": "./ssl/ark.crt"
         }
     },
     "nethash":"198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d"

diff --git a/config.main.json b/config.main.json
@@ -3,7 +3,7 @@
     "address": "0.0.0.0",
     "version": "0.3.3",
     "fileLogLevel": "info",
-    "logFileName": "logs/lisk.log",
+    "logFileName": "logs/ark.log",
     "consoleLogLevel": "debug",
     "trustProxy": false,
     "db": {
@@ -85,8 +85,8 @@
         "options": {
             "port": 443,
             "address": "0.0.0.0",
-            "key": "./ssl/lisk.key",
-            "cert": "./ssl/lisk.crt"
+            "key": "./ssl/ark.key",
+            "cert": "./ssl/ark.crt"
         }
     },
     "nethash": "ed14889723f24ecc54871d058d98ce91ff2f973192075c0155ba2b7b70ad2511"

diff --git a/genesisBlock.json b/genesisBlock.json
@@ -1697,57 +1697,7 @@
           "+94b163c5a5ad346db1c84edaff51604164476cf78b8834b6b610dd03bd6b65d9",
           "+6164b0cc68f8de44cde90c78e838b9ee1d6041fa61cf0cfbd834d76bb369a10e",
           "+3476bba16437ee0e04a29daa34d753139fbcfc14152372d7be5b7c75d51bac6c",
-          "+01389197bbaf1afb0acd47bbfeabb34aca80fb372a8f694a1c0716b3398db746",
-          "+aa33af13b440746b4f24312cba5fa910eb077ce6b16b84ebb482cb7720b5c686",
-          "+6f04988de7e63537c8f14e84b0eb51e0ea9c5da8b4b9256243b3e40b1aeccb76",
-          "+07935c642c7409c365258c8488760e96a851cee618aec72eeeb135c9c827f0f9",
-          "+526931663cbee883ff22369172cba091a5dd5fa1200284fa790d7aeca53d37af",
-          "+f7b9751d59dd6be6029aa36a81a3f6436e2970cf4348845ab6254678fb946c18",
-          "+5f6cc5a8aac752d37c676b0d46a798f7625e37dfa1e96091983274e04ab7ffe2",
-          "+9c16751dbe57f4dff7b3fb8911a62c0cb2bdee6240e3f3fefe76832788cb14c6",
-          "+ba2ea5e324eeb42fa6f4d1132a1d79911721e8507033bb0abd49715f531877b4",
-          "+0186d6cbee0c9b1a9783e7202f57fc234b1d98197ada1cc29cfbdf697a636ef1",
-          "+edbb9828fbe62da2a59afbc8623e8ebc5ed2f9b7f77a0cd1cdcf55edea30521c",
-          "+b6ac700bf890b887e218dbd55b8f6b091dfc5a684d0fd7a6f69db7dc0313b51b",
-          "+62bbb3c41e43df73de2c3f87e6577d095b84cf6deb1b2d6e87612a9156b980f8",
-          "+6fb2e0882cd9d895e1e441b9f9be7f98e877aa0a16ae230ee5caceb7a1b896ae",
-          "+9a0f19e60581003b70291cf4a874e8217b04871e676b2c53c85a18ab95c2683b",
-          "+1e6ce18addd973ad432f05f16a4c86372eaca054cbdbcaf1169ad6df033f6b85",
-          "+27f43391cca75cbc82d1750307649508d1d318cd015f1f172b97318f17ab954e",
-          "+644a971f2c0d0d4b657d050fca27e5f9265e3dfa02a71f7fbf834cc2f2a6a4c8",
-          "+cdd68a321ea737e82bce23d2208040f79471d36f2e6f84c74ea36ab26245e522",
-          "+f9f6ff873c10c24eba834be28a56415a49c9c67b7c0ee9f106da827847168986",
-          "+fab7b58be4c1e9542c342023b52e9d359ea89a3af34440bdb97318273e8555f0",
-          "+1b5a93c7622c666b0228236a70ee1a31407828b71bfb6daaa29a1509e87d4d3c",
-          "+74583aba9c0b92e4f08c8c75e6df341c255ca007971195ff64d6f909dc4b7177",
-          "+2b6f49383af36fd9f1a72d5d2708c8c354add89aaea7edc702c420e2d5fdf22e",
-          "+a10ed9c59dac2c4b8264dc34f2d318719fb5f20ecdd8d6be2d7abfe32294f20d",
-          "+c61d0822bbdbfe2a0b5503daff0ce8441c623115c94c0cfcf047a51f8b7160d3",
-          "+031e27beab583e2c94cb3167d128fc1a356c1ae88adfcfaa2334abffa3ae0b4c",
-          "+9986cedd4b5a28e4c81d9b4bff0461dddaa25099df00b8632fe99e88df28ce73",
-          "+03e811dda4f51323ac712cd12299410830d655ddffb104f2c9974d90bf8c583a",
-          "+64db2bce729e302f6021047dfd39b6c53caf83b42da4b5b881cb153a3fb31613",
-          "+f827f60366fae9f9ed65384979de780f4a18c6dbfbefb1c7d100957dde51a06d",
-          "+68680ca0bcd4676489976837edeac305c34f652e970386013ef26e67589a2516",
-          "+f25af3c59ac7f5155c7a9f36762bd941b9dc9c5c051a1bc2d4e34ed773dd04a3",
-          "+d3e3c8348bca51461eabfc382f8a01e8e284db54104ad37ec0695d48ae5531ac",
-          "+3be2eb47134d5158e5f7d52076b624b76744b3fba8aa50791b46ba21408524c9",
-          "+9f2fcc688518324273da230afff9756312bf23592174896fab669c2d78b1533c",
-          "+e818ac2e8e9ffacd2d49f0f2f6739e16711644194d10bb1a8e9e434603125fa1",
-          "+19d55c023d85d6061d1e196fa440a50907878e2d425bcd893366fa04bc23b4de",
-          "+6d462852d410e84ca199a34d7ccad443784471f22cf3de37c531ce3b87ebbc41",
-          "+e6d075e3e396673c853210f74f8fe6db5e814c304bb9cd7f362018881a21f76c",
-          "+0779ca873bbda77f2850965c8a3a3d40a6ee4ec56af55f0a3f16c7c34c0f298b",
-          "+73fec19d4bfe361c0680a7cfd24b3f744a1c1b29d932c4d89ce6157679f8af7d",
-          "+1e82c7db09da2010e7f5fef24d83bc46238a20ef7ecdf12d9f32e4318a818777",
-          "+e42bfabc4a61f02131760af5f2fa0311007932a819a508da25f2ce6af2468156",
-          "+bf9f5cfc548d29983cc0dfa5c4ec47c66c31df0f87aa669869678996902ab47f",
-          "+b137de324fcc79dd1a21ae39a2ee8eed05e76b86d8e89d378f8bb766afb8719f",
-          "+31402977c7eaf9e38d18d0689a45d719d615de941f7e80f6db388453b46f4df5",
-          "+f62062b7590d46f382fb8c37a26ab0a1bd512951777aedcaa96822230727d3a1",
-          "+76c9494237e608d43fd6fb0114106a7517f5503cf79d7482db58a02304339b6c",
-          "+addb0e15a44b0fdc6ff291be28d8c98f5551d0cd9218d749e30ddb87c6e31ca9",
-          "+904c294899819cce0283d8d351cb10febfa0e9f0acd90a820ec8eb90a7084c37"
+          "+01389197bbaf1afb0acd47bbfeabb34aca80fb372a8f694a1c0716b3398db746"
         ]
       },
       "signature": "9f9446b527e93f81d3fb8840b02fcd1454e2b6276d3c19bd724033a01d3121dd2edb0aff61d48fad29091e222249754e8ec541132032aefaeebc312796f69e08",

diff --git a/helpers/constants.js b/helpers/constants.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-	activeDelegates: 101,
+	activeDelegates: 51,
 	addressLength: 208,
 	blockHeaderLength: 248,
 	confirmationLength: 77,

diff --git a/helpers/slots.js b/helpers/slots.js
@@ -3,7 +3,7 @@
 var constants = require('./constants.js');
 
 /**
- * Get time from Lisk epoch.
+ * Get time from Ark epoch.
  * @param {number|undefined} time Time in unix seconds
  * @returns {number}
  */

diff --git a/sql/memoryTables.sql b/sql/memoryTables.sql
@@ -1,4 +1,4 @@
-/* Lisk Memory Tables
+/* Ark Memory Tables
  *
  */
 

diff --git a/sql/runtime.sql b/sql/runtime.sql
@@ -1,4 +1,4 @@
-/* Lisk Runtime
+/* Ark Runtime
  *
  */
 

diff --git a/test/api/accounts.js b/test/api/accounts.js
@@ -29,7 +29,7 @@ describe('GET /api/accounts/getBalance?address=', function () {
 	});
 
 	it('using invalid address should fail', function (done) {
-		getBalance('thisIsNOTALiskAddress', function (err, res) {
+		getBalance('thisIsNOTAArkAddress', function (err, res) {
 			node.expect(res.body).to.have.property('success').to.be.not.ok;
 			node.expect(res.body).to.have.property('error').to.eql('Invalid address');
 			done();
@@ -69,7 +69,7 @@ describe('GET /api/accounts/getPublicKey?address=', function () {
 	});
 
 	it('using invalid address should fail', function (done) {
-		getPublicKey('thisIsNOTALiskAddress', function (err, res) {
+		getPublicKey('thisIsNOTAArkAddress', function (err, res) {
 			node.expect(res.body).to.have.property('success').to.be.not.ok;
 			node.expect(res.body).to.have.property('error').to.contain('Invalid address');
 			done();
@@ -135,7 +135,7 @@ describe('GET /accounts?address=', function () {
 	});
 
 	it('using invalid address should fail', function (done) {
-		getAccounts('thisIsNOTAValidLiskAddress', function (err, res) {
+		getAccounts('thisIsNOTAValidArkAddress', function (err, res) {
 			node.expect(res.body).to.have.property('success').to.be.not.ok;
 			node.expect(res.body).to.have.property('error');
 			node.expect(res.body.error).to.contain('Invalid address');