wip

Author: ltfschoen

package.json

@@ -43,6 +43,7 @@
     "secret:setEVMGatewayAddress": "yarn workspace secret-contracts-scripts setEVMGatewayAddress",
     "secret:queryPubkey": "yarn workspace secret-contracts-scripts queryPubkey",
     "secret:submit": "yarn workspace secret-contracts-scripts submit",
+    "secret:submitRequestValue": "yarn workspace secret-contracts-scripts submitRequestValue",
     "secret:requestValue": "yarn workspace secret-contracts-scripts requestValue",
     "secret:clean": "yarn workspace secret-contracts-scripts clean",
     "secret:upload": "yarn workspace secret-contracts-scripts upload",

packages/hardhat/contracts/Gateway.sol

@@ -53,6 +53,8 @@ contract Gateway is Ownable, Utils {
     string public routing_info = "";
     string public routing_code_hash = "";
 
+    bytes public owner_public_key;
+
     /*//////////////////////////////////////////////////////////////
                               Structs
     //////////////////////////////////////////////////////////////*/
@@ -267,10 +269,11 @@ contract Gateway is Ownable, Utils {
     event FulfilledRequestValue(uint256 indexed requestId);
 
     // Constructor
-    constructor(address nunyaContractAddress) {
+    constructor(address nunyaContractAddress, bytes memory deployerPublicKeyBytes) {
         // Initializer
         // Set owner to be the deployed NunyaBusiness.sol contract
         owner = nunyaContractAddress;
+        owner_public_key = deployerPublicKeyBytes;
 
         taskId = 1;
         nonce = 0;
@@ -502,7 +505,7 @@ contract Gateway is Ownable, Utils {
 
         // Note - It is only possible to call this function `encodeAddressToBase64` three times
         // in this function, otherwise it generates error `Error: Transaction reverted without a reason`.
-        bytes28 senderAddressBase64 = encodeAddressToBase64(address(msg.sender));
+        bytes28 senderAddressBase64 = encodeAddressToBase64(msg.sender);
 
         requestId = taskId;
 
@@ -543,9 +546,7 @@ contract Gateway is Ownable, Utils {
         bytes memory payload_info = abi.encodePacked(
             '}","routing_info":"',routing_info,
             '","routing_code_hash":"',routing_code_hash,
-            '","user_address":"',address(msg.sender),
-            '","user_key":"',senderAddressBase64,
-            '","callback_address":"'
+            '","user_address":"0x0000","user_key":"AAA=","callback_address":"'
         );
 
         //
@@ -559,12 +560,12 @@ contract Gateway is Ownable, Utils {
         // );
         // console.log("------ Gateway.requestValue - payload_info: ", payload_info);
 
-        uint32 _myArg = 123;
+        // uint32 _myArg = 123;
         //construct the payload that is sent into the Secret Gateway
         // FIXME: Error parsing into type secret_gateway::types::Payload: Invalid unicode code point.: execute contract failed
         bytes memory payload = bytes.concat(
             '{"data":"{\\"myArg\\":',
-            uint256toBytesString(_myArg),
+            uint256toBytesString(123),
             payload_info,
             senderAddressBase64, //callback_address
             // callback selector should be a hex value already converted into base64 to be used
@@ -597,12 +598,12 @@ contract Gateway is Ownable, Utils {
         bytes memory emptyBytes = hex"0000";
 
         // TODO - make `user_key` a unique key different from `user_pubkey`
-        bytes memory userKey = bytes.concat(senderAddressBase64); // equals AAA= in base64
+        // bytes memory userKey = bytes.concat(senderAddressBase64); // equals AAA= in base64
 
         // ExecutionInfo struct
         ExecutionInfo memory executionInfo = ExecutionInfo({
-            user_key: userKey, // FIXME - use this instead when resolve issue
-            // user_key: emptyBytes,
+            // user_key: userKey, // FIXME - use this instead when resolve issue
+            user_key: emptyBytes, // equals AAA= in base64
             // FIXME: use of `secret_gateway_signer_pubkey` does not compile, what alternative to use?
             // user_pubkey: uint256toBytesString(secret_gateway_signer_pubkey),
             user_pubkey: emptyBytes, // Fill with 0 bytes
@@ -614,7 +615,7 @@ contract Gateway is Ownable, Utils {
             payload: payload,
             // TODO: add a payload signature
             // Signature of hash of encrypted input values
-            payload_signature: emptyBytes
+            payload_signature: emptyBytes // empty signature, fill with 0 bytes
             // payload_signature: bytes32ToBytes(payloadHash)
         });
 

packages/hardhat/deploy/01_deploy_your_contract.ts

@@ -1,6 +1,6 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { Contract, SigningKey, Wallet, ethers, formatEther, parseEther, parseUnits } from "ethers";
+import { Contract, SigningKey, Wallet, getBytes, ethers, formatEther, parseEther, parseUnits } from "ethers";
 import config from "../hardhat.config";
 import * as dotenv from "dotenv";
 dotenv.config();
@@ -13,6 +13,17 @@ const value = 0;
 // const value = 1337;
 // const value = ethers.utils.parseEther("0.0000001337");
 
+function getDeployerPublicKeyBytes(deployer: string) {
+  const deployerWallet = new Wallet(deployer);
+  console.log("Generating keys for deployer public address:", deployerWallet.address, "\n");
+  const userPublicKey = new SigningKey(deployerWallet.privateKey).compressedPublicKey;
+  console.log('userPublicKey: ', userPublicKey);
+  // https://github.com/ethers-io/ethers.js/issues/3795#issue-1589631066
+  const userPublicKeyBytes = getBytes(userPublicKey);
+  console.log('userPublicKeyBytes: ', userPublicKeyBytes);
+  return userPublicKeyBytes;
+}
+
 /**
  * Deploys a contract named "YourContract" using the deployer account and
  * constructor arguments set to the deployer address
@@ -38,31 +49,26 @@ const deployYourContract: DeployFunction = async function (hre: HardhatRuntimeEn
   let providerRpc;
   let deployer;
   let deployerAddress;
+  let deployerPublicKeyBytes;
+  // Ethereum Local Network
   // Account #0: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 (10000 ETH)
   // Private Key: 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+  const deployerPrivateKeyLocalNetwork = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80";
   const deployerAddressLocalNetwork = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266";
 
-  // const deployerWallet = new Wallet(deployer);
-  // const deployerPublicKey = new SigningKey(deployerWallet.privateKey).compressedPublicKey;
-  // const deployerAddressPublicKey = deployerPublicKey || "0x0";
-
-  // if (deployerAddressPublicKey == "0x0") {
-  //   console.error("Invalid public key");
-  //   return;
-  // }
-
   if (hre.network.name == "sepolia") {
     console.log("hre.network.name: ", hre.network.name);
     if (process.env.DEPLOYER_ADDRESS == "" || process.env.DEPLOYER_PRIVATE_KEY == "") {
       throw new Error(`Please add deployer address and private key to the .env file for Sepolia Network.`)
     }
     deployer = process.env.DEPLOYER_PRIVATE_KEY || "";  // config.networks?.sepolia?.accounts[0];
     deployerAddress = process.env.DEPLOYER_ADDRESS || "";
+    deployerPublicKeyBytes = getDeployerPublicKeyBytes(deployer);
     providerRpc = String(config.networks?.sepolia);
   } else {
-    const accounts = await hre.getNamedAccounts();
-    deployer = accounts.deployer || "";
+    deployer = deployerPrivateKeyLocalNetwork;
     deployerAddress = deployerAddressLocalNetwork;
+    deployerPublicKeyBytes = getDeployerPublicKeyBytes(deployer);
     providerRpc = "http://127.0.0.1:8545/";
   }
 
@@ -88,7 +94,7 @@ const deployYourContract: DeployFunction = async function (hre: HardhatRuntimeEn
 
   const gateway = await deploy("Gateway", {
     from: deployer,
-    args: [nunyaContract.address],
+    args: [nunyaContract.address, deployerPublicKeyBytes],
     log: true,
     gasLimit: 30000000,
     // autoMine: can be passed to the deploy function to make the deployment process faster on local networks by

packages/secret-contracts-scripts/package.json

@@ -8,6 +8,7 @@
     "setEVMGatewayAddress": "yarn build && node ./dist/evm/setEVMGatewayAddress.js",
     "queryPubkey": "yarn build && node ./dist/functions/query/queryPubkey.js",
     "submit": "yarn build && node ./dist/submit.js",
+    "submitRequestValue": "yarn build && node ./dist/submitRequestValue.js",
     "requestValue": "yarn build && node ./dist/evm/requestValue.js",
     "build": "./node_modules/.bin/tsc --build",
     "clean": "./node_modules/.bin/tsc --build --clean",

packages/secret-contracts-scripts/src/config/deploy.ts

@@ -12,6 +12,8 @@ const config = {
       endpoint: "http://127.0.0.1:8545/",
       // Account #0: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 (10000 ETH)
       privateKey: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+      // Obtained from ./packages/secret-contracts-scripts/src/functions/secretpath/generateKeys.ts
+      publicKey: "0x038318535b54105d4a7aae60c08fc45f9687181b4fdfc625bd1a753fa7397fed75",
       nunyaBusinessContractAddress: "0x5FbDB2315678afecb367f032d93F642f64180aa3", // only know after deploy
       gatewayContractAddress: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512", // only know after deploy
     },

packages/secret-contracts-scripts/src/evm/getPublicKey.ts

@@ -11,12 +11,20 @@ export async function generateKeys() {
   ? config.secret.testnet
   : config.secret.localhost;
 
+  let vars;
+  if (config.evm.network == "sepolia") {
+    vars = config.evm.sepolia;
+  } else if (config.evm.network == "localhost") {
+    vars = config.evm.localhost;
+  } else {
+    throw new Error(`Unsupported network.`)
+  }
+  const { chainId, endpoint, nunyaBusinessContractAddress, gatewayContractAddress, privateKey } = vars;
+
   if (gatewayContractEncryptionKeyForChaChaPoly1305 == "") {
     throw Error("Unable to obtain Secret Network Gateway information");
   }
 
-  const privateKey = process.env.DEPLOYER_PRIVATE_KEY;
-
   if (!privateKey) {
     console.log("🚫️ You don't have a deployer account configured in environment variables");
     return;
@@ -39,6 +47,7 @@ export async function generateKeys() {
 
   // https://github.com/SolarRepublic/neutrino/blob/main/src/secp256k1.ts#L334
   const sharedKey = await sha256(ecdh(userPrivateKeyBytes, gatewayContractPublicKeyBytes));
+  console.log('sharedKey: ', sharedKey);
 
-  return { userPrivateKeyBytes, userPublicKeyBytes, sharedKey };
+  return { userPublicKey, userPrivateKeyBytes, userPublicKeyBytes, sharedKey };
 }