Merge pull request #761 from nemgrouplimited/dev

Merge Dev -> Main

CHANGELOG.md

@@ -3,7 +3,25 @@ All notable changes to this project will be documented in this file.
 
 The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [v0.7.1[v0.7.1] - 19-Dec-2020
+## [v0.8.0][v0.8.0] - 16-Jan-2021
+
+### Milestone: [[email protected]][[email protected]]
+
+Package  | Version  | Link
+---|---|---
+REST Core| v2.3.0 | [catapult-rest][[email protected]]
+SDK Core| v0.23.0 | [symbol-sdk][[email protected]]
+
+### Added
+- Added compatibility for 0.10.0.5 server.
+- Update SDK. [#753](https://github.com/nemgrouplimited/symbol-explorer/issues/753)
+
+### Fixed
+- Removed NEM Foundation in Explorer [#748](https://github.com/nemgrouplimited/symbol-explorer/issues/748)
+- Do not expose whole ENV in /config [#754](https://github.com/nemgrouplimited/symbol-explorer/issues/754)
+- Minor bug in explorer
+
+## [v0.7.1][v0.7.1] - 19-Dec-2020
 
 ### Milestone: [[email protected]](https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.4)
 
@@ -227,3 +245,8 @@ SDK Core| v0.20.7 | [symbol-sdk](https://www.npmjs.com/package/symbol-sdk)
 [v0.6.2]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.6.2
 [v0.7.0]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.7.0
 [v0.7.1]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.7.1
+[v0.8.0]: https://github.com/nemfoundation/symbol-explorer/releases/tag/v0.8.0
+
+[[email protected]]: https://github.com/nemtech/catapult-server/releases/tag/v0.10.0.5
+[[email protected]]: https://www.npmjs.com/package/symbol-sdk/v/0.23.0
+[[email protected]]: https://github.com/nemtech/catapult-rest/releases/tag/v2.3.0

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at greg@nem.foundation. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at support@nem.group. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

package.json

@@ -2,7 +2,7 @@
   "name": "symbol-explorer",
   "description": "Symbol Block and Network Explorer",
   "homepage": "https://github.com/nemgrouplimited/symbol-explorer",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "scripts": {
     "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -29,7 +29,7 @@
     "leaflet.markercluster": "^1.4.1",
     "merkletreejs": "^0.2.9",
     "moment-timezone": "^0.5.28",
-    "symbol-sdk": "^0.22.2",
+    "symbol-sdk": "^0.23.0",
     "url-parse": "^1.4.7",
     "utf8": "^3.0.0",
     "vue": "^2.6.11",

server.js

@@ -20,7 +20,9 @@ const readConfig = (callback) => {
 			const parsedENV = {};
 			Object.keys(ENV).forEach(key => {
 				try {
-					parsedENV[key] = JSON.parse(ENV[key]);
+					if (defaultConfig[key]) {
+						parsedENV[key] = JSON.parse(ENV[key]);
+					}
 				}
 				catch(e) {
 					parsedENV[key] = ENV[key];
@@ -71,13 +73,13 @@ readConfig(res => {
 		if(req.url === '/')
 			req.url = INDEX_HTML;
 
-		if(req.url === CONFIG_ROUTE) { 
+		if(req.url === CONFIG_ROUTE) {
 			sendJSON(res, ENV);
 		}
 		else {
-			getFile(req.url, 
+			getFile(req.url,
 				() => {
-					getFile(INDEX_HTML, 
+					getFile(INDEX_HTML,
 						err => sendError(res, err, 404),
 						data => send(res, data)
 					);

src/components/NemCopyright.vue

@@ -20,7 +20,7 @@
 	<div class="row">
 		<div class="col-md-12 d-flex justify-content-center">
 			<div class="ftr_btm">
-				<span>NEM.io Foundation 2019</span>
+				<span> © NSL {{ currentYear }}</span>
 				<span>|</span>
 				<span>All Rights Reserved</span>
 				<span>|</span>
@@ -33,6 +33,16 @@
 	</div>
 </template>
 
+<script>
+export default {
+	computed: {
+		currentYear() {
+			return new Date().getFullYear();
+		}
+	}
+};
+</script>
+
 <style lang="scss" scoped>
 span {
     margin: 0 4px;

src/components/fields/MosaicsField.vue

@@ -65,7 +65,7 @@ export default {
 
 		getMosaicName(mosaic) {
 			return mosaic.mosaicAliasName !== 'N/A'
-				? mosaic.mosaicAliasName[0]
+				? mosaic.mosaicAliasName
 				: mosaic.mosaicId;
 		}
 	}

src/config/default.json

@@ -1,13 +1,13 @@
 {
 	"peersApi": {
-		"defaultNode": "http://api-01.eu-central-1.0.10.0.x.symboldev.network:3000",
+		"defaultNode": "http://api-01.ap-northeast-1.testnet.symboldev.network:3000",
 		"nodes": [
-			"http://api-01.ap-northeast-1.0.10.0.x.symboldev.network:3000",
-			"http://api-01.ap-southeast-1.0.10.0.x.symboldev.network:3000",
-			"http://api-01.eu-central-1.0.10.0.x.symboldev.network:3000",
-			"http://api-01.eu-west-1.0.10.0.x.symboldev.network:3000",
-			"http://api-01.us-east-1.0.10.0.x.symboldev.network:3000",
-			"http://api-01.us-west-1.0.10.0.x.symboldev.network:3000"
+			"http://api-01.ap-northeast-1.testnet.symboldev.network:3000",
+			"http://api-01.ap-southeast-1.testnet.symboldev.network:3000",
+			"http://api-01.eu-central-1.testnet.symboldev.network:3000",
+			"http://api-01.eu-west-1.testnet.symboldev.network:3000",
+			"http://api-01.us-east-1.testnet.symboldev.network:3000",
+			"http://api-01.us-west-1.testnet.symboldev.network:3000"
 		]
 	},
 	"apiNodePort": 3000,
@@ -17,7 +17,7 @@
 	},
 	"networkConfig": {
 		"namespaceName": "symbol.xym",
-		"mosaicId": "5B66E76BECAD0860",
+		"mosaicId": "2CF403E85507F39E",
 		"divisibility": "6"
 	},
 	"footer": {
@@ -48,13 +48,8 @@
 				"icon": "IconGithub"
 			},
 			{
-				"href": "http://faucet-0.10.0.x-01.symboldev.network/",
-				"text": "Faucet-01",
-				"icon": "IconHomeCurrencyUsd"
-			},
-			{
-				"href": "http://faucet-0.10.0.x-02.symboldev.network/",
-				"text": "Faucet-02",
+				"href": "http://faucet.testnet.symboldev.network/",
+				"text": "Faucet",
 				"icon": "IconHomeCurrencyUsd"
 			}
 		]

src/helper.js

@@ -501,6 +501,7 @@ class helper {
 
 	  return {
   		...mosaic,
+  		rawAmount: mosaic.amount,
   		mosaicId: mosaic.id.toHex(),
   		amount: this.formatMosaicAmountWithDivisibility(mosaic.amount, http.networkCurrency.divisibility),
   		mosaicAliasName: http.networkCurrency.namespaceName

src/views/Privacy.vue

@@ -22,10 +22,10 @@
 							If after you opt-in, you change your mind, you may withdraw your consent for us to contact you, for the continued collection,
 							use or disclosure of your information, at anytime, by contacting us at
 							<a
-								href="mailto:contact@nemn.io"
+								href="mailto:privacy@nem.io"
 							>
-								<b>contact@nemn.io</b>
-							</a> or mailing us at: NEM.io Foundation Limited. 57 Mohamed Sultan Rd., #01-05, Sultan-Link, Singapore 238997.
+								<b>privacy@nem.io</b>
+							</a> or mailing us at: NEM Group LIMITED, Suite 7, Hadfield House, Library Street, Gibraltar.
 						</p>
 						<h2>Section 3 - Disclosure</h2>
 						<p>We may disclose your personal information if we are required by law to do so or if you violate our Terms of Service.</p>
@@ -59,11 +59,11 @@
 							If you would like to: access, correct, amend or delete any personal information we have about you, register a complaint,
 							or simply want more information contact our Privacy Compliance Officer at
 							<a
-								href="mailto:contact@nemn.io"
+								href="mailto:privacy@nem.io"
 							>
-								<b>contact@nemn.io</b>
+								<b>privacy@nem.io</b>
 							</a>
-							or by mail at NEM.io Foundation Limited. 57 Mohamed Sultan Rd., #01-05, Sultan-Link, Singapore 238997.
+							or by mail at NEM Group LIMITED, Suite 7, Hadfield House, Library Street, Gibraltar.
 						</p>
 					</div>
 				</div>