Merge pull request #3 from ConcealNetwork/master

v0.1.3
aivve · Feb 9, 2022 · 1c2f584 · 1c2f584
2 parents 18e6e36 + 51dddce
commit 1c2f584
Show file tree

Hide file tree

Showing 36 changed files with 221 additions and 217 deletions.
diff --git a/README.md b/README.md
@@ -45,10 +45,9 @@ Developers:
 - Ukrainian: [Aiwe](https://github.com/aivve)
 
 # Contributing
-- You can help Karbo by translation the wallet in your native language, it's really easy!  
+- You can help Conceal Network by translation the wallet in your native language, it's really easy!  
 Read [the translations guide](TRANSLATIONS.md) to get instructions on how to do that
 - Report bugs & ideas to help us improve the web wallet by opening an issue 
-- [Make a donation to Karbo](https://wallet.karbo.org/#!donate)
 
 # Forks / Other Coins
 We have been receiving multiple coin developers help to fork it. As the time required to develop this project is heavy, please consider giving a mention to this project if you fork it.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "karbowebwallet",
+  "name": "ConcealWallet",
   "version": "1.1.0",
-  "description": "Fully client-side web-wallet for Karbo",
+  "description": "Fully client-side web-wallet for Conceal Network",
   "main": "index.js",
   "dependencies": {
     "typescript": "^3.9.0",
@@ -10,12 +10,12 @@
   "devDependencies": {},
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Karbovanets/karbo-webwallet-js.git"
+    "url": "git+https://github.com/ConcealNetwork/conceal-web-wallet.git"
   },
   "author": "Gnock,Aiwe,Alex,ExploShot",
   "license": "BSD-3",
   "bugs": {
-    "url": "https://github.com/Karbovanets/Karbo-webwallet-js/issues"
+    "url": "https://github.com/ConcealNetwork/conceal-web-wallet/issues"
   },
-  "homepage": "https://github.com/Karbovanets/Karbo-webwallet-js#readme"
+  "homepage": "https://github.com/ConcealNetwork/conceal-web-wallet#readme"
 }
diff --git a/src/CNAME b/src/CNAME
@@ -1 +1 @@
-wallet.karbo.org
+wallet.conceal.network
diff --git a/src/api.html b/src/api.html
@@ -17,11 +17,11 @@
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-	<title>Karbo API</title>
+	<title>Conceal Network API</title>
 </head>
 <body>
 
-<h1>Karbo Wallet API relay</h1>
+<h1>Conceal Network Wallet API relay</h1>
 
 <script src="lib/biginteger.js"></script>
 <script src="config.js"></script>

diff --git a/src/config.ts b/src/config.ts
@@ -2,18 +2,18 @@
 let global : any = typeof window !== 'undefined' ? window : self;
 global.config = {
 	apiUrl: [
-        "http://wallet.conceal.network/api/"
+        "http://walletapi.conceal.network/"
     ],
     nodeList: [
-        "https://explorer.conceal.network/daemon/"
+        "https://explorer.conceal.network/index.html#nodes"
     ],
 	nodeUrl: "",
 	mainnetExplorerUrl: "https://explorer.conceal.network/",
 	mainnetExplorerUrlHash: "https://explorer.conceal.network/index.html?hash={ID}#blockchain_transaction",
 	mainnetExplorerUrlBlock: "https://explorer.conceal.network/index.html?hash={ID}#blockchain_block",
-	testnetExplorerUrl: "http://testnet.conceal.network/",
-	mainnetExplorerUrlHash: "https://testnet.conceal.network/index.html?hash={ID}#blockchain_transaction",
-	mainnetExplorerUrlBlock: "https://testnet.conceal.network/index.html?hash={ID}#blockchain_block",
+	testnetExplorerUrl: "http://explorer.testnet.conceal.network/",
+	mainnetExplorerUrlHash: "https://explorer.testnet.conceal.network/index.html?hash={ID}#blockchain_transaction",
+	mainnetExplorerUrlBlock: "https://explorer.testnet.conceal.network/index.html?hash={ID}#blockchain_block",
 	testnet: false,
     coinUnitPlaces: 6,
     coinDisplayUnitPlaces: 6,

diff --git a/src/index.html b/src/index.html
@@ -2,8 +2,8 @@
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-	<title>Karbo Wallet</title>
-	<meta property="og:title" content="Karbo Wallet" />
+	<title>Conceal Network Wallet</title>
+	<meta property="og:title" content="Conceal Network Wallet" />
 	<meta property="twitter:title" content="" />
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -22,7 +22,7 @@
 	<!-- Add to home screen for Safari on iOS -->
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">
-	<meta name="apple-mobile-web-app-title" content="Karbo">
+	<meta name="apple-mobile-web-app-title" content="Conceal Network">
 
 	<link rel="icon" href="./assets/img/favicon.ico" />
 	<link rel="apple-touch-icon" href="assets/img/icons/icon-152x152.png">
@@ -38,13 +38,13 @@
 	<meta property="twitter:description" content="" />
 
 	<meta property="og:type" content="website" />
-	<meta property="og:url" content="https://wallet.karbo.org/" />
-	<meta property="og:image" content="https://wallet.karbo.org/assets/img/icons/icon-402x402.png" />
+	<meta property="og:url" content="https://wallet.conceal.network/" />
+	<meta property="og:image" content="https://wallet.conceal.network/assets/img/icons/icon-402x402.png" />
 
 	<meta property="twitter:card" content="summary" />
-	<meta property="twitter:site" content="https://wallet.karbo.org/" />
+	<meta property="twitter:site" content="https://wallet.conceal.network/" />
 
-	<meta property="twitter:creator" content="@krbcoin" />
+	<meta property="twitter:creator" content="@CCXcoin" />
 
 	<meta name="fragment" content="!">
 
@@ -56,7 +56,7 @@
 </div>
 
 <div id="menu">
-	<a id="menu_logo"><img src="./assets/img/coin_white.png" alt="&#1180;"/> Karbo</a>
+	<a id="menu_logo"><img src="./assets/img/coin_white.png" alt="&#1180;"/> Conceal Network</a>
 	<a href="#!index" class="onlyNotConnected"><span class="icon" ><i class="fa fa-home" aria-hidden="true"></i></span> {{ $t("menu.home") }}</a>
 	<a href="#!account" class="onlyWhenConnected"><span class="icon" ><i class="fa fa-tachometer" aria-hidden="true"></i></span> {{ $t("menu.account") }}</a>
 	<a href="#!send" class="onlyWhenConnected notViewOnlyWallet"><span class="icon" ><i class="fa fa-paper-plane" aria-hidden="true"></i></span> {{ $t("menu.send") }}</a>
@@ -76,7 +76,7 @@
 <div id="page" ></div>
 
 <div id="copyright" v-cloak="">
-	<div>© 2018-2021 www.karbo.org</div>
+	<div>© 2018-2021 www.Conceal Network.org</div>
 	<div class="links" >
 		<select v-model="language" class="hideOnNative">
 			<option value="en">English</option>
@@ -99,8 +99,8 @@
 		<a href="#!support" >{{ $t("bottom.support") }}</a>
 		<a class="hideOnNative" href="#!donate" >{{ $t("bottom.donate") }}</a>
 		<a class="hideOnNative" href="#!network" >{{ $t("bottom.network") }}</a>
-		<!--a class="hideOnNative" href="https://pool.karbowanec.com" target="_blank" >{{ $t("bottom.miningPool") }}</a-->
-		<a class="hideOnNative" href="https://github.com/Karbovanets/karbo-webwallet-js" target="_blank">{{ $t("bottom.github") }}</a>
+		<!--a class="hideOnNative" href="https://pool.conceal.network" target="_blank" >{{ $t("bottom.miningPool") }}</a-->
+		<a class="hideOnNative" href="https://github.com/ConcealNetwork/conceal-web-wallet" target="_blank">{{ $t("bottom.github") }}</a>
 	</div>
 	<div class="cb" ></div>
 </div>

diff --git a/src/index.ts b/src/index.ts
@@ -230,7 +230,7 @@ Y88b.      888                       888    This is a browser feature intended f
     "Y88b. 888    d88""88b 888 "88b  888    something here to enable a feature 
       "888 888    888  888 888  888  Y8P    or "hack" someone\'s account, it is a 
 Y88b  d88P Y88b.  Y88..88P 888 d88P         scam and will give them access to your 
- "Y8888P"   "Y888  "Y88P"  88888P"   888    Karbo Wallet!
+ "Y8888P"   "Y888  "Y88P"  88888P"   888    Conceal Network Wallet!
                            888              
                            888              
                            888              

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "Karbo Web Wallet",
-  "short_name": "KarboWallet",
+  "name": "Conceal Network Web Wallet",
+  "short_name": "Conceal Wallet",
   "icons": [{
 	"src": "assets/img/icons/icon-128x128.png",
 	"sizes": "128x128",

diff --git a/src/model/CoinUri.ts b/src/model/CoinUri.ts
@@ -15,8 +15,8 @@
 
 export class CoinUri{
 
-	static coinTxPrefix = 'karbowanec:';
-	static coinWalletPrefix = 'karbowanec:';
+	static coinTxPrefix = 'conceal:';
+	static coinWalletPrefix = 'conceal:';
 	static coinAddressLength = 95;
 
 	static decodeTx(str : string) : {

diff --git a/src/model/Wallet.ts b/src/model/Wallet.ts
@@ -29,7 +29,7 @@ export class WalletOptions{
 	checkMinerTx:boolean = false;
 	readSpeed:number = 10;
 	customNode:boolean = false;
-	nodeUrl:string = 'http://node.karbo.io:32348/';
+	nodeUrl:string = 'http://node.conceal.network:32348/';
 
 	static fromRaw(raw : RawWalletOptions){
 		let options = new WalletOptions();

diff --git a/src/model/WalletRepository.ts b/src/model/WalletRepository.ts
@@ -184,11 +184,11 @@ export class WalletRepository{
 		doc.setTextColor(255, 255, 255);
 		doc.setFontSize(10);
 		doc.text(110, 120, "To deposit funds to this paper wallet, send ");
-		doc.text(110, 125, "Karbo to the public address");
+		doc.text(110, 125, "Conceal Network to the public address");
 
 		doc.text(110, 135, "DO NOT REVEAL THE PRIVATE KEY");
 
-		//adding karbo logo
+		//adding Conceal Network logo
 		let c : HTMLCanvasElement|null = <HTMLCanvasElement>document.getElementById('canvasExport');
 		if(c !== null) {
 			let ctx = c.getContext("2d");

diff --git a/src/model/WalletWatchdog.ts b/src/model/WalletWatchdog.ts
@@ -1,7 +1,7 @@
 /**
  *     Copyright (c) 2018-2020, ExploShot
  *     Copyright (c) 2018-2020, The Qwertycoin Project
- *     Copyright (c) 2018-2020, The Karbo
+ *     Copyright (c) 2018-2020, The Conceal Network
  *
  *     All rights reserved.
  *     Redistribution and use in source and binary forms, with or without modification,

diff --git a/src/pages/account.html b/src/pages/account.html
@@ -22,9 +22,9 @@
 			<div class="body" >
 				<div class="header-title" >{{ $t("accountPage.balanceBlock.title") }}</div>
 				<div class="content" >
-					<span class="walletAmount" >{{ $n(walletAmount / currencyDivider) }}</span> KRB
+					<span class="walletAmount" >{{ $n(walletAmount / currencyDivider) }}</span> CCX
 					<tempate class="amount unlocked" v-if="unlockedWalletAmount !== walletAmount" >
-						<br/>{{ $t("accountPage.balanceBlock.unlocked") }}: <span class="walletAmount" >{{ $n(unlockedWalletAmount / currencyDivider) }}</span> KRB
+						<br/>{{ $t("accountPage.balanceBlock.unlocked") }}: <span class="walletAmount" >{{ $n(unlockedWalletAmount / currencyDivider) }}</span> CCX
 					</tempate>
 				</div>
 			</div>

diff --git a/src/pages/donate.html b/src/pages/donate.html
@@ -13,7 +13,7 @@
 				<div class="header-title" >{{ $t("donatePage.webwalletBlock.title") }}</div>
                 <div class="content">
                     <span v-html="$t('donatePage.webwalletBlock.content')"></span>
-                    <b>Karbo:</b> <a href="#send?address=KarBo7DQFVyCpMcb1Zk8nLR1xjPdAmo9jJ27mwX7pbgD7nHrra5uRgJdwGmUyinzb5cYrumqLW7Av539Jm46tXHYQfrYyW2">KarBo7DQFVyCpMcb1Zk8nLR1xjPdAmo9jJ27mwX7pbgD7nHrra5uRgJdwGmUyinzb5cYrumqLW7Av539Jm46tXHYQfrYyW2</a></span><br />
+                    <b>Conceal:</b> <a href="#send?address=ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj">ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj</a></span><br />
                     <b>Monero: </b>4AiWeKjAJ6KWUgr5TRHJHTAV5ZaeJ7kj8Kfb7bh9X3HA9KPCBWgp32Rd4J2Ho1zTeUQAQb2YZqTHRC3KTznzCt4oEnSbx7N<br />
                     <b>Bitcoin: </b>1Aiwe1sPZiGTCeev1QVFa3KNiMTkjRM6oz<br />
                 </div>

diff --git a/src/pages/importFromMnemonic.ts b/src/pages/importFromMnemonic.ts
@@ -2,6 +2,8 @@
  * Copyright (c) 2018, Gnock
  * Copyright (c) 2018, The Masari Project
  * Copyright (c) 2022, The Karbo Developers
+ * Copyright (c) 2022, Conceal Devs
+ * Copyright (c) 2022, Conceal Network
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
  *

diff --git a/src/pages/index.html b/src/pages/index.html
@@ -2,7 +2,7 @@
 	<div class="hideOnNonNative">
 		<div class="mainBlock">
 			<div class="actions">
-				<img src="./assets/img/logo.png" alt="Karbo"/>
+				<img src="./assets/img/logo.png" alt="Conceal Network"/>
 			</div>
 			<div class="headline">
 				<h1>{{ $t("homepage.mainTitle") }}</h1>
@@ -18,7 +18,7 @@ <h2>{{ $t("homepage.tagLine") }}</h2>
 	<div class="hideOnNative">
 		<div class="mainBlock">
 			<div class="actions">
-				<span id="main_logo"><img src="./assets/img/coin_white.png" alt="&#1180;"/> Karbo</span>
+				<span id="main_logo"><img src="./assets/img/coin_white.png" alt="&#1180;"/> Conceal Network</span>
 				<div class="right">
 					<a href="#" @click="loadWallet()" v-if="hasLocalWallet" class="btn mini basic">{{ $t("homepage.actions.loadWallet") }}</a>
 					<a href="#!import" class="btn mini">{{ $t("homepage.actions.importWallet") }}</a>
@@ -62,7 +62,7 @@ <h4>{{ $t("homepage.notes.technology.description") }}</h4>
 					<div class="block">
 						<i class="fa fa-code" aria-hidden="true"></i><br/>
 						<h3>{{ $t("homepage.notes.openSource.title") }}</h3>
-						<a href="https://github.com/Karbovanets/karbo-webwallet-js" target="_blank" rel="nofollow"><h4>{{ $t("homepage.notes.openSource.description") }}</h4></a>
+						<a href="https://github.com/ConcealNetwork/conceal-web-wallet" target="_blank" rel="nofollow"><h4>{{ $t("homepage.notes.openSource.description") }}</h4></a>
 					</div>
 				</div>
 			</div>

diff --git a/src/pages/network.html b/src/pages/network.html
@@ -16,7 +16,7 @@
 					<div>{{ $t("networkPage.statsBlock.height") }}: {{blockchainHeight}}</div>
 					<div>{{ $t("networkPage.statsBlock.difficulty") }}: {{networkDifficulty}}</div>
 					<div>{{ $t("networkPage.statsBlock.lastTimeBlock") }}: {{ $d(new Date(lastBlockFound*1000), 'long')}}</div>
-					<div>{{ $t("networkPage.statsBlock.lastReward") }}: {{lastReward}} KRB</div>
+					<div>{{ $t("networkPage.statsBlock.lastReward") }}: {{lastReward}} CCX</div>
 				</div>
 			</div>
 		</div>

diff --git a/src/pages/send.html b/src/pages/send.html
@@ -38,7 +38,7 @@ <h2 class="text" >{{ $t("sendPage.qrCodeScanning.explication") }}</h2>
 
 					<div class="field" >
 						<label>{{ $t("sendPage.sendBlock.amount.label") }}</label>
-						<input class="amountInput" type="text" v-model="amountToSend" placeholder="10.5 KRB" :readonly="lockedForm"/>
+						<input class="amountInput" type="text" v-model="amountToSend" placeholder="10.5 CCX" :readonly="lockedForm"/>
 						<div v-if="!amountToSendValid && amountToSend != ''" class="message error">
 							{{ $t("sendPage.sendBlock.amount.invalid") }}
 						</div>

diff --git a/src/pages/send.ts b/src/pages/send.ts
@@ -1,6 +1,9 @@
 /*
  * Copyright (c) 2018, Gnock
  * Copyright (c) 2018, The Masari Project
+ * Copyright (c) 2022, The Karbo Developers
+ * Copyright (c) 2022, Conceal Devs
+ * Copyright (c) 2022, Conceal Network
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
  *
@@ -302,9 +305,9 @@ class SendView extends DestructableView {
 
 						let promise = Promise.resolve();
 						if (
-							destinationAddress === 'Kdev1L9V5ow3cdKNqDpLcFFxZCqu5W2GE9xMKewsB2pUXWxcXvJaUWHcSrHuZw91eYfQFzRtGfTemReSSMN4kE445i6Etb3' ||
-							destinationAddress === 'KarBo7DQFVyCpMcb1Zk8nLR1xjPdAmo9jJ27mwX7pbgD7nHrra5uRgJdwGmUyinzb5cYrumqLW7Av539Jm46tXHYQfrYyW2' ||
-							destinationAddress === 'KdevxwLgUts7BVfWKFWrFWXLjfX6xf2HcbPP7jTirKhj1SWudNYFeKiHuLGRK4USLiBnaKPbNf7oj6iDNLgnn4Z45LhwtBi'
+							destinationAddress === 'ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj' ||
+							destinationAddress === 'ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj' ||
+							destinationAddress === 'ccx7V4LeUXy2eZ9waDXgsLS7Uc11e2CpNSCWVdxEqSRFAm6P6NQhSb7XMG1D6VAZKmJeaJP37WYQg84zbNrPduTX2whZ5pacfj'
 						) {
 							promise = swal({
 								type: 'success',

diff --git a/src/pages/settings.html b/src/pages/settings.html
@@ -52,7 +52,7 @@
 					</div>
 					<div class="field">
 						<label>{{ $t("settingsPage.settingsBlock.nodeUrl.label") }}</label>
-						<input type="url" placeholder="http://node.karbo.io:32348/" v-model="nodeUrl" />
+						<input type="url" placeholder="http://node.conceal.network:32348/" v-model="nodeUrl" />
 					</div>
 					<div class="actions tc">
 						<button @click="updateConnectionSettings()" class="btn" >{{ $t("settingsPage.walletSettings.updateButton") }}</button>

diff --git a/src/pages/settings.ts b/src/pages/settings.ts
@@ -36,7 +36,7 @@ class SendView extends DestructableView{
 	@VueVar(false) checkMinerTx !: boolean;
 
 	@VueVar(false) customNode !: boolean;
-	@VueVar('http://node.karbo.io:32348/') nodeUrl !: string;
+	@VueVar('http://node.conceal.network:32348/') nodeUrl !: string;
 
 	@VueVar(0) creationHeight !: number;
 	@VueVar(0) scanHeight !: number;

diff --git a/src/pages/termsOfUse.html b/src/pages/termsOfUse.html
@@ -15,11 +15,11 @@
 					It is understood that interactions with masariwallet.com’s web wallet are entirely client-side. <br/>
 					That masariwallet.com has no control or access to your wallet’s private keys, nor do they have the ability to recover your funds in any event of loss.<br/>
 
-					In all circumstances, wallet.karbo.org, Karbo Core Team, Karbo promoters, or any entity affiliated with the Karbo project will not be liable for loss or misuse of funds held using the aforementioned wallet.<br/>
-					Users also understand and agree that they are solely responsible for providing a secure environment to interact with a Karbowallet.com web wallet.<br/>
+					In all circumstances, wallet.conceal.network, Conceal Network Core Team, Conceal Network promoters, or any entity affiliated with the Conceal Network project will not be liable for loss or misuse of funds held using the aforementioned wallet.<br/>
+					Users also understand and agree that they are solely responsible for providing a secure environment to interact with a Conceal.Network web wallet.<br/>
 
-					Additionally, Karbowallet.com cannot, and will not, be held liable for use of funds originating from or arriving to a web wallet.<br/>
-					By creating, importing, or interacting with a wallet on Karbowallet.com, you implicitly agree to these terms, and absolve the website owners and affiliates of any and all liability.
+					Additionally, Conceal.Network cannot, and will not, be held liable for use of funds originating from or arriving to a web wallet.<br/>
+					By creating, importing, or interacting with a wallet on Conceal.Network, you implicitly agree to these terms, and absolve the website owners and affiliates of any and all liability.
 					<br/>
 					<a href="#!privacyPolicy" >Privacy policy (EN)</a>
 				</div>