diff --git a/go.mod b/go.mod
index fea50e6912f449522d7c6bdab770cc2870f4d47d..138480784216ade62e2b04ea5ff3458733070894 100644
--- a/go.mod
+++ b/go.mod
@@ -7,8 +7,8 @@ require (
github.com/hack-pad/go-indexeddb v0.2.0
github.com/pkg/errors v0.9.1
github.com/spf13/jwalterweatherman v1.1.0
- gitlab.com/elixxir/client v1.5.1-0.20221110212922-f53c2b152287
- gitlab.com/elixxir/crypto v0.0.7-0.20221110181326-dd7e5293feb0
+ gitlab.com/elixxir/client v1.5.1-0.20221121234059-3f75d507e3c8
+ gitlab.com/elixxir/crypto v0.0.7-0.20221121233335-83f145891bc7
gitlab.com/elixxir/primitives v0.0.3-0.20221110181119-e83320a48b13
gitlab.com/xx_network/crypto v0.0.5-0.20221110181048-76f0c556fe95
gitlab.com/xx_network/primitives v0.0.4-0.20221110180011-fd6ea3058225
diff --git a/go.sum b/go.sum
index bd9184d3634b840870581bf4068c2bd5c32f54ed..4fcea68df113835b64e255ed24597200921f1e0a 100644
--- a/go.sum
+++ b/go.sum
@@ -368,12 +368,12 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f h1:yXGvNBqzZwAhDYlSnxPRbgor6JWoOt1Z7s3z1O9JR40=
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k=
-gitlab.com/elixxir/client v1.5.1-0.20221110212922-f53c2b152287 h1:EeHqLGcrDjVABIwOjxIlEHMszsoRYbN+aW3CT1d2usU=
-gitlab.com/elixxir/client v1.5.1-0.20221110212922-f53c2b152287/go.mod h1:LYkK9LyoCBz8/vaIJurXwPGaoZ7vKTi0JTUlpqB8q6I=
+gitlab.com/elixxir/client v1.5.1-0.20221121234059-3f75d507e3c8 h1:DWzodsczpQh9Y5415grILfP/xd0ol0mKczUyTJ5Gp0k=
+gitlab.com/elixxir/client v1.5.1-0.20221121234059-3f75d507e3c8/go.mod h1:ZUvPwnyqsvQaiZCkWKb4coWa5nwv6XxRthV/64rZK4s=
gitlab.com/elixxir/comms v0.0.4-0.20221110181420-84bca6216fe4 h1:bLRjVCyMVde4n2hTVgoyyIAWrKI4CevpChchkPeb6A0=
gitlab.com/elixxir/comms v0.0.4-0.20221110181420-84bca6216fe4/go.mod h1:XhI2/CMng+xcH3mAs+1aPz29PSNu1079XMJ8V+xxihw=
-gitlab.com/elixxir/crypto v0.0.7-0.20221110181326-dd7e5293feb0 h1:IgspAliiN6MGqJX7LZ+1GinCX6bNJw6KlIa+rvEo2+A=
-gitlab.com/elixxir/crypto v0.0.7-0.20221110181326-dd7e5293feb0/go.mod h1:IqswRNqsGooEOt2tP1LzeAcBOccVW0aUiJFH5B7UGfg=
+gitlab.com/elixxir/crypto v0.0.7-0.20221121233335-83f145891bc7 h1:yhc8jQ27JKypdRE41NpfJPaYRS0sNkOwugaIyoscDiU=
+gitlab.com/elixxir/crypto v0.0.7-0.20221121233335-83f145891bc7/go.mod h1:oRh3AwveOEvpk9E3kRcMGK8fImcEnN0PY4jr9HDgQE8=
gitlab.com/elixxir/ekv v0.2.1 h1:dtwbt6KmAXG2Tik5d60iDz2fLhoFBgWwST03p7T+9Is=
gitlab.com/elixxir/ekv v0.2.1/go.mod h1:USLD7xeDnuZEavygdrgzNEwZXeLQJK/w1a+htpN+JEU=
gitlab.com/elixxir/primitives v0.0.3-0.20221110181119-e83320a48b13 h1:U3tbClFN5BLYlAoMj+o6VWAs9akbFiJstMGCuk1aB94=
diff --git a/main.go b/main.go
index 7c5f570cf47b27cad75d3e65ba1465bd0590667e..80426e4c90b0d8a64523f8330bfb02699c229544 100644
--- a/main.go
+++ b/main.go
@@ -78,6 +78,10 @@ func main() {
js.Global().Set("NewChannelsManagerWithIndexedDbUnsafe",
js.FuncOf(wasm.NewChannelsManagerWithIndexedDbUnsafe))
js.Global().Set("GenerateChannel", js.FuncOf(wasm.GenerateChannel))
+ js.Global().Set("GetSavedChannelPrivateKey",
+ js.FuncOf(wasm.GetSavedChannelPrivateKey))
+ js.Global().Set("ImportChannelPrivateKey",
+ js.FuncOf(wasm.ImportChannelPrivateKey))
js.Global().Set("GetSavedChannelPrivateKeyUNSAFE",
js.FuncOf(wasm.GetSavedChannelPrivateKeyUNSAFE))
js.Global().Set("DecodePublicURL", js.FuncOf(wasm.DecodePublicURL))
diff --git a/utils/utils.go b/utils/utils.go
index c2ee6b41a73b8d65bab18a4c77881f5fccabdf4e..a7cc234a16b48b9c34a58ef19801cb1ddd9be014 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -76,9 +76,11 @@ func CreatePromise(f PromiseFn) interface{} {
return Promise.New(handler)
}
-// Await waits on a Javascript value. It returns the results of the then and
-// catch functions once it resolves.
-func Await(awaitable js.Value) ([]js.Value, []js.Value) {
+// Await waits on a Javascript value. It blocks until the awaitable successfully
+// resolves to the result or rejects to err.
+//
+// If there is a result, err will be nil and vice versa.
+func Await(awaitable js.Value) (result []js.Value, err []js.Value) {
then := make(chan []js.Value)
defer close(then)
thenFunc := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
@@ -98,9 +100,9 @@ func Await(awaitable js.Value) ([]js.Value, []js.Value) {
awaitable.Call("then", thenFunc).Call("catch", catchFunc)
select {
- case result := <-then:
+ case result = <-then:
return result, nil
- case err := <-catch:
+ case err = <-catch:
return nil, err
}
}
diff --git a/wasm/channels.go b/wasm/channels.go
index 6ad411531194cc60fa87fe787dbb7c4ca572b162..5eb4e3c7044e6f2cd77f17be2a977167e8b17eef 100644
--- a/wasm/channels.go
+++ b/wasm/channels.go
@@ -551,6 +551,59 @@ func GenerateChannel(_ js.Value, args []js.Value) interface{} {
return utils.CopyBytesToJS(gen)
}
+// GetSavedChannelPrivateKey loads the private key from storage for the given
+// channel ID. And returns it encrypted with th given password.
+//
+// Parameters:
+// - args[0] - ID of [Cmix] object in tracker (int).
+// - args[1] - Marshalled bytes of the channel's [id.ID] (Uint8Array).
+// - args[2] - The password used to encrypt the private key (string).
+//
+// Returns:
+// - Portable string of the channel private key encrypted with the password
+// (Uint8Array).
+// - Throws a TypeError if there is no channel private key for the given
+// channel or if encrypting the key fails.
+func GetSavedChannelPrivateKey(_ js.Value, args []js.Value) interface{} {
+ cmixID := args[0].Int()
+ channelIdBytes := utils.CopyBytesToGo(args[1])
+ password := args[2].String()
+
+ pkPacket, err :=
+ bindings.GetSavedChannelPrivateKey(cmixID, channelIdBytes, password)
+ if err != nil {
+ utils.Throw(utils.TypeError, err)
+ return nil
+ }
+
+ return utils.CopyBytesToJS(pkPacket)
+}
+
+// ImportChannelPrivateKey decrypts the given private channel ID and saves it to
+// storage.
+//
+// Parameters:
+// - args[0] - ID of [Cmix] object in tracker (int).
+// - args[1] - The password used to encrypt the private key (string).
+// - args[2] - The encrypted channel private key packet (Uint8Array).
+//
+// Returns:
+// - Throws a TypeError if decryption the private key or saving it to storage
+// fails.
+func ImportChannelPrivateKey(_ js.Value, args []js.Value) interface{} {
+ cmixID := args[0].Int()
+ password := args[1].String()
+ encryptedPrivKey := utils.CopyBytesToGo(args[2])
+
+ err := bindings.ImportChannelPrivateKey(cmixID, password, encryptedPrivKey)
+ if err != nil {
+ utils.Throw(utils.TypeError, err)
+ return nil
+ }
+
+ return nil
+}
+
// GetSavedChannelPrivateKeyUNSAFE loads the private key from storage for the
// given channel ID.
//