Merge pull request #2 from sei-protocol/gprusak-refactor

refactor

Author: stevenlanders

Makefile

@@ -15,7 +15,7 @@ ifeq ($(GOPATH),)
 endif
 
 # Tools
-SOLC := solc
+SOLC := /tmp/solc
 ABIGEN := abigen
 NVM_DIR := $(HOME)/.nvm
 NODE_VERSION := 20
@@ -63,8 +63,8 @@ setup-node:
 	nvm install $(NODE_VERSION) && \
 	nvm use $(NODE_VERSION)
 	@echo "📦 Installing native solc binary..."
-	@curl -L https://github.com/ethereum/solidity/releases/download/v0.8.19/solc-static-linux -o /usr/local/bin/solc && \
-	chmod +x /usr/local/bin/solc
+	@curl -L https://github.com/ethereum/solidity/releases/download/v0.8.19/solc-static-linux -o /tmp/solc && \
+	chmod +x /tmp/solc
 	@echo "✅ Node.js environment setup complete"
 	@echo "ℹ️  Note: You may need to restart your shell or run 'source ~/.bashrc' to use nvm in new sessions"
 

generator/generator.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"seiload/config"
-	"seiload/generator/scenarios"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator/scenarios"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 // Generator interface defines the contract for transaction generators

generator/generator_test.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"seiload/config"
-	"seiload/generator"
-	"seiload/generator/scenarios"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator"
+	"github.com/sei-protocol/sei-load/generator/scenarios"
 )
 
 func TestScenarioWeightsAndAccountDistribution(t *testing.T) {

generator/prewarm.go

@@ -3,85 +3,85 @@ package generator
 import (
 	"sync"
 
-	"seiload/config"
-	"seiload/generator/scenarios"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator/scenarios"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 // PrewarmGenerator generates self-transfer transactions to prewarm account nonces
 type PrewarmGenerator struct {
-	accountPools    []types.AccountPool
-	evmScenario     scenarios.TxGenerator
-	currentPoolIdx  int
-	finished        bool
-	mu              sync.RWMutex
+	accountPools   []types.AccountPool
+	evmScenario    scenarios.TxGenerator
+	currentPoolIdx int
+	finished       bool
+	mu             sync.RWMutex
 }
 
 // NewPrewarmGenerator creates a new prewarm generator using all account pools from the main generator
 func NewPrewarmGenerator(config *config.LoadConfig, mainGenerator Generator) *PrewarmGenerator {
 	// Get all account pools from the main generator
 	accountPools := mainGenerator.GetAccountPools()
-	
+
 	// Create EVMTransfer scenario for prewarming
 	evmScenario := scenarios.NewEVMTransferScenario()
-	
+
 	// Deploy/initialize the scenario (EVMTransfer doesn't need actual deployment)
 	deployerAccounts := types.GenerateAccounts(1)
 	deployer := deployerAccounts[0]
 	evmScenario.Deploy(config, deployer)
-	
+
 	return &PrewarmGenerator{
-		accountPools: accountPools,
-		evmScenario:  evmScenario,
+		accountPools:   accountPools,
+		evmScenario:    evmScenario,
 		currentPoolIdx: 0,
-		finished:     false,
+		finished:       false,
 	}
 }
 
 // Generate generates self-transfer transactions until all accounts are prewarmed
 func (pg *PrewarmGenerator) Generate() (*types.LoadTx, bool) {
 	pg.mu.Lock()
 	defer pg.mu.Unlock()
-	
+
 	// Check if we're already finished
 	if pg.finished || pg.currentPoolIdx >= len(pg.accountPools) {
 		return nil, false
 	}
-	
+
 	// Get current pool
 	currentPool := pg.accountPools[pg.currentPoolIdx]
 	account := currentPool.NextAccount()
-	
+
 	// If this account has nonce > 0, we've already prewarmed it (round-robin means we're done with this pool)
 	if account.Nonce > 0 {
 		// Move to next pool
 		pg.currentPoolIdx++
-		
+
 		// Check if we've finished all pools
 		if pg.currentPoolIdx >= len(pg.accountPools) {
 			pg.finished = true
 			return nil, false
 		}
-		
+
 		// Get account from next pool
 		currentPool = pg.accountPools[pg.currentPoolIdx]
 		account = currentPool.NextAccount()
-		
+
 		// If this account also has nonce > 0, we're completely done
 		if account.Nonce > 0 {
 			pg.finished = true
 			return nil, false
 		}
 	}
-	
+
 	// Create self-transfer transaction
 	scenario := &types.TxScenario{
 		Name:     "EVMTransfer",
 		Sender:   account,
 		Receiver: account.Address, // Send to self
 		Nonce:    account.GetAndIncrementNonce(),
 	}
-	
+
 	// Generate the transaction using EVMTransfer scenario
 	return pg.evmScenario.Generate(scenario), true
 }
@@ -103,7 +103,7 @@ func (pg *PrewarmGenerator) GenerateN(n int) []*types.LoadTx {
 func (pg *PrewarmGenerator) GetAccountPools() []types.AccountPool {
 	pg.mu.RLock()
 	defer pg.mu.RUnlock()
-	
+
 	// Return a copy to prevent external modification
 	pools := make([]types.AccountPool, len(pg.accountPools))
 	copy(pools, pg.accountPools)

generator/scenario.go

@@ -3,8 +3,8 @@ package generator
 import (
 	"sync"
 
-	"seiload/generator/scenarios"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/generator/scenarios"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 type scenarioGenerator struct {

generator/scenarios/ERC20.go

@@ -6,9 +6,9 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 
-	"seiload/config"
-	"seiload/generator/bindings"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator/bindings"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 const ERC20 = "ERC20"

generator/scenarios/ERC20Conflict.go

@@ -6,9 +6,9 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 
-	"seiload/config"
-	"seiload/generator/bindings"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator/bindings"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 const ERC20Conflict = "ERC20Conflict"

generator/scenarios/ERC20Noop.go

@@ -6,9 +6,9 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 
-	"seiload/config"
-	"seiload/generator/bindings"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator/bindings"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 const ERC20Noop = "ERC20Noop"

generator/scenarios/ERC721.go

@@ -9,9 +9,9 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 
-	"seiload/config"
-	"seiload/generator/bindings"
-	"seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	"github.com/sei-protocol/sei-load/generator/bindings"
+	"github.com/sei-protocol/sei-load/types"
 )
 
 const ERC721 = "ERC721"

generator/scenarios/EVMTransfer.go

@@ -6,8 +6,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
-	"seiload/config"
-	types2 "seiload/types"
+	"github.com/sei-protocol/sei-load/config"
+	types2 "github.com/sei-protocol/sei-load/types"
 )
 
 const EVMTransfer = "EVMTransfer"