u
This commit is contained in:
@@ -1,46 +1,64 @@
|
||||
const Action = require('./Action.js')
|
||||
const ticc = require('tic-crypto')
|
||||
|
||||
/** ****************** Public of instance ********************/
|
||||
|
||||
const DAD = module.exports = function ActionMultisig (prop) {
|
||||
const DAD = (module.exports = function ActionMultisig (prop) {
|
||||
this._class = this.constructor.name
|
||||
this.setProp(prop) // 没有定义 DAD.prototype._model,因此继承了上级Action.prototype._model,因此通过this.setProp,继承了上级Action定义的实例自有数据。另一个方案是,调用 Action.call(this, prop)
|
||||
this.type = this.constructor.name
|
||||
}
|
||||
})
|
||||
DAD.__proto__ = Action
|
||||
|
||||
const MOM = DAD.prototype
|
||||
MOM.__proto__ = Action.prototype
|
||||
// MOM._table=DAD.name // 注释掉,从而继承父类Action的数据库表格名
|
||||
|
||||
MOM.signMe = async function (seckey) { // 由前端调用,后台不该进行签名
|
||||
let json = this.getJson({ exclude: ['hash', 'blockHash', 'actorSignature', 'json'] }) // 是前端用户发起事务时签字,这时候还不知道进入哪个区块,所以不能计入blockHash
|
||||
this.actorSignature = await wo.Crypto.sign(json, seckey)
|
||||
MOM.signMe = async function (seckey) {
|
||||
// 由前端调用,后台不该进行签名
|
||||
let json = this.getJson({
|
||||
exclude: ['hash', 'blockHash', 'actorSignature', 'json']
|
||||
}) // 是前端用户发起事务时签字,这时候还不知道进入哪个区块,所以不能计入blockHash
|
||||
this.actorSignature = await ticc.sign(json, seckey)
|
||||
return this
|
||||
}
|
||||
|
||||
MOM.verifySig = async function () {
|
||||
let json = this.getJson(({ exclude: ['hash', 'blockHash', 'actorSignature', 'json'] }))
|
||||
let res = await wo.Crypto.verify(json, this.actorSignature, this.actorPubkey)
|
||||
let json = this.getJson({
|
||||
exclude: ['hash', 'blockHash', 'actorSignature', 'json']
|
||||
})
|
||||
let res = await ticc.verify({
|
||||
data: json,
|
||||
signature: this.actorSignature,
|
||||
pubkey: this.actorPubkey
|
||||
})
|
||||
return res
|
||||
}
|
||||
|
||||
MOM.verifyAddress = function () {
|
||||
return this.actorAddress === wo.Crypto.pubkey2address(this.actorPubkey)
|
||||
return (
|
||||
this.actorAddress === ticc.pubkey_to_address({ pubkey: this.actorPubkey })
|
||||
)
|
||||
}
|
||||
|
||||
MOM.hashMe = function () {
|
||||
this.hash = wo.Crypto.hash(this.getJson({ exclude: ['hash', 'blockHash', 'json'] })) // block.hash 受到所包含的actionList影响,所以action不能受blockHash影响,否则循环了
|
||||
this.hash = ticc.hash(
|
||||
this.getJson({ exclude: ['hash', 'blockHash', 'json'] })
|
||||
) // block.hash 受到所包含的actionList影响,所以action不能受blockHash影响,否则循环了
|
||||
return this
|
||||
}
|
||||
|
||||
MOM.verifyHash = function () {
|
||||
return this.hash === wo.Crypto.hash(this.getJson({ exclude: ['hash', 'blockHash', 'json'] }))
|
||||
return (
|
||||
this.hash ===
|
||||
ticc.hash(this.getJson({ exclude: ['hash', 'blockHash', 'json'] }))
|
||||
)
|
||||
}
|
||||
|
||||
MOM.packMe = async function (keypair) { // 由前端调用,后台不创建
|
||||
MOM.packMe = async function (keypair) {
|
||||
// 由前端调用,后台不创建
|
||||
this.actorPubkey = keypair.pubkey
|
||||
this.actorAddress = wo.Crypto.pubkey2address(keypair.pubkey)
|
||||
this.actorAddress = ticc.pubkey_to_address({ pubkey: keypair.pubkey })
|
||||
this.timestamp = new Date()
|
||||
|
||||
await this.signMe(keypair.seckey)
|
||||
@@ -49,7 +67,9 @@ MOM.packMe = async function (keypair) { // 由前端调用,后台不创建
|
||||
}
|
||||
|
||||
MOM.checkMultiSig = async function (account) {
|
||||
let json = this.getJson(({ exclude: ['hash', 'blockHash', 'actorSignature', 'json'] }))
|
||||
let json = this.getJson({
|
||||
exclude: ['hash', 'blockHash', 'actorSignature', 'json']
|
||||
})
|
||||
let sigers = Object.keys(this.json) // 公钥列表
|
||||
// 交易发起人的签名在prepare的verifySig里已经检查过合法性,
|
||||
if (account.multiSignatures.keysgroup.indexOf(this.actorPubkey) === -1) {
|
||||
@@ -57,9 +77,12 @@ MOM.checkMultiSig = async function (account) {
|
||||
} else {
|
||||
let M = 0 // 如果发起人已经在keysgroup里则从0算起
|
||||
}
|
||||
for (let i of sigers) // 该交易内已签名的每一个公钥
|
||||
{
|
||||
if (account.multiSignatures.keysgroup.indexOf(i) !== -1 && await wo.Crypto.verify(json, this.json[i], i)) {
|
||||
for (let i of sigers) {
|
||||
// 该交易内已签名的每一个公钥
|
||||
if (
|
||||
account.multiSignatures.keysgroup.indexOf(i) !== -1 &&
|
||||
(await ticc.verify(json, this.json[i], i))
|
||||
) {
|
||||
M++
|
||||
}
|
||||
}
|
||||
@@ -140,16 +163,20 @@ step3:发起人申请执行
|
||||
*/
|
||||
|
||||
MOM.validateMe = async function () {
|
||||
return wo.Crypto.isAddress(this.toAddress) &&
|
||||
return (
|
||||
ticc.is_chain_address({ address: this.toAddress }) &&
|
||||
this.fee >= wo.Config.MIN_FEE_ActionTransfer &&
|
||||
this.toAddress != this.actorAddress
|
||||
)
|
||||
}
|
||||
|
||||
MOM.executableMe = async function () {
|
||||
if (this.json.act === 'createTransfer') { // 创建挂起的多重签名事务
|
||||
if (this.json.act === 'createTransfer') {
|
||||
// 创建挂起的多重签名事务
|
||||
DAD.pendingPool[this.hash] = this
|
||||
return false
|
||||
} else if (this.json.act === 'addSig') { // 签名者签名
|
||||
} else if (this.json.act === 'addSig') {
|
||||
// 签名者签名
|
||||
DAD.pendingPool[this.hash].json[this.actorPubkey] = this.json.signature
|
||||
return false
|
||||
}
|
||||
@@ -160,27 +187,48 @@ MOM.executeMe = async function () {
|
||||
switch (this.json.act) {
|
||||
// 多重签名账户注册
|
||||
case 'sign': {
|
||||
let actor = await wo.Account.getOne({ Account: { address: this.actorAddress } })
|
||||
let actor = await wo.Account.getOne({
|
||||
Account: { address: this.actorAddress }
|
||||
})
|
||||
if (actor && actor.type !== 'multisig') {
|
||||
// 检查账户类型,只有不是多重签名账户的才可以执行
|
||||
// todo:类型检查,安全操作
|
||||
await actor.setMe({ Account: { multiSignatures: {
|
||||
min: this.json.min,
|
||||
ttl: this.json.ttl, // 该账户交易的最大挂起时间
|
||||
keysgroup: this.json.keysgroup
|
||||
} },
|
||||
cond: { address: actor.address } })
|
||||
await actor.setMe({
|
||||
Account: {
|
||||
multiSignatures: {
|
||||
min: this.json.min,
|
||||
ttl: this.json.ttl, // 该账户交易的最大挂起时间
|
||||
keysgroup: this.json.keysgroup
|
||||
}
|
||||
},
|
||||
cond: { address: actor.address }
|
||||
})
|
||||
}
|
||||
return this
|
||||
}
|
||||
// 多重签名账户执行转账
|
||||
case 'emitTransfer': {
|
||||
let sender = await wo.Account.getOne({ Account: { address: this.actorAddress } })
|
||||
if (sender && await this.checkMultiSig(sender) && this.toAddress != this.actorAddress && sender.balance >= this.amount + this.fee) {
|
||||
await sender.setMe({ Account: { balance: sender.balance - this.amount - this.fee }, cond: { address: sender.address } })
|
||||
let getter = await wo.Account.getOne({ Account: { address: this.toAddress } })
|
||||
let sender = await wo.Account.getOne({
|
||||
Account: { address: this.actorAddress }
|
||||
})
|
||||
if (
|
||||
sender &&
|
||||
(await this.checkMultiSig(sender)) &&
|
||||
this.toAddress != this.actorAddress &&
|
||||
sender.balance >= this.amount + this.fee
|
||||
) {
|
||||
await sender.setMe({
|
||||
Account: { balance: sender.balance - this.amount - this.fee },
|
||||
cond: { address: sender.address }
|
||||
})
|
||||
let getter = await wo.Account.getOne({
|
||||
Account: { address: this.toAddress }
|
||||
})
|
||||
if (getter) {
|
||||
await getter.setMe({ Account: { balance: getter.balance + this.amount }, cond: { address: getter.address } })
|
||||
await getter.setMe({
|
||||
Account: { balance: getter.balance + this.amount },
|
||||
cond: { address: getter.address }
|
||||
})
|
||||
} else {
|
||||
await wo.Account.addOne({ Account: { address: this.toAddress } })
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user