v0.0.4

common/types/spork.go

@@ -1,7 +1,7 @@
 package types
 
 var (
-	AcceleratorSpork     = NewImplementedSpork("97f0a9636a5cc633dfa3814e431f19c1974536eef3d1ebb713db50464dc5e750")
+	AcceleratorSpork     = NewImplementedSpork("6d2b1e6cb4025f2f45533f0fe22e9b7ce2014d91cc960471045fa64eee5a6ba3")
 	ImplementedSporksMap = map[Hash]bool{
 		AcceleratorSpork.SporkId: true,
 	}

metadata/version.go

@@ -3,5 +3,5 @@
 package metadata
 
 const (
-	Version = "v0.0.3"
+	Version = "v0.0.4"
 )

metadata/version_libznn.go

@@ -3,5 +3,5 @@
 package metadata
 
 const (
-	Version = "v0.0.3-libznn"
+	Version = "v0.0.4-libznn"
 )

node/config.go

@@ -56,7 +56,7 @@ type Config struct {
 
 	Name string
 
-	LogLevel string // "debug", "dbug" | "info" | "warn" | "error", "eror" | "crit"
+	LogLevel string // "debug", "dbug" | "info" | "warn" | "error", "error" | "crit"
 
 	Producer *ProducerConfig
 	RPC      RPCConfig

vm/embedded/definition/plasma.go

@@ -73,7 +73,7 @@ func (entry *FusionInfo) Delete(context db.DB) error {
 }
 
 func getFusionInfoKey(addr types.Address, hash types.Hash) []byte {
-	return common.JoinBytes(tokenInfoKeyPrefix, addr.Bytes(), hash.Bytes())
+	return common.JoinBytes(fusionInfoKeyPrefix, addr.Bytes(), hash.Bytes())
 }
 func isFusionInfoKey(key []byte) bool {
 	return key[0] == fusionInfoKeyPrefix[0]

vm/embedded/embedded_test.go

@@ -29,16 +29,8 @@ func TestDumpContractsABIMethods(t *testing.T) {
 
 	common.Expect(t, dump, `
 [
-{"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"AddPhase", "id":"c7e13ddc", "signature":"AddPhase(hash,string,string,string,uint256,uint256)"}
-{"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"CreateProject", "id":"77c044b6", "signature":"CreateProject(string,string,string,uint256,uint256)"}
 {"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"Donate", "id":"cb7f8b2a", "signature":"Donate()"}
-{"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"Update", "id":"20093ea6", "signature":"Update()"}
-{"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"UpdatePhase", "id":"c1d7d323", "signature":"UpdatePhase(hash,string,string,string,uint256,uint256)"}
-{"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"VoteByName", "id":"5c6c1064", "signature":"VoteByName(hash,string,uint8)"}
-{"address":"z1qxemdeddedxaccelerat0rxxxxxxxxxxp4tk22", "name":"VoteByProdAddress", "id":"90ed001c", "signature":"VoteByProdAddress(hash,uint8)"}
-{"address":"z1qxemdeddedxlyquydytyxxxxxxxxxxxxflaaae", "name":"BurnZnn", "id":"096b75a4", "signature":"BurnZnn(uint256)"}
 {"address":"z1qxemdeddedxlyquydytyxxxxxxxxxxxxflaaae", "name":"Donate", "id":"cb7f8b2a", "signature":"Donate()"}
-{"address":"z1qxemdeddedxlyquydytyxxxxxxxxxxxxflaaae", "name":"Fund", "id":"912f3c3f", "signature":"Fund(uint256,uint256)"}
 {"address":"z1qxemdeddedxlyquydytyxxxxxxxxxxxxflaaae", "name":"Update", "id":"20093ea6", "signature":"Update()"}
 {"address":"z1qxemdeddedxplasmaxxxxxxxxxxxxxxxxsctrp", "name":"CancelFuse", "id":"f9ca9dc3", "signature":"CancelFuse(hash)"}
 {"address":"z1qxemdeddedxplasmaxxxxxxxxxxxxxxxxsctrp", "name":"Fuse", "id":"5ac942e8", "signature":"Fuse(address)"}

vm/embedded/implementation/accelerator.go

@@ -51,8 +51,8 @@ func checkMetaDataStatic(param *definition.AcceleratorParam) error {
 }
 
 func checkReceivedFunds(context vm_context.AccountVmContext, project *definition.Project) bool {
-	znnFunds := project.ZnnFundsNeeded
-	qsrFunds := project.QsrFundsNeeded
+	znnFunds := new(big.Int).Set(project.ZnnFundsNeeded)
+	qsrFunds := new(big.Int).Set(project.QsrFundsNeeded)
 	for _, phaseId := range project.PhaseIds {
 		phase, err := definition.GetPhaseEntry(context.Storage(), phaseId)
 		if err != nil {
@@ -201,7 +201,7 @@ func (p *AddPhaseMethod) ReceiveBlock(context vm_context.AccountVmContext, sendB
 	err := definition.ABIAccelerator.UnpackMethod(param, p.MethodName, sendBlock.Data)
 	common.DealWithErr(err)
 
-	// Check project exists and block is send by owner
+	// Check project exists and block is sent by owner
 	project, err := definition.GetProjectEntry(context.Storage(), param.Id)
 	if err != nil {
 		return nil, constants.ErrDataNonExistent
@@ -317,14 +317,16 @@ func (p *UpdateEmbeddedAcceleratorMethod) ReceiveBlock(context vm_context.Accoun
 	}
 
 	blocks := make([]*nom.AccountBlock, 0)
-	znnBalance, err := context.GetBalance(types.ZnnTokenStandard)
+	balanceZnn, err := context.GetBalance(types.ZnnTokenStandard)
 	if err != nil {
 		return nil, err
 	}
-	qsrBalance, err := context.GetBalance(types.QsrTokenStandard)
+	znnBalance := new(big.Int).Set(balanceZnn)
+	balanceQsr, err := context.GetBalance(types.QsrTokenStandard)
 	if err != nil {
 		return nil, err
 	}
+	qsrBalance := new(big.Int).Set(balanceQsr)
 
 	sort.Slice(projectList, func(i, j int) bool {
 		var phaseITimestamp, phaseJTimestamp int64
@@ -345,7 +347,7 @@ func (p *UpdateEmbeddedAcceleratorMethod) ReceiveBlock(context vm_context.Accoun
 	for _, project := range projectList {
 		if project.Status == definition.VotingStatus {
 			// Check if project voting period has ended
-			if project.CreationTimestamp+constants.AcceleratorProjectVotingPeriod > frontierMomentum.Timestamp.Unix() {
+			if project.CreationTimestamp+constants.AcceleratorProjectVotingPeriod >= frontierMomentum.Timestamp.Unix() {
 				ok := checkAcceleratorVotes(context, project.Id, numPillars)
 				acceleratorLog.Debug("project passed voting period", "project-id", project.Id, "passed-votes", ok)
 				if ok {
@@ -485,6 +487,7 @@ func (p *UpdatePhaseMethod) ReceiveBlock(context vm_context.AccountVmContext, se
 	newPhase.QsrFundsNeeded = param.QsrFundsNeeded
 	newPhase.CreationTimestamp = frontierMomentum.Timestamp.Unix()
 	newPhase.Status = definition.VotingStatus
+	newPhase.ProjectId = project.Id
 	newPhase.Save(context.Storage())
 
 	project.PhaseIds[len(project.PhaseIds)-1] = newPhase.Id

vm/embedded/implementation/liquidity.go

@@ -148,7 +148,7 @@ func (p *FundMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBlock
 		if err != nil {
 			return nil, err
 		}
-		if znnBalance.Cmp(param.ZnnReward) > 0 && qsrBalance.Cmp(param.QsrReward) > 0 {
+		if znnBalance.Cmp(param.ZnnReward) != -1 && qsrBalance.Cmp(param.QsrReward) != -1 {
 			znnReward := &nom.AccountBlock{
 				Address:       types.LiquidityContract,
 				ToAddress:     types.AcceleratorContract,
@@ -157,7 +157,7 @@ func (p *FundMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBlock
 				Amount:        param.ZnnReward,
 			}
 			blocks = append(blocks, znnReward)
-			znnBalance = znnBalance.Sub(znnBalance, znnReward.Amount)
+
 			qsrReward := &nom.AccountBlock{
 				Address:       types.LiquidityContract,
 				ToAddress:     types.AcceleratorContract,
@@ -215,7 +215,7 @@ func (p *BurnZnnMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBl
 		if err != nil {
 			return nil, err
 		}
-		if znnBalance.Cmp(param.BurnAmount) > 0 {
+		if znnBalance.Cmp(param.BurnAmount) != -1 {
 			burnBlock := &nom.AccountBlock{
 				Address:       types.LiquidityContract,
 				ToAddress:     types.TokenContract,

vm/embedded/implementation/pillars.go

@@ -75,7 +75,7 @@ func checkAndRegisterPillar(context vm_context.AccountVmContext, param *definiti
 	// check if pillar name is used
 	_, err := definition.GetPillarInfo(context.Storage(), param.Name)
 	if err == constants.ErrDataNonExistent {
-		// ok, does not exists
+		// ok, does not exist
 	} else if err == nil {
 		return constants.ErrNotUnique
 	} else {

vm/embedded/implementation/sentinel.go

@@ -160,15 +160,15 @@ func (method *UpdateEmbeddedSentinelMethod) GetPlasma(plasmaTable *constants.Pla
 func (method *UpdateEmbeddedSentinelMethod) ValidateSendBlock(block *nom.AccountBlock) error {
 	var err error
 
-	if err := definition.ABIStake.UnpackEmptyMethod(method.MethodName, block.Data); err != nil {
+	if err := definition.ABISentinel.UnpackEmptyMethod(method.MethodName, block.Data); err != nil {
 		return constants.ErrUnpackError
 	}
 
 	if block.Amount.Sign() != 0 {
 		return constants.ErrInvalidTokenOrAmount
 	}
 
-	block.Data, err = definition.ABIStake.PackMethod(method.MethodName)
+	block.Data, err = definition.ABISentinel.PackMethod(method.MethodName)
 	return err
 }
 func (method *UpdateEmbeddedSentinelMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBlock *nom.AccountBlock) ([]*nom.AccountBlock, error) {

vm/embedded/implementation/spork.go

@@ -59,7 +59,7 @@ func (p *CreateSporkMethod) ValidateSendBlock(block *nom.AccountBlock) error {
 }
 func (p *CreateSporkMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBlock *nom.AccountBlock) ([]*nom.AccountBlock, error) {
 	if err := p.ValidateSendBlock(sendBlock); err != nil {
-		sentinelLog.Debug("invalid create - syntactic validation failed", "address", sendBlock.Address, "reason", err)
+		sporkLog.Debug("invalid create - syntactic validation failed", "address", sendBlock.Address, "reason", err)
 		return nil, err
 	}
 
@@ -110,6 +110,11 @@ func (p *ActivateSporkMethod) ValidateSendBlock(block *nom.AccountBlock) error {
 	return err
 }
 func (p *ActivateSporkMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBlock *nom.AccountBlock) ([]*nom.AccountBlock, error) {
+	if err := p.ValidateSendBlock(sendBlock); err != nil {
+		sporkLog.Debug("invalid spork activation - syntactic validation failed", "address", sendBlock.Address, "reason", err)
+		return nil, err
+	}
+
 	id := new(types.Hash)
 	err := definition.ABISpork.UnpackMethod(id, p.MethodName, sendBlock.Data)
 	if err != nil {

vm/embedded/implementation/token.go

@@ -116,10 +116,10 @@ func (p *IssueMethod) ReceiveBlock(context vm_context.AccountVmContext, sendBloc
 
 	tokenStandard := newTokenID(sendBlock.Hash)
 	if _, err := definition.GetTokenInfo(context.Storage(), tokenStandard); err == constants.ErrDataNonExistent {
-	} else if err != constants.ErrDataNonExistent {
-		common.DealWithErr(err)
 	} else if err == nil {
 		return nil, constants.ErrIDNotUnique
+	} else if err != constants.ErrDataNonExistent {
+		common.DealWithErr(err)
 	}
 
 	tokenInfo := definition.TokenInfo{