refactor: rename transaction to tx

README.md

@@ -51,10 +51,10 @@ type Signer interface {
 }
 ```
 
-### transaction
+### tx
 
-- `github.com/darrenvechain/thorgo/crypto/transaction`
-- The `transaction` package is a copy of the [vechain/thor/tx](https://github.com/vechain/thor/tree/master/tx) package and can be used to build transactions where `thorgo` does not provide the necessary functionality.
+- `github.com/darrenvechain/thorgo/crypto/tx`
+- The `tx` package is a copy of the [vechain/thor/tx](https://github.com/vechain/thor/tree/master/tx) package and can be used to build transactions where `thorgo` does not provide the necessary functionality.
 
 ### solo
 
@@ -190,7 +190,7 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/darrenvechain/thorgo/solo"
 	"github.com/darrenvechain/thorgo"
 	"github.com/darrenvechain/thorgo/txmanager"

accounts/accounts.go

@@ -4,7 +4,7 @@ import (
 	"math/big"
 
 	"github.com/darrenvechain/thorgo/client"
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -53,10 +53,10 @@ func (a *Visitor) Storage(key common.Hash) (*client.AccountStorage, error) {
 
 // Call executes a read-only contract call.
 func (a *Visitor) Call(calldata []byte) (*client.InspectResponse, error) {
-	clause := transaction.NewClause(&a.account).WithData(calldata).WithValue(big.NewInt(0))
+	clause := tx.NewClause(&a.account).WithData(calldata).WithValue(big.NewInt(0))
 
 	request := client.InspectRequest{
-		Clauses: []*transaction.Clause{clause},
+		Clauses: []*tx.Clause{clause},
 	}
 	var (
 		inspection []client.InspectResponse

accounts/contract.go

@@ -7,7 +7,7 @@ import (
 	"math/big"
 
 	"github.com/darrenvechain/thorgo/client"
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/darrenvechain/thorgo/transactions"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
@@ -47,9 +47,9 @@ func (c *Contract) Call(method string, value interface{}, args ...interface{}) e
 	if err != nil {
 		return fmt.Errorf("failed to pack method %s: %w", method, err)
 	}
-	clause := transaction.NewClause(&c.Address).WithData(packed).WithValue(big.NewInt(0))
+	clause := tx.NewClause(&c.Address).WithData(packed).WithValue(big.NewInt(0))
 	request := client.InspectRequest{
-		Clauses: []*transaction.Clause{clause},
+		Clauses: []*tx.Clause{clause},
 	}
 	var response []client.InspectResponse
 	if c.revision == nil {
@@ -103,16 +103,16 @@ func (c *Contract) DecodeCall(data []byte, value interface{}) error {
 }
 
 // AsClause returns a transaction clause for the given method and arguments.
-func (c *Contract) AsClause(method string, args ...interface{}) (*transaction.Clause, error) {
+func (c *Contract) AsClause(method string, args ...interface{}) (*tx.Clause, error) {
 	packed, err := c.ABI.Pack(method, args...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to pack method %s: %w", method, err)
 	}
-	return transaction.NewClause(&c.Address).WithData(packed).WithValue(big.NewInt(0)), nil
+	return tx.NewClause(&c.Address).WithData(packed).WithValue(big.NewInt(0)), nil
 }
 
 type TxManager interface {
-	SendClauses(clauses []*transaction.Clause) (common.Hash, error)
+	SendClauses(clauses []*tx.Clause) (common.Hash, error)
 }
 
 // Send executes a transaction with a single clause.
@@ -121,7 +121,7 @@ func (c *Contract) Send(manager TxManager, method string, args ...interface{}) (
 	if err != nil {
 		return &transactions.Visitor{}, fmt.Errorf("failed to pack method %s: %w", method, err)
 	}
-	txId, err := manager.SendClauses([]*transaction.Clause{clause})
+	txId, err := manager.SendClauses([]*tx.Clause{clause})
 	if err != nil {
 		return &transactions.Visitor{}, fmt.Errorf("failed to send transaction: %w", err)
 	}

accounts/deployer.go

@@ -6,7 +6,7 @@ import (
 	"math/big"
 
 	"github.com/darrenvechain/thorgo/client"
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/darrenvechain/thorgo/transactions"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
@@ -34,7 +34,7 @@ func (d *Deployer) Deploy(sender TxManager, args ...interface{}) (*Contract, com
 	if err != nil {
 		return nil, txID, fmt.Errorf("failed to pack contract arguments: %w", err)
 	}
-	txID, err = sender.SendClauses([]*transaction.Clause{clause})
+	txID, err = sender.SendClauses([]*tx.Clause{clause})
 	if err != nil {
 		return nil, txID, fmt.Errorf("failed to send contract deployment transaction: %w", err)
 	}
@@ -52,12 +52,12 @@ func (d *Deployer) Deploy(sender TxManager, args ...interface{}) (*Contract, com
 }
 
 // AsClause returns the contract deployment clause.
-func (d *Deployer) AsClause(args ...interface{}) (*transaction.Clause, error) {
+func (d *Deployer) AsClause(args ...interface{}) (*tx.Clause, error) {
 	contractArgs, err := d.abi.Pack("", args...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to pack contract arguments: %w", err)
 	}
 	bytecode := append(d.bytecode, contractArgs...)
-	clause := transaction.NewClause(nil).WithData(bytecode).WithValue(d.value)
+	clause := tx.NewClause(nil).WithData(bytecode).WithValue(d.value)
 	return clause, nil
 }

client/accounts.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 )
@@ -21,14 +21,14 @@ type AccountStorage struct {
 }
 
 type InspectRequest struct {
-	Gas        *uint64               `json:"gas,omitempty"`
-	GasPrice   *uint64               `json:"gasPrice,omitempty"`
-	Caller     *common.Address       `json:"caller,omitempty"`
-	ProvedWork *string               `json:"provedWork,omitempty"`
-	GasPayer   *common.Address       `json:"gasPayer,omitempty"`
-	Expiration *uint64               `json:"expiration,omitempty"`
-	BlockRef   *string               `json:"blockRef,omitempty"`
-	Clauses    []*transaction.Clause `json:"clauses"`
+	Gas        *uint64         `json:"gas,omitempty"`
+	GasPrice   *uint64         `json:"gasPrice,omitempty"`
+	Caller     *common.Address `json:"caller,omitempty"`
+	ProvedWork *string         `json:"provedWork,omitempty"`
+	GasPayer   *common.Address `json:"gasPayer,omitempty"`
+	Expiration *uint64         `json:"expiration,omitempty"`
+	BlockRef   *string         `json:"blockRef,omitempty"`
+	Clauses    []*tx.Clause    `json:"clauses"`
 }
 
 type InspectResponse struct {

client/blocks.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 )
@@ -31,29 +31,29 @@ func (b *Block) ChainTag() byte {
 	return b.ID[len(b.ID)-1]
 }
 
-func (b *Block) BlockRef() transaction.BlockRef {
-	return transaction.NewBlockRefFromID(b.ID)
+func (b *Block) BlockRef() tx.BlockRef {
+	return tx.NewBlockRefFromID(b.ID)
 }
 
 type BlockTransaction struct {
-	ID           common.Hash          `json:"id"`
-	ChainTag     byte                 `json:"chainTag"`
-	BlockRef     transaction.BlockRef `json:"blockRef"`
-	Expiration   int64                `json:"expiration"`
-	Clauses      []transaction.Clause `json:"clauses"`
-	GasPriceCoef int64                `json:"gasPriceCoef"`
-	Gas          int64                `json:"gas"`
-	Origin       common.Address       `json:"origin"`
-	Delegator    *common.Address      `json:"delegator,omitempty"`
-	Nonce        hexutil.Big          `json:"nonce"`
-	DependsOn    *common.Hash         `json:"dependsOn,omitempty"`
-	Size         int64                `json:"size"`
-	GasUsed      int64                `json:"gasUsed"`
-	GasPayer     common.Address       `json:"gasPayer"`
-	Paid         hexutil.Big          `json:"paid"`
-	Reward       hexutil.Big          `json:"reward"`
-	Reverted     bool                 `json:"reverted"`
-	Outputs      []Output             `json:"outputs"`
+	ID           common.Hash     `json:"id"`
+	ChainTag     byte            `json:"chainTag"`
+	BlockRef     tx.BlockRef     `json:"blockRef"`
+	Expiration   int64           `json:"expiration"`
+	Clauses      []tx.Clause     `json:"clauses"`
+	GasPriceCoef int64           `json:"gasPriceCoef"`
+	Gas          int64           `json:"gas"`
+	Origin       common.Address  `json:"origin"`
+	Delegator    *common.Address `json:"delegator,omitempty"`
+	Nonce        hexutil.Big     `json:"nonce"`
+	DependsOn    *common.Hash    `json:"dependsOn,omitempty"`
+	Size         int64           `json:"size"`
+	GasUsed      int64           `json:"gasUsed"`
+	GasPayer     common.Address  `json:"gasPayer"`
+	Paid         hexutil.Big     `json:"paid"`
+	Reward       hexutil.Big     `json:"reward"`
+	Reverted     bool            `json:"reverted"`
+	Outputs      []Output        `json:"outputs"`
 }
 
 type ExpandedBlock struct {

client/client.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -135,7 +135,7 @@ func (c *Client) ChainTag() byte {
 }
 
 // SendTransaction sends a transaction to the node.
-func (c *Client) SendTransaction(tx *transaction.Transaction) (*SendTransactionResponse, error) {
+func (c *Client) SendTransaction(tx *tx.Transaction) (*SendTransactionResponse, error) {
 	body := make(map[string]string)
 	encoded, err := tx.Encoded()
 	if err != nil {

client/transactions.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 )
@@ -26,19 +26,19 @@ type TransactionReceipt struct {
 }
 
 type Transaction struct {
-	ID           common.Hash          `json:"id"`
-	ChainTag     int64                `json:"chainTag"`
-	BlockRef     transaction.BlockRef `json:"blockRef"`
-	Expiration   int64                `json:"expiration"`
-	Clauses      []transaction.Clause `json:"clauses"`
-	GasPriceCoef int64                `json:"gasPriceCoef"`
-	Gas          int64                `json:"gas"`
-	Origin       common.Address       `json:"origin"`
-	Delegator    *common.Address      `json:"delegator"`
-	Nonce        hexutil.Big          `json:"nonce"`
-	DependsOn    *common.Hash         `json:"dependsOn"`
-	Size         int64                `json:"size"`
-	Meta         TxMeta               `json:"meta"`
+	ID           common.Hash     `json:"id"`
+	ChainTag     int64           `json:"chainTag"`
+	BlockRef     tx.BlockRef     `json:"blockRef"`
+	Expiration   int64           `json:"expiration"`
+	Clauses      []tx.Clause     `json:"clauses"`
+	GasPriceCoef int64           `json:"gasPriceCoef"`
+	Gas          int64           `json:"gas"`
+	Origin       common.Address  `json:"origin"`
+	Delegator    *common.Address `json:"delegator"`
+	Nonce        hexutil.Big     `json:"nonce"`
+	DependsOn    *common.Hash    `json:"dependsOn"`
+	Size         int64           `json:"size"`
+	Meta         TxMeta          `json:"meta"`
 }
 
 type Transfer struct {

client/transactions_test.go

@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/darrenvechain/thorgo/crypto/transaction"
+	"github.com/darrenvechain/thorgo/crypto/tx"
 	"github.com/darrenvechain/thorgo/solo"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/assert"
@@ -15,16 +15,16 @@ func TestClient_SendTransaction(t *testing.T) {
 	account2 := solo.Keys()[1]
 	account2Addr := crypto.PubkeyToAddress(account2.PublicKey)
 
-	vetClause := transaction.NewClause(&account2Addr).
+	vetClause := tx.NewClause(&account2Addr).
 		WithValue(big.NewInt(1000))
 
-	txBody := new(transaction.Builder).
+	txBody := new(tx.Builder).
 		Gas(3_000_000).
 		GasPriceCoef(255).
 		ChainTag(client.ChainTag()).
 		Expiration(100000000).
-		BlockRef(transaction.NewBlockRef(0)).
-		Nonce(transaction.Nonce()).
+		BlockRef(tx.NewBlockRef(0)).
+		Nonce(tx.Nonce()).
 		Clause(vetClause).
 		Build()
 

crypto/transaction/block_ref.go → crypto/tx/block_ref.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"encoding/binary"

crypto/transaction/block_ref_test.go → crypto/tx/block_ref_test.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"crypto/rand"

crypto/transaction/builder.go → crypto/tx/builder.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"encoding/binary"

crypto/transaction/builder_test.go → crypto/tx/builder_test.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction_test
+package tx_test
 
 import (
 	"testing"

crypto/transaction/clause.go → crypto/tx/clause.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"encoding/json"

crypto/transaction/clause_test.go → crypto/tx/clause_test.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"math/big"

crypto/transaction/features.go → crypto/tx/features.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 // Features bitset contains tx features.
 type Features uint32

crypto/transaction/features_test.go → crypto/tx/features_test.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"testing"

crypto/transaction/nonce.go → crypto/tx/nonce.go

@@ -1,4 +1,4 @@
-package transaction
+package tx
 
 import (
 	"crypto/rand"

crypto/transaction/params.go → crypto/tx/params.go

@@ -3,7 +3,7 @@
 // Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
 // file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
 
-package transaction
+package tx
 
 import (
 	"github.com/ethereum/go-ethereum/params"