Multiview with portal

.gitignore

@@ -62,6 +62,7 @@ mempool/testdatabase
 cmd/incognito
 blockchain/testparams/*
 tmp/*
+bin/data
 
 # vim
 *.swp   

bin/Dockerfile

@@ -10,21 +10,15 @@ ARG commit=commit
 ENV commit=$commit
 
 
-COPY ./bootnode /
 COPY ./keylist.json /
 COPY ./keylist_256.json /
 COPY ./sample-config.conf /
 
-
-RUN chmod +x /bootnode
-
-COPY ./run_bootnode.sh /
 COPY ./run_incognito.sh /
 COPY ./run_incognito_dev.sh /
 COPY ./run_fullnode.sh /
 
 
-RUN chmod +x /run_bootnode.sh
 RUN chmod +x /run_incognito_dev.sh
 RUN chmod +x /run_fullnode.sh
 

bin/local.sh

@@ -9,10 +9,9 @@ fi
 echo "!23"
 
 env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags '-w' -o incognito ../*.go
-env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags '-w' -o bootnode ../bootnode/*.go
 cp ../keylist.json .
+cp ../keylist_256.json .
 cp ../sample-config.conf .
 
 commit=`git show --summary --oneline | cut -d ' ' -f 1`
 docker build --build-arg commit=$commit . -t incognito && echo "Commit: $commit"
-docker rmi -f $(docker images --filter "dangling=true" -q)

blockchain/accessor_blockchain.go

@@ -11,17 +11,120 @@ import (
 )
 
 func (blockchain *BlockChain) StoreShardBestState(shardID byte) error {
-	return rawdbv2.StoreShardBestState(blockchain.GetDatabase(), shardID, blockchain.BestState.Shard[shardID])
+	return rawdbv2.StoreShardBestState(blockchain.GetDatabase(), shardID, blockchain.GetBestStateShard(shardID))
+}
+
+func (blockchain *BlockChain) FinalizedShardBlock(shardBlock *ShardBlock) error {
+	return rawdbv2.FinalizedShardBlock(blockchain.GetDatabase(), shardBlock.Header.ShardID, shardBlock.Header.Hash())
+}
+
+func (blockchain *BlockChain) GetFinalizedShardBlock(shardID byte) (*ShardBlock, uint64, error) {
+	hash, err := rawdbv2.GetFinalizedShardBlock(blockchain.GetDatabase(), shardID)
+	if err != nil {
+		return nil, 0, err
+	}
+	shardBlock, height, err := blockchain.GetShardBlockByHash(hash)
+	if err != nil {
+		return nil, 0, err
+	}
+	return shardBlock, height, nil
+}
+
+func (blockchain *BlockChain) DeleteShardBlockByView(view common.Hash) error {
+	return rawdbv2.DeleteShardBlockByView(blockchain.GetDatabase(), view)
+}
+
+func (blockchain *BlockChain) GetShardBlockByHeightAndView(shardID byte, height uint64, view common.Hash) (*ShardBlock, error) {
+	finalShardBlock, finalHeight, err := blockchain.GetFinalizedShardBlock(shardID)
+	if err != nil {
+		return nil, err
+	}
+	if height == finalHeight {
+		return finalShardBlock, nil
+	}
+	if height < finalHeight {
+		shardBlocks, err := blockchain.GetShardBlockByHeight(height, shardID)
+		if err != nil {
+			return nil, err
+		}
+		shardBlock := NewShardBlock()
+		for _, v := range shardBlocks {
+			shardBlock = v
+			break
+		}
+		return shardBlock, nil
+	}
+	if height > finalHeight {
+		shardBlockIndexes, err := rawdbv2.GetShardBlockByView(blockchain.GetDatabase(), view)
+		if err != nil {
+			return nil, err
+		}
+		if blockHash, ok := shardBlockIndexes[height]; !ok {
+			return nil, fmt.Errorf("Shard %+v, Block Height %+v, View %+v, not found", shardID, height, view)
+		} else {
+			shardBlock, shardHeight, err := blockchain.GetShardBlockByHash(blockHash)
+			if err != nil {
+				return nil, err
+			}
+			if shardHeight != height {
+				return nil, fmt.Errorf("Shard %+v, Block Height %+v, View %+v, not found", shardID, height, view)
+			}
+			return shardBlock, nil
+		}
+	}
+	return nil, fmt.Errorf("Shard %+v, Block Height %+v, View %+v, not found", shardID, height, view)
 }
 
 func (blockchain *BlockChain) StoreBeaconBestState() error {
-	beaconBestStateBytes, err := json.Marshal(blockchain.BestState.Beacon)
+	beaconBestStateBytes, err := json.Marshal(blockchain.GetBeaconBestState())
 	if err != nil {
 		return err
 	}
 	return rawdbv2.StoreBeaconBestState(blockchain.config.DataBase, beaconBestStateBytes)
 }
 
+func (blockchain *BlockChain) FinalizedBeaconBlock(beaconBlock *BeaconBlock) error {
+	return rawdbv2.FinalizedBeaconBlock(blockchain.GetDatabase(), beaconBlock.Header.Hash())
+}
+
+func (blockchain *BlockChain) GetFinalizedBeaconBlock() (*BeaconBlock, uint64, error) {
+	hash, err := rawdbv2.GetFinalizedBeaconBlock(blockchain.GetDatabase())
+	if err != nil {
+		return nil, 0, err
+	}
+	beaconBlock, height, err := blockchain.GetBeaconBlockByHash(hash)
+	if err != nil {
+		return nil, 0, err
+	}
+	return beaconBlock, height, nil
+}
+
+func (blockchain *BlockChain) DeleteBeaconBlockByView(view common.Hash) error {
+	return rawdbv2.DeleteBeaconBlockByView(blockchain.GetDatabase(), view)
+}
+
+func (blockchain *BlockChain) GetBeaconBlockByHeightAndView(height uint64, viewHash common.Hash) (*BeaconBlock, error) {
+	finalView := blockchain.BeaconChain.GetFinalView()
+
+	if height == finalView.GetHeight() {
+		return finalView.GetBlock().(*BeaconBlock), nil
+	}
+	if height < finalView.GetHeight() {
+		beaconBlocks, err := blockchain.GetBeaconBlockByHeight(height)
+		if err != nil {
+			return nil, err
+		}
+		return beaconBlocks[0], nil
+	}
+	if height > finalView.GetHeight() {
+		view := blockchain.BeaconChain.GetViewByHash(viewHash)
+		if view != nil {
+			return view.GetBlock().(*BeaconBlock), nil
+		}
+	}
+	return nil, fmt.Errorf("Beacon, Block Height %+v, View %+v, not found", height, viewHash)
+}
+
 func (blockchain *BlockChain) GetBlockHeightByBlockHash(hash common.Hash) (uint64, byte, error) {
 	return rawdbv2.GetIndexOfBlock(blockchain.GetDatabase(), hash)
 }
@@ -137,34 +240,34 @@ func (blockchain *BlockChain) GetShardBlockByHash(hash common.Hash) (*ShardBlock
 	return shardBlock, shardBlock.Header.Height, nil
 }
 
-func (blockchain *BlockChain) GetShardRewardStateDB(shardID byte) *statedb.StateDB {
-	return blockchain.BestState.Shard[shardID].GetCopiedRewardStateDB()
+func (blockchain *BlockChain) GetBestStateShardRewardStateDB(shardID byte) *statedb.StateDB {
+	return blockchain.GetBestStateShard(shardID).GetShardRewardStateDB()
 }
 
-func (blockchain *BlockChain) GetTransactionStateDB(shardID byte) *statedb.StateDB {
-	return blockchain.BestState.Shard[shardID].GetCopiedTransactionStateDB()
+func (blockchain *BlockChain) GetBestStateTransactionStateDB(shardID byte) *statedb.StateDB {
+	return blockchain.GetBestStateShard(shardID).GetCopiedTransactionStateDB()
 }
 
 func (blockchain *BlockChain) GetShardFeatureStateDB(shardID byte) *statedb.StateDB {
-	return blockchain.BestState.Shard[shardID].GetCopiedFeatureStateDB()
+	return blockchain.GetBestStateShard(shardID).GetCopiedFeatureStateDB()
 }
 
-func (blockchain *BlockChain) GetBeaconFeatureStateDB() *statedb.StateDB {
-	return blockchain.BestState.Beacon.GetCopiedFeatureStateDB()
+func (blockchain *BlockChain) GetBestStateBeaconFeatureStateDB() *statedb.StateDB {
+	return blockchain.GetBeaconBestState().GetBeaconFeatureStateDB()
 }
 
-func (blockchain *BlockChain) GetBeaconFeatureStateDBByHeight(height uint64, db incdb.Database) (*statedb.StateDB, error) {
+func (blockchain *BlockChain) GetBestStateBeaconFeatureStateDBByHeight(height uint64, db incdb.Database) (*statedb.StateDB, error) {
 	rootHash, err := blockchain.GetBeaconFeatureRootHash(blockchain.GetDatabase(), height)
 	if err != nil {
 		return nil, fmt.Errorf("Beacon Feature State DB not found, height %+v, error %+v", height, err)
 	}
 	return statedb.NewWithPrefixTrie(rootHash, statedb.NewDatabaseAccessWarper(db))
 }
 
-func (blockchain *BlockChain) GetBeaconSlashStateDB() *statedb.StateDB {
-	return blockchain.BestState.Beacon.slashStateDB
+func (blockchain *BlockChain) GetBestBeaconSlashStateDB() *statedb.StateDB {
+	return blockchain.GetBeaconBestState().slashStateDB
 }
 
-func (blockchain *BlockChain) GetBeaconRewardStateDB() *statedb.StateDB {
-	return blockchain.BestState.Beacon.rewardStateDB
+func (blockchain *BlockChain) GetBestBeaconRewardStateDB() *statedb.StateDB {
+	return blockchain.GetBeaconBestState().rewardStateDB
 }

blockchain/accessor_token.go

@@ -9,7 +9,7 @@ import (
 
 func (blockchain *BlockChain) ListAllPrivacyCustomTokenAndPRV() (map[common.Hash]*statedb.TokenState, error) {
 	tokenStates := make(map[common.Hash]*statedb.TokenState)
-	for i := 0; i < blockchain.BestState.Beacon.ActiveShards; i++ {
+	for i := 0; i < blockchain.GetBeaconBestState().ActiveShards; i++ {
 		shardID := byte(i)
 		m, err := blockchain.ListPrivacyCustomTokenAndPRVByShardID(shardID)
 		if err != nil {
@@ -34,7 +34,7 @@ func (blockchain *BlockChain) ListAllPrivacyCustomTokenAndPRV() (map[common.Hash
 
 func (blockchain *BlockChain) ListAllPrivacyCustomTokenAndPRVWithTxs() (map[common.Hash]*statedb.TokenState, error) {
 	tokenStates := make(map[common.Hash]*statedb.TokenState)
-	for i := 0; i < blockchain.BestState.Beacon.ActiveShards; i++ {
+	for i := 0; i < blockchain.GetBeaconBestState().ActiveShards; i++ {
 		shardID := byte(i)
 		m, err := blockchain.ListPrivacyCustomTokenAndPRVByShardIDWithTxs(shardID)
 		if err != nil {
@@ -59,13 +59,13 @@ func (blockchain *BlockChain) ListAllPrivacyCustomTokenAndPRVWithTxs() (map[comm
 
 // ListCustomToken - return all custom token which existed in network
 func (blockchain *BlockChain) ListPrivacyCustomTokenAndPRVByShardID(shardID byte) (map[common.Hash]*statedb.TokenState, error) {
-	tokenStates := statedb.ListPrivacyToken(blockchain.BestState.Shard[shardID].GetCopiedTransactionStateDB())
+	tokenStates := statedb.ListPrivacyToken(blockchain.GetBestStateShard(shardID).GetCopiedTransactionStateDB())
 	return tokenStates, nil
 }
 
 // ListCustomToken - return all custom token which existed in network
 func (blockchain *BlockChain) ListPrivacyCustomTokenAndPRVByShardIDWithTxs(shardID byte) (map[common.Hash]*statedb.TokenState, error) {
-	tokenStates := statedb.ListPrivacyTokenWithTxs(blockchain.BestState.Shard[shardID].GetCopiedTransactionStateDB())
+	tokenStates := statedb.ListPrivacyTokenWithTxs(blockchain.GetBestStateShard(shardID).GetCopiedTransactionStateDB())
 	return tokenStates, nil
 }
 
@@ -92,18 +92,18 @@ func (blockchain *BlockChain) ListPrivacyTokenAndBridgeTokenAndPRVByShardID(shar
 
 // Check Privacy Custom token ID is existed
 func (blockchain *BlockChain) PrivacyCustomTokenIDExistedV2(tokenID *common.Hash, shardID byte) bool {
-	return statedb.PrivacyTokenIDExisted(blockchain.BestState.Shard[shardID].GetCopiedTransactionStateDB(), *tokenID)
+	return statedb.PrivacyTokenIDExisted(blockchain.GetBestStateShard(shardID).GetCopiedTransactionStateDB(), *tokenID)
 }
 
 // Check Privacy Custom token ID is existed
 func (blockchain *BlockChain) GetPrivacyTokenState(tokenID common.Hash, shardID byte) (*statedb.TokenState, bool, error) {
-	return statedb.GetPrivacyTokenState(blockchain.BestState.Shard[shardID].GetCopiedTransactionStateDB(), tokenID)
+	return statedb.GetPrivacyTokenState(blockchain.GetBestStateShard(shardID).GetCopiedTransactionStateDB(), tokenID)
 }
 
 func (blockchain *BlockChain) GetAllBridgeTokens() ([]common.Hash, []*rawdbv2.BridgeTokenInfo, error) {
 	bridgeTokenIDs := []common.Hash{}
 	allBridgeTokens := []*rawdbv2.BridgeTokenInfo{}
-	bridgeStateDB := blockchain.BestState.Beacon.GetCopiedFeatureStateDB()
+	bridgeStateDB := blockchain.GetBeaconBestState().GetBeaconFeatureStateDB()
 	allBridgeTokensBytes, err := statedb.GetAllBridgeTokens(bridgeStateDB)
 	if err != nil {
 		return bridgeTokenIDs, allBridgeTokens, err

blockchain/accessor_transaction.go

@@ -130,7 +130,7 @@ func (blockchain *BlockChain) ValidateResponseTransactionFromTxsWithMetadata(sha
 			Logger.log.Infof("Coin ID %+v", *coinID)
 			Logger.log.Infof("Amount Request %+v", amountRes)
 			Logger.log.Infof("Temp Public Key %+v", tempPublicKey)
-			amount, err := statedb.GetCommitteeReward(blockchain.BestState.Shard[shardBlock.Header.ShardID].GetCopiedRewardStateDB(), tempPublicKey, requestMeta.TokenID)
+			amount, err := statedb.GetCommitteeReward(blockchain.GetBestStateShard(shardBlock.Header.ShardID).GetShardRewardStateDB(), tempPublicKey, requestMeta.TokenID)
 			if (amount == 0) || (err != nil) {
 				return errors.Errorf("Invalid request %v, amount from db %v, error %v", requester, amount, err)
 			}
@@ -200,11 +200,11 @@ func (blockchain *BlockChain) InitTxSalaryByCoinID(
 }
 
 // @Notice: change from body.Transaction -> transactions
-func (blockchain *BlockChain) BuildResponseTransactionFromTxsWithMetadata(transactions []metadata.Transaction, blkProducerPrivateKey *privacy.PrivateKey, shardID byte) ([]metadata.Transaction, error) {
+func (blockchain *BlockChain) BuildResponseTransactionFromTxsWithMetadata(view *ShardBestState, transactions []metadata.Transaction, blkProducerPrivateKey *privacy.PrivateKey, shardID byte) ([]metadata.Transaction, error) {
 	txRequestTable := reqTableFromReqTxs(transactions)
 	txsResponse := []metadata.Transaction{}
 	for key, value := range txRequestTable {
-		txRes, err := blockchain.buildWithDrawTransactionResponse(&value, blkProducerPrivateKey, shardID)
+		txRes, err := blockchain.buildWithDrawTransactionResponse(view, &value, blkProducerPrivateKey, shardID)
 		if err != nil {
 			Logger.log.Errorf("Build Withdraw transactions response for tx %v return errors %v", value, err)
 			delete(txRequestTable, key)
@@ -232,11 +232,9 @@ func (blockchain *BlockChain) BuildResponseTransactionFromTxsWithMetadata(transa
 //in case payment-address: return all outputcoin tx with no amount value
 //- Param #2: coinType - which type of joinsplitdesc(COIN or BOND)
 func (blockchain *BlockChain) GetListOutputCoinsByKeyset(keyset *incognitokey.KeySet, shardID byte, tokenID *common.Hash) ([]*privacy.OutputCoin, error) {
-	blockchain.BestState.Shard[shardID].lock.Lock()
-	defer blockchain.BestState.Shard[shardID].lock.Unlock()
 	var outCointsInBytes [][]byte
 	var err error
-	transactionStateDB := blockchain.BestState.Shard[shardID].transactionStateDB
+	transactionStateDB := blockchain.GetBestStateShard(shardID).transactionStateDB
 	if keyset == nil {
 		return nil, NewBlockChainError(GetListOutputCoinsByKeysetError, fmt.Errorf("invalid key set, got keyset %+v", keyset))
 	}
@@ -290,7 +288,7 @@ func (blockchain *BlockChain) GetListOutputCoinsByKeyset(keyset *incognitokey.Ke
 // CreateAndSaveTxViewPointFromBlock - fetch data from block, put into txviewpoint variable and save into db
 // still storage full data of commitments, serial number, snderivator to check double spend
 // this function only work for transaction transfer token/prv within shard
-func (blockchain *BlockChain) CreateAndSaveTxViewPointFromBlock(shardBlock *ShardBlock, transactionStateRoot *statedb.StateDB, beaconFeatureStateRoot *statedb.StateDB) error {
+func (blockchain *BlockChain) CreateAndSaveTxViewPointFromBlock(shardBlock *ShardBlock, transactionStateRoot *statedb.StateDB) error {
 	// Fetch data from shardBlock into tx View point
 	if shardBlock.Header.Height == 1 {
 		err := storePRV(transactionStateRoot)