Commit 6b1ea7ea authored by jiangpeng's avatar jiangpeng Committed by vipwzw

crypto:replace New mehtod with Load

parent e014eeaa
......@@ -190,7 +190,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
}
//为了使用VRF,需要使用SECP256K1体系的公私钥
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
dposlog.Error("NewDPosClient", "err", err)
return nil
......@@ -199,7 +199,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
ttypes.ConsensusCrypto = cr
//安全连接仍然要使用ed25519
cr2, err := crypto.New(types.GetSignName("", types.ED25519))
cr2, err := crypto.Load(types.GetSignName("", types.ED25519), -1)
if err != nil {
dposlog.Error("NewDPosClient", "err", err)
return nil
......
......@@ -352,9 +352,9 @@ signType="auth_ecdsa"
)
func init() {
cr2, err := crypto.New(types.GetSignName("", types.ED25519))
cr2, err := crypto.Load(types.GetSignName("", types.ED25519), -1)
if err != nil {
fmt.Println("crypto.New failed for types.ED25519")
fmt.Println("crypto.Load failed for types.ED25519")
return
}
secureConnCrypto = cr2
......
......@@ -19,7 +19,7 @@ const (
func init() {
//为了使用VRF,需要使用SECP256K1体系的公私钥
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic("init ConsensusCrypto failed.")
}
......
......@@ -32,7 +32,7 @@ const (
func init() {
//为了使用VRF,需要使用SECP256K1体系的公私钥
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic("init ConsensusCrypto failed.")
}
......
......@@ -14,7 +14,7 @@ import (
func init() {
//为了使用VRF,需要使用SECP256K1体系的公私钥
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic("init ConsensusCrypto failed.")
}
......
......@@ -33,7 +33,7 @@ var (
func init() {
//为了使用VRF,需要使用SECP256K1体系的公私钥
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic("init ConsensusCrypto failed.")
}
......
......@@ -27,7 +27,7 @@ var (
func init() {
//为了使用VRF,需要使用SECP256K1体系的公私钥
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic("init ConsensusCrypto failed.")
}
......
......@@ -140,7 +140,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
if err != nil {
panic(err)
}
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -155,7 +155,7 @@ func TestAddMinerTx(t *testing.T) {
pk, err := hex.DecodeString(minerPrivateKey)
assert.Nil(t, err)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.Nil(t, err)
priKey, err := secp.PrivKeyFromBytes(pk)
......
......@@ -65,7 +65,7 @@ type blsClient struct {
func newBlsClient(para *client, cfg *subConfig) *blsClient {
b := &blsClient{paraClient: para}
b.selfID = cfg.AuthAccount
cli, err := crypto.New("bls")
cli, err := crypto.Load("bls", para.GetCurrentHeight())
if err != nil {
panic("new bls crypto fail")
}
......
......@@ -37,7 +37,7 @@ func TestIntegrateCommits(t *testing.T) {
}
func TestBlsSignMain(t *testing.T) {
cryptoCli, err := crypto.New("bls")
cryptoCli, err := crypto.Load("bls", -1)
assert.NoError(t, err)
testSecpPrikey2BlsPub(t, cryptoCli)
......
......@@ -1021,7 +1021,7 @@ func getSecpPriKey(key string) (crypto.PrivKey, error) {
return nil, errors.Wrapf(err, "fromhex=%s", key)
}
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
return nil, errors.Wrapf(err, "crypto=%s", key)
}
......
......@@ -62,7 +62,7 @@ func createParaTestInstance(t *testing.T, q queue.Queue) *client {
//生成私钥
pk, err := hex.DecodeString(TestPrivateKey)
assert.Nil(t, err)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.Nil(t, err)
priKey, err := secp.PrivKeyFromBytes(pk)
assert.Nil(t, err)
......
......@@ -33,7 +33,7 @@ func getPrivKey(t *testing.T) crypto.PrivKey {
pk, err := common.FromHex("6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b")
assert.Nil(t, err)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.Nil(t, err)
priKey, err := secp.PrivKeyFromBytes(pk)
......
......@@ -108,7 +108,7 @@ func sendReplyList(q queue.Queue) {
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -203,7 +203,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
}
ttypes.CryptoName = types.GetSignName("", signType)
cr, err := crypto.New(ttypes.CryptoName)
cr, err := crypto.Load(ttypes.CryptoName, -1)
if err != nil {
qbftlog.Error("load qbft crypto fail", "err", err)
return nil
......
......@@ -118,7 +118,7 @@ func configManagerTx() *types.Transaction {
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -378,7 +378,7 @@ func NormGet(key string) {
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......@@ -394,7 +394,7 @@ func getprivkey(key string) crypto.PrivKey {
}
func genaddress() (string, crypto.PrivKey) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -23,9 +23,9 @@ var (
)
func init() {
cr2, err := crypto.New(types.GetSignName("", types.ED25519))
cr2, err := crypto.Load(types.GetSignName("", types.ED25519), -1)
if err != nil {
fmt.Println("crypto.New failed for types.ED25519")
fmt.Println("crypto.Load failed for types.ED25519")
return
}
secureConnCrypto = cr2
......
......@@ -377,7 +377,7 @@ func SaveState(state State) *tmtypes.State {
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -175,7 +175,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
}
ttypes.CryptoName = types.GetSignName("", signType)
cr, err := crypto.New(ttypes.CryptoName)
cr, err := crypto.Load(ttypes.CryptoName, -1)
if err != nil {
tendermintlog.Error("NewTendermintClient", "err", err)
return nil
......
......@@ -518,7 +518,7 @@ type RespMsg struct {
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......@@ -534,7 +534,7 @@ func getprivkey(key string) crypto.PrivKey {
}
func genaddress() (string, crypto.PrivKey) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -173,7 +173,7 @@ func (client *Client) ProcEvent(msg *queue.Message) bool {
}
func (client *Client) privFromBytes(privkey []byte) (crypto.PrivKey, error) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
return nil, err
}
......
......@@ -138,7 +138,7 @@ func TestTicketMap(t *testing.T) {
}
privmap := make(map[string]crypto.PrivKey)
//通过privkey生成一个pubkey然后换算成对应的addr
cr, _ := crypto.New("secp256k1")
cr, _ := crypto.Load("secp256k1", -1)
priv, _ := cr.PrivKeyFromBytes([]byte("2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989"))
privmap["1111"] = priv
privmap["2222"] = priv
......@@ -170,7 +170,7 @@ func TestProcEvent(t *testing.T) {
}
func Test_genPrivHash(t *testing.T) {
c, err := crypto.New(types.GetSignName("", types.SECP256K1))
c, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.NoError(t, err)
priv, _ := c.GenKey()
......@@ -198,7 +198,7 @@ func Test_getNextRequiredDifficulty(t *testing.T) {
}
func Test_vrfVerify(t *testing.T) {
c, err := crypto.New(types.GetSignName("", types.SECP256K1))
c, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.NoError(t, err)
priv, err := c.GenKey()
assert.NoError(t, err)
......
......@@ -439,7 +439,7 @@ func Exec_QueryExpiredAccounts(expiredtime int64, stateDB db.KV, kvdb db.KVDB) (
}
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType),-1)
if err != nil {
return tx, err
}
......
......@@ -763,7 +763,7 @@ func TestVerifyMinerAddr(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(auty.AutonomyX, signType))
c, err := crypto.Load(types.GetSignName(auty.AutonomyX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -362,7 +362,7 @@ func (loader *UserLoader) loadUsers() error {
}
func (loader *UserLoader) genCryptoPriv(keyBytes []byte) (crypto.PrivKey, error) {
cr, err := crypto.New(types.GetSignName("cert", loader.signType))
cr, err := crypto.Load(types.GetSignName("cert", loader.signType), -1)
if err != nil {
return nil, fmt.Errorf("create crypto %s failed, error:%s", types.GetSignName("cert", loader.signType), err)
}
......
......@@ -43,7 +43,7 @@ var (
privRaw, _ = common.FromHex("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
tr = &cty.CoinsAction_Transfer{Transfer: &types.AssetsTransfer{Amount: int64(1e8)}}
secpp256, _ = crypto.New(types.GetSignName("", types.SECP256K1))
secpp256, _ = crypto.Load(types.GetSignName("", types.SECP256K1), -1)
privKey, _ = secpp256.PrivKeyFromBytes(privRaw)
tx14 = &types.Transaction{
Execer: []byte("coins"),
......@@ -188,7 +188,7 @@ func TestChckSignWithNoneAuth(t *testing.T) {
TestCase04 不带证书,SM2签名验证
*/
func TestChckSignWithSm2(t *testing.T) {
sm2, err := crypto.New(types.GetSignName("cert", ct.AuthSM2))
sm2, err := crypto.Load(types.GetSignName("cert", ct.AuthSM2), -1)
assert.Nil(t, err)
privKeysm2, _ := sm2.PrivKeyFromBytes(privRaw)
tx15 := &types.Transaction{Execer: []byte("coins"),
......@@ -213,7 +213,7 @@ func TestChckSignWithSm2(t *testing.T) {
TestCase05 不带证书,secp256r1签名验证
*/
func TestChckSignWithEcdsa(t *testing.T) {
ecdsacrypto, _ := crypto.New(types.GetSignName("cert", ct.AuthECDSA))
ecdsacrypto, _ := crypto.Load(types.GetSignName("cert", ct.AuthECDSA), -1)
privKeyecdsa, _ := ecdsacrypto.PrivKeyFromBytes(privRaw)
tx16 := &types.Transaction{Execer: []byte("coins"),
Payload: types.Encode(&cty.CoinsAction{Value: tr, Ty: cty.CoinsActionTransfer}),
......
......@@ -138,7 +138,7 @@ func signCertTx(tx *types.Transaction, priv crypto.PrivKey, cert []byte) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(pkt.CollateralizeX, signType))
c, err := crypto.Load(types.GetSignName(pkt.CollateralizeX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -670,7 +670,7 @@ func TestCollateralize(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(pkt.CollateralizeX, signType))
c, err := crypto.Load(types.GetSignName(pkt.CollateralizeX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -611,7 +611,7 @@ MAIN_LOOP:
}
func initCryptoImpl() error {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
fmt.Printf("New crypto impl failed err: %v", err)
return err
......
......@@ -854,7 +854,7 @@ func Exec_QueryHistoryOrder(query *et.QueryHistoryOrderList, stateDB db.KV, kvdb
}
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType), -1)
if err != nil {
return tx, err
}
......
......@@ -202,7 +202,7 @@ func (c *ExecCli) Query(fn string, msg proto.Message) ([]byte, error) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType), -1)
if err != nil {
return tx, err
}
......
......@@ -479,7 +479,7 @@ func TestGame(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType), -1)
if err != nil {
return tx, err
}
......
......@@ -306,9 +306,9 @@ func init() {
log.SetLogLevel("info")
random = rand.New(rand.NewSource(types.Now().UnixNano()))
cr2, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr2, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
fmt.Println("crypto.New failed for types.ED25519")
fmt.Println("crypto.Load failed for types.ED25519")
return
}
secp = cr2
......
......@@ -308,9 +308,9 @@ func init() {
log.SetLogLevel("info")
random = rand.New(rand.NewSource(types.Now().UnixNano()))
cr2, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr2, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
fmt.Println("crypto.New failed for types.ED25519")
fmt.Println("crypto.Load failed for types.ED25519")
return
}
secp = cr2
......
......@@ -37,7 +37,7 @@ var (
const secretLen = 32
func genaddress() (string, crypto.PrivKey) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -705,7 +705,7 @@ func TestIssuance(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(pkt.IssuanceX, signType))
c, err := crypto.Load(types.GetSignName(pkt.IssuanceX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -136,7 +136,7 @@ func TestExecDrawLottery(t *testing.T) {
}
func genaddress() (string, crypto.PrivKey) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -41,7 +41,7 @@ func (p *mixPolicy) getPrivKeyByAddr(addr string) (crypto.PrivKey, error) {
password := []byte(operater.GetPassword())
privkey := wcom.CBCDecrypterPrivkey(password, prikeybyte)
//通过privkey生成一个pubkey然后换算成对应的addr
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
bizlog.Error("ProcSendToAddress", "err", err)
return nil, err
......
......@@ -933,7 +933,7 @@ func testMultiSigAccExecTransferFrom(t *testing.T, driver drivers.Driver, env ex
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(mty.MultiSigX, signType))
c, err := crypto.Load(types.GetSignName(mty.MultiSigX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -38,7 +38,7 @@ var (
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(mty.MultiSigX, signType))
c, err := crypto.Load(types.GetSignName(mty.MultiSigX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -478,7 +478,7 @@ func TestOrace(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(oty.OracleX, signType))
c, err := crypto.Load(types.GetSignName(oty.OracleX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -51,7 +51,7 @@ func newParacross() drivers.Driver {
c := &Paracross{}
c.SetChild(c)
c.SetExecutorType(types.LoadExecutorType(driverName))
cli, err := crypto.New("bls")
cli, err := crypto.Load("bls", -1)
if err != nil {
panic("paracross need bls sign register")
}
......
......@@ -215,7 +215,7 @@ func fillRawCommitTx(suite suite.Suite) (*types.Transaction, error) {
func signTx(s suite.Suite, tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType), -1)
if err != nil {
s.T().Error("TestExec", "new crypto failed", err)
return tx, err
......@@ -239,7 +239,7 @@ func signTx(s suite.Suite, tx *types.Transaction, hexPrivKey string) (*types.Tra
func getPrivKey(s suite.Suite, hexPrivKey string) (crypto.PrivKey, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType), -1)
if err != nil {
s.T().Error("TestExec", "new crypto failed", err)
return nil, err
......@@ -760,7 +760,7 @@ func TestValidParaCrossExec(t *testing.T) {
}
func TestVerifyBlsSign(t *testing.T) {
cryptoCli, err := crypto.New("bls")
cryptoCli, err := crypto.Load("bls", -1)
assert.NoError(t, err)
status := &pt.ParacrossNodeStatus{}
......
......@@ -218,7 +218,7 @@ func TestPokerbull(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(pkt.PokerBullX, signType))
c, err := crypto.Load(types.GetSignName(pkt.PokerBullX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -90,7 +90,7 @@ func TestGenerateKeyImage1(t *testing.T) {
func TestGenerateKeyImage2(t *testing.T) {
c, err := crypto.New(types.GetSignName("privacy", privacytypes.OnetimeED25519))
c, err := crypto.Load(types.GetSignName("privacy", privacytypes.OnetimeED25519), -1)
if err != nil {
t.Errorf("create Crypto failed. %v\n", err)
}
......@@ -335,7 +335,7 @@ func testRingSignatureOncetime(maxCount int, t *testing.T) {
// 初始化测试数据
prefixHash, _ := common.FromHex("fd1f64844a7d6a9f74fc2141bceba9d9d69b1fd6104f93bfa42a6d708a6ab22c")
c, err := crypto.New(types.GetSignName("privacy", privacytypes.OnetimeED25519))
c, err := crypto.Load(types.GetSignName("privacy", privacytypes.OnetimeED25519), -1)
if err != nil {
t.Errorf("create Crypto failed. %v\n", err)
}
......@@ -385,7 +385,7 @@ func TestGenerateRingSignatureAPI(t *testing.T) {
rand.Seed(time.Now().Unix())
// step1. init params
c, err := crypto.New(types.GetSignName("privacy", privacytypes.OnetimeED25519))
c, err := crypto.Load(types.GetSignName("privacy", privacytypes.OnetimeED25519), -1)
if err != nil {
t.Errorf("create Crypto failed. %v\n", err)
}
......@@ -442,7 +442,7 @@ func benchRingSignatureOncetime(maxCount int) {
// 初始化测试数据
prefixHash, _ := common.FromHex("fd1f64844a7d6a9f74fc2141bceba9d9d69b1fd6104f93bfa42a6d708a6ab22c")
c, _ := crypto.New(types.GetSignName("privacy", privacytypes.OnetimeED25519))
c, _ := crypto.Load(types.GetSignName("privacy", privacytypes.OnetimeED25519), -1)
for i := 0; i < maxCount; i++ {
pub := PubKeyPrivacy{}
sign := Sign{}
......
......@@ -166,7 +166,7 @@ func (mock *testExecMock) addBlockTx(tx *types.Transaction, receipt *types.Recei
func createTx(mock *testExecMock, payload types.Message, priv string, systemCreate bool) (*types.Transaction, error) {
c, err := crypto.New(crypto.GetName(types.SECP256K1))
c, err := crypto.Load(crypto.GetName(types.SECP256K1), -1)
if err != nil {
return nil, err
}
......
......@@ -137,7 +137,7 @@ func (policy *privacyPolicy) getPrivKeyByAddr(addr string) (crypto.PrivKey, erro
password := []byte(operater.GetPassword())
privkey := wcom.CBCDecrypterPrivkey(password, prikeybyte)
//通过privkey生成一个pubkey然后换算成对应的addr
cr, err := crypto.New(types.GetSignName("privacy", operater.GetSignType()))
cr, err := crypto.Load(types.GetSignName("privacy", operater.GetSignType()), -1)
if err != nil {
bizlog.Error("ProcSendToAddress", "err", err)
return nil, err
......
......@@ -56,7 +56,7 @@ func (mock *PrivacyMock) getPrivKeyByAddr(addr string) (crypto.PrivKey, error) {
password := []byte(mock.password)
privkey := wcom.CBCDecrypterPrivkey(password, prikeybyte)
//通过privkey生成一个pubkey然后换算成对应的addr
cr, err := crypto.New(types.GetSignName("", mock.walletOp.GetSignType()))
cr, err := crypto.Load(types.GetSignName("", mock.walletOp.GetSignType()), -1)
if err != nil {
bizlog.Error("ProcSendToAddress", "err", err)
return nil, err
......
......@@ -280,7 +280,7 @@ MAIN_LOOP:
func initCryptoImpl(signType int) error {
ttypes.CryptoName = types.GetSignName("", signType)
cr, err := crypto.New(ttypes.CryptoName)
cr, err := crypto.Load(ttypes.CryptoName, -1)
if err != nil {
fmt.Printf("init crypto fail: %v", err)
return err
......
......@@ -110,7 +110,7 @@ func NewRelayd(config *Config) *Relayd {
}
db.Set(privateKey[:], pk)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -17,7 +17,7 @@ import (
)
func TestGeneratePrivateKey(t *testing.T) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
t.Fatal(err)
}
......
......@@ -94,7 +94,7 @@ var privFrom = getprivkey("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE7145
var privTo = getprivkey("BC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -33,7 +33,7 @@ var (
)
func genaddress() (string, crypto.PrivKey) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -191,7 +191,7 @@ func TestStorage(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(oty.StorageX, signType))
c, err := crypto.Load(types.GetSignName(oty.StorageX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -105,7 +105,7 @@ func bindMiner(cmd *cobra.Command, args []string) {
}
bindAddr, _ := cmd.Flags().GetString("bind_addr")
originAddr, _ := cmd.Flags().GetString("origin_addr")
//c, _ := crypto.New(types.GetSignName(wallet.SignType))
//c, _ := crypto.Load(types.GetSignName(wallet.SignType))
//a, _ := common.FromHex(key)
//privKey, _ := c.PrivKeyFromBytes(a)
//originAddr := account.PubKeyToAddress(privKey.PubKey().Bytes()).String()
......
......@@ -104,7 +104,7 @@ func Test_Exec_Bind_Unbind(t *testing.T) {
func FromPrivkey(hexPrivKey string) (crypto.PrivKey, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("ticket", signType))
c, err := crypto.Load(types.GetSignName("ticket", signType), -1)
if err != nil {
return nil, err
}
......
......@@ -63,7 +63,7 @@ func TestCloseTicketsByAddr(t *testing.T) {
pk, err := hex.DecodeString("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
assert.Nil(t, err)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.Nil(t, err)
priKey, err := secp.PrivKeyFromBytes(pk)
assert.Nil(t, err)
......@@ -100,7 +100,7 @@ func TestBuyTicketOne(t *testing.T) {
ticket.walletOperate = wallet
pk, err := hex.DecodeString("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
assert.Nil(t, err)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.Nil(t, err)
priKey, err := secp.PrivKeyFromBytes(pk)
assert.Nil(t, err)
......@@ -117,7 +117,7 @@ func TestBuyMinerAddrTicketOne(t *testing.T) {
pk, err := hex.DecodeString("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
assert.Nil(t, err)
secp, err := crypto.New(types.GetSignName("", types.SECP256K1))
secp, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
assert.Nil(t, err)
priKey, err := secp.PrivKeyFromBytes(pk)
assert.Nil(t, err)
......
......@@ -124,7 +124,7 @@ func (signatory *Signatory) SignTransfer(in *string, out *interface{}) error {
}
func signTx(tx *types.Transaction, hexPrivKey string) error {
c, _ := crypto.New(types.GetSignName("", types.SECP256K1))
c, _ := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
bytes, err := common.FromHex(hexPrivKey)
if err != nil {
......
......@@ -420,7 +420,7 @@ func waitTx(hash []byte) bool {
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -286,7 +286,7 @@ func TestToken(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(pty.TokenX, signType))
c, err := crypto.Load(types.GetSignName(pty.TokenX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -340,7 +340,7 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("trade", signType))
c, err := crypto.Load(types.GetSignName("trade", signType), -1)
if err != nil {
return tx, err
}
......
......@@ -274,7 +274,7 @@ func TestUnfreeze(t *testing.T) {
func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName(pty.UnfreezeX, signType))
c, err := crypto.Load(types.GetSignName(pty.UnfreezeX, signType), -1)
if err != nil {
return tx, err
}
......
......@@ -233,7 +233,7 @@ MAIN_LOOP:
func initCryptoImpl(signType int) error {
ttypes.CryptoName = types.GetSignName("", signType)
cr, err := crypto.New(ttypes.CryptoName)
cr, err := crypto.Load(ttypes.CryptoName, -1)
if err != nil {
fmt.Printf("Init crypto fail: %v", err)
return err
......
......@@ -104,7 +104,7 @@ func (mock *testExecMock) initExec() {
}
func decodePrivKey(priv string) (crypto.PrivKey, error) {
c, err := crypto.New(crypto.GetName(types.SECP256K1))
c, err := crypto.Load(crypto.GetName(types.SECP256K1), -1)
if err != nil {
return nil, err
}
......
......@@ -351,7 +351,7 @@ func initAccount(db db.KV) *account.DB {
func signTx(tx *types.Transaction, hexPrivKey string) error {
signType := types.SECP256K1
c, err := crypto.New(types.GetSignName("", signType))
c, err := crypto.Load(types.GetSignName("", signType), -1)
if err != nil {
return err
}
......
......@@ -383,7 +383,7 @@ func (x *suiteX2Ethereum) queryGetEthProphecy(id string, statusTest types2.EthBr
}
func getprivkey(key string) crypto.PrivKey {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
panic(err)
}
......
......@@ -19,7 +19,7 @@ import (
)
var (
c, _ = crypto.New(types.GetSignName("", types.SECP256K1))
c, _ = crypto.Load(types.GetSignName("", types.SECP256K1), -1)
hex = "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
a, _ = common.FromHex(hex)
privKey, _ = c.PrivKeyFromBytes(a)
......
......@@ -20,7 +20,7 @@ import (
)
var (
c, _ = crypto.New(types.GetSignName("", types.SECP256K1))
c, _ = crypto.Load(types.GetSignName("", types.SECP256K1), -1)
hex = "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
a, _ = common.FromHex(hex)
privKey, _ = c.PrivKeyFromBytes(a)
......
......@@ -183,7 +183,7 @@ func (c Comm) dialPeer(addr *NetAddress, node *Node) (*Peer, error) {
// GenPrivPubkey return key and pubkey in bytes
func (c Comm) GenPrivPubkey() ([]byte, []byte, error) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
log.Error("CryPto Error", "Error", err.Error())
return nil, nil, err
......@@ -200,7 +200,7 @@ func (c Comm) GenPrivPubkey() ([]byte, []byte, error) {
// Pubkey get pubkey by priv key
func (c Comm) Pubkey(key string) (string, error) {
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
log.Error("CryPto Error", "Error", err.Error())
return "", err
......@@ -239,7 +239,7 @@ func (c Comm) NewPingData(nodeInfo *NodeInfo) (*types.P2PPing, error) {
func (c Comm) Signature(key string, in *types.P2PPing) (*types.P2PPing, error) {
data := types.Encode(in)
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
if err != nil {
log.Error("CryPto Error", "Error", err.Error())
return nil, err
......@@ -271,9 +271,9 @@ func (c Comm) CheckSign(in *types.P2PPing) bool {
return false
}
cr, err := crypto.New(types.GetSignName("", int(sign.Ty)))
cr, err := crypto.Load(types.GetSignName("", int(sign.Ty)), -1)
if err != nil {
log.Error("CheckSign", "crypto.New err", err.Error())
log.Error("CheckSign", "crypto.Load err", err.Error())
return false
}
pub, err := cr.PubKeyFromBytes(sign.Pubkey)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment