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

Configured block time shortening epoch for the mainnet #65

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Configured block time shortening epoch for the mainnet #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
842f8ca
Configured block time shortening epoch for the mainnet
ironbeer Aug 29, 2024
95fd7e6
Fix block time shortening epoch for the mainnet
ironbeer Aug 29, 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: 1 addition & 1 deletion contracts/oasys/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var deploymentSets = map[common.Hash]map[uint64]deploymentSet{
971800: deploymentSet{deployments7},
1529980: deploymentSet{deployments9},
1892000: deploymentSet{deployments10},
9999999: deploymentSet{deployments11}, // TODO
4089588: deploymentSet{deployments11},
},
params.OasysTestnetGenesisHash: {
1: deploymentSet{deployments0},
Expand Down
8 changes: 4 additions & 4 deletions contracts/oasys/oasys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,11 +1063,11 @@ func _deployments11(genesisHash common.Hash, contracts wantContracts) {
contracts["0x0000000000000000000000000000000000001000"].storage = map[string]string{
// uint256[] public updates
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000002",
"0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf7": "0x00000000000000000000000000000000000000000000000000000000000003e7",
"0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf7": "0x00000000000000000000000000000000000000000000000000000000000002c7",
// EnvironmentValue[] public values
"0x0000000000000000000000000000000000000000000000000000000000000002": "0x0000000000000000000000000000000000000000000000000000000000000002",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad7": "0x000000000000000000000000000000000000000000000000000000000057b700",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad8": "0x00000000000000000000000000000000000000000000000000000000000003e7",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad7": "0x00000000000000000000000000000000000000000000000000000000003e6700",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad8": "0x00000000000000000000000000000000000000000000000000000000000002c7",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad9": "0x0000000000000000000000000000000000000000000000000000000000000006",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ada": "0x0000000000000000000000000000000000000000000000000000000000003840",
"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5adb": "0x000000000000000000000000000000000000000000000000000000000000000a",
Expand Down Expand Up @@ -1140,7 +1140,7 @@ func TestDeploy(t *testing.T) {
{971800, []deployFn{_deployments7}},
{1529980, []deployFn{_deployments9}},
{1892000, []deployFn{_deployments10}},
{9999999, []deployFn{_deployments11}},
{4089588, []deployFn{_deployments11}},
},
},
{
Expand Down
6 changes: 3 additions & 3 deletions params/oasys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const (
SHORT_BLOCK_TIME_SECONDS = 6
SHORT_BLOCK_TIME_EPOCH_PERIOD = 14400 // 6 sec * 14400 block = 1 days

SHORT_BLOCK_TIME_FORK_EPOCH_MAINNET = 999 // TODO
SHORT_BLOCK_TIME_FORK_EPOCH_TESTNET = 699
SHORT_BLOCK_TIME_FORK_EPOCH_OTHERS = 10 // for local chain
SHORT_BLOCK_TIME_FORK_EPOCH_MAINNET = 711 // Block #4089600
SHORT_BLOCK_TIME_FORK_EPOCH_TESTNET = 699 // Block #4020480
SHORT_BLOCK_TIME_FORK_EPOCH_OTHERS = 10 // for local chain
)

// EnvironmentValue is a representation of `Environment.EnvironmentValue`.
Expand Down