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

Add epoch snapshot endBlock attribute #72

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Add epoch snapshot endBlock attribute #72

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
761858d
Add `endBlock` into epoch snapshot
Mike-CZ Oct 9, 2024
d8b4033
Add epoch end block getters and test
Oct 9, 2024
6688b75
Merge branch 'refs/heads/sonic_sfc' into mike/extend_epoch_snapshot
Mike-CZ Oct 22, 2024
8f9156a
GetLastBlock number in test
Mike-CZ Oct 22, 2024
f23cf1b
Linter
Mike-CZ Oct 22, 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
5 changes: 5 additions & 0 deletions contracts/sfc/SFC.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ contract SFC is SFCBase, Version {
return getEpochSnapshot[epoch].offlineBlocks[validatorID];
}

function getEpochEndBlock(uint256 epoch) public view returns (uint256) {
return getEpochSnapshot[epoch].endBlock;
}

function rewardsStash(address delegator, uint256 validatorID) public view returns (uint256) {
Rewards memory stash = _rewardsStash[delegator][validatorID];
return stash.lockupBaseReward + stash.lockupExtraReward + stash.unlockedReward;
Expand Down Expand Up @@ -369,6 +373,7 @@ contract SFC is SFCBase, Version {

currentSealedEpoch = currentEpoch();
snapshot.endTime = _now();
snapshot.endBlock = block.number;
snapshot.baseRewardPerSecond = c.baseRewardPerSecond();
snapshot.totalSupply = totalSupply;
}
Expand Down
3 changes: 3 additions & 0 deletions contracts/sfc/SFCI.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ interface SFCI {
view
returns (
uint256 endTime,
uint256 endBlock,
uint256 epochFee,
uint256 totalBaseRewardWeight,
uint256 totalTxRewardWeight,
Expand Down Expand Up @@ -139,6 +140,8 @@ interface SFCI {

function getEpochOfflineBlocks(uint256 epoch, uint256 validatorID) external view returns (uint256);

function getEpochEndBlock(uint256 epoch) external view returns (uint256);

function rewardsStash(address delegator, uint256 validatorID) external view returns (uint256);

function getLockedStake(address delegator, uint256 toValidatorID) external view returns (uint256);
Expand Down
1 change: 1 addition & 0 deletions contracts/sfc/SFCState.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ contract SFCState is Initializable, Ownable {
mapping(uint256 => uint256) offlineBlocks;
uint256[] validatorIDs;
uint256 endTime;
uint256 endBlock;
uint256 epochFee;
uint256 totalBaseRewardWeight;
uint256 totalTxRewardWeight;
Expand Down
3 changes: 3 additions & 0 deletions contracts/test/UnitTestSFC.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ interface SFCUnitTestI {
view
returns (
uint256 endTime,
uint256 endBlock,
uint256 epochFee,
uint256 totalBaseRewardWeight,
uint256 totalTxRewardWeight,
Expand Down Expand Up @@ -217,6 +218,8 @@ interface SFCUnitTestI {

function getEpochOfflineBlocks(uint256 epoch, uint256 validatorID) external view returns (uint256);

function getEpochEndBlock(uint256 epoch) external view returns (uint256);

function rewardsStash(address delegator, uint256 validatorID) external view returns (uint256);

function getLockedStake(address delegator, uint256 toValidatorID) external view returns (uint256);
Expand Down
11 changes: 11 additions & 0 deletions test/SFC.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,17 @@ describe('SFC', () => {
expect(await this.sfc.currentEpoch.call()).to.equal(6);
expect(await this.sfc.currentSealedEpoch()).to.equal(5);
});

it('Should succeed and return endBlock', async function () {
const epochNumber = await this.sfc.currentEpoch();
await this.sfc.enableNonNodeCalls();
await this.sfc.sealEpoch([100, 101, 102], [100, 101, 102], [100, 101, 102], [100, 101, 102], 0);
const lastBlock = await ethers.provider.getBlock('latest');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe would be more direct to use await ethers.provider.getBlockNumber() instead?

expect(lastBlock).to.not.equal(null);
// endBlock is on second position
expect((await this.sfc.getEpochSnapshot(epochNumber))[1]).to.equal(lastBlock!.number);
expect(await this.sfc.getEpochEndBlock(epochNumber)).to.equal(lastBlock!.number);
});
});
});

Expand Down
Loading