Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parallel decrypts: sync decryption results #146

Merged
merged 32 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2da1391
update the Get() function to delegate the type assertion to the caller
toml01 Sep 3, 2024
169b585
type compatibility
toml01 Sep 3, 2024
e1d1cdf
fix tests
toml01 Sep 3, 2024
8c34dde
implement the decrypt precomp
toml01 Sep 3, 2024
323192f
added fheos serialization for decryption results
eshelB Sep 8, 2024
c02cea3
serialize flow finished+ added loadMultiple results
eshelB Sep 8, 2024
ddad1ff
added first serialization test
eshelB Sep 8, 2024
5f2e90d
Merge branch 'pd-sequencer-flow' into sync-tx-results
eshelB Sep 11, 2024
b97abe9
Merge branch 'pd-precompiles' into sync-tx-results-3
eshelB Sep 12, 2024
095558c
adding nitro-overrides parse_l2.go and executionegine.go, updating bl…
eshelB Sep 11, 2024
7113bda
added nitro-overrides to dockerfile
eshelB Sep 11, 2024
7a51719
using the go-ethereum version of pd-precompiles
eshelB Sep 12, 2024
6eb2be7
removing ontxsuccess
eshelB Sep 12, 2024
8d6c500
changed expected type for sealoutput result serialization to be strin…
eshelB Sep 12, 2024
eab219c
Merge branch 'pd-precompiles' into sync-tx-results
eshelB Sep 12, 2024
53c6324
now parallel goroutine waits for txqueueitem to exist
eshelB Sep 15, 2024
5890c58
adding a nitro override
eshelB Sep 15, 2024
34f4da5
fixing sequencer bug on notifyDecResult and documenting potential issue
eshelB Sep 15, 2024
aa454ee
fixing re-close channel bug
eshelB Sep 15, 2024
38c80e9
Merge branch 'pd-delegate-test-fix' into sync-tx-results
eshelB Sep 15, 2024
180df97
restoring dockerfile local change
eshelB Sep 15, 2024
0b2fb8f
updating overrides
eshelB Sep 15, 2024
79f74d5
forgot one bytes to string conversion
eshelB Sep 15, 2024
ca4324a
removing todo
eshelB Sep 15, 2024
53d0a5f
nitro overrides
eshelB Sep 16, 2024
7b47439
Merge branch 'parallel-decrypts' of github.com:FhenixProtocol/fheos i…
eshelB Sep 16, 2024
9f0146f
adding debug log
eshelB Sep 18, 2024
fea1d1d
CI: refactoring common code into function
eshelB Sep 18, 2024
42bb41a
adding minor change in override
eshelB Sep 18, 2024
324bb2e
Merge branch 'parallel-decrypts' into pd-sync-results
eshelB Sep 23, 2024
0e0939a
updating nitro-override
eshelB Sep 23, 2024
e167b94
Merge remote-tracking branch 'origin/parallel-decrypts' into pd-sync-…
eshelB Sep 23, 2024
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
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ COPY nitro-overrides/precompiles/FheOps.go precompiles/FheOps.go
COPY nitro-overrides/precompiles/precompile.go precompiles/precompile.go
COPY nitro-overrides/arbos/block_processor.go arbos/block_processor.go
COPY nitro-overrides/arbos/parallel_tx_processor.go arbos/parallel_tx_processor.go
COPY nitro-overrides/arbos/parse_l2.go arbos/parse_l2.go
COPY nitro-overrides/gethhook/geth-hook.go gethhook/geth-hook.go
COPY nitro-overrides/execution/gethexec/sequencer.go execution/gethexec/sequencer.go
COPY nitro-overrides/execution/gethexec/tx_ops_graph.go execution/gethexec/tx_ops_graph.go
COPY nitro-overrides/execution/gethexec/executionengine.go execution/gethexec/executionengine.go

RUN go mod tidy

Expand Down
10 changes: 4 additions & 6 deletions nitro-overrides/arbos/block_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ type SequencingHooks struct {
ConditionalOptionsForTx []*arbitrum_types.ConditionalOptions

// Fhenix specific
NotifyCt func(*types.Transaction, *arbitrum_types.ConditionalOptions, *fheos.PendingDecryption)
NotifyDecryptRes func(*fheos.PendingDecryption) error
OnTxSuccess func(*types.Transaction)
NotifyCt func(*types.Transaction, *arbitrum_types.ConditionalOptions, *fheos.PendingDecryption)
NotifyDecryptRes func(*fheos.PendingDecryption) error
SerializeTxDecryptRes func(*types.Transaction) ([]byte, error)
}

func NoopSequencingHooks() *SequencingHooks {
Expand All @@ -143,7 +143,7 @@ func NoopSequencingHooks() *SequencingHooks {
nil,
func(*types.Transaction, *arbitrum_types.ConditionalOptions, *fheos.PendingDecryption) {},
func(*fheos.PendingDecryption) error { return nil },
func(*types.Transaction) {},
func(*types.Transaction) ([]byte, error) { return nil, nil },
}
}

Expand Down Expand Up @@ -403,8 +403,6 @@ func ProduceBlockAdvanced(
}
}
continue
} else {
hooks.OnTxSuccess(tx)
}

if tx.Type() == types.ArbitrumInternalTxType && result.Err != nil {
Expand Down
Loading
Loading