Merge pull request #3 from AndriianChestnykh/origin/feature/diffie-hellman

Origin/feature/diffie hellman

Author: AndriianChestnykh

contracts/Hub.sol

@@ -12,6 +12,8 @@ contract Hub {
     mapping (address => Request) public requests;
     mapping (address => bytes) public registeredKeys;
 
+    mapping (address => bool) public isHeir;
+
     event PublicKeyRegistered(address indexed user, bytes publicKey);
     event EIMSentToOracle(address indexed owner, address indexed heir, bytes encryptedData);
     event EIMRequestedByHeir(address indexed heir);
@@ -33,6 +35,7 @@ contract Hub {
 
     function registerPubKeyHeir(address heir, bytes calldata publicKey) public {
         registeredKeys[heir] = publicKey;
+        isHeir[msg.sender] = true;
         emit PublicKeyRegistered(heir, publicKey);
     }
 
@@ -70,4 +73,10 @@ contract Hub {
         require(registeredKeys[msg.sender].length > 0, "Oracle public key not registered");
         emit EIMSentToHeir(heir, encryptedData);
     }
+
+    function getPublicKeyHeir(string memory heirAddressStr) public view returns (bytes memory) {
+        address heirAddress = address(bytes20(bytes(heirAddressStr)));
+        require(isHeir[heirAddress], "Addres is not Heir");
+        return registeredKeys[heirAddress];
+    }
 }

dapps/ui/src/index.js

@@ -1,12 +1,13 @@
-import { ethers } from "ethers";
-
+import { ethers } from 'ethers'
 import './index.css';
 
 import WalletArtifact from '../../../artifacts/contracts/Wallet.sol/Wallet.json'
+import HubArtifact from '../../../artifacts/contracts/Hub.sol/Hub.json'
 import DeployInfo from '../../../deployInfo.json'
 import { splitSignature } from "ethers/lib/utils";
 
 const { abi: walletAbi } = WalletArtifact
+const { abi: hubAbi } = HubArtifact
 
 let wallet;
 let accounts
@@ -71,6 +72,12 @@ const popupText = document.getElementById('popup-text')
 
 const provider = new ethers.providers.Web3Provider(window.ethereum)
 
+const hubProvider = new ethers.providers.JsonRpcProvider('http://localhost:8545');
+const hubAddress = DeployInfo.hubAddress
+
+const hubContract = new ethers.Contract(hubAbi, hubAddress, hubProvider)
+
+
 let walletInfo = {
   ownershipStatus: undefined,
   address: undefined,
@@ -137,6 +144,19 @@ async function onClickSignTypedData() {
   const heirAddress = document.getElementById('heirAddress')
   const heir = provider.getSigner(heirAddress.value)
 
+  //todo - get public key from heir
+  async function getPublicKeyFromHeir(address) {
+    try {
+      const publicKey = await hubContract.getPublicKeyHeir(address)
+      return publicKey
+    } catch {
+      console.error("Error getting public key:", error)
+      return null
+    }
+  }
+
+  const publicKeyHeir = getPublicKeyFromHeir(heirAddress.value)
+
   const im = {
     types: {
       InheritanceMessage: [
@@ -560,6 +580,8 @@ const initialize = async () => {
   updateButtons()
 }
 
+getGreetingFromContractHub()
+
 // assign events
 connectWalletButton.onclick = onClickConnectWallet
 disconnectWalletButton.onclick = onClickDisconnectWallet

dapps/ui/src/test-file.js

@@ -0,0 +1,17 @@
+import { HDNodeWallet } from 'ethers';
+
+const mnemonic = 'test test test test test test test test test test test junk';
+
+const message = "Hello World!";
+
+(async () => {
+  const hdwallet = HDNodeWallet.fromPhrase(mnemonic);
+  console.log("Private key0: ", hdwallet.privateKey); // default path m/44'/60'/0'/0/0
+  console.log("Address0: ", hdwallet.address);
+  console.log("Signature0: ", await hdwallet.signMessage(message));
+
+  const hdwallet1 = HDNodeWallet.fromPhrase(mnemonic, null, "m/44'/60'/0'/0/1");
+  console.log("\nPrivate key1: ", hdwallet1.privateKey);
+  console.log("Address1: ", hdwallet1.address);
+  console.log("Signature1: ", await hdwallet1.signMessage(message));
+})();

package.json

@@ -28,15 +28,18 @@
     "crypto": "^1.0.1",
     "css-loader": "^6.8.1",
     "eth-sig-util": "^3.0.1",
+    "fs": "^0.0.1-security",
     "hardhat": "^2.12.7",
     "mini-css-extract-plugin": "^2.7.6",
     "mocha": "^10.3.0",
     "node-polyfill-webpack-plugin": "^2.0.1",
+    "secp256k1": "^5.0.0",
     "serve": "^14.2.0",
     "sodium": "^3.0.2",
     "style-loader": "^3.3.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1"
+    "webpack-dev-server": "^4.11.1",
+    "yaml": "^2.3.4"
   }
 }