heibai2006/web3.php
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

call support batch

Browse Source
This commit is contained in:
代码之美 2020-09-01 00:03:00 +08:00 committed by GitHub
parent 7423d1766a
commit 168a31ece4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Contract.php
View File

@ -597,7 +597,6 @@ class Contract
if (isset($this->functions)) {
$arguments = func_get_args();
$method = array_splice($arguments, 0, 1)[0];
$callback = array_pop($arguments);
if (!is_string($method)) {
throw new InvalidArgumentException('Please make sure the method is string.');
@ -612,8 +611,17 @@ class Contract
if (count($functions) < 1) {
throw new InvalidArgumentException('Please make sure the method exists.');
}
if (is_callable($callback) !== true) {
/* if (is_callable($callback) !== true) {
throw new \InvalidArgumentException('The last param must be callback function.');
}*/
if ($this->eth->provider->isBatch) {
$callback = null;
} else {
$callback = array_pop($arguments);
if (is_callable($callback) !== true) {
throw new \InvalidArgumentException('The last param must be callback function.');
}
}
// check the arguments
@ -670,14 +678,18 @@ class Contract
$transaction['to'] = $this->toAddress;
$transaction['data'] = $functionSignature . Utils::stripZero($data);
$this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
if ($err !== null) {
return call_user_func($callback, $err, null);
}
$decodedTransaction = $this->ethabi->decodeParameters($function, $transaction);
if ($this->eth->provider->isBatch) {
$this->eth->call($transaction, $defaultBlock);
} else {
$this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
if ($err !== null) {
return call_user_func($callback, $err, null);
}
$decodedTransaction = $this->ethabi->decodeParameters($function, $transaction);
return call_user_func($callback, null, $decodedTransaction);
});
return call_user_func($callback, null, $decodedTransaction);
});
}
}
}
@ -869,4 +881,18 @@ class Contract
return $functionData;
}
}
/**
* batch
*
* @param bool $status
* @return void
*/
public function batch($status)
{
$status = is_bool($status);
$this->eth->batch($status);
echo "isbat:" . $this->eth->getProvider()->getIsBatch() . PHP_EOL;
exit();
}
}