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

Sync stable-cadence branch with master #5400

Merged
merged 128 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
2c0621f
Sync with `master` to get CI improvements (#4995)
jordanschalm Nov 10, 2023
b86e354
FLIP 204: Add `TargetEndTime` to Epoch models and API (#4987)
jordanschalm Nov 17, 2023
445e0ab
FLIP 204: Add `TargetDuration` to Epoch models and API #4987 (#5038)
jordanschalm Nov 23, 2023
de721aa
FLIP 204: Update `cruisectl.BlockTimeController` to use `TargetEndTim…
jordanschalm Nov 24, 2023
64356c8
Sync `master` with `feature-flip-204` (#5057)
jordanschalm Nov 27, 2023
3e5b651
FLIP 204: Include epoch timing config in sporking/bootstrapping proce…
jordanschalm Nov 27, 2023
acdd1ec
Sync master / FLIP 204 (#5063)
jordanschalm Nov 27, 2023
0b64668
Sync master / FLIP 204 (#5065)
jordanschalm Nov 28, 2023
2479faa
Merge branch 'master' into feature/flip-204-epoch-target-end-time
jordanschalm Nov 28, 2023
ef2a908
use crypto v0.24.9 in all modules
jordanschalm Nov 28, 2023
afcbff2
Merge branch 'master' into jordan/feat/flip204
jordanschalm Nov 28, 2023
4d9a41f
Merge branch 'master' into jordan/feat/flip204
jordanschalm Dec 5, 2023
714a626
wip: pin branch commit of updated flow-emu
jordanschalm Dec 5, 2023
b1d4e2c
correct flow-emu version and update core-contracts to v0.15.0
jordanschalm Dec 5, 2023
0c32573
Merge branch 'master' into jordan/feat/flip204
jordanschalm Dec 6, 2023
dd78843
update flow-emulator to v0.59.0
jordanschalm Dec 6, 2023
c1dde1b
tidy
jordanschalm Dec 6, 2023
e766833
Merge branch 'master' into jordan/feat/flip204
jordanschalm Dec 6, 2023
00f109d
Apply suggestions from code review
jordanschalm Dec 8, 2023
c3c6fc9
add sanity check for target end time
jordanschalm Dec 8, 2023
3d8753d
remove unused param from initEpochInfo
jordanschalm Dec 8, 2023
2f11b11
Update cmd/bootstrap/cmd/seal.go
jordanschalm Dec 18, 2023
e3e0daf
epoch timing flag requirements
jordanschalm Dec 22, 2023
894151a
Add EVM load
janezpodhostnik Jan 26, 2024
8b162a2
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 1, 2024
b86f936
make tidy
jordanschalm Feb 1, 2024
3aabf33
leftover merge artifact and import ordering
jordanschalm Feb 1, 2024
4b35c39
update state commentments
jordanschalm Feb 1, 2024
d909f97
rename to selector
ramtinms Feb 1, 2024
74f60d1
add abi utility
ramtinms Feb 1, 2024
eaf39d9
add coa ownership proofs
ramtinms Feb 1, 2024
deba603
add coa proof to handler
ramtinms Feb 1, 2024
bb22d11
add coa proof verifier to evm contract
ramtinms Feb 1, 2024
85415c1
fix test utils
ramtinms Feb 1, 2024
1b8f32c
fix the rootAddr mismatch bug
ramtinms Feb 1, 2024
e11dae9
add test for arch flow height lookup
ramtinms Feb 1, 2024
3f3cbc1
add test for COA proofs
ramtinms Feb 1, 2024
de87a5b
test clean up
ramtinms Feb 2, 2024
1ae6759
reorg epoch timing config flags
jordanschalm Feb 2, 2024
8002974
update BN2 Makefile bootstrapping
jordanschalm Feb 2, 2024
5004491
consolidate epoch setup fixtures, fix test
jordanschalm Feb 2, 2024
bbf67a0
fix a bad copy-paste
jordanschalm Feb 2, 2024
603a48f
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 2, 2024
fa4b24e
tps gen changes
janezpodhostnik Feb 5, 2024
6e4820b
temp only bench last commit
janezpodhostnik Feb 5, 2024
13c03a6
fix tps server scripts
janezpodhostnik Feb 5, 2024
49cc60d
fix control script
janezpodhostnik Feb 5, 2024
98ebe77
fix transaction sender
janezpodhostnik Feb 5, 2024
7a01db8
remove compute limit
janezpodhostnik Feb 5, 2024
7979d5b
signers are not concurency safe
janezpodhostnik Feb 5, 2024
f17116e
fix err handling
janezpodhostnik Feb 5, 2024
c26520a
improve subscription validator integration test
kc1116 Feb 6, 2024
c685c39
fix err handling
janezpodhostnik Feb 6, 2024
fbb5fad
Update cmd/bootstrap/cmd/finalize.go
jordanschalm Feb 6, 2024
226727e
add additional flag to bootstrap readme
jordanschalm Feb 6, 2024
096d016
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 6, 2024
209f901
fix commit ordering
janezpodhostnik Feb 6, 2024
173a00f
fix service account handling
janezpodhostnik Feb 6, 2024
d8b0204
fix account creation
janezpodhostnik Feb 6, 2024
10ee110
fix error handling
janezpodhostnik Feb 6, 2024
a698961
fix logging
janezpodhostnik Feb 6, 2024
ae74a84
account creation debugging
janezpodhostnik Feb 6, 2024
6b65067
do not reuse signers accross threads
janezpodhostnik Feb 6, 2024
1cada3d
reduce create account load
janezpodhostnik Feb 6, 2024
0b23892
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 6, 2024
a119066
use load type from parameters
janezpodhostnik Feb 6, 2024
323d090
reduce accounts created at once
janezpodhostnik Feb 6, 2024
2d185b2
fix evm load type name
janezpodhostnik Feb 6, 2024
3b734e1
increase timeout
janezpodhostnik Feb 6, 2024
686a182
Update network/internal/p2pfixtures/fixtures.go
kc1116 Feb 7, 2024
63b7196
Update network/internal/p2pfixtures/fixtures.go
kc1116 Feb 7, 2024
1691bb3
Update fixtures.go
kc1116 Feb 7, 2024
e385b9b
Merge branch 'khalil/6932-fix-subscription-validator-test' of github.…
kc1116 Feb 7, 2024
82baeba
Merge branch 'master' into khalil/6932-fix-subscription-validator-test
kc1116 Feb 7, 2024
541905b
add setup to evm transfer load
janezpodhostnik Feb 7, 2024
7ca7296
fix evm_load
janezpodhostnik Feb 7, 2024
fd10f1d
make setup faster
janezpodhostnik Feb 7, 2024
433ca90
bugfix on account loading
janezpodhostnik Feb 7, 2024
d1454de
fix tests
janezpodhostnik Feb 7, 2024
7f125b6
fix tests
janezpodhostnik Feb 7, 2024
13f1134
reduce batch size for account creation
janezpodhostnik Feb 7, 2024
f427fd2
Merge branch 'master' into janez/tps-benchmark-evm-load
janezpodhostnik Feb 7, 2024
ec07042
fix evm load
janezpodhostnik Feb 8, 2024
30d8805
cleanup
janezpodhostnik Feb 8, 2024
cc7e059
add todo
janezpodhostnik Feb 8, 2024
741008f
Merge branch 'master' into ramtin/5197-part2-precompile
ramtinms Feb 8, 2024
50f2855
apply PR feedback
ramtinms Feb 8, 2024
7e4e216
apply PR feedback
ramtinms Feb 8, 2024
40c9647
rename functions
ramtinms Feb 8, 2024
b89ac22
add test for read uint256
ramtinms Feb 8, 2024
6f3d51c
add test for size needed for bytes
ramtinms Feb 8, 2024
7638b16
Merge branch 'ramtin/5197-part2-precompile' into ramtin/5197-part3-st…
ramtinms Feb 8, 2024
0b2c79f
fix test
ramtinms Feb 8, 2024
8311418
lint fix
ramtinms Feb 8, 2024
38d3730
log progress of loading wal segment file
zhangchiqing Feb 8, 2024
3eb7e8d
log storage init
zhangchiqing Feb 8, 2024
ac7cd2f
fix test
ramtinms Feb 9, 2024
d0577df
?
ramtinms Feb 9, 2024
927251c
upgrade wal
zhangchiqing Feb 9, 2024
eeaa7e9
lint fix
ramtinms Feb 9, 2024
6086e05
Merge branch 'ramtin/5197-part2-precompile' into ramtin/5197-part3-st…
ramtinms Feb 9, 2024
9374e87
clean up
ramtinms Feb 9, 2024
c2bdf70
move test contracts to its own files
ramtinms Feb 9, 2024
79b5462
Merge branch 'master' into ramtin/5197-part2-precompile
ramtinms Feb 10, 2024
99232e1
Update cmd/bootstrap/cmd/finalize.go
jordanschalm Feb 12, 2024
1baa345
Merge pull request #5342 from onflow/ramtin/5197-part2-precompile
ramtinms Feb 12, 2024
5f976ba
Merge branch 'master' into ramtin/5197-part3-stdlib
ramtinms Feb 12, 2024
11973b9
lint fix
ramtinms Feb 12, 2024
8fe3563
Merge branch 'ramtin/5197-part3-stdlib' of github.com:onflow/flow-go …
ramtinms Feb 12, 2024
b144ecf
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 13, 2024
52e7802
correct obo in error documentation
jordanschalm Feb 13, 2024
aefd300
update tests
ramtinms Feb 13, 2024
26ac4b4
Merge pull request #5343 from onflow/ramtin/5197-part3-stdlib
ramtinms Feb 13, 2024
9a016d8
Update module/executiondatasync/tracker/storage.go
zhangchiqing Feb 13, 2024
9a40970
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 13, 2024
d22727b
Merge pull request #5367 from onflow/leo/add-logs-for-en-startup
zhangchiqing Feb 13, 2024
4de14a3
edit control.sh
janezpodhostnik Feb 13, 2024
36d340f
Merge branch 'master' into jordan/feat/flip204
jordanschalm Feb 13, 2024
0421a12
Merge branch 'master' into janez/tps-benchmark-evm-load
janezpodhostnik Feb 14, 2024
e654b2d
Merge pull request #5071 from onflow/jordan/feat/flip204
jordanschalm Feb 14, 2024
ceec128
Merge pull request #5363 from onflow/janez/tps-benchmark-evm-load
janezpodhostnik Feb 14, 2024
ae8ab05
Merge pull request #5355 from onflow/khalil/6932-fix-subscription-val…
kc1116 Feb 14, 2024
cca11b7
Merge branch 'master' of https://github.com/onflow/flow-go into supun…
SupunS Feb 15, 2024
baf9cc3
Update EVM module to match Cadence changes
SupunS Feb 15, 2024
873396d
Fix code
SupunS Feb 15, 2024
21d646a
revert incorrect conflict resolution of wal dependency
turbolent Feb 15, 2024
a6db2d9
remove evm load from test untill its fixed
janezpodhostnik Feb 15, 2024
a60dda9
revert part of 873396d628b0b379ec2bb846f418b68a49f7d94a
turbolent Feb 15, 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
Prev Previous commit
Next Next commit
lint fix
  • Loading branch information
ramtinms committed Feb 12, 2024
commit 11973b9f9d8d1148a30bc8abf7502e722946bf30
1 change: 1 addition & 0 deletions fvm/evm/handler/invocations.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package handler

import (
"github.com/onflow/cadence/runtime/sema"

"github.com/onflow/flow-go/fvm/environment"
"github.com/onflow/flow-go/fvm/evm/types"
"github.com/onflow/flow-go/model/flow"
Expand Down
1 change: 1 addition & 0 deletions fvm/evm/types/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/onflow/cadence"
"github.com/onflow/cadence/encoding/ccf"
"github.com/onflow/cadence/runtime/sema"

"github.com/onflow/flow-go/model/flow"
)

Expand Down