diff --git a/ling/Action.js b/Action.js similarity index 100% rename from ling/Action.js rename to Action.js diff --git a/ling/ActTransfer.js b/ActionTransfer.js similarity index 69% rename from ling/ActTransfer.js rename to ActionTransfer.js index 369d173..1be5793 100644 --- a/ling/ActTransfer.js +++ b/ActionTransfer.js @@ -1,9 +1,9 @@ const Action = require('./Action.js') -const DAD = module.exports = function ActTransfer (prop) { - this._class = 'ActTransfer' - this.setProp(prop) // 没有定义 ActTransfer.prototype._model,因此继承了上级Action.prototype._model,因此通过this.setProp,继承了上级Action定义的实例自有数据。另一个方案是,调用 Action.call(this, prop) - this.type = 'ActTransfer' +const DAD = module.exports = function ActionTransfer (prop) { + this._class = 'ActionTransfer' + this.setProp(prop) // 没有定义 ActionTransfer.prototype._model,因此继承了上级Action.prototype._model,因此通过this.setProp,继承了上级Action定义的实例自有数据。另一个方案是,调用 Action.call(this, prop) + this.type = 'ActionTransfer' } DAD.__proto__ = Action const MOM = DAD.prototype @@ -12,7 +12,7 @@ MOM.__proto__ = Action.prototype DAD.validate = async function (action) { // if (sender && sender.type !== 'multisig' && action.toAddress != action.actorAddress && sender.balance >= action.amount + action.fee){ let sender = await wo.Store.getBalance(action.actorAddress) - return action.actorAddress && action.toAddress && action.toAddress != action.actorAddress && action.amount && action.amount > 0 && sender >= action.amount + action.fee && action.fee >= wo.Config.MIN_FEE_ActTransfer + return action.actorAddress && action.toAddress && action.toAddress != action.actorAddress && action.amount && action.amount > 0 && sender >= action.amount + action.fee && action.fee >= wo.Config.MIN_FEE_ActionTransfer } DAD.execute = async function (action) { diff --git a/index.js b/index.js index bb4d7f0..62cdb2d 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,6 @@ -const Action = require('./ling/Action.js') -const ActTransfer = require('./ling/ActTransfer.js') +const Action = require('./Action.js') +const ActionTransfer = require('./ActionTransfer.js') module.exports = { Action, - ActTransfer + ActionTransfer } \ No newline at end of file