feat: mainnet (#1087)

* feat: mainnet * feat: set env variables * feat: set env variables
capsulesocial · Jul 21, 2022 · a54e165 · a54e165
1 parent 3908e96
commit a54e165
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/.github/configs/production.env b/.github/configs/production.env
@@ -1,4 +1,4 @@
-CONTRACT_NAME="capsule-beta.testnet"
+CONTRACT_NAME=blogchain.near
 DOMAIN="https://blogchain.app"
 CAPSULE_SERVER="https://blogchain.app/server"
 ORBIT_URL="https://node1.blogchain.app"
@@ -8,4 +8,5 @@ TORUS_DISCORD_VERIFIER="blogchain-app-discord-production"
 TORUS_DISCORD_CLIENTID="947888768269033512"
 TORUS_NETWORK=mainnet
 STRIPE_PUBLISHABLE_KEY=pk_live_51I81pBCPCJ3FaYLGK7rT7mqLsvvFCAOOxdN2RDLt868Oc2Tvrp6MYuyOoPyT6GkZNXvbGY02T5q6IsB8Z6HpE1PN00aopEjYBi
-HCAPTCHA_SITE_KEY="4c2a59d5-cedc-4e81-a646-b769bf50e52c"
+HCAPTCHA_SITE_KEY="4c2a59d5-cedc-4e81-a646-b769bf50e52c"
+NEAR_NETWORK=mainnet
diff --git a/src/backend/utilities/config.ts b/src/backend/utilities/config.ts
@@ -29,7 +29,7 @@ if (parsedTorusNetwork && parsedTorusNetwork !== `mainnet` && parsedTorusNetwork
 }
 export const torusNetwork: TORUS_NETWORK_TYPE = (parsedTorusNetwork as `mainnet` | `testnet` | undefined) || `testnet`
 
-const nearNetwork = process.env.NEAR_NETWORK || `testnet`
+export const nearNetwork = process.env.NEAR_NETWORK || `testnet`
 
 export function nodeUrl() {
 	const preferredNodeUrl = window.localStorage.getItem(`preferredNodeUrl`)

diff --git a/src/components/register/SignUp.vue b/src/components/register/SignUp.vue
@@ -27,6 +27,7 @@ import { getUsernameNEAR, removeNearPrivateKey, walletLogout } from '@/backend/n
 import { MutationType, createSessionFromProfile, namespace as sessionStoreNamespace } from '~/store/session'
 import { setNearUserFromPrivateKey, login, register, IAuthResult, IWalletStatus } from '@/backend/auth'
 import { ValidationError } from '@/errors'
+import { nearNetwork } from '@/backend/utilities/config'
 
 interface IData {
 	funds: string
@@ -71,7 +72,7 @@ export default Vue.extend({
 			}
 			if (this.userInfo.type === `near`) {
 				// If the key exists we can login him
-				const pk = window.localStorage.getItem(`near-api-js:${this.userInfo.accountId}:testnet`)
+				const pk = window.localStorage.getItem(`near-api-js:${this.userInfo.accountId}:${nearNetwork}`)
 				if (pk) {
 					this.username = username
 					await this.verify(this.username)

diff --git a/src/plugins/backend.ts b/src/plugins/backend.ts
@@ -5,6 +5,18 @@ import { initContract, initNear, initWalletConnection } from '@/backend/near'
 
 const backend: Plugin = async (context) => {
 	try {
+		// If the user has refreshed or backtracked etc
+		for (let i = 0; i < localStorage.length; i++) {
+			const key = localStorage.key(i)
+			if (key && key.startsWith(`near-api-js:keystore`)) {
+				if (key.endsWith(`testnet`)) {
+					const privateKey = localStorage.getItem(key)
+					if (privateKey) {
+						localStorage.setItem(key.replace(`testnet`, `mainnet`), privateKey)
+					}
+				}
+			}
+		}
 		await initNear()
 		const libsodium = initLibSodium()
 		libsodium.initResult.catch((err: unknown) => {