refactor: replace builders with evm

src/Enums/AbiFunction.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ArkEcosystem\Crypto\Enums;
+
+use ArkEcosystem\Crypto\Transactions\Types\Unvote;
+use ArkEcosystem\Crypto\Transactions\Types\ValidatorRegistration;
+use ArkEcosystem\Crypto\Transactions\Types\ValidatorResignation;
+use ArkEcosystem\Crypto\Transactions\Types\Vote;
+
+enum AbiFunction: string
+{
+    case VOTE                         = 'vote';
+    case UNVOTE                       = 'unvote';
+    case VALIDATOR_REGISTRATION       = 'registerValidator';
+    case VALIDATOR_RESIGNATION        = 'resignValidator';
+
+    public function transactionClass(): string
+    {
+        return match ($this) {
+            self::VOTE                       => Vote::class,
+            self::UNVOTE                     => Unvote::class,
+            self::VALIDATOR_REGISTRATION     => ValidatorRegistration::class,
+            self::VALIDATOR_RESIGNATION      => ValidatorResignation::class,
+        };
+    }
+}

src/Enums/Fees.php

@@ -22,6 +22,5 @@ class Fees
 
     public const USERNAME_RESIGNATION = '2500000000';
 
-    // @TODO: review this fee
     public const EVM = '0';
 }

src/Enums/Types.php

@@ -4,15 +4,6 @@
 
 namespace ArkEcosystem\Crypto\Enums;
 
-use ArkEcosystem\Crypto\Transactions\Types\EvmCall;
-use ArkEcosystem\Crypto\Transactions\Types\MultiPayment;
-use ArkEcosystem\Crypto\Transactions\Types\MultiSignatureRegistration;
-use ArkEcosystem\Crypto\Transactions\Types\Transfer;
-use ArkEcosystem\Crypto\Transactions\Types\UsernameRegistration;
-use ArkEcosystem\Crypto\Transactions\Types\UsernameResignation;
-use ArkEcosystem\Crypto\Transactions\Types\ValidatorRegistration;
-use ArkEcosystem\Crypto\Transactions\Types\ValidatorResignation;
-use ArkEcosystem\Crypto\Transactions\Types\Vote;
 use ReflectionEnum;
 
 /**
@@ -30,32 +21,17 @@ enum Types: int
     case USERNAME_RESIGNATION         = 9;
     case EVM_CALL                     = 10;
 
-    public function transactionClass(): string
-    {
-        return match ($this) {
-            Types::TRANSFER                     => Transfer::class,
-            Types::VALIDATOR_REGISTRATION       => ValidatorRegistration::class,
-            Types::VOTE                         => Vote::class,
-            Types::MULTI_SIGNATURE_REGISTRATION => MultiSignatureRegistration::class,
-            Types::MULTI_PAYMENT                => MultiPayment::class,
-            Types::VALIDATOR_RESIGNATION        => ValidatorResignation::class,
-            Types::USERNAME_REGISTRATION        => UsernameRegistration::class,
-            Types::USERNAME_RESIGNATION         => UsernameResignation::class,
-            Types::EVM_CALL                     => EvmCall::class,
-        };
-    }
-
     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::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::USERNAME_REGISTRATION        => Fees::USERNAME_REGISTRATION,
+            // Types::USERNAME_RESIGNATION         => Fees::USERNAME_RESIGNATION,
             Types::EVM_CALL                     => Fees::EVM,
         };
     }

src/Transactions/Builder/AbstractTransactionBuilder.php

@@ -6,98 +6,91 @@
 
 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\Transaction;
+use ArkEcosystem\Crypto\Transactions\Types\AbstractTransaction;
 
 abstract class AbstractTransactionBuilder
 {
-    public $transaction;
+    public AbstractTransaction $transaction;
 
-    /**
-     * Create a new transaction instance.
-     */
-    public function __construct()
+    public function __construct(?array $data = null)
     {
-        $this->transaction                    = $this->getTransactionInstance();
-        $this->transaction->data['type']      = $this->getType();
-        $this->transaction->data['typeGroup'] = $this->getTypeGroup();
-        $this->transaction->data['nonce']     = '0';
-        $this->transaction->data['amount']    = '0';
-        $this->transaction->data['fee']       = $this->getFee();
-        $this->transaction->data['version']   = 1;
-        $this->transaction->data['network']   = Network::get()->pubKeyHash();
+        $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
+                ],
+            ],
+        ];
     }
 
-    /**
-     * Convert the message to its string representation.
-     *
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->toJson();
     }
 
-    /**
-     * Create a new transaction instance.
-     *
-     * @return AbstractTransactionBuilder
-     */
-    public static function new(): self
+    public static function new(?array $data = null): static
     {
-        return new static();
+        return new static($data);
     }
 
-    /**
-     * Set the transaction fee.
-     *
-     * @param string $fee
-     *
-     * @return AbstractTransactionBuilder
-     */
-    public function withFee(string $fee): self
+    public function gasLimit(int $gasLimit): static
+    {
+        $this->transaction->data['asset']['evmCall']['gasLimit'] = $gasLimit;
+
+        return $this;
+    }
+
+    public function recipient(string $recipientId): static
+    {
+        $this->transaction->data['recipientId'] = $recipientId;
+
+        return $this;
+    }
+
+    public function fee(string $fee): static
     {
         $this->transaction->data['fee'] = $fee;
 
         return $this;
     }
 
     /**
-     * Set the transaction nonce.
-     *
-     * @param string $nonce
-     *
-     * @return AbstractTransactionBuilder
+     * Alias for fee.
      */
-    public function withNonce(string $nonce): self
+    public function gasPrice(string $gasPrice): static
+    {
+        return $this->fee($gasPrice);
+    }
+
+    public function nonce(string $nonce): static
     {
         $this->transaction->data['nonce'] = $nonce;
 
         return $this;
     }
 
-    /**
-     * Set the transaction network.
-     *
-     * @param int $network
-     *
-     * @return AbstractTransactionBuilder
-     */
-    public function withNetwork(int $network): self
+    public function network(int $network): static
     {
         $this->transaction->data['network'] = $network;
 
         return $this;
     }
 
-    /**
-     * Sign the transaction using the given passphrase.
-     *
-     * @param string $passphrase
-     *
-     * @return AbstractTransactionBuilder
-     */
-    public function sign(string $passphrase): self
+    public function sign(string $passphrase): static
     {
         $keys                                       = PrivateKey::fromPassphrase($passphrase);
         $this->transaction->data['senderPublicKey'] = $keys->getPublicKey()->getHex();
@@ -108,105 +101,43 @@ public function sign(string $passphrase): self
         return $this;
     }
 
-    /**
-     * Sign the transaction using the given passphrase.
-     *
-     * @param string $passphrase
-     *
-     * @return AbstractTransactionBuilder
-     */
-    public function multiSign(string $passphrase, int $index = -1): self
+    public function multiSign(string $passphrase, int $index = -1): static
     {
-        $keys = PrivateKey::fromPassphrase($passphrase);
-
+        $keys              = PrivateKey::fromPassphrase($passphrase);
         $this->transaction = $this->transaction->multiSign($keys, $index);
 
         return $this;
     }
 
-    /**
-     * Sign the transaction using the given second passphrase.
-     *
-     * @param string $secondPassphrase
-     *
-     * @return AbstractTransactionBuilder
-     */
-    public function secondSign(string $secondPassphrase): self
+    public function secondSign(string $secondPassphrase): static
     {
-        $this->transaction             = $this->transaction->secondSign(PrivateKey::fromPassphrase($secondPassphrase));
+        $this->transaction = $this->transaction->secondSign(
+            PrivateKey::fromPassphrase($secondPassphrase)
+        );
         $this->transaction->data['id'] = $this->transaction->getId();
 
         return $this;
     }
 
-    /**
-     * Verify the transaction validity.
-     *
-     * @return bool
-     */
     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.
-     *
-     * @return array
-     */
     public function toArray(): array
     {
         return $this->transaction->toArray();
     }
 
-    /**
-     * Convert the transaction to its JSON representation.
-     *
-     * @return string
-     */
     public function toJson(): string
     {
         return $this->transaction->toJson();
     }
 
-    /**
-     * Get the transaction type.
-     *
-     * @return int
-     */
-    abstract protected function getType(): int;
-
-    /**
-     * Get the transaction typeGroup.
-     *
-     * @return int
-     */
-    abstract protected function getTypeGroup(): int;
-
-    /**
-     * Get the transaction instance.
-     *
-     * @return object
-     */
-    abstract protected function getTransactionInstance(): object;
-
-    /**
-     * Get the transaction fee.
-     *
-     * @return string
-     */
-    protected function getFee(): string
-    {
-        return Fee::get($this->transaction->data['type']);
-    }
+    abstract protected function getTransactionInstance(?array $data = []): AbstractTransaction;
 }