Zauth support (wasm/clis)

core/conf/config.go

@@ -73,7 +73,9 @@ type Config struct {
 	// ZboxAppType app type name
 	ZboxAppType string `json:"zbox_app_type"`
 	// SharderConsensous is consensous for when quering for SCRestAPI calls
-	SharderConsensous int `json:"sharder_consensous"`
+	SharderConsensous int          `json:"sharder_consensous"`
+	ZauthServer       string       `json:"zauth_server"`
+	V                 *viper.Viper `json:"-"`
 }
 
 // LoadConfigFile load and parse Config from file
@@ -99,7 +101,14 @@ func LoadConfigFile(file string) (Config, error) {
 		return cfg, thrown.Throw(ErrBadParsing, err.Error())
 	}
 
-	return LoadConfig(v)
+	cfg, err = LoadConfig(v)
+	if err != nil {
+		return cfg, err
+	}
+
+	cfg.V = v
+
+	return cfg, nil
 }
 
 // LoadConfig load and parse config
@@ -165,9 +174,9 @@ func LoadConfig(v Reader) (Config, error) {
 
 	cfg.SignatureScheme = v.GetString("signature_scheme")
 	cfg.ChainID = v.GetString("chain_id")
+	cfg.ZauthServer = v.GetString("zauth.server")
 
 	return cfg, nil
-
 }
 
 func isURL(s string) bool {

core/sys/vars.go

@@ -14,7 +14,8 @@ var (
 	Sleep = time.Sleep
 
 	// Sign sign method. it should be initialized on different platform.
-	Sign SignFunc
+	Sign         SignFunc
+	SignWithAuth SignFunc
 
 	// Verify verify method. it should be initialized on different platform.
 	Verify VerifyFunc
@@ -23,4 +24,15 @@ var (
 	VerifyWith VerifyWithFunc
 
 	Authorize AuthorizeFunc
+
+	AuthCommon AuthorizeFunc
 )
+
+// SetAuthorize sets the authorize callback function
+func SetAuthorize(auth AuthorizeFunc) {
+	Authorize = auth
+}
+
+func SetAuthCommon(auth AuthorizeFunc) {
+	AuthCommon = auth
+}

core/transaction/entity.go

@@ -251,14 +251,15 @@ func NewTransactionReceipt(t *Transaction) *TxnReceipt {
 	return &TxnReceipt{Transaction: t}
 }
 
-func (t *Transaction) VerifyTransaction(verifyHandler VerifyFunc) (bool, error) {
+// VerifySigWith verify the signature with the given public key and handler
+func (t *Transaction) VerifySigWith(pubkey string, verifyHandler VerifyFunc) (bool, error) {
 	// Store the hash
 	hash := t.Hash
 	t.ComputeHashData()
 	if t.Hash != hash {
 		return false, errors.New("verify_transaction", fmt.Sprintf(`{"error":"hash_mismatch", "expected":"%v", "actual":%v"}`, t.Hash, hash))
 	}
-	return verifyHandler(t.PublicKey, t.Signature, t.Hash)
+	return verifyHandler(pubkey, t.Signature, t.Hash)
 }
 
 func SendTransactionSync(txn *Transaction, miners []string) error {

core/version/version.go

@@ -2,5 +2,5 @@
 //====== THIS IS AUTOGENERATED FILE. DO NOT MODIFY ========
 
 package version
-const VERSIONSTR = "v1.12.1-3-gbc68f654"
+const VERSIONSTR = "v1.14.0-RC7-76-g8a35d81e"
 

core/zcncrypto/bls0chain_herumi_test.go

@@ -150,12 +150,14 @@ func TestCombinedSignAndVerify(t *testing.T) {
 }
 
 func TestSplitKey(t *testing.T) {
-	primaryKeyStr := `c36f2f92b673cf057a32e8bd0ca88888e7ace40337b737e9c7459fdc4c521918`
+	primaryKeyStr := `872eac6370c72093535fa395ad41a08ee90c9d0d46df9461eb2515451f389d1b`
+	// primaryKeyStr := `c36f2f92b673cf057a32e8bd0ca88888e7ace40337b737e9c7459fdc4c521918`
 	sig0 := NewSignatureScheme("bls0chain")
 	err := sig0.SetPrivateKey(primaryKeyStr)
 	if err != nil {
 		t.Fatalf("Set private key failed - %s", errors.Top(err))
 	}
+	data = "823bb3dc0b80a6c86922a884e63908cb9e963ef488688b41e32cbf4d84471a1f"
 	hash := Sha3Sum256(data)
 	signature, err := sig0.Sign(hash)
 	if err != nil {
@@ -170,15 +172,18 @@ func TestSplitKey(t *testing.T) {
 	for i := 0; i < numSplitKeys; i++ {
 		sigAggScheme[i] = NewSignatureScheme("bls0chain")
 		err = sigAggScheme[i].SetPrivateKey(w.Keys[i].PrivateKey)
+		fmt.Println("seckey:", sigAggScheme[i].GetPrivateKey())
 
 		require.NoError(t, err)
 	}
 	var aggrSig string
 	for i := 1; i < numSplitKeys; i++ {
 		tmpSig, _ := sigAggScheme[i].Sign(hash)
+		fmt.Println("tmpSig:", tmpSig)
 		aggrSig, _ = sigAggScheme[0].Add(tmpSig, hash)
 	}
 	if aggrSig != signature {
 		t.Fatalf("split key signature failed")
 	}
+	fmt.Println("aggrSig:", aggrSig)
 }

core/zcncrypto/signature_scheme.go

@@ -2,6 +2,8 @@ package zcncrypto
 
 import (
 	"encoding/json"
+	"fmt"
+	"os"
 
 	"github.com/0chain/errors"
 	"github.com/0chain/gosdk/core/encryption"
@@ -18,13 +20,15 @@ type KeyPair struct {
 
 // Wallet structure
 type Wallet struct {
-	ClientID    string    `json:"client_id"`
-	ClientKey   string    `json:"client_key"`
-	Keys        []KeyPair `json:"keys"`
-	Mnemonic    string    `json:"mnemonics"`
-	Version     string    `json:"version"`
-	DateCreated string    `json:"date_created"`
-	Nonce       int64     `json:"nonce"`
+	ClientID      string    `json:"client_id"`
+	ClientKey     string    `json:"client_key"`
+	PeerPublicKey string    `json:"peer_public_key"` // Peer public key exists only in split wallet
+	Keys          []KeyPair `json:"keys"`
+	Mnemonic      string    `json:"mnemonics"`
+	Version       string    `json:"version"`
+	DateCreated   string    `json:"date_created"`
+	Nonce         int64     `json:"nonce"`
+	IsSplit       bool      `json:"is_split"`
 }
 
 // SignatureScheme - an encryption scheme for signing and verifying messages
@@ -81,6 +85,22 @@ func (w *Wallet) Sign(hash, scheme string) (string, error) {
 	return sigScheme.Sign(hash)
 }
 
+// SetSplitKeys sets split keys and wipes out mnemonic and original primary keys
+func (w *Wallet) SetSplitKeys(sw *Wallet) {
+	*w = *sw
+}
+
+func (w *Wallet) SaveTo(file string) error {
+	d, err := json.Marshal(w)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("Saving wallet to file: ", string(d))
+
+	return os.WriteFile(file, d, 0644)
+}
+
 func IsMnemonicValid(mnemonic string) bool {
 	return bip39.IsMnemonicValid(mnemonic)
 }

wasmsdk/allocation.go

@@ -304,6 +304,11 @@ func unlockStakePool(providerType, fee uint64, providerID string) (int64, error)
 	return unstake, err
 }
 
+func collectRewards(providerType int, providerID string) (string, error) {
+	hash, _, err := sdk.CollectRewards(providerID, sdk.ProviderType(providerType))
+	return hash, err
+}
+
 func getSkatePoolInfo(providerType int, providerID string) (*sdk.StakePoolInfo, error) {
 
 	info, err := sdk.GetStakePoolInfo(sdk.ProviderType(providerType), providerID)

wasmsdk/auth_txn.go

@@ -8,6 +8,7 @@ import (
 	"syscall/js"
 
 	"github.com/0chain/gosdk/core/sys"
+	"github.com/0chain/gosdk/zcncore"
 )
 
 type AuthCallbackFunc func(msg string) string
@@ -28,6 +29,36 @@ func registerAuthorizer(this js.Value, args []js.Value) interface{} {
 	return nil
 }
 
+func registerZauthServer(serverAddr, splitPublicKey string) {
+	sys.SetAuthorize(zcncore.ZauthSignTxn(serverAddr, splitPublicKey))
+	sys.SetAuthCommon(zcncore.ZauthAuthCommon(serverAddr, splitPublicKey))
+}
+
+// zvaultNewWallet generates new split wallet
+func zvaultNewWallet(serverAddr, token, passphrase string) (string, error) {
+	return zcncore.CallZvaultNewWalletString(serverAddr, token, "", passphrase)
+}
+
+// zvaultNewSplit generates new split wallet from existing clientID
+func zvaultNewSplit(clientID, serverAddr, token, passphrase string) (string, error) {
+	return zcncore.CallZvaultNewWalletString(serverAddr, token, clientID, passphrase)
+}
+
+func zvaultStoreKey(serverAddr, token, privateKey, passphrase string) (string, error) {
+	return zcncore.CallZvaultStoreKeyString(serverAddr, token, privateKey, passphrase)
+}
+
+func registerAuthCommon(this js.Value, args []js.Value) interface{} {
+	authCallback = parseAuthorizerCallback(args[0])
+	authResponseC = make(chan string, 1)
+
+	sys.AuthCommon = func(msg string) (string, error) {
+		authCallback(msg)
+		return <-authResponseC, nil
+	}
+	return nil
+}
+
 func authResponse(response string) {
 	authResponseC <- response
 }

wasmsdk/jsbridge/func.go

@@ -31,7 +31,7 @@ func BindFunc(global js.Value, jsFuncName string, fn interface{}) error {
 func BindAsyncFuncs(global js.Value, fnList map[string]interface{}) {
 
 	for jsFuncName, fn := range fnList {
-		if jsFuncName == "registerAuthorizer" || jsFuncName == "callAuth" {
+		if jsFuncName == "registerAuthorizer" || jsFuncName == "callAuth" || jsFuncName == "registerAuthCommon" {
 			global.Set(jsFuncName, fn)
 		} else {
 			jsFunc, err := promise(fn)
@@ -45,7 +45,6 @@ func BindAsyncFuncs(global js.Value, fnList map[string]interface{}) {
 	}
 }
 
-
 func BindFuncs(global js.Value, fnList map[string]interface{}) {
 
 	for jsFuncName, fn := range fnList {

wasmsdk/jsbridge/input.go

@@ -97,6 +97,7 @@ func (b *InputBuilder) Build() (InputBinder, error) {
 // Bind bind js inputs to reflect values
 func (b *InputBuilder) Bind(args []js.Value) ([]reflect.Value, error) {
 	if len(args) != b.numIn {
+		fmt.Println("args:", args)
 		return nil, ErrMismatchedInputLength
 	}
 

wasmsdk/proxy.go

@@ -4,6 +4,7 @@
 package main
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"sync"
@@ -62,6 +63,46 @@ func main() {
 					// js already has signatureScheme and keys
 					return signFunc(hash)
 				}
+
+				sys.SignWithAuth = func(hash, signatureScheme string, keys []sys.KeyPair) (string, error) {
+					sig, err := sys.Sign(hash, signatureScheme, keys)
+					if err != nil {
+						return "", fmt.Errorf("failed to sign with split key: %v", err)
+					}
+
+					data, err := json.Marshal(struct {
+						Hash      string `json:"hash"`
+						Signature string `json:"signature"`
+						ClientID  string `json:"client_id"`
+					}{
+						Hash:      hash,
+						Signature: sig,
+						ClientID:  client.GetClient().ClientID,
+					})
+					if err != nil {
+						return "", err
+					}
+
+					if sys.AuthCommon == nil {
+						return "", errors.New("authCommon is not set")
+					}
+
+					rsp, err := sys.AuthCommon(string(data))
+					if err != nil {
+						return "", err
+					}
+
+					var sigpk struct {
+						Sig string `json:"sig"`
+					}
+
+					err = json.Unmarshal([]byte(rsp), &sigpk)
+					if err != nil {
+						return "", err
+					}
+
+					return sigpk.Sig, nil
+				}
 			} else {
 				PrintError("__zcn_wasm__.jsProxy.sign is not installed yet")
 			}
@@ -217,6 +258,9 @@ func main() {
 				"unLockReadPool":  unLockReadPool,
 				"createReadPool":  createReadPool,
 
+				// claim rewards
+				"collectRewards": collectRewards,
+
 				// stakepool
 				"getSkatePoolInfo": getSkatePoolInfo,
 				"lockStakePool":    lockStakePool,
@@ -258,8 +302,16 @@ func main() {
 				"setAuthUrl":    setAuthUrl,
 
 				"registerAuthorizer": js.FuncOf(registerAuthorizer),
+				"registerAuthCommon": js.FuncOf(registerAuthCommon),
 				"callAuth":           js.FuncOf(callAuth),
 				"authResponse":       authResponse,
+
+				// zauth
+				"registerZauthServer": registerZauthServer,
+				// zvault
+				"zvaultNewWallet": zvaultNewWallet,
+				"zvaultNewSplit":  zvaultNewSplit,
+				"zvaultStoreKey":  zvaultStoreKey,
 			})
 
 			fmt.Println("__wasm_initialized__ = true;")