mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-21 05:41:43 +03:00
naive: l2 csv correct tx-data initialization
it seemed to work correctly before, but this makes it more clear that we're doing the right thing
This commit is contained in:
parent
fe9481d9b9
commit
e70b036e07
@ -209,21 +209,23 @@
|
|||||||
:: what nonce was actually submitted without the private key of the signer.
|
:: what nonce was actually submitted without the private key of the signer.
|
||||||
::
|
::
|
||||||
=| roll-tx-list=(list tx-data)
|
=| roll-tx-list=(list tx-data)
|
||||||
|
=| =tx-data
|
||||||
=| nonce-and-tx=[_| _|]
|
=| nonce-and-tx=[_| _|]
|
||||||
=/ =tx-data :* blocknum.block timestamp.block-dat.block
|
|
||||||
sender.roll-dat.roll keccak.roll *keccak *ship
|
|
||||||
*proxy:naive *nonce:naive gas.roll-dat.roll *@
|
|
||||||
| *action *ship
|
|
||||||
==
|
|
||||||
|-
|
|-
|
||||||
=* effect-loop $
|
=* effect-loop $
|
||||||
|
:: if we are processing a new transaction, initialize the parts of tx-data
|
||||||
|
:: that are identical for every transaction in the roll
|
||||||
|
=? tx-data =([| |] nonce-and-tx)
|
||||||
|
:* blocknum.block timestamp.block-dat.block sender.roll-dat.roll
|
||||||
|
keccak.roll *keccak *ship *proxy:naive *nonce:naive
|
||||||
|
gas.roll-dat.roll *@ | *action *ship
|
||||||
|
==
|
||||||
:: if we've gotten both the %nonce and %tx diff from a transaction, add the
|
:: if we've gotten both the %nonce and %tx diff from a transaction, add the
|
||||||
:: tx-data to the list of tx for the roll
|
:: tx-data to the list of tx for the roll
|
||||||
::
|
::
|
||||||
?: =([& &] nonce-and-tx)
|
?: =([& &] nonce-and-tx)
|
||||||
%= effect-loop
|
%= effect-loop
|
||||||
nonce-and-tx [| |]
|
nonce-and-tx [| |]
|
||||||
tx-data *_tx-data :: reset tx-data
|
|
||||||
roll-tx-list (snoc roll-tx-list tx-data)
|
roll-tx-list (snoc roll-tx-list tx-data)
|
||||||
==
|
==
|
||||||
:: if we've finished looping through the effects, add the tx list from the
|
:: if we've finished looping through the effects, add the tx list from the
|
||||||
@ -236,8 +238,10 @@
|
|||||||
==
|
==
|
||||||
::
|
::
|
||||||
=/ =diff:naive i.effects.roll-dat.roll
|
=/ =diff:naive i.effects.roll-dat.roll
|
||||||
|
:: we ignore %operator, %dns, %point diffs
|
||||||
|
::
|
||||||
?+ diff
|
?+ diff
|
||||||
$(effects.roll-dat.roll t.effects.roll-dat.roll) :: we ignore %operator, %dns, %point diffs
|
$(effects.roll-dat.roll t.effects.roll-dat.roll)
|
||||||
:: %nonce is always the first diff from a given transaction.
|
:: %nonce is always the first diff from a given transaction.
|
||||||
::
|
::
|
||||||
[%nonce *]
|
[%nonce *]
|
||||||
|
Loading…
Reference in New Issue
Block a user