Merge 7e21d77471
into cede0cc410
This commit is contained in:
commit
a1d9553b5b
@ -92,6 +92,7 @@ class SolidityType
|
||||
*/
|
||||
public function nestedName($name)
|
||||
{
|
||||
|
||||
if (!is_string($name)) {
|
||||
throw new InvalidArgumentException('nestedName name must string.');
|
||||
}
|
||||
@ -203,6 +204,21 @@ class SolidityType
|
||||
$nestedName = $this->nestedName($name);
|
||||
$result = [];
|
||||
$result[] = IntegerFormatter::format($length);
|
||||
//解决 encode
|
||||
|
||||
if ($this->isDynamicType($nestedName)){
|
||||
$start = 0;
|
||||
foreach ($value as $k => $val) {
|
||||
if ($start == 0){
|
||||
$l = $length * 32;
|
||||
}else{
|
||||
$v_1 = Utils::toHex($value[$k-1]);
|
||||
$l = (floor((mb_strlen($v_1) + 63) / 64)+1) * 32;
|
||||
}
|
||||
$start += $l;
|
||||
$result[] = IntegerFormatter::format($start);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($value as $val) {
|
||||
$result[] = $this->encode($val, $nestedName);
|
||||
@ -232,11 +248,37 @@ class SolidityType
|
||||
public function decode($value, $offset, $name)
|
||||
{
|
||||
if ($this->isDynamicArray($name)) {
|
||||
$arrayOffset = (int) Utils::toBn('0x' . mb_substr($value, $offset * 2, 64))->toString();
|
||||
$length = (int) Utils::toBn('0x' . mb_substr($value, $arrayOffset * 2, 64))->toString();
|
||||
$arrayOffset = (int) Utils::toBn('0x' . mb_substr($value, $offset * 2, 64))->toString(); //32
|
||||
$length = (int) Utils::toBn('0x' . mb_substr($value, $arrayOffset * 2, 64))->toString(); //数组的个数
|
||||
$arrayStart = $arrayOffset + 32;
|
||||
|
||||
$nestedName = $this->nestedName($name);
|
||||
|
||||
if($nestedName=='bytes' || $nestedName=='string')
|
||||
{
|
||||
$mA = $arrayStart*2;
|
||||
$mAA = ($mA + (64*1));
|
||||
for($i=0;$i<$length;$i++)
|
||||
{
|
||||
$mAA = ($mA + (64*$i)); //目前的定位
|
||||
|
||||
$mB = (int) Utils::toBn('0x' . mb_substr($value, ($mA + (64*$i)), 64))->toString();
|
||||
|
||||
|
||||
$mBB= $mA+($mB*2);
|
||||
#clear $mBB.PHP_EOL;
|
||||
$mC = (int) Utils::toBn('0x' . mb_substr($value, $mBB, 64))->toString();
|
||||
$mCC = (floor($mC/32)+1)*64;
|
||||
$mD = mb_substr($value, ($mBB+64), $mCC);
|
||||
#echo $mD.PHP_EOL;
|
||||
#echo mb_substr($value, $mBB, 64).PHP_EOL;
|
||||
|
||||
#echo "mb ={$mB} mBB={$mBB} mc={$mC} mcc={$mCC}".PHP_EOL;
|
||||
$result[] = $this->decode($value, $mBB , $nestedName);
|
||||
}
|
||||
|
||||
}else
|
||||
{
|
||||
$nestedStaticPartLength = $this->staticPartLength($nestedName);
|
||||
$roundedNestedStaticPartLength = floor(($nestedStaticPartLength + 31) / 32) * 32;
|
||||
$result = [];
|
||||
@ -244,6 +286,9 @@ class SolidityType
|
||||
for ($i=0; $i<$length * $roundedNestedStaticPartLength; $i+=$roundedNestedStaticPartLength) {
|
||||
$result[] = $this->decode($value, $arrayStart + $i, $nestedName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $result;
|
||||
} elseif ($this->isStaticArray($name)) {
|
||||
$length = $this->staticArrayLength($name);
|
||||
@ -259,10 +304,19 @@ class SolidityType
|
||||
}
|
||||
return $result;
|
||||
} elseif ($this->isDynamicType()) {
|
||||
|
||||
if($name=='bytes' || $name=='string')
|
||||
{
|
||||
$mC = (int) Utils::toBn('0x' . mb_substr($value, $offset, 64))->toString();
|
||||
$mCC = (floor($mC/32)+1)*64;
|
||||
$param = mb_substr($value, ($offset), ($mCC+64));
|
||||
}else
|
||||
{
|
||||
$dynamicOffset = (int) Utils::toBn('0x' . mb_substr($value, $offset * 2, 64))->toString();
|
||||
$length = (int) Utils::toBn('0x' . mb_substr($value, $dynamicOffset * 2, 64))->toString();
|
||||
$roundedLength = floor(($length + 31) / 32);
|
||||
$param = mb_substr($value, $dynamicOffset * 2, ( 1 + $roundedLength) * 64);
|
||||
}
|
||||
return $this->outputFormat($param, $name);
|
||||
}
|
||||
$length = $this->staticPartLength($name);
|
||||
|
Loading…
Reference in New Issue
Block a user