rename param, add fee mode

Author: scottafk

packages/block/block.go

@@ -76,7 +76,7 @@ func (b *Block) PlaySafe() error {
 		dbTransaction.Rollback()
 		if b.GenBlock && len(b.Transactions) == 0 {
 			if err == transaction.ErrLimitStop {
-				err = transaction.ErrLimitTime
+				err = script.ErrVMTimeLimit
 			}
 			if inputTx[0].IsSmartContract() {
 				transaction.BadTxForBan(inputTx[0].TxKeyID())
@@ -222,7 +222,7 @@ func (b *Block) Play(dbTransaction *sqldb.DbTransaction) (batchErr error) {
 					break
 				}
 				if strings.Contains(err.Error(), script.ErrVMTimeLimit.Error()) {
-					err = transaction.ErrLimitTime
+					err = script.ErrVMTimeLimit
 				}
 			}
 			if t.IsSmartContract() {

packages/conf/syspar/syspar.go

@@ -71,8 +71,8 @@ const (
 	LocalNodeBanTime = `local_node_ban_time`
 	// TaxesSize is the value of the taxes
 	TaxesSize = `taxes_size`
-	// PriceTxSizeWallet is the size of a user's resource in the database
-	PriceTxSizeWallet = `price_tx_size_wallet`
+	// PriceTxSize is the size of a user's resource in the database
+	PriceTxSize = `price_tx_size`
 	// PriceCreateRate is new element rate, include table、contract、column、ecosystem、page、menu
 	PriceCreateRate = `price_create_rate`
 	// Test equals true or 1 if we have a test blockchain
@@ -356,7 +356,8 @@ func GetFuelRate(ecosystem int64) string {
 	return fuels[1]
 }
 
-func IsFuelRate(ecosystem int64) (string, bool) {
+// HasFuelRate is returns fuels exist
+func HasFuelRate(ecosystem int64) (string, bool) {
 	mutex.RLock()
 	defer mutex.RUnlock()
 	if ret, ok := fuels[ecosystem]; ok {
@@ -375,8 +376,8 @@ func GetTaxesWallet(ecosystem int64) string {
 	return wallets[1]
 }
 
-// IsTaxesWallet is returns taxes exist
-func IsTaxesWallet(ecosystem int64) (string, bool) {
+// HasTaxesWallet is returns taxes exist
+func HasTaxesWallet(ecosystem int64) (string, bool) {
 	mutex.RLock()
 	defer mutex.RUnlock()
 	if ret, ok := wallets[ecosystem]; ok {

packages/migration/clb/system_parameters_data.go

@@ -68,7 +68,7 @@ INSERT INTO "1_system_parameters" ("id","name", "value", "conditions") VALUES
 	(next_id('1_system_parameters'),'incorrect_blocks_per_day','10','ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'node_ban_time','86400000','ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'node_ban_time_local','1800000','ContractAccess("@1UpdateSysParam")'),
-	(next_id('1_system_parameters'),'price_tx_size_wallet', '15', 'ContractAccess("@1UpdateSysParam")'),
+	(next_id('1_system_parameters'),'price_tx_size', '15', 'ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'price_create_rate', '1000000', 'ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'test','false','false'),
 	(next_id('1_system_parameters'),'price_tx_data', '0', 'ContractAccess("@1UpdateSysParam")'),

packages/migration/first_system_parameters_data.go

@@ -42,7 +42,7 @@ INSERT INTO "1_system_parameters" ("id","name", "value", "conditions") VALUES
 	(next_id('1_system_parameters'),'incorrect_blocks_per_day','10','ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'node_ban_time','86400000','ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'node_ban_time_local','1800000','ContractAccess("@1UpdateSysParam")'),
-	(next_id('1_system_parameters'),'price_tx_size_wallet', '15', 'ContractAccess("@1UpdateSysParam")'),
+	(next_id('1_system_parameters'),'price_tx_size', '15', 'ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'price_create_rate', '1000000', 'ContractAccess("@1UpdateSysParam")'),
 	(next_id('1_system_parameters'),'test','false','false'),
 	(next_id('1_system_parameters'),'price_tx_data', '10', 'ContractAccess("@1UpdateSysParam")'),