some cleaning

verklegarden · Dec 3, 2023 · fec2a9e · fec2a9e
1 parent b6b842a
commit fec2a9e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/examples/stealth-addresses/StealthSecp256k1.sol b/examples/stealth-addresses/StealthSecp256k1.sol
@@ -50,6 +50,8 @@ contract StealthSecp256k1Example is Script {
             spendingPubKey: receiverSpendingPubKey,
             viewingPubKey: receiverViewPubKey
         });
+        console.log("Stealth Meta Address: ");
+        console.logBytes(receiverStealthMeta.toBytes("eth"));
 
         // Sender creates stealth address from receiver's stealth meta address.
         console.log(

diff --git a/src/curves/Secp256k1Arithmetic.sol b/src/curves/Secp256k1Arithmetic.sol
@@ -11,7 +11,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.16;
 
-// TODO: Represent point at infinity via zero point?
 /**
  * @notice Point is a secp256k1 point in Affine coordinates
  *
@@ -168,7 +167,7 @@ library Secp256k1Arithmetic {
     //----------------------------------
     // Arithmetic
 
-    /// @dev Returns a new point being the sum of points `point` and `other`.
+    /// @dev Returns the sum of points `point` and `other` as new point.
     ///
     /// @dev TODO Note about performance. intoPoint() conversion is expensive.
     ///           Also created new point struct in memory.
@@ -391,7 +390,7 @@ library Secp256k1Arithmetic {
     // Private Functions
 
     //----------------------------------
-    // Affine Point
+    // Jacobian Point
     //
     // Functionality stolen from Jordi Baylina's [ecsol](https://github.com/jbaylina/ecsol/blob/c2256afad126b7500e6f879a9369b100e47d435d/ec.sol).
 

diff --git a/src/signatures/ECDSA.sol b/src/signatures/ECDSA.sol
@@ -211,8 +211,6 @@ library ECDSA {
             revert("PrivateKeyInvalid()");
         }
 
-        // TODO: Should revert if digest is zero?
-
         uint8 v;
         bytes32 r;
         bytes32 s;

diff --git a/src/stealth-addresses/ERC5564Announcer.sol b/src/stealth-addresses/ERC5564Announcer.sol
@@ -17,20 +17,20 @@ pragma solidity ^0.8.16;
  *
  *         Index      |  Description                                  | Length in bytes
  *        -----------------------------------------------------------------------------
- *        [0x00]      | View tag                                      | 1
- *        [0x01:0x04] | `0xeeeeeeee`                                  | 4
- *        [0x05:0x24] | `0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE`  | 20
- *        [0x18:0x38] | Amount in wei                                 | 32
+ *        [0x00]      | View tag                                      |              1
+ *        [0x01:0x04] | `0xeeeeeeee`                                  |              4
+ *        [0x05:0x24] | `0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE`  |             20
+ *        [0x18:0x38] | Amount in wei                                 |             32
  *
  *      - Tx involving a contract call with a single argument, eg ERC-20/ERC-721
  *        transfers:
  *
  *         Index      |  Description                                  | Length in bytes
  *        -----------------------------------------------------------------------------
- *        [0x00]      | View tag                                      | 1
- *        [0x01:0x04] | Solidity function selector                    | 4
- *        [0x05:0x24] | Contract address                              | 20
- *        [0x18:0x38] | One word argument, eg token amount            | 32
+ *        [0x00]      | View tag                                      |             1
+ *        [0x01:0x04] | Solidity function selector                    |             4
+ *        [0x05:0x24] | Contract address                              |             20
+ *        [0x18:0x38] | One word argument, eg token amount            |             32
  *
  * @custom:references
  *      - [EIP-5564]: https://eips.ethereum.org/EIPS/eip-5564
@@ -41,7 +41,7 @@ interface IERC5564Announcer {
     ///
     /// @param schemeId Scheme id based on [EIP-5564 Scheme Registry] registry.
     /// @param stealthAddress The stealth address.
-    /// @param caller The address who announced the tx.
+    /// @param caller The address announcing the tx.
     /// @param ephemeralPubKey The ephemeral public key created during the
     ///                        stealth address generation.
     /// @param metadata Bytes blob providing the view tag and arbitrary

diff --git a/src/stealth-addresses/StealthSecp256k1.sol b/src/stealth-addresses/StealthSecp256k1.sol
@@ -52,12 +52,21 @@ library StealthSecp256k1 {
     // Stealth Meta Addresses
 
     // TODO: See https://eips.ethereum.org/EIPS/eip-5564#stealth-meta-address-format.
-    function toBytes(StealthAddress memory stealthMetaAddress)
-        internal
-        pure
-        returns (bytes memory)
-    {
-        return bytes("");
+    //
+    //       st:eth:0x<spendingKey><viewingKey>
+    function toBytes(
+        StealthMetaAddress memory stealthMetaAddress,
+        string memory chainShortName
+    ) internal pure returns (bytes memory) {
+        bytes memory prefix =
+            abi.encodePacked(bytes("st:"), bytes(chainShortName), bytes(":0x"));
+
+        bytes memory pubKeys = abi.encodePacked(
+            stealthMetaAddress.spendingPubKey.toBytes(),
+            stealthMetaAddress.viewingPubKey.toBytes()
+        );
+
+        return abi.encodePacked(prefix, pubKeys);
     }
 
     // Stealth Address
@@ -67,9 +76,6 @@ library StealthSecp256k1 {
         internal
         returns (StealthAddress memory)
     {
-        // TODO: Functionality missing in Secp256k1(Arithmetic):
-        //       - PublicKey + PublicKey
-
         // Create ephemeral key pair.
         PrivateKey ephemeralPrivKey = Secp256k1.newPrivateKey();
         PublicKey memory ephemeralPubKey = ephemeralPrivKey.toPublicKey();