Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions Modules/Common/UTXOMainModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ final public function pre_process_block($block_id)
count($transaction['vout']) +
(int)(isset($transaction['vjoinsplit']) && $transaction['vjoinsplit']) +
(int)((isset($transaction['vShieldedSpend']) && $transaction['vShieldedSpend']) || (isset($transaction['vShieldedOutput']) && $transaction['vShieldedOutput'])) +
(int)(isset($transaction['orchard']) && $transaction['orchard'] && $transaction['orchard']['actions'])
(int)(isset($transaction['orchard']) && $transaction['orchard'] && $transaction['orchard']['actions']) +
(int)(isset($transaction['ironwood']) && $transaction['ironwood'] && $transaction['ironwood']['actions'])
) === 0
)
throw new ModuleError("No events for transaction {$transaction['txid']}");
Expand Down Expand Up @@ -281,6 +282,19 @@ final public function pre_process_block($block_id)

$fees[($transaction['txid'])] = bcadd($fees[($transaction['txid'])], $transaction['orchard']['valueBalanceZat']);
}

// Ironwood (NU6.3 successor to Orchard, built on revised Orchard code)

if (isset($transaction['ironwood']) && $transaction['ironwood'] && $transaction['ironwood']['actions'])
{
$events[] = ['transaction' => $transaction['txid'],
'address' => 'ironwood-pool',
'effect' => bcmul('-1', $transaction['ironwood']['valueBalanceZat']),
'sort_in_transaction' => PHP_INT_MAX - 1,
];

$fees[($transaction['txid'])] = bcadd($fees[($transaction['txid'])], $transaction['ironwood']['valueBalanceZat']);
}
}

$sort_in_block_lib[($transaction['txid'])] = $block_n;
Expand Down Expand Up @@ -433,7 +447,7 @@ final public function pre_process_block($block_id)
if (in_array(UTXOSpecialFeatures::HasShieldedPools, $this->extra_features) && $block_id !== MEMPOOL)
{
$delta_pools = [];
$this_pools = ['transparent' => '0', 'sprout' => '0', 'sapling' => '0', 'orchard' => '0', 'lockbox' => '0'];
$this_pools = ['transparent' => '0', 'sprout' => '0', 'sapling' => '0', 'orchard' => '0', 'ironwood' => '0', 'lockbox' => '0'];

foreach ($block['valuePools'] as $pool)
$delta_pools[($pool['id'])] = $pool['valueDeltaZat'];
Expand All @@ -448,13 +462,16 @@ final public function pre_process_block($block_id)
$this_pools['sapling'] = bcadd($this_pools['sapling'], $event['effect']);
if ($event['address'] === 'orchard-pool')
$this_pools['orchard'] = bcadd($this_pools['orchard'], $event['effect']);
if ($event['address'] === 'ironwood-pool')
$this_pools['ironwood'] = bcadd($this_pools['ironwood'], $event['effect']);
if ($event['address'] === 'lockbox')
$this_pools['lockbox'] = bcadd($this_pools['lockbox'], $event['effect']);
}

$this_pools['transparent'] = bcsub($this_pools['transparent'], $this_pools['sprout']);
$this_pools['transparent'] = bcsub($this_pools['transparent'], $this_pools['sapling']);
$this_pools['transparent'] = bcsub($this_pools['transparent'], $this_pools['orchard']);
$this_pools['transparent'] = bcsub($this_pools['transparent'], $this_pools['ironwood']);
$this_pools['transparent'] = bcsub($this_pools['transparent'], $this_pools['lockbox']);

// Check if the coinbase value is correct
Expand Down