Akhilesh/conductor test

wasmsdk/auth_txn.go

@@ -42,17 +42,29 @@ func registerZauthServer(serverAddr string) {
 	sys.SetAuthCommon(zcncore.ZauthAuthCommon(serverAddr))
 }
 
-// zvaultNewWallet generates new split wallet
-func zvaultNewWallet(serverAddr, token string) (string, error) {
-	return zcncore.CallZvaultNewWalletString(serverAddr, token, "")
+func zauthRetrieveKey(clientID, peerPublicKey, serverAddr, token string) (string, error) {
+	return zcncore.CallZauthRetreiveKey(serverAddr, token, clientID, peerPublicKey)
 }
 
-// zvaultNewSplit generates new split wallet from existing clientID
-func zvaultNewSplit(clientID, serverAddr, token string) (string, error) {
-	return zcncore.CallZvaultNewWalletString(serverAddr, token, clientID)
+// zvaultNewWallet generates new wallet
+func zvaultNewWallet(serverAddr, token string) error {
+	return zcncore.CallZvaultNewWallet(serverAddr, token)
 }
 
-func zvaultStoreKey(serverAddr, token, privateKey string) (string, error) {
+// zvaultNewSplit generates new split key for saved wallet
+func zvaultNewSplit(clientID, serverAddr, token string) error {
+	return zcncore.CallZvaultNewSplit(serverAddr, token, clientID)
+}
+
+func zvaultRetrieveRestrictions(peerPublicKey, serverAddr, token string) (string, error) {
+	return zcncore.CallZvaultRetrieveRestrictions(serverAddr, token, peerPublicKey)
+}
+
+func zvaultUpdateRestrictions(clientID, peerPublicKey, serverAddr, token string, restrictions []string) error {
+	return zcncore.CallZvaultUpdateRestrictions(serverAddr, token, clientID, peerPublicKey, restrictions)
+}
+
+func zvaultStoreKey(serverAddr, token, privateKey string) error {
 	return zcncore.CallZvaultStoreKeyString(serverAddr, token, privateKey)
 }
 
@@ -92,7 +104,8 @@ func registerAuthCommon(this js.Value, args []js.Value) interface{} {
 }
 
 // authResponse Publishes the response to the authorization request.
-// 		`response` is the response to the authorization request.
+//
+//	`response` is the response to the authorization request.
 func authResponse(response string) {
 	authResponseC <- response
 }

wasmsdk/proxy.go

@@ -82,11 +82,7 @@ func main() {
 						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"`
-					}{
+					data, err := json.Marshal(zcncore.AuthMessage{
 						Hash:      hash,
 						Signature: sig,
 						ClientID:  client.GetClient().ClientID,
@@ -327,9 +323,12 @@ func main() {
 
 				// zauth
 				"registerZauthServer": registerZauthServer,
+				"zauthRetrieveKey":    zauthRetrieveKey,
 				// zvault
 				"zvaultNewWallet":             zvaultNewWallet,
 				"zvaultNewSplit":              zvaultNewSplit,
+				"zvaultRetrieveRestrictions":  zvaultRetrieveRestrictions,
+				"zvaultUpdateRestrictions":    zvaultUpdateRestrictions,
 				"zvaultStoreKey":              zvaultStoreKey,
 				"zvaultRetrieveKeys":          zvaultRetrieveKeys,
 				"zvaultRevokeKey":             zvaultRevokeKey,
@@ -383,11 +382,7 @@ func main() {
 						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"`
-					}{
+					data, err := json.Marshal(zcncore.AuthMessage{
 						Hash:      hash,
 						Signature: sig,
 						ClientID:  client.GetClient().ClientID,

zboxapi/sdk.go

@@ -113,7 +113,7 @@ func (c *Client) createResty(ctx context.Context, csrfToken, userID string, head
 	h["X-App-Timestamp"] = strconv.FormatInt(time.Now().Unix(), 10)
 
 	if _, ok := h["X-App-ID-Token"]; !ok {
-		h["X-App-ID-Token"] = "*" //ignore firebase token in jwt requests
+		h["X-App-ID-Token"] = "*"
 	}
 
 	h["X-App-Type"] = c.appType

zboxcore/sdk/rollback.go

@@ -217,6 +217,7 @@ func (rb *RollbackBlobber) processRollback(ctx context.Context, tx string) error
 			}
 
 			if strings.Contains(string(respBody), "pending_markers:") {
+				fmt.Println("=======================\n" , string(respBody), "\n=======================")
 				l.Logger.Info("Commit pending for blobber ",
 					rb.blobber.Baseurl, " Retrying")
 				time.Sleep(5 * time.Second)