切换到 sign({...}) 和 verify({...}) 调用参数

This commit is contained in:
陆柯 2021-05-08 22:32:24 +08:00
parent fbf91171c3
commit aff70d43f7

265
tic.js
View File

@ -1,135 +1,156 @@
'use strict' "use strict";
const axios = require('axios') const axios = require("axios");
const ticCrypto = require('tic.crypto') const ticCrypto = require("tic.crypto");
const ticActionTransfer = require('tic.action').ActionTransfer const ticActionTransfer = require("tic.action").ActionTransfer;
const TIC_TXFEE = 10; const TIC_TXFEE = 10;
const TIC_NODE = require('./netConfig').TIC_NODE const TIC_NODE = require("./netConfig").TIC_NODE;
class TIC { class TIC {
constructor(seckey,option={}){ constructor(seckey, option = {}) {
if(!seckey||!ticCrypto.isSeckey(seckey)) throw "ERROR:Invalid Seckey" if (!seckey || !ticCrypto.isSeckey(seckey)) throw "ERROR:Invalid Seckey";
Object.defineProperties(this, { Object.defineProperties(this, {
'seckey' : { seckey: {
value : seckey, value: seckey,
enumerable : true, enumerable: true,
writable : false, writable: false,
}, },
'pubkey' : { pubkey: {
value : ticCrypto.seckey2pubkey(seckey), value: ticCrypto.seckey2pubkey(seckey),
enumerable : true, enumerable: true,
writable : false, writable: false,
}, },
'address' : { address: {
value : ticCrypto.pubkey2address(ticCrypto.seckey2pubkey(seckey)), value: ticCrypto.pubkey2address(ticCrypto.seckey2pubkey(seckey)),
enumerable : true, enumerable: true,
writable : false writable: false,
} },
}) });
Object.assign(this,{ Object.assign(this, {
_url : option._url||TIC_NODE, _url: option._url || TIC_NODE,
_defaultFee : option.fee||TIC_TXFEE //fee cannot be zero _defaultFee: option.fee || TIC_TXFEE, //fee cannot be zero
}) });
} }
get url(){return this._url} get url() {
set url(newURL){this._url = newURL} return this._url;
get txfee(){return this._defaultFee} }
set txfee(fee){this._defaultFee = fee} set url(newURL) {
this._url = newURL;
}
get txfee() {
return this._defaultFee;
}
set txfee(fee) {
this._defaultFee = fee;
}
static generateNewAccount(){ static generateNewAccount() {
var secword = ticCrypto.randomSecword() var secword = ticCrypto.randomSecword();
return Object.assign(new TIC(ticCrypto.secword2keypair(secword).seckey),{secword:secword}) return Object.assign(new TIC(ticCrypto.secword2keypair(secword).seckey), {
secword: secword,
});
}
static fromMnemonic(secword) {
if (!secword || !ticCrypto.isSecword(secword))
throw "ERROR:Invalid Secword";
return new TIC(ticCrypto.secword2keypair(secword).seckey);
}
static async getBalance(address) {
if (!address) {
throw new Error("Address is required");
} }
static fromMnemonic(secword){ return (
if(!secword||!ticCrypto.isSecword(secword)) throw "ERROR:Invalid Secword" await axios.post(TIC_NODE + "/Account/getBalance", {
return new TIC(ticCrypto.secword2keypair(secword).seckey) Account: {
} address: address,
static async getBalance(address){ },
if(!address){ throw new Error('Address is required'); } })
return (await axios.post(TIC_NODE+'/Account/getBalance',{ ).data;
"Account" : { }
"address":address static async getActions(address) {
} if (!address) {
})).data throw new Error("Address is required");
}
static async getActions(address){
if(!address){ throw new Error('Address is required'); }
return (await axios.post(TIC_NODE+'/Action/getActionList',{
"Action" : {
"actorAddress" : address,
"toAddress" : address
},
"config":{
"logic":"OR"
}
})).data
}
static encrypt(data, key){
if(!data || !key) throw new Error('Required Params Missing')
return ticCrypto.encrypt(data,key)
}
static decrypt(data, key){
return ticCrypto.decrypt(data, key, {format:"json"}) //return null for wrong key
} }
return (
await axios.post(TIC_NODE + "/Action/getActionList", {
Action: {
actorAddress: address,
toAddress: address,
},
config: {
logic: "OR",
},
})
).data;
}
static encrypt(data, key) {
if (!data || !key) throw new Error("Required Params Missing");
return ticCrypto.encrypt(data, key);
}
static decrypt(data, key) {
return ticCrypto.decrypt(data, key, { format: "json" }); //return null for wrong key
}
static isValidAddress(address){ static isValidAddress(address) {
return ticCrypto.isAddress(address) return ticCrypto.isAddress(address);
} }
async sendTransaction(toAddress, amount, option = {gasFee : TIC_TXFEE}){ async sendTransaction(toAddress, amount, option = { gasFee: TIC_TXFEE }) {
if(!toAddress||!amount){throw new Error("ERROR:RequiredParamsMissing")} //amount cannot be zero if (!toAddress || !amount) {
let action = new ticActionTransfer({ throw new Error("ERROR:RequiredParamsMissing");
amount: parseInt(amount), } //amount cannot be zero
toAddress: toAddress, let action = new ticActionTransfer({
fee: option.gasFee, amount: parseInt(amount),
}) toAddress: toAddress,
//对交易数据签名,packMe 内的参数是交易发起人的keypair fee: option.gasFee,
action.packMe({ });
seckey: this.seckey, //对交易数据签名,packMe 内的参数是交易发起人的keypair
pubkey: this.pubkey, action.packMe({
}) seckey: this.seckey,
let data = { pubkey: this.pubkey,
Action:action });
} let data = {
try{ Action: action,
};
let res = (await axios.post(this._url + '/Action/prepare',data)).data try {
return res let res = (await axios.post(this._url + "/Action/prepare", data)).data;
}catch(err){ return res;
return null } catch (err) {
} return null;
} }
async getBalance(){ }
return TIC.getBalance(this.address) async getBalance() {
return TIC.getBalance(this.address);
}
async getActions() {
return TIC.getActions(this.address);
}
getSerializedTx(option) {
if (!option.toAddress || !option.amount) {
throw new Error("ERROR:RequiredParamsMissing");
} }
async getActions(){ let action = new ticActionTransfer({
return TIC.getActions(this.address) amount: parseInt(option.amount),
} toAddress: option.toAddress,
getSerializedTx(option){ fee: option.fee || this._defaultFee,
if(!option.toAddress||!option.amount){throw new Error("ERROR:RequiredParamsMissing")} });
let action=new ticActionTransfer({ //sign for txBody use function packMe, which needs actor's keypair as parameter
amount: parseInt(option.amount), action.packMe({
toAddress: option.toAddress, seckey: this.seckey,
fee: option.fee||this._defaultFee, pubkey: this.pubkey,
}) });
//sign for txBody use function packMe, which needs actor's keypair as parameter return action;
action.packMe({ }
seckey: this.seckey, //default key for sign&encrypt is account's seckey,other keys are optional.
pubkey: this.pubkey, sign(message, key = this.seckey) {
}) return ticCrypto.sign({ data: message, seckey: key });
return action }
} verify(message, signature) {
//default key for sign&encrypt is account's seckey,other keys are optional. return ticCrypto.sign({ data: message, signature, seckey: this.seckey });
sign(message,key = this.seckey){ }
return ticCrypto.sign(message,key) encrypt(key) {
} return TIC.encrypt(this, key);
verify(message,signature){ }
return ticCrypto.sign(message,signature,this.seckey)
}
encrypt(key){
return TIC.encrypt(this, key)
}
} }
module.exports = {TIC} module.exports = { TIC };