From 240b8e5b76e7478e2351a289ba9b971bb41a62f1 Mon Sep 17 00:00:00 2001 From: YashK Date: Fri, 2 Aug 2024 16:59:51 +0530 Subject: [PATCH 1/4] chore: updated default addresses and chainId to mainnet addresses and chainId --- addresses/mainnet.json | 2 +- core/constants.go | 4 ++-- core/contracts.go | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addresses/mainnet.json b/addresses/mainnet.json index 84568c78b..81462089a 100644 --- a/addresses/mainnet.json +++ b/addresses/mainnet.json @@ -9,4 +9,4 @@ "RAZOR": "0xcbf70914Fae03B3acB91E953De60CfDAaCA8145f", "StakedTokenFactory": "0xEffA78888Dc1b6033286E5dF9b170bc5223178AB", "RandomNoManager": "0xC6eF45F5Add040800D30FE6dEe01b4EBC4BfC467" - } \ No newline at end of file +} \ No newline at end of file diff --git a/core/constants.go b/core/constants.go index e935f3c16..2aad5ba69 100644 --- a/core/constants.go +++ b/core/constants.go @@ -9,13 +9,13 @@ import ( ) const ( - EpochLength uint64 = 300 + EpochLength uint64 = 1200 NumberOfStates uint64 = 5 StateLength = EpochLength / NumberOfStates ) // ChainId corresponds to the SKALE chain -var ChainId = big.NewInt(0x561bf78b) +var ChainId = big.NewInt(0x109B4597) const MaxRetries uint = 8 diff --git a/core/contracts.go b/core/contracts.go index 957204ed7..6079b6e4c 100644 --- a/core/contracts.go +++ b/core/contracts.go @@ -1,7 +1,7 @@ package core -var StakeManagerAddress = "0x432bDa6F3E5148898929be9d3555Ca5AA82b214b" -var RAZORAddress = "0xbF3BCf61f64C9825C7Af3f3D79817c9Cf44afBa7" -var CollectionManagerAddress = "0x7B8BF9a0B648Dd9f75D5E9e8a3054D18E8C4Cc5e" -var VoteManagerAddress = "0x86886e048fd0f253E6E75c13a3f924598799e06A" -var BlockManagerAddress = "0x39D4B78bb09DEEC54fA2df729808b19962Cb9aae" +var StakeManagerAddress = "0xe0bC695203d9C9f379bcdE9260B9F71B64B85298" +var RAZORAddress = "0xcbf70914Fae03B3acB91E953De60CfDAaCA8145f" +var CollectionManagerAddress = "0x367962d1462C568A0dDd0e2448311469451bF5a3" +var VoteManagerAddress = "0x641BAD0641eB5B94B19568C0a22a55AEbDAF1870" +var BlockManagerAddress = "0x11aB70d78f1Dd2c3F967180d8A64858Db03A0aBa" From ebec5327b89425e700633aed5db8ce277fe896cc Mon Sep 17 00:00:00 2001 From: YashK Date: Fri, 2 Aug 2024 17:05:46 +0530 Subject: [PATCH 2/4] chore: updated testnet addresses to staging europa 20 min epoch --- addresses.json | 12 ------------ addresses/testnet.json | 21 +++++++++++---------- package.json | 1 + 3 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 addresses.json diff --git a/addresses.json b/addresses.json deleted file mode 100644 index 5226f0726..000000000 --- a/addresses.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Governance": "0xD2A74B7A962FFc85827da0124A4278e731D15464", - "BlockManager": "0x096e44B0d8b68376C8Efe40F28C3857951f03069", - "CollectionManager": "0x3b76eB8c0282dAf531D7C507E4f3143A9A9c38b1", - "StakeManager": "0x9f55a2C6C1F1Be8B01562cEae2df2F22931C7a46", - "RewardManager": "0x07875369943951b1Af9c37f4ea137dcED9d9181d", - "VoteManager": "0x11995b74D6d07a6Edc05653a71F3e8B3354caBF0", - "Delegator": "0xe295863DF95AaAeC66E7de11D3aD0C35698d0fE9", - "RAZOR": "0x4500E10fEb89e46E9fb642D0c62b1a761278155D", - "StakedTokenFactory": "0xe20e11687F269fE9e356da92C4B15aBF98BbC9ff", - "RandomNoManager": "0x31463bC4D5E67Bca623fFc6152D253Ea17216fA9" -} \ No newline at end of file diff --git a/addresses/testnet.json b/addresses/testnet.json index 263d97f53..a70785723 100644 --- a/addresses/testnet.json +++ b/addresses/testnet.json @@ -1,12 +1,13 @@ { - "Governance": "0x6aC4BbACE4E38B085BA82bDA5477cc85222C2B40", - "BlockManager": "0x39D4B78bb09DEEC54fA2df729808b19962Cb9aae", - "CollectionManager": "0x7B8BF9a0B648Dd9f75D5E9e8a3054D18E8C4Cc5e", - "StakeManager": "0x432bDa6F3E5148898929be9d3555Ca5AA82b214b", - "RewardManager": "0x09FF6AB6F720F9866fe7b782566448E853c1F306", - "VoteManager": "0x86886e048fd0f253E6E75c13a3f924598799e06A", - "Delegator": "0x5755d776F77bF88d226EEEe0bA7f337F49Ac7FaE", - "RAZOR": "0xbF3BCf61f64C9825C7Af3f3D79817c9Cf44afBa7", - "StakedTokenFactory": "0x5008862c54ff6fae663Acd36E52D4614DcaF4329", - "RandomNoManager": "0x1495Ab19E7937e4259e3C292D906bB2e6302802f" + "Governance": "0x0b9CC11E7f7D3D4f9bBc0cCaB85b73B96C322c78", + "BlockManager": "0x076df1c2d81C40D30DF115Ab68A13251fBD3FFA4", + "CollectionManager": "0x83f4D7ad6dD366c3F04Af45a1437c77636b03388", + "StakeManager": "0xf99a873a6afdF1b24388ac02ea0f1CFE3c70A80b", + "RewardManager": "0x522d2A51639332388dA4788DF59fB4E598278fAd", + "VoteManager": "0x2399D4d92b4D8762971605d0bC9597F780852CC4", + "Delegator": "0x81c72fB60d19Bfc3A0adDfE394501150d290cd66", + "RAZOR": "0x504C6635af1e7E6fdc586c8A89973783b9281A77", + "StakedTokenFactory": "0xf271bd91104946Cb8e43BC0e83423ed073ab136e", + "RandomNoManager": "0x2dc9E4663675c933f78D97cDD44463ee9C43144c", + "DelegatorV2": "0x4e9E5AE58Fb6d7Ca5b79A196b8d0FCF7CA15C100" } \ No newline at end of file diff --git a/package.json b/package.json index a14ebf922..2fd2ffcc2 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "setup": "make setup", "build": "make build", "build-all": "make all", + "build-all-testnet": "make all-testnet", "build-noargs": "make build-noargs", "build-noargs-testnet": "make build-noargs-testnet", "test": "go test ./... -v" From 80032f4c3a0fc00fbfafeb3cff5fb71d095b5181 Mon Sep 17 00:00:00 2001 From: YashK Date: Fri, 2 Aug 2024 17:09:19 +0530 Subject: [PATCH 3/4] chore: updated version to v1.2.0 --- core/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/version.go b/core/version.go index e05fa25c3..b31b42ff3 100644 --- a/core/version.go +++ b/core/version.go @@ -4,8 +4,8 @@ import "fmt" const ( VersionMajor = 1 // Major version component of the current release - VersionMinor = 1 // Minor version component of the current release - VersionPatch = 1 // Patch version component of the current release + VersionMinor = 2 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release VersionMeta = "" // Version metadata to append to the version string ) From d599690231dd48e154c09c9872a49b27600f8127 Mon Sep 17 00:00:00 2001 From: YashK Date: Fri, 2 Aug 2024 18:33:35 +0530 Subject: [PATCH 4/4] refactor: fixed tests due to state length change to 1200 --- utils/common_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/common_test.go b/utils/common_test.go index cea9ca0fb..4ab53a83b 100644 --- a/utils/common_test.go +++ b/utils/common_test.go @@ -386,7 +386,7 @@ func TestGetBufferedState(t *testing.T) { stateBuffer: 5, }, - want: 1, + want: 0, wantErr: false, }, { @@ -398,7 +398,7 @@ func TestGetBufferedState(t *testing.T) { buffer: 2, stateBuffer: 5, }, - want: -1, + want: 4, wantErr: false, }, { @@ -411,7 +411,7 @@ func TestGetBufferedState(t *testing.T) { stateBuffer: 5, }, - want: -1, + want: 3, wantErr: false, }, { @@ -959,7 +959,7 @@ func TestGetRemainingTimeOfCurrentState(t *testing.T) { block: &types.Header{}, stateBuffer: 5, }, - want: 55, + want: 235, wantErr: false, }, { @@ -1086,7 +1086,7 @@ func TestEstimateBlockNumberAtEpochBeginning(t *testing.T) { block: &types.Header{Time: 1, Number: big.NewInt(1)}, previousBlock: &types.Header{Time: 20, Number: big.NewInt(1)}, }, - want: big.NewInt(-59), + want: big.NewInt(-239), wantErr: false, }, {