diff --git a/Desktop/DesktopApp.js b/Desktop/DesktopApp.js index 78a592757..df7d7f570 100644 --- a/Desktop/DesktopApp.js +++ b/Desktop/DesktopApp.js @@ -41,7 +41,7 @@ exports.newDesktopApp = function newDesktopApp() { console.log('Desktop Client Web Sockets Interface ....................................... Listening at port ' + global.env.DESKTOP_WEB_SOCKETS_INTERFACE_PORT) - thisObject.webSocketsClient = DK.projects.socialTrading.modules.httpInterface.newDesktopModulesHttpInterface() + thisObject.httpInterface = DK.projects.socialTrading.modules.httpInterface.newDesktopModulesHttpInterface() thisObject.httpInterface.initialize() console.log('Desktop Client Http Interface .............................................. Listening at port ' + global.env.DESKTOP_HTTP_INTERFACE_PORT) diff --git a/Projects/Education/UI/Function-Libraries/DocsStats.js b/Projects/Education/UI/Function-Libraries/DocsStatisticsFunctions.js similarity index 95% rename from Projects/Education/UI/Function-Libraries/DocsStats.js rename to Projects/Education/UI/Function-Libraries/DocsStatisticsFunctions.js index a52432f75..7858aae97 100644 --- a/Projects/Education/UI/Function-Libraries/DocsStats.js +++ b/Projects/Education/UI/Function-Libraries/DocsStatisticsFunctions.js @@ -1,4 +1,4 @@ -function newEducationFunctionLibraryDocsStats() { +function newEducationFunctionLibraryDocsStatisticsFunctions() { let thisObject = { printDocsStats: printDocsStats } diff --git a/Projects/Network/SA/Modules/UserProfiles.js b/Projects/Network/SA/Modules/UserProfiles.js index c9493dc31..26052d734 100644 --- a/Projects/Network/SA/Modules/UserProfiles.js +++ b/Projects/Network/SA/Modules/UserProfiles.js @@ -64,7 +64,8 @@ exports.newNetworkModulesUserProfiles = function newNetworkModulesUserProfiles() let config = JSON.parse(signingAccount.config) let signatureObject = config.signature let web3 = new SA.nodeModules.web3() - let blockchainAccount = web3.eth.accounts.recover(signatureObject) + let blockchainAccount = web3.eth.accounts.recover(signatureObject) + SA.projects.network.globals.memory.maps.USER_PROFILES_BY_BLOKCHAIN_ACCOUNT.set(blockchainAccount, userProfile) /* If the Signing Account is for a P2P node, we will add the node to the array of available nodes at the p2p network. */ @@ -84,7 +85,7 @@ exports.newNetworkModulesUserProfiles = function newNetworkModulesUserProfiles() } if (config.webSocketsPort === undefined) { continue - } + } p2pNetworkNode = SA.projects.network.modules.p2pNetworkNode.newNetworkModulesP2PNetworkNode() p2pNetworkNode.initialize(signingAccount.signingAccountChild, userProfile, blockchainAccount) diff --git a/Projects/Network/SA/Modules/WebSocketsNetworkClient.js b/Projects/Network/SA/Modules/WebSocketsNetworkClient.js index 15b34ecba..c7628e1f9 100644 --- a/Projects/Network/SA/Modules/WebSocketsNetworkClient.js +++ b/Projects/Network/SA/Modules/WebSocketsNetworkClient.js @@ -36,7 +36,7 @@ exports.newNetworkModulesWebSocketsNetworkClient = function newNetworkModulesWeb await setUpWebsocketClient(callerRole, p2pNetworkNode) } - async function setUpWebsocketClient(callerRole) { + async function setUpWebsocketClient(callerRole, p2pNetworkNode) { return new Promise(connectToNewtwork) @@ -167,7 +167,7 @@ exports.newNetworkModulesWebSocketsNetworkClient = function newNetworkModulesWeb */ socketClient.onmessage = socketMessage => { stepTwoResponse(socketMessage) } - let signature = web3.eth.accounts.sign(JSON.stringify(signedMessage), SA.secrets.map.get(global.env.DESKTOP_APP_SIGNING_ACCOUNT).userProfileHandle) + let signature = web3.eth.accounts.sign(JSON.stringify(signedMessage), SA.secrets.map.get(global.env.DESKTOP_APP_SIGNING_ACCOUNT).privateKey) let message = { messageType: 'Handshake', diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index 49ec0b489..2182d5c83 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -1093,7 +1093,7 @@ { "name": "Docs Statistics Functions", "propertyName": "docsStatisticsFunctions", - "functionName": "newEducationFunctionLibraryDocsStats" + "functionName": "newEducationFunctionLibraryDocsStatisticsFunctions" } ], "utilities": [ @@ -1405,13 +1405,13 @@ { "name": "P2P Network", "propertyName": "p2pNetwork", - "functionName": "newSocialTradingModulesP2PNetwork", + "functionName": "newNetworkModulesP2PNetwork", "fileName": "P2PNetwork.js" }, { "name": "P2P Network Node", "propertyName": "p2pNetworkNode", - "functionName": "newSocialTradingModulesP2PNetworkNode", + "functionName": "newNetworkModulesP2PNetworkNode", "fileName": "P2PNetworkNode.js" } ],