refactor: evm ecdsa adjustments

.github/workflows/test.yml

@@ -15,9 +15,6 @@ 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
 

src/Enums/Types.php

@@ -21,21 +21,6 @@ enum Types: int
     case USERNAME_RESIGNATION         = 9;
     case EVM_CALL                     = 10;
 
-    public function defaultFee(): string
-    {
-        return match ($this) {
-            Types::TRANSFER                     => Fees::TRANSFER,
-            Types::VALIDATOR_REGISTRATION       => Fees::VALIDATOR_REGISTRATION,
-            Types::VOTE                         => Fees::VOTE,
-            // Types::MULTI_SIGNATURE_REGISTRATION => Fees::MULTI_SIGNATURE_REGISTRATION,
-            // Types::MULTI_PAYMENT                => Fees::MULTI_PAYMENT,
-            Types::VALIDATOR_RESIGNATION        => Fees::VALIDATOR_RESIGNATION,
-            // Types::USERNAME_REGISTRATION        => Fees::USERNAME_REGISTRATION,
-            // Types::USERNAME_RESIGNATION         => Fees::USERNAME_RESIGNATION,
-            Types::EVM_CALL                     => Fees::EVM,
-        };
-    }
-
     public static function fromValue(int $value): ?self
     {
         $enum = new ReflectionEnum(self::class);

src/Transactions/Builder/AbstractTransactionBuilder.php

@@ -4,10 +4,7 @@
 
 namespace ArkEcosystem\Crypto\Transactions\Builder;
 
-use ArkEcosystem\Crypto\Configuration\Fee;
 use ArkEcosystem\Crypto\Configuration\Network;
-use ArkEcosystem\Crypto\Enums\TypeGroup;
-use ArkEcosystem\Crypto\Enums\Types;
 use ArkEcosystem\Crypto\Identities\PrivateKey;
 use ArkEcosystem\Crypto\Transactions\Types\AbstractTransaction;
 
@@ -20,20 +17,13 @@ public function __construct(?array $data = null)
         $this->transaction = $this->getTransactionInstance();
 
         $this->transaction->data = $data ?? [
-            'type'            => Types::EVM_CALL->value,
-            'typeGroup'       => TypeGroup::CORE,
-            'amount'          => '0',
-            'senderPublicKey' => '',
-            'fee'             => Fee::get(Types::EVM_CALL->value),
-            'nonce'           => '1',
-            'version'         => 1,
-            'network'         => Network::get()->pubKeyHash(),
-            'asset'           => [
-                'evmCall' => [
-                    'gasLimit' => 1000000,  // Default gas limit
-                    'payload'  => '',       // EVM code in hex format
-                ],
-            ],
+            'value'             => '0',
+            'senderPublicKey'   => '',
+            'gasPrice'          => '5',
+            'nonce'             => '1',
+            'network'           => Network::get()->pubKeyHash(),
+            'gasLimit'          => 1_000_000,
+            'data'              => '',
         ];
     }
 
@@ -49,33 +39,25 @@ public static function new(?array $data = null): static
 
     public function gasLimit(int $gasLimit): static
     {
-        $this->transaction->data['asset']['evmCall']['gasLimit'] = $gasLimit;
+        $this->transaction->data['gasLimit'] = $gasLimit;
 
         return $this;
     }
 
-    public function recipient(string $recipientId): static
+    public function recipientAddress(string $recipientAddress): static
     {
-        $this->transaction->data['recipientId'] = $recipientId;
+        $this->transaction->data['recipientAddress'] = $recipientAddress;
 
         return $this;
     }
 
-    public function fee(string $fee): static
+    public function gasPrice(int $gasPrice): static
     {
-        $this->transaction->data['fee'] = $fee;
+        $this->transaction->data['gasPrice'] = $gasPrice;
 
         return $this;
     }
 
-    /**
-     * Alias for fee.
-     */
-    public function gasPrice(string $gasPrice): static
-    {
-        return $this->fee($gasPrice);
-    }
-
     public function nonce(string $nonce): static
     {
         $this->transaction->data['nonce'] = $nonce;
@@ -93,27 +75,11 @@ public function network(int $network): static
     public function sign(string $passphrase): static
     {
         $keys                                       = PrivateKey::fromPassphrase($passphrase);
+
         $this->transaction->data['senderPublicKey'] = $keys->getPublicKey()->getHex();
 
         $this->transaction             = $this->transaction->sign($keys);
-        $this->transaction->data['id'] = $this->transaction->getId();
 
-        return $this;
-    }
-
-    public function multiSign(string $passphrase, int $index = -1): static
-    {
-        $keys              = PrivateKey::fromPassphrase($passphrase);
-        $this->transaction = $this->transaction->multiSign($keys, $index);
-
-        return $this;
-    }
-
-    public function secondSign(string $secondPassphrase): static
-    {
-        $this->transaction = $this->transaction->secondSign(
-            PrivateKey::fromPassphrase($secondPassphrase)
-        );
         $this->transaction->data['id'] = $this->transaction->getId();
 
         return $this;
@@ -124,11 +90,6 @@ public function verify(): bool
         return $this->transaction->verify();
     }
 
-    public function secondVerify(string $secondPublicKey): bool
-    {
-        return $this->transaction->secondVerify($secondPublicKey);
-    }
-
     public function toArray(): array
     {
         return $this->transaction->toArray();

src/Transactions/Builder/EvmCallBuilder.php

@@ -12,7 +12,7 @@ class EvmCallBuilder extends AbstractTransactionBuilder
     public function payload(string $payload): self
     {
         $payload                                                = ltrim($payload, '0x');
-        $this->transaction->data['asset']['evmCall']['payload'] = $payload;
+        $this->transaction->data['data']                        = $payload;
 
         return $this;
     }

src/Transactions/Builder/TransferBuilder.php

@@ -9,9 +9,9 @@
 
 class TransferBuilder extends AbstractTransactionBuilder
 {
-    public function amount(string $amount): self
+    public function value(string $value): self
     {
-        $this->transaction->data['amount'] = $amount;
+        $this->transaction->data['value'] = $value;
 
         return $this;
     }

src/Transactions/Builder/ValidatorRegistrationBuilder.php

@@ -11,7 +11,7 @@ class ValidatorRegistrationBuilder extends AbstractTransactionBuilder
 {
     public function validatorPublicKey(string $validatorPublicKey): self
     {
-        $this->transaction->data['asset']['validatorPublicKey'] = $validatorPublicKey;
+        $this->transaction->data['validatorPublicKey'] = $validatorPublicKey;
 
         return $this;
     }

src/Transactions/Builder/VoteBuilder.php

@@ -11,7 +11,7 @@ class VoteBuilder extends AbstractTransactionBuilder
 {
     public function vote(string $vote): self
     {
-        $this->transaction->data['asset']['vote'] = $vote;
+        $this->transaction->data['vote'] = $vote;
 
         return $this;
     }