aljaz/ark
1
0
Fork 0
mirror of https://github.com/aljazceru/ark.git synced 2025-12-17 20:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (#121)

Browse Source 
* Cleanup common

* Cleanup client

* Cleanup server

* Renamings

* Tidy up proto

* Update ocean protos

* Fixes

* Fixes
This commit is contained in:
Pietralberto Mazza
2024-02-28 18:05:03 +01:00
committed by GitHub
parent 1650ea5935
commit 6d0d03e316
31 changed files with 2475 additions and 2217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
client/init.go
View File

@@ -1,8 +1,10 @@
package main
import (
"context"
"encoding/hex"
"fmt"
"strconv"
"strings"
arkv1 "github.com/ark-network/ark/api-spec/protobuf/gen/ark/v1"
@@ -57,7 +59,7 @@ func initAction(ctx *cli.Context) error {
return fmt.Errorf("invalid network")
}
if err := connectToAsp(ctx, net, url); err != nil {
if err := connectToAsp(ctx.Context, net, url); err != nil {
return err
}
return initWallet(ctx, key, password)
@@ -71,24 +73,24 @@ func generateRandomPrivateKey() (*secp256k1.PrivateKey, error) {
return privKey, nil
}
func connectToAsp(ctx *cli.Context, net, url string) error {
client, close, err := getClient(ctx, url)
func connectToAsp(ctx context.Context, net, url string) error {
client, close, err := getClient(url)
if err != nil {
return err
}
defer close()
resp, err := client.GetInfo(ctx.Context, &arkv1.GetInfoRequest{})
resp, err := client.GetInfo(ctx, &arkv1.GetInfoRequest{})
if err != nil {
return err
}
return setState(map[string]interface{}{
"ark_url": url,
"network": net,
"ark_pubkey": resp.Pubkey,
"ark_lifetime": resp.Lifetime,
"exit_delay": resp.ExitDelay,
return setState(map[string]string{
ASP_URL: url,
NETWORK: net,
ASP_PUBKEY: resp.Pubkey,
ROUND_LIFETIME: strconv.Itoa(int(resp.GetRoundLifetime())),
UNILATERAL_EXIT_DELAY: strconv.Itoa(int(resp.GetUnilateralExitDelay())),
})
}
@@ -109,17 +111,20 @@ func initWallet(ctx *cli.Context, key, password string) error {
privateKey = secp256k1.PrivKeyFromBytes(privKeyBytes)
}
encryptedPrivateKey, err := NewAES128Cypher().Encrypt(privateKey.Serialize(), []byte(password))
cypher := newAES128Cypher()
buf := privateKey.Serialize()
encryptedPrivateKey, err := cypher.encrypt(buf, []byte(password))
if err != nil {
return err
}
passwordHash := hashPassword([]byte(password))
state := map[string]interface{}{
"encrypted_private_key": hex.EncodeToString(encryptedPrivateKey),
"password_hash": hex.EncodeToString(passwordHash),
"public_key": hex.EncodeToString(privateKey.PubKey().SerializeCompressed()),
pubkey := privateKey.PubKey().SerializeCompressed()
state := map[string]string{
ENCRYPTED_PRVKEY: hex.EncodeToString(encryptedPrivateKey),
PASSWORD_HASH: hex.EncodeToString(passwordHash),
PUBKEY: hex.EncodeToString(pubkey),
}
if err := setState(state); err != nil {