Merge branch 'v2' of https://github.com/RiseVision/rise-explorer into v2

lib/api/accounts.js

@@ -268,7 +268,7 @@ module.exports = function (app) {
 	function TopAccount() {
 		const getDelegate = (account, cb) => {
 			request.get({
-				url: `${app.get('lisk address')}/api/delegates/get?publicKey=${account.publicKey}`,
+				url: `${app.get('lisk address')}/api/delegates/get?username=${account.username}`,
 				json: true,
 			}, (err, response, body) => {
 				if (err || response.statusCode !== 200) {
@@ -285,7 +285,7 @@ module.exports = function (app) {
 		this.getKnowledge = (account, cb) => {
 			account.knowledge = knowledge.inAccount(account);
 
-			if (!account.knowledge && account.forgingPK) {
+			if (!account.knowledge && account.username) {
 				return getDelegate(account, cb);
 			}
 			return cb(null, account);

lib/api/blocks.js

@@ -145,11 +145,7 @@ module.exports = function (app) {
 			const b = body.block;
 
 			b.confirmations = (height - b.height) + 1;
-<<<<<<< HEAD
-			b.payloadHash = new Buffer.alloc(b.payloadHash).toString('hex');
-=======
-			b.payloadHash = new Buffer.alloc(b.payloadHash, 'hex');
->>>>>>> eefeb0b82819698034d15b5629e572d69be12e95
+			b.payloadHash = new Buffer.alloc(parseInt(b.payloadHash, 10)).toString('hex');
 
 			return body;
 		};

lib/api/delegates.js

@@ -23,7 +23,10 @@ const {cachedRequest} = require('../cachedRequest');
 module.exports = function (app) {
 	const parseDelegates = (delegates) => {
 		_.each(delegates, (d) => {
-			d.productivity = Math.abs(parseFloat(d.productivity)) || 0.0;
+			d.productivity = Math.abs(parseFloat(d.infos.productivity)) || 0.0;
+			// TODO rankV2 isnt stable
+			// d.rate = Math.abs(parseFloat(d.infos.rankV2)) || 0.0;
+			d.rate = Math.abs(parseFloat(d.infos.rankV1)) || 0.0;
 		});
 
 		return delegates;
@@ -148,6 +151,8 @@ module.exports = function (app) {
 		};
 
 		this.getDelegate = function (tx, cb) {
+			// let account = accounts.Account();
+			// let username = account.getAccountByPublicKey(tx.senderPubData);
 			cachedRequest({
 				url: `${app.get('lisk address')}/api/delegates/get?publicKey=${tx.senderPubData}`,
 				json: true,
@@ -156,6 +161,9 @@ module.exports = function (app) {
 					return cb(err || 'Response was unsuccessful');
 				} else if (body.success === true) {
 					tx.delegate = body.delegate;
+					if (body.forgingPKs && body.forgingPKs.length) {
+						tx.forgingPK = body.forgingPKs[body.forgingPKs.length - 1].forgingPK;
+					}
 					return cb();
 				} else if (body.error && body.error === 'Delegate not found') {
 					tx.delegate = {};

lib/api/forgingChance.js

@@ -51,11 +51,12 @@ module.exports = function (app) {
 				(err, res) => {
 					if (err) return cb(err);
 					const toRet = (res[0] || []).concat(res[1] || []).slice(0, M)
+						// TODO why mapped
 						.map((d) => {
 							return {
 								address  : d.address,
 								username : d.username,
-								publicKey: d.forgingPK,
+								forgingPK: d.forgingPK,
 								vote     : d.votesWeight,
 								rank     : d.infos.rankV2,
 							};

sockets/delegateMonitor.js

@@ -91,23 +91,23 @@ module.exports = function (app, connectionHandler, socket) {
 	};
 
 	const findActive = delegate =>
-		data.active.delegates.find(d => d.publicKey === delegate.publicKey);
+		data.active.delegates.find(d => d.forgingPK === delegate.forgingPK);
 
 	const findActiveByBlock = block =>
-		data.active.delegates.find(d => d.publicKey === block.generatorPublicKey);
+		data.active.delegates.find(d => d.forgingPK === block.generatorPublicKey);
 
 	const updateDelegate = (delegate, updateForgingTime) => {
 		// Update delegate with forging time
 		if (updateForgingTime) {
 			// eslint-disable-next-line prefer-const
-			let index = tmpData.nextForgers.delegates.indexOf(delegate.publicKey);
+			let index = tmpData.nextForgers.delegates.indexOf(delegate.forgingPK);
 			delegate.forgingTime = index * app.get('blockTime');
 			if (index === -1) {
 				delegate.forgingTime = 200 * app.get('blockTime'); // Workaround for tables sorting;
 			}
 		}
 
-		delegate.isInRound = tmpData.nextForgers.delegates.indexOf(delegate.publicKey) > -1;
+		delegate.isInRound = tmpData.nextForgers.delegates.indexOf(delegate.forgingPK) > -1;
 		return delegate;
 	};
 
@@ -197,7 +197,7 @@ module.exports = function (app, connectionHandler, socket) {
 			});
 	};
 
-	const delegateName = delegate => `${delegate.username}[${delegate.rate}]`;
+	const delegateName = delegate => `${delegate.username}[${delegate.infos && delegate.infos.productivity || '??'}]`;
 
 	const emitDelegate = (delegate) => {
 		log('info', `Emitting last blocks for: ${delegateName(delegate)}`);
@@ -229,7 +229,15 @@ module.exports = function (app, connectionHandler, socket) {
 			(result, callback) => {
 				// Set last block and his delegate (we will emit it later in emitData)
 				data.lastBlock.block = result.blocks[0];
+
 				const lastBlockDelegate = findActiveByBlock(data.lastBlock.block);
+
+				if (!lastBlockDelegate) {
+					// couldnt find the delegate who minded the last block
+					callback('couldnt find the delegate who minded the last block ID ' + result.blocks[0].id);
+					return;
+				}
+
 				data.lastBlock.block.delegate = {
 					username: lastBlockDelegate.username,
 					address: lastBlockDelegate.address,
@@ -267,7 +275,7 @@ module.exports = function (app, connectionHandler, socket) {
 						return cb(null);
 					}
 					return delegates.getLastBlocks(
-						{ publicKey: delegate.publicKey,
+						{ publicKey: delegate.forgingPK,
 							limit: 1 },
 						(res) => {
 							log('error', `Error retrieving last blocks for: ${delegateName(delegate)}`);

src/components/delegate-monitor/delegate-monitor.service.js

@@ -115,7 +115,7 @@ const DelegateMonitor = function ($scope, $rootScope, forgingMonitor) {
 
 		let found = false;
 		const existing = $scope.activeDelegates.filter((d) => {
-			if (!found && (d.publicKey === delegate.publicKey)) {
+			if (!found && (d.forgingPK === delegate.forgingPK)) {
 				found = true;
 				return true;
 			}
@@ -152,7 +152,7 @@ AppDelegateMonitor.factory('delegateMonitor',
 		});
 
 		ns.on('delegate', (res) => {
-			if (res.publicKey) {
+			if (res.forgingPK) {
 				delegateMonitor.updateLastBlocks(res);
 			}
 		});

src/directives/account-href.js

@@ -48,9 +48,12 @@ const accountHref = AppTools.directive('accountHref', () => {
 			if ($attrs.type === 'sender' || $attrs.type === 'recipient') {
 				username = getUserName($scope, $attrs);
 				id = $scope.accountHref[joinCameCased($attrs.type, 'id')];
-			} else {
+			} else if ($scope.accountHref) {
 				username = $attrs.type === 'delegate' && $scope.accountHref.username;
 				id = $scope.id ? $scope.id : $scope.accountHref.address;
+			} else {
+				username = 'unknown';
+				id = 'unknown';
 			}
 
 			$attrs.$set('href', username ? `/delegate/${id}` : `/address/${id}`);