npm/tic-traction
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename seckey to prikey

Browse Source
This commit is contained in:
陆柯 2022-08-14 15:51:24 +08:00
parent 8cf67bf90c
commit 76deb199a5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Action.js
View File

@ -44,15 +44,15 @@ MOM.packMe = async function (keypair) {
this.actorAddress = ticc.pubkey_to_address({ pubkey: keypair.pubkey }) this.actorAddress = ticc.pubkey_to_address({ pubkey: keypair.pubkey })
this.timestamp = new Date() this.timestamp = new Date()
await this.signMe(keypair.seckey) await this.signMe(keypair.prikey)
this.hashMe() this.hashMe()
return this return this
} }
MOM.signMe = async function (seckey) { MOM.signMe = async function (prikey) {
// 由前端调用，后台不该进行签名 // 由前端调用，后台不该进行签名
let json = this.getJson({ exclude: ['hash', 'blockHash', 'actorSignature'] }) // 是前端用户发起事务时签字，这时候还不知道进入哪个区块，所以不能计入blockHash let json = this.getJson({ exclude: ['hash', 'blockHash', 'actorSignature'] }) // 是前端用户发起事务时签字，这时候还不知道进入哪个区块，所以不能计入blockHash
this.actorSignature = await ticc.sign_easy({ data: json, seckey }) this.actorSignature = await ticc.sign_easy({ data: json, prikey })
return this return this
} }
@ -156,9 +156,9 @@ DAD.buildUserAction = async function (action, keypair) {
action && action &&
action.type && action.type &&
keypair && keypair &&
keypair.seckey && keypair.prikey &&
keypair.pubkey && keypair.pubkey &&
ticc.seckey_to_pubkey({ seckey: keypair.seckey }) === keypair.pubkey ticc.seckey_to_pubkey({ prikey: keypair.prikey }) === keypair.pubkey
) { ) {
let typedAction = new wo[action.type](action) let typedAction = new wo[action.type](action)
typedAction.actorPubkey = keypair.pubkey typedAction.actorPubkey = keypair.pubkey

6
ActionMultisig.js
View File

@ -14,12 +14,12 @@ const MOM = DAD.prototype
MOM.__proto__ = Action.prototype MOM.__proto__ = Action.prototype
// MOM._table=DAD.name // 注释掉，从而继承父类Action的数据库表格名 // MOM._table=DAD.name // 注释掉，从而继承父类Action的数据库表格名
MOM.signMe = async function (seckey) { MOM.signMe = async function (prikey) {
// 由前端调用，后台不该进行签名 // 由前端调用，后台不该进行签名
let json = this.getJson({ let json = this.getJson({
exclude: ['hash', 'blockHash', 'actorSignature', 'json'] exclude: ['hash', 'blockHash', 'actorSignature', 'json']
}) // 是前端用户发起事务时签字，这时候还不知道进入哪个区块，所以不能计入blockHash }) // 是前端用户发起事务时签字，这时候还不知道进入哪个区块，所以不能计入blockHash
this.actorSignature = await ticc.sign_easy({ data: json, seckey }) this.actorSignature = await ticc.sign_easy({ data: json, prikey })
return this return this
} }
@ -61,7 +61,7 @@ MOM.packMe = async function (keypair) {
this.actorAddress = ticc.pubkey_to_address({ pubkey: keypair.pubkey }) this.actorAddress = ticc.pubkey_to_address({ pubkey: keypair.pubkey })
this.timestamp = new Date() this.timestamp = new Date()
await this.signMe(keypair.seckey) await this.signMe(keypair.prikey)
this.hashMe() this.hashMe()
return this return this
} }