From 3cf673af6f932a31ec20731ce376c1fcef28e991 Mon Sep 17 00:00:00 2001
From: "luk.lu" <luk.lu@yuanjin.net>
Date: Thu, 11 Apr 2019 15:59:26 +0800
Subject: [PATCH] =?UTF-8?q?action.packMe(keypair)=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=9C=89=E4=B8=AA=E6=97=A0=E5=85=B3=E7=B4=A7=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E5=B0=8F=E9=94=99=EF=BC=9A=E8=BE=93=E5=85=A5=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=98=AF=20{seckey,=20pubkey}=20=E5=8D=B3=E5=8F=AF=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BC=A0=E5=85=A5=20address?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=20address=20=E6=98=AF=20packMe=20?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=87=AA=E5=B7=B1=E6=A0=B9=E6=8D=AE=20pubkey?=
 =?UTF-8?q?=20=E7=94=9F=E6=88=90=E7=9A=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Action.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Action.js b/Action.js
index bae21af..416156f 100644
--- a/Action.js
+++ b/Action.js
@@ -1,5 +1,5 @@
 var Ling = require('fon.ling')
-var Ticrypto = require('tic.crypto')
+var ticCrypto = require('tic.crypto')
 
 /** ****************** Public of instance ********************/
 
@@ -35,7 +35,7 @@ MOM._model = {
 
 MOM.packMe = function (keypair) { // 由前端调用，后台不创建
   this.actorPubkey = keypair.pubkey
-  this.actorAddress = Ticrypto.pubkey2address(keypair.pubkey)
+  this.actorAddress = ticCrypto.pubkey2address(keypair.pubkey)
   this.timestamp = new Date()
 
   this.signMe(keypair.seckey)
@@ -45,12 +45,12 @@ MOM.packMe = function (keypair) { // 由前端调用，后台不创建
 
 MOM.signMe = function (seckey) { // 由前端调用，后台不该进行签名
   let json = this.getJson({ exclude: ['hash', 'blockHash', 'actorSignature'] }) // 是前端用户发起事务时签字，这时候还不知道进入哪个区块，所以不能计入blockHash
-  this.actorSignature = Ticrypto.sign(json, seckey)
+  this.actorSignature = ticCrypto.sign(json, seckey)
   return this
 }
 
 MOM.hashMe = function () {
-  this.hash = Ticrypto.hash(this.getJson({ exclude: ['hash', 'blockHash'] })) // block.hash 受到所包含的actionList影响，所以action不能受blockHash影响，否则循环了
+  this.hash = ticCrypto.hash(this.getJson({ exclude: ['hash', 'blockHash'] })) // block.hash 受到所包含的actionList影响，所以action不能受blockHash影响，否则循环了
   return this
 }
 
@@ -67,16 +67,16 @@ DAD.getJson = function (action, option = {}) {
 
 DAD.verifySig = function (action) {
   let json = DAD.getJson(action, { exclude: ['hash', 'blockHash', 'actorSignature'] })
-  let res = Ticrypto.verify(json, action.actorSignature, action.actorPubkey)
+  let res = ticCrypto.verify(json, action.actorSignature, action.actorPubkey)
   return res
 }
 
 DAD.verifyAddress = function (action) {
-  return action.actorAddress === Ticrypto.pubkey2address(action.actorPubkey)
+  return action.actorAddress === ticCrypto.pubkey2address(action.actorPubkey)
 }
 
 DAD.verifyHash = function (action) {
-  return action.hash === Ticrypto.hash(DAD.getJson(action, { exclude: ['hash', 'blockHash'] }))
+  return action.hash === ticCrypto.hash(DAD.getJson(action, { exclude: ['hash', 'blockHash'] }))
 }
 
 MOM.validateMe = async function() { // 子类应当覆盖本方法。
@@ -100,6 +100,9 @@ DAD.execute = async function (action) {
   let typedAction = new wo[action.type](action)
   return await typedAction.executeMe()
 }
+// [todo 20190411] 执行事务池中的所有事务
+// DAD.executePool = async function() {
+// }
 
 /**
  * 获取一批交易，在出块时调用。调用actionPool的内容被深拷贝到currentActionPool后自动清空。