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.

Sign up for GitHub

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

Jump to bottom

tools: block generator inner transactions #5506

Merged
merged 35 commits into from
Jun 30, 2023
Merged

tools: block generator inner transactions #5506

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
fbdfafb
squashing
Jun 21, 2023
8d9d6cc
Update tools/block-generator/generator/generate.go
tzaffi Jun 21, 2023
6dcf417
per CR suggestions - remove init + more detailed commentary for effec…
Jun 21, 2023
aee29e3
Update tools/block-generator/generator/generate.go
tzaffi Jun 23, 2023
ae6d910
per CR: don't need redefinition of type in var + better comment
Jun 23, 2023
480a00d
Merge remote-tracking branch 'algorand/master' into tools-blockgen-boxes
Jun 23, 2023
53c4960
per CR suggestion: let the default Makefile target do what you think …
Jun 23, 2023
676db87
cleaner clean targets
Jun 23, 2023
8ba0dc6
ApplyDataTracer
Jun 24, 2023
c8b1547
mohae/deepcopy is too damn old
Jun 24, 2023
1aa095e
verbose on
Jun 24, 2023
e0a06c7
forgot one
Jun 24, 2023
5f4495c
per CR suggestion
Jun 24, 2023
291d30f
various improvements around effects
Jun 25, 2023
6374eb4
Update tools/block-generator/generator/generate_apps.go
tzaffi Jun 26, 2023
f631aec
per CR suggestion
Jun 26, 2023
b8d9b9d
more refactorings
Jun 26, 2023
a4654d1
return value commentary
Jun 26, 2023
14e8567
revert EvalTracer changes
Jun 27, 2023
18d576d
refactorings
Jun 27, 2023
057000b
generate with ApplyData
Jun 27, 2023
00bba28
Merge branch 'master' into tools-blockgen-innertxns
Jun 27, 2023
5004a16
commentary
Jun 27, 2023
f78a97d
checkout from master
Jun 27, 2023
d1ed12b
license
Jun 28, 2023
297ecd9
rename gen --> g for easier searching / consistency
Jun 28, 2023
62f4908
startRound always sets the txnCounter
Jun 28, 2023
8869206
log g.txnCounter _after_ startRound()
Jun 28, 2023
7878d49
revert gen --> g for a smaller diff
Jun 28, 2023
e6a618f
return numTxns instead of intra
Jun 28, 2023
919af24
Update tools/block-generator/scenarios/config.appboxes.small.yml
tzaffi Jun 28, 2023
9cc5329
don't forget that inner txns are recursive
Jun 28, 2023
ec4e588
per CR - return 0 instead of intra
Jun 29, 2023
3fedf2d
Update tools/block-generator/generator/generate.go
tzaffi Jun 29, 2023
c5ae50b
"this should never happen" in error messgae
Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/block-generator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SKIP = --skip-runner
RESETDB = --reset-db
REPORTS = ../../tmp/RUN_RUNNER_OUTPUTS
DURATION = 30s
VERBOSE = # --verbose
VERBOSE = --verbose

block-generator: clean-generator
go build
Expand Down
9 changes: 3 additions & 6 deletions tools/block-generator/generator/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ const (
appBoxesClose TxTypeID = "app_boxes_close"
appBoxesClear TxTypeID = "app_boxes_clear"

// Special TxTypeID's recording effects of higher level transactions
effectPaymentTxSibling TxTypeID = "effect_payment_sibling"
effectInnerTx TxTypeID = "effect_inner_tx"
// For reporting side-effects of higher level transactions
tzaffi marked this conversation as resolved.
Show resolved Hide resolved
effectPaymentTxSibling = "effect_payment_sibling"
effectInnerTx = "effect_inner_tx"

// Defaults
defaultGenesisAccountsCount uint64 = 1000
Expand All @@ -81,9 +81,6 @@ const (
assetTotal uint64 = 100_000_000_000_000_000 // 100 billion units per asset

consensusTimeMilli int64 = 3300

// TODO: do we still need this as can get it from the Ledger?
startingTxnCounter uint64 = 1000
tzaffi marked this conversation as resolved.
Show resolved Hide resolved
)

type appKind uint8
Expand Down