wip

Author: ltfschoen

_QUICKSTART.md

@@ -124,14 +124,19 @@ scp -r $SOURCE root@$REMOTE_IP:$DESTINATION
   Example output:
 	```
 	res queryPubkey:  {
-	  encryption_key: 'AtDOG9EBwaKhMBheTGPR1wkduasNyjxlGZjTFKFVAyPA',
-	  verification_key: '0x04d0ce1bd101c1a2a130185e4c63d1d7091db9ab0dca3c651998d314a1550323c02649b0960b00bb1fac896aaf4056abb605e87d55ec1805a91ddb3e32c6b89c36'
+	  encryption_key: '...',
+	  verification_key: '0x...'
 	}
 	```
 
 	* Paste them into deploy.ts, `gatewayContractPublicKey` with `verification_key` and `gatewayContractEncryptionKeyForChaChaPoly1305` with `encryption_key`
 
-	# UPDATE IF DIFFERS deploy.ts
+	* UPDATE CONFIG AND RUN ON LOCAL IF DIFFERS
+  ```bash
+  SOURCE=/Users/luke/code/clones/github/svub/nunya/packages/secret-contracts-scripts/src/config/deploy.ts
+  DESTINATION=/root/nunya/packages/secret-contracts-scripts/src/config/deploy.ts
+  scp -r $SOURCE root@$REMOTE_IP:$DESTINATION
+  ```
 
   ```bash
 	yarn run secret:clean

_SETUP.md

@@ -365,8 +365,8 @@ git submodule update --init --recursive
   Example output:
 	```
 	res queryPubkey:  {
-	  encryption_key: 'AtDOG9EBwaKhMBheTGPR1wkduasNyjxlGZjTFKFVAyPA',
-	  verification_key: '0x04d0ce1bd101c1a2a130185e4c63d1d7091db9ab0dca3c651998d314a1550323c02649b0960b00bb1fac896aaf4056abb605e87d55ec1805a91ddb3e32c6b89c36'
+	  encryption_key: '...',
+	  verification_key: '0x...'
 	}
 	```
 

packages/hardhat/contracts/Gateway.sol

@@ -58,6 +58,8 @@ contract Gateway is Ownable, Utils, Base64 {
 
     bytes public owner_public_key;
 
+    bytes28 public gatewayAddressBase64 = encodeAddressToBase64(address(this));
+
     /*//////////////////////////////////////////////////////////////
                               Structs
     //////////////////////////////////////////////////////////////*/
@@ -511,8 +513,7 @@ contract Gateway is Ownable, Utils, Base64 {
 
         // 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(msg.sender);
-        bytes28 gatewayAddressBase64 = encodeAddressToBase64(address(this));
+        // bytes28 senderAddressBase64 = encodeAddressToBase64(msg.sender);
 
         requestId = taskId;
 
@@ -717,9 +718,6 @@ contract Gateway is Ownable, Utils, Base64 {
     function retrievePubkey(uint256 _callbackSelector, uint32 _callbackGasLimit) external payable onlyOwner returns (uint256 requestId) {
         console.log("------ Gateway.retrievePubkey");
 
-        bytes28 senderAddressBase64 = encodeAddressToBase64(address(msg.sender));
-        bytes28 gatewayAddressBase64 = encodeAddressToBase64(address(this));
-
         requestId = taskId;
 
         // TODO: optionally add guard to verify value of _callbackSelector if necessary
@@ -737,6 +735,8 @@ contract Gateway is Ownable, Utils, Base64 {
             require(msg.value >= estimatedPrice, "Paid Callback Fee Too Low");
         }
 
+        bytes memory userKey = bytes.concat("A4MYU1tUEF1Keq5gwI/EX5aHGBtP38YlvRp1P6c5f+11");
+
         // Note: Since contracts only have an address, but not public keys, where the
         // addresses are derived from the address of the user (or other contract) that
         // created them, which are in turn are derived from the public key of a normal
@@ -750,7 +750,7 @@ contract Gateway is Ownable, Utils, Base64 {
             '}","routing_info":"', routing_info,
             '","routing_code_hash":"', routing_code_hash,
             '","user_address":"', address(msg.sender),
-            '","user_key":"', senderAddressBase64,
+            '","user_key":"', userKey,
             '","callback_address":"'
         );
 

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

@@ -84,11 +84,11 @@ const config = {
       secretGateway: {
         gatewayContractCodeId: "1", // only know after upload
         gatewayContractAddress: "secret1mfk7n6mc2cg6lznujmeckdh4x0a5ezf6hx6y8q", // only know after instantiate
-        gatewayContractCodeHash: "836a34c60637d684c044d4ddc1277e3d21ae1f440d2bb2d26870c81639d2f4c4", // only know after upload
+        gatewayContractCodeHash: "b9fb512153812cd554884922d10c007bef9d2749d14ae9fda445e83710ee8c10", // only know after upload
         // obtain from running `yarn run secret:querySecretGatewayPubkey`
-        gatewayContractPublicKey: "0x04d0ce1bd101c1a2a130185e4c63d1d7091db9ab0dca3c651998d314a1550323c02649b0960b00bb1fac896aaf4056abb605e87d55ec1805a91ddb3e32c6b89c36",
+        gatewayContractPublicKey: "0x04c545d3a2aa0d070a579beca7eca512a1b6c84a027a2e7df0b9caad10190cf45d14495e7c0d04e9cc9b16205cce6ef4b2a1b1b613aaae97753be3379519b3cc7f",
         // obtain from running `yarn run secret:querySecretGatewayPubkey`
-        gatewayContractEncryptionKeyForChaChaPoly1305: "AtDOG9EBwaKhMBheTGPR1wkduasNyjxlGZjTFKFVAyPA",
+        gatewayContractEncryptionKeyForChaChaPoly1305: "A8VF06KqDQcKV5vsp+ylEqG2yEoCei598LnKrRAZDPRd",
         gatewayContractWasmPath: "secret-gateway-contract.wasm.gz",
       }
     }