feat: schnorr signing workaround

.github/workflows/test.yml

@@ -15,6 +15,9 @@ jobs:
         steps:
             - uses: actions/checkout@v1
 
+            - name: Install schnorr workaround script dependencies
+              run: npm --prefix ./scripts/ install
+
             - name: Install
               run: composer update --no-interaction --no-suggest --ignore-platform-reqs
 

.gitignore

@@ -5,3 +5,5 @@ clover.xml
 .phpunit.result.cache
 .coverage
 coverage.xml
+# Used for the schnorr signature hack, remove once a php version is implemented
+scripts/node_modules

scripts/.babelrc

@@ -0,0 +1,3 @@
+{
+    "presets": ["@babel/preset-env"]
+}

scripts/package.json

@@ -0,0 +1,24 @@
+{
+    "name": "schnorr-signer",
+    "version": "1.0.0",
+    "description": "node-schorr-signer",
+    "main": "dist/schnorr-signer.js",
+    "directories": {
+        "test": "tests"
+    },
+    "scripts": {
+        "build": "babel src --out-dir dist",
+        "dev": "node src/schnorr-signer.js",
+        "start": "node dist/schnorr-signer.js"
+    },
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+        "@babel/cli": "^7.14.5",
+        "@babel/core": "^7.14.6",
+        "@babel/preset-env": "^7.14.7"
+    },
+    "dependencies": {
+        "bcrypto": "^5.5.2"
+    }
+}

scripts/src/schnorr-signer.js

@@ -0,0 +1,86 @@
+const { schnorr } = require("bcrypto");
+
+// Function to sign a message using the provided private key
+const signMessage = async (privateKeyHex, messageHex) => {
+    const privateKey = Buffer.from(privateKeyHex, "hex");
+    const message = Buffer.from(messageHex, "hex");
+
+    try {
+        const signature = await schnorr.sign(message, privateKey);
+        const signatureHex = signature.toString("hex");
+
+        return {
+            status: "success",
+            signature: signatureHex,
+        };
+    } catch (error) {
+        return {
+            status: "error",
+            message: error.message,
+        };
+    }
+};
+
+// Function to verify a signature using the provided public key
+const verifySignature = async (publicKeyHex, messageHex, signatureHex) => {
+    let publicKey = Buffer.from(publicKeyHex, "hex");
+    const message = Buffer.from(messageHex, "hex");
+    const signature = Buffer.from(signatureHex, "hex");
+
+    // Remove leading byte ('02' / '03') from ECDSA key
+    if (publicKey.byteLength === 33) {
+        publicKey = publicKey.subarray(1);
+    }
+
+    try {
+        const isValid = await schnorr.verify(message, signature, publicKey);
+
+        return {
+            status: "success",
+            isValid: isValid,
+        };
+    } catch (error) {
+        return {
+            status: "error",
+            message: error.message,
+        };
+    }
+};
+
+// Function to parse command line arguments and call the appropriate function
+const main = async () => {
+    const args = process.argv.slice(2);
+
+    if (args.length < 3) {
+        console.error(
+            JSON.stringify({
+                status: "error",
+                message: "Usage: npm start <mode> <parameters>",
+            })
+        );
+        process.exit(1);
+    }
+
+    const mode = args[0];
+    let result;
+
+    if (mode === "sign" && args.length === 3) {
+        const [privateKeyHex, messageHex] = args.slice(1);
+        result = await signMessage(privateKeyHex, messageHex);
+    } else if (mode === "verify" && args.length === 4) {
+        const [publicKeyHex, messageHex, signatureHex] = args.slice(1);
+        result = await verifySignature(publicKeyHex, messageHex, signatureHex);
+    } else {
+        console.error(
+            JSON.stringify({
+                status: "error",
+                message: `Usage: npm start ${mode} <parameters>.\nFor 'sign': npm start sign <privateKeyHex> <messageHex>.\nFor 'verify': npm start verify <publicKeyHex> <messageHex> <signatureHex>.`,
+            })
+        );
+        process.exit(1);
+    }
+
+    console.log(JSON.stringify(result));
+};
+
+main();

src/Configuration/Fee.php

@@ -31,12 +31,12 @@ class Fee
     private static $fees = [
         Types::TRANSFER                      => Fees::TRANSFER,
         Types::SECOND_SIGNATURE_REGISTRATION => Fees::SECOND_SIGNATURE_REGISTRATION,
-        Types::DELEGATE_REGISTRATION         => Fees::DELEGATE_REGISTRATION,
+        Types::VALIDATOR_REGISTRATION        => Fees::VALIDATOR_REGISTRATION,
         Types::VOTE                          => Fees::VOTE,
         Types::MULTI_SIGNATURE_REGISTRATION  => Fees::MULTI_SIGNATURE_REGISTRATION,
         Types::IPFS                          => Fees::IPFS,
         Types::MULTI_PAYMENT                 => Fees::MULTI_PAYMENT,
-        Types::DELEGATE_RESIGNATION          => Fees::DELEGATE_RESIGNATION,
+        Types::VALIDATOR_RESIGNATION         => Fees::VALIDATOR_RESIGNATION,
         Types::HTLC_LOCK                     => Fees::HTLC_LOCK,
         Types::HTLC_CLAIM                    => Fees::HTLC_CLAIM,
         Types::HTLC_REFUND                   => Fees::HTLC_REFUND,

src/Enums/Fees.php

@@ -24,7 +24,7 @@ class Fees
 
     public const SECOND_SIGNATURE_REGISTRATION = '500000000';
 
-    public const DELEGATE_REGISTRATION = '2500000000';
+    public const VALIDATOR_REGISTRATION = '2500000000';
 
     public const VOTE = '100000000';
 
@@ -34,7 +34,7 @@ class Fees
 
     public const MULTI_PAYMENT = '10000000';
 
-    public const DELEGATE_RESIGNATION = '2500000000';
+    public const VALIDATOR_RESIGNATION = '2500000000';
 
     public const HTLC_LOCK = '10000000';
 

src/Enums/Types.php

@@ -24,7 +24,7 @@ class Types
 
     public const SECOND_SIGNATURE_REGISTRATION = 1;
 
-    public const DELEGATE_REGISTRATION = 2;
+    public const VALIDATOR_REGISTRATION = 2;
 
     public const VOTE = 3;
 
@@ -34,7 +34,7 @@ class Types
 
     public const MULTI_PAYMENT = 6;
 
-    public const DELEGATE_RESIGNATION = 7;
+    public const VALIDATOR_RESIGNATION = 7;
 
     public const HTLC_LOCK = 8;
 

src/Identities/Address.php

@@ -14,8 +14,8 @@
 namespace ArkEcosystem\Crypto\Identities;
 
 use ArkEcosystem\Crypto\Networks\AbstractNetwork;
+use ArkEcosystem\Crypto\Utils\Address as AddressUtils;
 use BitWasp\Bitcoin\Crypto\EcAdapter\Impl\PhpEcc\Key\PrivateKey as EccPrivateKey;
-use BitWasp\Bitcoin\Crypto\Hash;
 use Elliptic\EC;
 use kornrunner\Keccak;
 
@@ -25,13 +25,12 @@ class Address
      * Derive the address from the given passphrase.
      *
      * @param string               $passphrase
-     * @param AbstractNetwork|null $network
      *
      * @return string
      */
-    public static function fromPassphrase(string $passphrase, AbstractNetwork $network = null): string
+    public static function fromPassphrase(string $passphrase): string
     {
-        return static::fromPrivateKey(PrivateKey::fromPassphrase($passphrase), $network);
+        return static::fromPrivateKey(PrivateKey::fromPassphrase($passphrase));
     }
 
     /**
@@ -51,11 +50,10 @@ public static function fromMultiSignatureAsset(int $min, array $publicKeys): str
      * Derive the address from the given public key.
      *
      * @param string               $publicKey
-     * @param AbstractNetwork|null $network
      *
      * @return string
      */
-    public static function fromPublicKey(string $publicKey, $network = null): string
+    public static function fromPublicKey(string $publicKey): string
     {
         // Convert the public key to a byte array
         $publicKeyBytes = hex2bin($publicKey);
@@ -81,22 +79,21 @@ public static function fromPublicKey(string $publicKey, $network = null): string
         $address = '0x'.$address;
 
         // Convert to checksum address
-        return self::toChecksumAddress($address);
+        return AddressUtils::toChecksumAddress($address);
     }
 
     /**
      * Derive the address from the given private key.
      *
      * @param EccPrivateKey $privateKey
-     * @param AbstractNetwork|null $network
      *
      * @return string
      */
-    public static function fromPrivateKey(EccPrivateKey $privateKey, AbstractNetwork $network = null): string
+    public static function fromPrivateKey(EccPrivateKey $privateKey): string
     {
         $publicKey = $privateKey->getPublicKey()->getHex();
 
-        return static::fromPublicKey($publicKey, $network);
+        return static::fromPublicKey($publicKey);
     }
 
     /**
@@ -107,33 +104,9 @@ public static function fromPrivateKey(EccPrivateKey $privateKey, AbstractNetwork
      *
      * @return bool
      */
-    public static function validate(string $address, $network = null): bool
+    public static function validate(string $address): bool
     {
         // Simple validation to check if the address starts with 0x and is 42 characters long
         return preg_match('/^0x[a-fA-F0-9]{40}$/', $address) === 1;
     }
-
-    /**
-     * Convert to checksum address.
-     *
-     * @param string $address
-     *
-     * @return string
-     */
-    private static function toChecksumAddress(string $address): string
-    {
-        $address         = strtolower(substr($address, 2));
-        $hash            = Keccak::hash($address, 256);
-        $checksumAddress = '0x';
-
-        for ($i = 0; $i < 40; $i++) {
-            if (intval($hash[$i], 16) >= 8) {
-                $checksumAddress .= strtoupper($address[$i]);
-            } else {
-                $checksumAddress .= $address[$i];
-            }
-        }
-
-        return $checksumAddress;
-    }
 }

src/Transactions/Builder/AbstractTransactionBuilder.php

@@ -38,7 +38,7 @@ public function __construct()
         $this->transaction->data['nonce']     = '0';
         $this->transaction->data['amount']    = '0';
         $this->transaction->data['fee']       = $this->getFee();
-        $this->transaction->data['version']   = 2;
+        $this->transaction->data['version']   = 1;
         $this->transaction->data['network']   = Network::get()->pubKeyHash();
     }
 
@@ -123,16 +123,17 @@ public function sign(string $passphrase): self
     }
 
     /**
-     * Sign the transaction using the given second passphrase.
+     * Sign the transaction using the given passphrase.
      *
-     * @param string $secondPassphrase
+     * @param string $passphrase
      *
      * @return AbstractTransactionBuilder
      */
-    public function secondSign(string $secondPassphrase): self
+    public function multiSign(string $passphrase, int $index = -1): self
     {
-        $this->transaction             = $this->transaction->secondSign(PrivateKey::fromPassphrase($secondPassphrase));
-        $this->transaction->data['id'] = $this->transaction->getId();
+        $keys = PrivateKey::fromPassphrase($passphrase);
+
+        $this->transaction = $this->transaction->multiSign($keys, $index);
 
         return $this;
     }
@@ -147,16 +148,6 @@ public function verify(): bool
         return $this->transaction->verify();
     }
 
-    /**
-     * Verify the transaction validity with a second signature.
-     *
-     * @return bool
-     */
-    public function secondVerify(string $secondPublicKey): bool
-    {
-        return $this->transaction->secondVerify($secondPublicKey);
-    }
-
     /**
      * Convert the transaction to its array representation.
      *

src/Transactions/Builder/MultiPaymentBuilder.php

@@ -44,6 +44,8 @@ public function add(string $recipientId, string $amount): self
     {
         $this->transaction->data['asset']['payments'][] = compact('recipientId', 'amount');
 
+        $this->transaction->data['amount'] = strval(+$this->transaction->data['amount'] + +$amount);
+
         return $this;
     }