[SDK] Remove password arg from Lock() (#516)

* passwordless Lock()

* update wasm wrapper

* update index.html

Author: louisinger

pkg/client-sdk/ark_sdk.go

@@ -15,7 +15,7 @@ type ArkClient interface {
 	InitWithWallet(ctx context.Context, args InitWithWalletArgs) error
 	IsLocked(ctx context.Context) bool
 	Unlock(ctx context.Context, password string) error
-	Lock(ctx context.Context, password string) error
+	Lock(ctx context.Context) error
 	Balance(ctx context.Context, computeExpiryDetails bool) (*Balance, error)
 	Receive(ctx context.Context) (offchainAddr, boardingAddr string, err error)
 	SendOffChain(

pkg/client-sdk/client.go

@@ -79,8 +79,8 @@ func (a *arkClient) Unlock(ctx context.Context, pasword string) error {
 	return err
 }
 
-func (a *arkClient) Lock(ctx context.Context, pasword string) error {
-	return a.wallet.Lock(ctx, pasword)
+func (a *arkClient) Lock(ctx context.Context) error {
+	return a.wallet.Lock(ctx)
 }
 
 func (a *arkClient) IsLocked(ctx context.Context) bool {

pkg/client-sdk/example/covenant/alice_to_bob.go

@@ -38,7 +38,7 @@ func main() {
 		log.Fatal(err)
 	}
 	//nolint:all
-	defer aliceArkClient.Lock(ctx, password)
+	defer aliceArkClient.Lock(ctx)
 
 	log.Info("alice is acquiring onchain funds...")
 	_, aliceBoardingAddr, err := aliceArkClient.Receive(ctx)
@@ -82,7 +82,7 @@ func main() {
 		log.Fatal(err)
 	}
 	//nolint:all
-	defer bobArkClient.Lock(ctx, password)
+	defer bobArkClient.Lock(ctx)
 
 	bobOffchainAddr, _, err := bobArkClient.Receive(ctx)
 	if err != nil {

pkg/client-sdk/example/covenant/wasm/index.html

@@ -85,7 +85,7 @@
             } catch (err) {
                 logMessage("Send error: " + err.message);
             } finally {
-                await lock(password);
+                await lock();
             }
         }
 
@@ -133,7 +133,7 @@
             } catch (err) {
                 logMessage("Onboard error: " + err.message);
             } finally {
-                await lock(password);
+                await lock();
             }
 
         }

pkg/client-sdk/example/covenantless/alice_to_bob.go

@@ -59,7 +59,7 @@ func main() {
 		log.Fatal(err)
 	}
 	//nolint:all
-	defer aliceArkClient.Lock(ctx, password)
+	defer aliceArkClient.Lock(ctx)
 
 	log.Info("alice is acquiring onchain funds...")
 	_, boardingAddress, err := aliceArkClient.Receive(ctx)
@@ -105,7 +105,7 @@ func main() {
 		log.Fatal(err)
 	}
 	//nolint:all
-	defer bobArkClient.Lock(ctx, password)
+	defer bobArkClient.Lock(ctx)
 
 	bobOffchainAddr, _, err := bobArkClient.Receive(ctx)
 	if err != nil {

pkg/client-sdk/example/covenantless/wasm/index.html

@@ -86,7 +86,7 @@
             } catch (err) {
                 logMessage("Send error: " + err.message);
             } finally {
-                await lock(password);
+                await lock();
             }
         }
 
@@ -104,7 +104,7 @@
             } catch (err) {
                 logMessage("Settle error: " + err.message);
             } finally {
-                await lock(password);
+                await lock();
             }
         }
 

pkg/client-sdk/wallet/singlekey/wallet.go

@@ -66,7 +66,7 @@ func (w *singlekeyWallet) Create(
 	return hex.EncodeToString(privateKey.Serialize()), nil
 }
 
-func (w *singlekeyWallet) Lock(_ context.Context, password string) error {
+func (w *singlekeyWallet) Lock(context.Context) error {
 	if w.walletData == nil {
 		return fmt.Errorf("wallet not initialized")
 	}
@@ -75,13 +75,6 @@ func (w *singlekeyWallet) Lock(_ context.Context, password string) error {
 		return nil
 	}
 
-	pwd := []byte(password)
-	currentPassHash := utils.HashPassword(pwd)
-
-	if !bytes.Equal(w.walletData.PasswordHash, currentPassHash) {
-		return fmt.Errorf("invalid password")
-	}
-
 	w.privateKey = nil
 	return nil
 }

pkg/client-sdk/wallet/wallet.go

@@ -21,7 +21,7 @@ type WalletService interface {
 	Create(
 		ctx context.Context, password, seed string,
 	) (walletSeed string, err error)
-	Lock(ctx context.Context, password string) (err error)
+	Lock(ctx context.Context) (err error)
 	Unlock(ctx context.Context, password string) (alreadyUnlocked bool, err error)
 	IsLocked() bool
 	GetAddresses(

pkg/client-sdk/wallet/wallet_test.go

@@ -131,11 +131,7 @@ func TestWallet(t *testing.T) {
 			require.NoError(t, err)
 			require.True(t, alreadyUnlocked)
 
-			// Check no password is required to lock if wallet is already locked.
-			err = walletSvc.Lock(ctx, password)
-			require.NoError(t, err)
-
-			err = walletSvc.Lock(ctx, "")
+			err = walletSvc.Lock(ctx)
 			require.NoError(t, err)
 
 			locked := walletSvc.IsLocked()

pkg/client-sdk/wasm/browser/wrappers.go

@@ -105,12 +105,7 @@ func UnlockWrapper() js.Func {
 
 func LockWrapper() js.Func {
 	return JSPromise(func(args []js.Value) (interface{}, error) {
-		if len(args) != 1 {
-			return nil, errors.New("invalid number of args")
-		}
-		password := args[0].String()
-
-		err := arkSdkClient.Lock(context.Background(), password)
+		err := arkSdkClient.Lock(context.Background())
 		return nil, err
 	})
 }