Skip to content

Commit f6be19b

Browse files
mweinschenkgithub-actions[bot]
authored andcommitted
Fix styling
1 parent 8d9fbc8 commit f6be19b

18 files changed

+215
-94
lines changed

src/Clients/ContractClientGeneric.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Farbcode\LaravelEvm\Contracts\ContractClient;
77
use Farbcode\LaravelEvm\Contracts\RpcClient;
88
use Farbcode\LaravelEvm\Contracts\Signer;
9+
use Farbcode\LaravelEvm\Events\CallPerformed;
910
use Farbcode\LaravelEvm\Jobs\SendTransaction;
1011
use Farbcode\LaravelEvm\Support\CallResult;
11-
use Farbcode\LaravelEvm\Events\CallPerformed;
1212

1313
class ContractClientGeneric implements ContractClient
1414
{

src/Clients/RpcHttpClient.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,11 @@ public function health(): array
168168
public function getLogs(array $filter): array
169169
{
170170
// Basic validation: require either blockHash or fromBlock/toBlock pair.
171-
if (!isset($filter['blockHash']) && !isset($filter['fromBlock']) && !isset($filter['toBlock'])) {
171+
if (! isset($filter['blockHash']) && ! isset($filter['fromBlock']) && ! isset($filter['toBlock'])) {
172172
throw new \InvalidArgumentException('getLogs filter requires blockHash or fromBlock/toBlock');
173173
}
174174
$res = $this->call('eth_getLogs', [$filter]);
175+
175176
return is_array($res) ? $res : [];
176177
}
177178
}

src/Codec/AbiCodecWeb3p.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,12 @@ private function encodeStatic(string $type, mixed $val): string
7878
}
7979
if ($type === 'address') {
8080
$clean = strtolower(preg_replace('/^0x/', '', (string) $val));
81+
8182
return str_pad($clean, 64, '0', STR_PAD_LEFT);
8283
}
8384
if ($type === 'bytes32') {
8485
$clean = strtolower(preg_replace('/^0x/', '', (string) $val));
86+
8587
return str_pad(substr($clean, 0, 64), 64, '0', STR_PAD_RIGHT);
8688
}
8789
if ($type === 'bool') {
@@ -100,6 +102,7 @@ private function encodeDynamic(string $type, mixed $val): string
100102
$length = strlen($bin); // bytes
101103
$lenSlot = str_pad(dechex($length), 64, '0', STR_PAD_LEFT);
102104
$dataPadded = $this->padHexRight($hex);
105+
103106
return $lenSlot.$dataPadded;
104107
}
105108
if ($type === 'bytes') {
@@ -108,6 +111,7 @@ private function encodeDynamic(string $type, mixed $val): string
108111
$length = strlen($bin);
109112
$lenSlot = str_pad(dechex($length), 64, '0', STR_PAD_LEFT);
110113
$dataPadded = $this->padHexRight($clean);
114+
111115
return $lenSlot.$dataPadded;
112116
}
113117
throw new \RuntimeException('Unsupported dynamic ABI type '.$type);
@@ -117,12 +121,14 @@ private function padHexRight(string $hex): string
117121
{
118122
$bytesLen = (int) ceil(strlen($hex) / 2);
119123
$padBytes = (32 - ($bytesLen % 32)) % 32;
124+
120125
return $hex.str_repeat('00', $padBytes);
121126
}
122127

123128
public function callStatic(array|string $abi, string $fn, array $args, callable $ethCall): mixed
124129
{
125130
$data = $this->encodeFunction($abi, $fn, $args);
131+
126132
return $ethCall($data);
127133
}
128134
}

src/Commands/EvmBumpCommand.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,21 @@ public function handle(RpcClient $rpc, Signer $signer, FeePolicy $fees): int
3434
$nonce = $pending - 1; // last pending
3535
} else {
3636
$this->error('No pending transactions detected (pending == latest). Use --nonce to force replacement.');
37+
3738
return self::FAILURE;
3839
}
3940
}
4041
if ($nonce < 0) {
4142
$this->error('Calculated nonce is negative; abort.');
43+
4244
return self::FAILURE;
4345
}
4446

4547
// Optional original tx fetch
4648
$origHash = $this->option('original');
47-
$origPriority = null; $origMaxFee = null; $origGas = null;
49+
$origPriority = null;
50+
$origMaxFee = null;
51+
$origGas = null;
4852
if ($origHash) {
4953
try {
5054
$orig = $rpc->call('eth_getTransactionByHash', [$origHash]);
@@ -113,6 +117,7 @@ public function handle(RpcClient $rpc, Signer $signer, FeePolicy $fees): int
113117
$rpcChain = is_string($rpcChainHex) ? hexdec($rpcChainHex) : (int) $rpcChainHex;
114118
if ($rpcChain !== $chainId && ! $this->option('dry-run')) {
115119
$this->error('ChainId mismatch: local='.$chainId.' remote='.$rpcChain.' (abort)');
120+
116121
return self::FAILURE;
117122
}
118123

@@ -135,7 +140,7 @@ public function handle(RpcClient $rpc, Signer $signer, FeePolicy $fees): int
135140
$maxFee,
136141
$gasLimit,
137142
]];
138-
$this->table(['nonce','priority','maxFee','gasLimit'], $rows);
143+
$this->table(['nonce', 'priority', 'maxFee', 'gasLimit'], $rows);
139144
if ($origPriority !== null) {
140145
$this->info('Original priority: '.$origPriority.' original maxFee: '.$origMaxFee.' original gas: '.$origGas);
141146
}
@@ -149,8 +154,10 @@ public function handle(RpcClient $rpc, Signer $signer, FeePolicy $fees): int
149154
$this->line($rawHex);
150155
} catch (\Throwable $e) {
151156
$this->error('Dry-run signing failed: '.$e->getMessage());
157+
152158
return self::FAILURE;
153159
}
160+
154161
return self::SUCCESS;
155162
}
156163

@@ -172,6 +179,7 @@ public function handle(RpcClient $rpc, Signer $signer, FeePolicy $fees): int
172179
$this->line('If original tx fees unknown, start with factor 3-5 or specify --priority / --max manually.');
173180
}
174181
}
182+
175183
return self::FAILURE;
176184
}
177185

src/Commands/EvmCallCommand.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ public function handle(): int
2222
$fn = $this->argument('function');
2323
$args = $this->argument('args');
2424

25-
$client = LaravelEvmFacade::at($addr, $abi)->call($fn, $args);
26-
$raw = $client->result();
27-
$decoded = $client->as('string'); // example casting; user can choose other types
25+
$client = LaravelEvmFacade::at($addr, $abi)->call($fn, $args);
26+
$raw = $client->result();
27+
$decoded = $client->as('string'); // example casting; user can choose other types
2828

29-
$this->line('Raw: '.$raw);
30-
$this->line('Decoded(string): '.$decoded);
29+
$this->line('Raw: '.$raw);
30+
$this->line('Decoded(string): '.$decoded);
3131

3232
return self::SUCCESS;
3333
}

src/Crypto/PrivateKeySigner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function __construct(private ?string $privateKey)
2020
public function getAddress(): string
2121
{
2222
$address = new Address(ltrim($this->privateKey, '0x'));
23+
2324
return '0x'.$address->get();
2425
}
2526

src/Events/CallPerformed.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ public function __construct(
1212
public mixed $rawResult
1313
) {}
1414
}
15-

src/Facades/EvmLogs.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Farbcode\LaravelEvm\Facades;
44

5-
use Illuminate\Support\Facades\Facade;
65
use Farbcode\LaravelEvm\Support\LogFilterBuilder;
6+
use Illuminate\Support\Facades\Facade;
77

88
class EvmLogs extends Facade
99
{
@@ -19,6 +19,7 @@ public static function query(): LogFilterBuilder
1919
{
2020
/** @var LogFilterBuilder $builder */
2121
$builder = app(LogFilterBuilder::class);
22+
2223
return $builder;
2324
}
2425
}

src/Jobs/SendTransaction.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public function handle(RpcClient $rpc, Signer $signer, NonceManager $nonces, Fee
6565
'accessList' => [],
6666
];
6767

68-
6968
$pk = method_exists($signer, 'privateKey') ? $signer->privateKey() : null;
7069
if (! $pk) {
7170
event(new TxFailed($this->address, $this->data, 'Signer has no privateKey method'));

src/LaravelEvmServiceProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
use Farbcode\LaravelEvm\Clients\ContractClientGeneric;
66
use Farbcode\LaravelEvm\Clients\RpcHttpClient;
77
use Farbcode\LaravelEvm\Codec\AbiCodecWeb3p;
8+
use Farbcode\LaravelEvm\Commands\EvmBumpCommand;
89
use Farbcode\LaravelEvm\Commands\EvmCallCommand;
910
use Farbcode\LaravelEvm\Commands\EvmGenerateAddressCommand;
1011
use Farbcode\LaravelEvm\Commands\EvmHealthCommand;
1112
use Farbcode\LaravelEvm\Commands\EvmSendCommand;
1213
use Farbcode\LaravelEvm\Commands\EvmWaitCommand;
13-
use Farbcode\LaravelEvm\Commands\EvmBumpCommand;
1414
use Farbcode\LaravelEvm\Contracts\AbiCodec;
1515
use Farbcode\LaravelEvm\Contracts\ContractClient;
1616
use Farbcode\LaravelEvm\Contracts\FeePolicy;
@@ -21,8 +21,8 @@
2121
use Farbcode\LaravelEvm\Crypto\LocalNonceManager;
2222
use Farbcode\LaravelEvm\Crypto\PrivateKeySigner;
2323
use Farbcode\LaravelEvm\Crypto\TxBuilderEip1559;
24-
use Farbcode\LaravelEvm\Support\SimpleFeePolicy;
2524
use Farbcode\LaravelEvm\Support\LogFilterBuilder;
25+
use Farbcode\LaravelEvm\Support\SimpleFeePolicy;
2626
use Illuminate\Contracts\Foundation\Application;
2727
use Spatie\LaravelPackageTools\Package;
2828
use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -85,7 +85,7 @@ public function packageRegistered()
8585
);
8686
});
8787

88-
$this->app->bind(LogFilterBuilder::class, function($app){
88+
$this->app->bind(LogFilterBuilder::class, function ($app) {
8989
return LogFilterBuilder::make($app->make(RpcClient::class));
9090
});
9191
}

0 commit comments

Comments
 (0)