mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2025-01-04 08:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sharding: finished addHeader, started submitVote

Browse Source 
Former-commit-id: ed38e8621204fa276328cfe8dfbf989294a28519 [formerly 10bbd9cc3990c0922e73eeba138bab7d016e9fde]
Former-commit-id: 8d0d2407ab547a8f5e2022d85361dd74d3328da9
This commit is contained in:
Terence Tsao 2018-04-28 14:55:27 -07:00
parent 8bed2909f1
commit 3bc4acd4e3
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sharding/contracts/sharding_manager.sol
View File

@ -2,7 +2,7 @@ pragma solidity ^0.4.23;
contract SMC { contract SMC {
event HeaderAdded(uint indexed shardId, bytes32 chunkRoot, int128 period, address proposerAddress); event HeaderAdded(uint indexed shardId, bytes32 chunkRoot, uint period, address proposerAddress);
event NotaryRegistered(address notary, uint poolIndex); event NotaryRegistered(address notary, uint poolIndex);
event NotaryDeregistered(address notary, uint poolIndex, uint deregisteredPeriod); event NotaryDeregistered(address notary, uint poolIndex, uint deregisteredPeriod);
event NotaryReleased(address notary, uint poolIndex); event NotaryReleased(address notary, uint poolIndex);
@ -26,12 +26,16 @@ contract SMC {
mapping (address => Notary) public notaryRegistry; mapping (address => Notary) public notaryRegistry;
// number of notaries // number of notaries
uint public notaryPoolLength; uint public notaryPoolLength;
// current vote count of each shard
// first 31 bytes are bitfield of individual notary's vote
// last 1 byte is total notary's vote count
mapping (uint => byte32) public currentVote
// Collation state variables // Collation state variables
// shardId => (period => CollationHeader), collation records been appended by proposer // shardId => (period => CollationHeader), collation records been appended by proposer
mapping (uint => mapping (uint => CollationHeader)) public collationRecords; mapping (uint => mapping (uint => CollationHeader)) public collationRecords;
// shardId => period, latest period which new collation header submitted // shardId => period, latest period which new collation header submitted
mapping (uint => uint) public lastUpdatedPeriod; mapping (uint => uint) public shardLastUpdatedPeriod;
// Internal help functions variables // Internal help functions variables
// Stack of empty notary slot indicies // Stack of empty notary slot indicies
@ -157,7 +161,6 @@ contract SMC {
bytes32 parentHash, bytes32 parentHash,
bytes32 chunkRoot, bytes32 chunkRoot,
uint256 period, uint256 period,
address proposerAddress
) public returns(bytes32) { ) public returns(bytes32) {
/* /*
TODO: Calculate the hash of the collation header from the input parameters TODO: Calculate the hash of the collation header from the input parameters
@ -167,14 +170,41 @@ contract SMC {
/// Add collation header to the main chain, anyone can call this function. It emits a log /// Add collation header to the main chain, anyone can call this function. It emits a log
function addHeader( function addHeader(
uint _shardId, uint _shardId,
uint period, uint _period,
bytes32 chunkRoot, bytes32 _chunkRoot,
address proposerAddress
) public { ) public {
require((_shardId >= 0) && (_shardId < SHARD_COUNT)); require((_shardId >= 0) && (_shardId < SHARD_COUNT));
require(block.number >= PERIOD_LENGTH); require(block.number >= PERIOD_LENGTH);
require(period == block.number / PERIOD_LENGTH); require(_period == block.number / PERIOD_LENGTH);
require(period != lastUpdatedPeriod[_shardId]); require(_period > shardLastUpdatedPeriod[_shardId]);
// Track the numbers of participating notaries in between periods
updateNotarySampleSize();
collationRecords[_shardId][_period] = CollationHeader({
shardId: _shardId,
chunkRoot: _chunkRoot,
period: _period,
proposerAddress: msg.sender
});
shardLastUpdatedPeriod[_shardId] = block.number / PERIOD_LENGTH;
emit HeaderAdded(_shardId, _chunkRoot, _period, msg.sender);
}
/// Sampled notary can call the following funtion to submit vote,
/// a vote log will be emitted which client will monitor
function submitVote(
uint _shardId,
uint _period,
uint _index,
bytes32 _chunkRoot,
) public {
require(notaryRegister[msg.sender].deposited)
require(collationRecords[_shardId][_period].chunkRoot == _chunkRoot)
require(getNotaryInCommittee(_shardId, _index) == msg.sender)
} }
/// To keep track of notary size in between periods, we call updateNotarySampleSize /// To keep track of notary size in between periods, we call updateNotarySampleSize