fix invalid bloom etc. (#397)

fix bug: deploy contract with event fail(invalid bloom) and others

core/minorblockchain_addon.go

@@ -658,14 +658,17 @@ func (m *MinorBlockChain) addTransactionToBlock(block *types.MinorBlock, evmStat
 		return nil, nil, err
 	}
 	txs, err := types.NewTransactionsByPriceAndNonce(types.NewEIP155Signer(uint32(m.Config().NetworkID)), pending)
-
+	if err != nil {
+		return nil, nil, err
+	}
 	gp := new(GasPool).AddGas(block.Header().GetGasLimit().Uint64())
 	usedGas := new(uint64)
 
 	receipts := make([]*types.Receipt, 0)
 	txsInBlock := make([]*types.Transaction, 0)
 
 	stateT := evmState
+	txIndex := 0
 	for stateT.GetGasUsed().Cmp(stateT.GetGasLimit()) < 0 {
 		tx := txs.Peek()
 		// Pop skip all txs about this account
@@ -679,6 +682,7 @@ func (m *MinorBlockChain) addTransactionToBlock(block *types.MinorBlock, evmStat
 			}
 
 		}
+		stateT.Prepare(tx.Hash(), block.Hash(), txIndex)
 		_, receipt, _, err := ApplyTransaction(m.ethChainConfig, m, gp, stateT, block.IHeader().(*types.MinorBlockHeader), tx, usedGas, *m.GetVMConfig())
 		switch err {
 		case ErrGasLimitReached:
@@ -697,6 +701,7 @@ func (m *MinorBlockChain) addTransactionToBlock(block *types.MinorBlock, evmStat
 			}
 			receipts = append(receipts, receipt)
 			txsInBlock = append(txsInBlock, tx)
+			txIndex++
 		default:
 			// Strange error, discard the transaction and get the next in line (note, the
 			// nonce-too-high clause will prevent us from executing in vain).

internal/qkcapi/input_args.go

@@ -29,8 +29,8 @@ type CallArgs struct {
 	GasPrice        hexutil.Big      `json:"gasPrice"`
 	Value           hexutil.Big      `json:"value"`
 	Data            hexutil.Bytes    `json:"data"`
-	GasTokenID      *hexutil.Uint64  `json:"gas_token_id"`
-	TransferTokenID *hexutil.Uint64  `json:"transfer_token_id"`
+	GasTokenID      *hexutil.Uint64  `json:"gasTokenId"`
+	TransferTokenID *hexutil.Uint64  `json:"transferTokenId"`
 }
 
 func (c *CallArgs) setDefaults() {