Merge pull request #5 from AndriianChestnykh/feature/diffie-hellman

add tests for encrypt and decrypt message Owner-Oracle-Heir

Author: AndriianChestnykh

contracts/Hub.sol

@@ -40,7 +40,6 @@ contract Hub {
     }
 
     function registerPubKeyOracle(bytes calldata publicKey) public {
-        require(registeredKeys[_address].length == 32, "This user did not register the key");
         registeredKeys[msg.sender] = publicKey;
         emit PublicKeyRegistered(msg.sender, publicKey);
     }

dapps/utils/compress-key/compress-key.js renamed to dapps/utils/compress-key.js

@@ -1,7 +1,7 @@
-const compressKey = require("./../compress-key/compress-key.js");
+const compressKey = require('./compress-key.js');
 const sodium = require('sodium').api;
 const crypto = require('crypto');
-const cryptoConfigConstant = require("./../crypto-config-constant.js");
+const cryptoConfigConstant = require("./crypto-config-constant.js");
 
 async function decryptIM(encryptedMessage, recipientPrivateKey, senderPublicKey) {
     return new Promise((resolve, reject) => {

dapps/utils/decrypt-im/decrypt-im.js renamed to dapps/utils/decrypt-im.js

@@ -1,7 +1,7 @@
-const compressKey = require("./../compress-key/compress-key.js");
+const compressKey = require("./compress-key.js");
 const sodium = require('sodium').api;
 const crypto = require('crypto');
-const cryptoConfigConstant = require("./../crypto-config-constant.js");
+const cryptoConfigConstant = require("./crypto-config-constant.js");
 
 async function encryptIM(message, senderPrivateKey, recipientPublicKey) {
     return new Promise((resolve, reject) => {

dapps/utils/encryp-im/encrypt-im.js renamed to dapps/utils/encrypt-im.js

@@ -1,6 +1,8 @@
 const { expect } = require("chai");
-const encryptIM = require("./../dapps/utils/encryp-im/encrypt-im.js");
-const decryptIM = require("./../dapps/utils/decrypt-im/decrypt-im.js");
+const { ethers } = require("hardhat");
+const { utils } = require("ethers");
+const encryptIM = require("./../dapps/utils/encrypt-im.js");
+const decryptIM = require("./../dapps/utils/decrypt-im.js");
 
 const accounts = {
     Owner: {
@@ -33,4 +35,37 @@ describe("Encryption and Decryption", function () {
         // Check if the decrypted message matches the original message
         expect(decryptedMessage).to.equal(message);
     });
+
+    it("should encrypt the message, send it to Oracle, Oracle should decrypt it", async function () {
+        const message = "Hello, world!";
+
+        // Encrypting a message from Owner to Heir
+        const encryptedMessage = await encryptIM(message, accounts.Owner.privateKey, accounts.Heir.publicKey);
+
+        // Owner encrypting message for Oracle and send it
+        const encryptedMessageForOracle = await encryptIM(encryptedMessage, accounts.Owner.privateKey, accounts.Oracle.publicKey);
+
+        // Oracle gets encrypted message from Owner and decrypted it
+        const decryptedMessageFromOwnerToOracle = await decryptIM(encryptedMessageForOracle, accounts.Oracle.privateKey, accounts.Owner.publicKey)
+
+        expect(decryptedMessageFromOwnerToOracle).to.equal(encryptedMessage)
+    })
+    
+    it("create new account using ether.js and private key", async function () {
+        const message = "Hello, world!";
+
+        // Encrypting a message from Owner to Heir
+        const encryptedMessage = await encryptIM(message, accounts.Owner.privateKey, accounts.Heir.publicKey);
+
+        // Owner encrypting message for Oracle and send it
+        const encryptedMessageForOracle = await encryptIM(encryptedMessage, accounts.Owner.privateKey, accounts.Oracle.publicKey);
+
+        // Oracle gets encrypted message from Owner and decrypted it
+        const decryptedMessageFromOwnerToOracle = await decryptIM(encryptedMessageForOracle, accounts.Oracle.privateKey, accounts.Owner.publicKey)
+
+        // Heir gets encrypt message from Oracle
+        const decryptedMessageFromOwnetToHeir = await decryptIM(decryptedMessageFromOwnerToOracle, accounts.Heir.privateKey, accounts.Owner.publicKey)
+        
+        expect(decryptedMessageFromOwnetToHeir).to.equal(message)
+    })
 });

test/encrypt-decrypt.test.js

@@ -54,7 +54,7 @@ describe("Hub Contract", function () {
 
     //1. Owner encrypts (DH with Owner + Heir): DH_O_H(IM) - EIM
 
-    alice.privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
+    // alice.privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
     //2. Owner gets Oracle public key
     //3. Owner encrypts (DH with Owner + Oracle): DH_O_Or(DH_O_H(IM)) - EIM
     //2. Owner sends DH_O_Or(DH_O_H(IM)) to Oracle
@@ -72,8 +72,15 @@ describe("Hub Contract", function () {
         // //3. Owner encrypts (DH with Owner + Oracle): DH_O_Or(DH_O_H(IM)) - EIM
 
         // TODO finalize the encryption process
-        const publicKey = sodium.crypto_scalarmult_base(alice.privateKey)
+        // const publicKey = sodium.crypto_scalarmult_base(alice.privateKey)
 
+        // await hubContract.connect(owner).registerPubKeyOwner(publicKey); // Register owner's public key
+
+        // const heirAddress = heir.address;
+        // const encryptedData = utils.toUtf8Bytes("0xencrypteddata");
+        // await hubContract.connect(owner).sendEIMtoOracle(heirAddress, encryptedData);
+
+        const publicKey = "0x0123456789ABCDEF"; // Example public key
         await hubContract.connect(owner).registerPubKeyOwner(publicKey); // Register owner's public key
 
         const heirAddress = heir.address;

test/hub/hub.test.js

@@ -0,0 +1,32 @@
+// const { expect } = require("chai");
+// const {ethers} = require("hardhat");
+// const encryptIM = require("./../dapps/utils/encrypt-im.js");
+// const decryptIM = require("./../dapps/utils/decrypt-im.js");
+// const { describe } = require("mocha");
+
+
+// describe("New encrypr decrypt tests functions", function() {
+//     let Hub;
+//     let hubContract;
+//     let owner;
+//     let heir;
+//     let oracle;
+
+//     before(async function() {
+//         Hub = await ethers.getContractFactory("Hub");
+//         [owner, heir, oracle] = await ethers.getSigners();
+//         ethers.ge
+
+//         hubContract = await Hub.deploy();
+//         await hubContract.deployed();
+//     })
+
+//     it("should encrypt and decrypt the message in Hub Smart Contract", async function() {
+//         const ownerPublicKey = await owner.getPublicKey();
+
+//         await hubContract.connect(owner).registerPubKeyOwner(ownerPublicKey);
+//         const registerPubKeyHeirByOwner = await hubContract.registeredKeys(owner.address);
+
+//         expect(registerPubKeyHeirByOwner).to.equal(ownerPublicKey);
+//     })
+// })