Merge pull request #6 from AndriianChestnykh/tests-libs-browser

Updated encryption functions for browser

Author: AndriianChestnykh

.gitignore

@@ -39,9 +39,9 @@ contract Hub {
         emit PublicKeyRegistered(heir, publicKey);
     }
 
-    function registerPubKeyOracle(bytes calldata publicKey) public {
-        registeredKeys[msg.sender] = publicKey;
-        emit PublicKeyRegistered(msg.sender, publicKey);
+    function registerPubKeyOracle(address oracle, bytes calldata publicKey) public {
+        registeredKeys[oracle] = publicKey;
+        emit PublicKeyRegistered(oracle, publicKey);
     }
 
     //Function for getting public keys

LICENSE

@@ -1,4 +1,5 @@
-import { ethers } from 'ethers'
+import { ethers } from 'ethers';
+import encryptIM from './../../utils/encrypt-im-browser-version.js';
 import './index.css';
 
 import WalletArtifact from '../../../artifacts/contracts/Wallet.sol/Wallet.json'
@@ -75,6 +76,24 @@ const provider = new ethers.providers.Web3Provider(window.ethereum)
 const hubAddress = DeployInfo.hubAddress
 const hubContract = new ethers.Contract(hubAddress, hubAbi, provider)
 
+const accounts1 = {
+  Owner: {
+      address: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+      publicKey: Buffer.from('0x04682c3ea377dafe9e4eb735af60c4edf2e581d529cc69816e768432a8aa09178470c9b1e703951f4a85e0dab7d8008e2a9e9e1794b0cfc6d430bc4aace3ad3e2', 'hex'),
+      privateKey: Buffer.from('0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex')
+  },
+  Heir: {
+      address: "x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+      publicKey: Buffer.from('0x0406626fc5130be23a0e58c6d24e148a3e6cefd676162f4c176822aa885e6c2eb15a1657e3a4a865b516e7bf2288bfcb6d32cd7ecdc0f058b5bf84d28a5d9d2b2', 'hex'),
+      privateKey: Buffer.from('0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex'),
+  },
+  Oracle: {
+      address: "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
+      publicKey: Buffer.from('0x0473a0b62325c802d13e0845e44a8199c91809a6df8a5be2f10c5270784b6db32de05b9818c92921488365ff6ba7258e72bc1e4aa05a6a8929787ba6cf0ddfb2b', 'hex'),
+      privateKey: Buffer.from('0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a', 'hex'),
+  }
+}
+
 let walletInfo = {
   ownershipStatus: undefined,
   address: undefined,
@@ -139,20 +158,7 @@ async function onClickSignTypedData() {
   //todo - get heir address from heirAddress.value
   const signer = provider.getSigner(_accounts[0])
   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 heir = provider.getSigner(heirAddress.value) 
 
   const im = {
     types: {
@@ -180,7 +186,10 @@ async function onClickSignTypedData() {
       signature: imSignature,
     }
 
-    signTypedDataResult.innerHTML = JSON.stringify(imWithSignature, null, 2)
+    const encryptedIM = await encryptIM(imWithSignature, accounts1.Owner.privateKey, accounts1.Heir.publicKey);
+
+    // signTypedDataResult.innerHTML = JSON.stringify(imWithSignature, null, 2)
+    signTypedDataResult.innerHTML = JSON.stringify(encryptedIM, null, 2)
     sendIMToOracleButton.disabled = false
   } catch (err) {
     console.error(err)
@@ -597,5 +606,3 @@ updateWalletButton.onclick = onClickUpdateWallet
 updateAccountButton.onclick = onClickUpdateAccount
 
 window.addEventListener('DOMContentLoaded', initialize)
-
-module.exports = {encryptIM, decryptIM}

README.md

@@ -0,0 +1,38 @@
+const sodium = require('sodium-universal');
+const CryptoJS = require('crypto-js');
+const cryptoConfigConstant = require('./crypto-config-constant.js');
+
+async function decryptIM(encryptedMessage, recipientPrivateKey, senderPublicKey) {
+    return new Promise((resolve, reject) => {
+        try {
+            if (recipientPrivateKey.startsWith("0x")) {
+                recipientPrivateKey = recipientPrivateKey.substring(2);
+            }
+
+            if (senderPublicKey.startsWith("0x")) {
+                senderPublicKey = senderPublicKey.substring(2);
+            }
+
+            const privKeyBuf = Uint8Array.from(recipientPrivateKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
+            const pubKeyBuf = Uint8Array.from(senderPublicKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
+
+            const sharedSecret = new Uint8Array(sodium.crypto_scalarmult_BYTES);
+            sodium.crypto_scalarmult(sharedSecret, privKeyBuf, pubKeyBuf);
+
+            const recipientSharedSecretHex = Array.prototype.map.call(sharedSecret, x => ('00' + x.toString(16)).slice(-2)).join('');
+            const iv = new Uint8Array(cryptoConfigConstant.ivBytes).fill(0);
+            const counter = CryptoJS.lib.WordArray.create('d8d8dae8405c447d86e84be03b71327b');
+            const decrypted = CryptoJS.AES.decrypt(encryptedMessage, recipientSharedSecretHex, {
+                iv: iv,
+                mode: CryptoJS.mode.CTR,
+                counter: counter
+            });
+
+            resolve(decrypted.toString(CryptoJS.enc.Utf8));
+        } catch (error) {
+            reject(error);
+        }
+    });
+}
+
+module.exports = decryptIM;

Screenshot.png

@@ -0,0 +1,43 @@
+const sodium = require('sodium-universal');
+const CryptoJS = require('crypto-js');
+const cryptoConfigConstant = require('./crypto-config-constant.js');
+
+async function encryptIM(message, senderPrivateKey, recipientPublicKey) {
+    return new Promise((resolve, reject) => {
+        try {
+
+            if (typeof message === 'object') {
+                message = JSON.stringify(message);
+            }
+
+            if (senderPrivateKey.startsWith("0x")) {
+                senderPrivateKey = senderPrivateKey.substring(2);
+            }
+
+            if (recipientPublicKey.startsWith("0x")) {
+                recipientPublicKey = recipientPublicKey.substring(2);
+            }
+
+            const privKeyBuf = Uint8Array.from(senderPrivateKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
+            const pubKeyBuf = Uint8Array.from(recipientPublicKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
+
+            const sharedSecret = new Uint8Array(sodium.crypto_scalarmult_BYTES);
+            sodium.crypto_scalarmult(sharedSecret, privKeyBuf, pubKeyBuf);
+
+            const senderSharedSecretHex = Array.prototype.map.call(sharedSecret, x => ('00' + x.toString(16)).slice(-2)).join('');
+            const iv = new Uint8Array(cryptoConfigConstant.ivBytes).fill(0);
+            const counter = CryptoJS.lib.WordArray.create('d8d8dae8405c447d86e84be03b71327b');
+            const encrypted = CryptoJS.AES.encrypt(message, senderSharedSecretHex, {
+                iv: iv,
+                mode: CryptoJS.mode.CTR,
+                counter: counter
+            })
+
+            resolve (encrypted.toString());
+        } catch (error) {
+            reject(error);
+        }
+    })
+}
+
+module.exports = encryptIM;

contracts/GLDToken.sol

@@ -25,7 +25,7 @@
     "@nomicfoundation/hardhat-toolbox": "^2.0.1",
     "@openzeppelin/contracts": "^4.8.1",
     "copy-webpack-plugin": "^11.0.0",
-    "crypto": "^1.0.1",
+    "crypto-js": "^4.2.0",
     "css-loader": "^6.8.1",
     "eth-sig-util": "^3.0.1",
     "fs": "^0.0.1-security",
@@ -35,7 +35,8 @@
     "node-polyfill-webpack-plugin": "^2.0.1",
     "secp256k1": "^5.0.0",
     "serve": "^14.2.0",
-    "sodium": "^3.0.2",
+    "sodium-javascript": "^0.8.0",
+    "sodium-universal": "^4.0.1",
     "style-loader": "^3.3.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",

contracts/GameItem.sol

@@ -1,29 +1,60 @@
 const { expect } = require("chai");
 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 encryptIM = require("./../dapps/utils/encrypt-im.js");
+// const decryptIM = require("./../dapps/utils/decrypt-im.js");
+
+const encryptIM = require("./../dapps/utils/encrypt-im-browser-version.js");
+const decryptIM = require("./../dapps/utils/decrypt-im-browser-version.js");
+const sodium = require("sodium-universal");
 
 const accounts = {
     Owner: {
         address: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-        publicKey: Buffer.from('0x04682c3ea377dafe9e4eb735af60c4edf2e581d529cc69816e768432a8aa09178470c9b1e703951f4a85e0dab7d8008e2a9e9e1794b0cfc6d430bc4aace3ad3e2', 'hex'),
-        privateKey: Buffer.from('0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex')
+        publicKey: '9adac7a7558764cf6bc45d88968b7d1e27b95e641c2827fba034350e91a44d22',
+        privateKey: 'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
     },
     Heir: {
-        address: "x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-        publicKey: Buffer.from('0x0406626fc5130be23a0e58c6d24e148a3e6cefd676162f4c176822aa885e6c2eb15a1657e3a4a865b516e7bf2288bfcb6d32cd7ecdc0f058b5bf84d28a5d9d2b2', 'hex'),
-        privateKey: Buffer.from('0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex'),
+        address: "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+        publicKey: '107302eea84f3f75c50184df4102862bf50f6fbcee88bf9d7d33852ab90f302d',
+        privateKey: '59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d',
     },
     Oracle: {
         address: "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
-        publicKey: Buffer.from('0x0473a0b62325c802d13e0845e44a8199c91809a6df8a5be2f10c5270784b6db32de05b9818c92921488365ff6ba7258e72bc1e4aa05a6a8929787ba6cf0ddfb2b', 'hex'),
-        privateKey: Buffer.from('0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a', 'hex'),
+        publicKey: '9a09fdb91965386b6705c734ed36c3265144967b823e23a1b665ae8be922683c',
+        privateKey: '5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a',
     }
 }
 
 describe("Encryption and Decryption", function () {
-    it("should encrypt and decrypt the message", async function () {
+    before(() => {
+        //TODO move to other file
+
+        const toHexString = (bytes) =>
+          bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), '');
+
+        const ownerPubKey = new Uint8Array(sodium.crypto_scalarmult_BYTES);
+        const ownerPrivKeyBuff = Uint8Array.from(accounts.Owner.privateKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)))
+        sodium.crypto_scalarmult_base(ownerPubKey, ownerPrivKeyBuff)
+        const ownerPubKeyHex = toHexString(Uint8Array.from(ownerPubKey));
+
+        const heirPubKey = new Uint8Array(sodium.crypto_scalarmult_BYTES);
+        const heirPrivKeyBuff = Uint8Array.from(accounts.Heir.privateKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)))
+        sodium.crypto_scalarmult_base(heirPubKey, heirPrivKeyBuff)
+        const heirPubKeyHex = toHexString(Uint8Array.from(heirPubKey));
+        console.log("s")
+
+        const oraclePubKey = new Uint8Array(sodium.crypto_scalarmult_BYTES);
+        const oraclePrivKeyBuff = Uint8Array.from(accounts.Oracle.privateKey.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)))
+        sodium.crypto_scalarmult_base(oraclePubKey, oraclePrivKeyBuff)
+        const oraclePubKeyHex = toHexString(Uint8Array.from(oraclePubKey));
+
+        console.log("OwnerPubKey: ", ownerPubKeyHex);
+        console.log("HeirPubKey: ", heirPubKeyHex);
+        console.log("OraclePubKey: ", oraclePubKeyHex);
+    });
+
+    it("should encrypt and decrypt the message (new functions)", async function () {
         const message = "Hello, world!";
 
         // Encrypting a message from Owner to Heir
@@ -50,8 +81,8 @@ describe("Encryption and Decryption", function () {
 
         expect(decryptedMessageFromOwnerToOracle).to.equal(encryptedMessage)
     })
-    
-    it("create new account using ether.js and private key", async function () {
+
+    it("should encrypt the message, send it to Oracle, Oracle should encrypt and send it Heir, Heir should decrypt it from Oracle and decrypt it from Owner ", async function () {
         const message = "Hello, world!";
 
         // Encrypting a message from Owner to Heir
@@ -65,7 +96,7 @@ describe("Encryption and Decryption", function () {
 
         // Heir gets encrypt message from Oracle
         const decryptedMessageFromOwnetToHeir = await decryptIM(decryptedMessageFromOwnerToOracle, accounts.Heir.privateKey, accounts.Owner.publicKey)
-        
+
         expect(decryptedMessageFromOwnetToHeir).to.equal(message)
     })
-});
+});

contracts/Hub.sol

@@ -51,8 +51,8 @@ describe("Hub Contract", function () {
         it("should register public key for oracle", async function () {
             const expectedPublicKey = "0x9876543210FEDCBA"; // Expected public key value by oracle
 
-            await hubContract.connect(owner).registerPubKeyOracle(expectedPublicKey);
-            const registeredPublicKey = await hubContract.registeredKeys(owner.address);
+            await hubContract.connect(owner).registerPubKeyOracle(oracle.address, expectedPublicKey);
+            const registeredPublicKey = await hubContract.registeredKeys(oracle.address);
 
             expect(registeredPublicKey.toLowerCase()).to.equal(expectedPublicKey.toLowerCase());
         });