Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ğecko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
Ğecko
Commits
46ee3ec6
Commit
46ee3ec6
authored
4 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
ref(dubp): make getDewifSecretCodeLen synchronous
parent
66b00daa
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
native/dubp_rs/src/dewif.rs
+14
-10
14 additions, 10 deletions
native/dubp_rs/src/dewif.rs
native/dubp_rs/src/lib.rs
+7
-16
7 additions, 16 deletions
native/dubp_rs/src/lib.rs
packages/dubp_rs/lib/dubp.dart
+11
-11
11 additions, 11 deletions
packages/dubp_rs/lib/dubp.dart
with
32 additions
and
37 deletions
native/dubp_rs/src/dewif.rs
+
14
−
10
View file @
46ee3ec6
...
...
@@ -65,18 +65,22 @@ pub(super) fn gen_dewif(
}
pub
(
super
)
fn
get_secret_code_len
(
currency
:
Currency
,
dewif
:
&
str
,
member_wallet
:
bool
,
secret_code_type
:
SecretCodeType
,
)
->
Result
<
String
,
DubpError
>
{
let
log_n
=
dup_crypto
::
dewif
::
read_dewif_log_n
(
ExpectedCurrency
::
Specific
(
currency
),
dewif
)
dewif
:
*
const
raw
::
c_char
,
member_wallet
:
u32
,
secret_code_type
:
u32
,
)
->
Result
<
usize
,
DubpError
>
{
let
dewif
=
char_ptr_to_str
(
dewif
)
?
;
let
member_wallet
=
member_wallet
!=
0
;
let
secret_code_type
=
SecretCodeType
::
from
(
secret_code_type
);
let
log_n
=
dup_crypto
::
dewif
::
read_dewif_log_n
(
ExpectedCurrency
::
Any
,
dewif
)
.map_err
(
DubpError
::
DewifReadError
)
?
;
Ok
(
crate
::
secret_code
::
compute_secret_code_len
(
member_wallet
,
secret_code_type
,
log_n
)
?
.to_string
(),
)
Ok
(
crate
::
secret_code
::
compute_secret_code_len
(
member_wallet
,
secret_code_type
,
log_n
,
)
?
)
}
pub
(
super
)
fn
get_pubkey
(
currency
:
Currency
,
dewif
:
&
str
,
pin
:
&
str
)
->
Result
<
String
,
DubpError
>
{
...
...
This diff is collapsed.
Click to expand it.
native/dubp_rs/src/lib.rs
+
7
−
16
View file @
46ee3ec6
...
...
@@ -169,25 +169,16 @@ pub extern "C" fn gen_mnemonic(port: i64, language: u32) {
#[no_mangle]
pub
extern
"C"
fn
get_dewif_secret_code_len
(
port
:
i64
,
currency
:
*
const
raw
::
c_char
,
dewif
:
*
const
raw
::
c_char
,
member_wallet
:
u32
,
secret_code_type
:
u32
,
)
{
exec_async
(
port
,
||
{
let
currency
=
parse_currency
(
char_ptr_to_str
(
currency
)
?
)
?
;
let
dewif
=
char_ptr_to_str
(
dewif
)
?
;
let
member_wallet
=
member_wallet
!=
0
;
let
secret_code_type
=
SecretCodeType
::
from
(
secret_code_type
);
Ok
((
currency
,
dewif
,
member_wallet
,
secret_code_type
))
},
|(
currency
,
dewif
,
member_wallet
,
secret_code_type
)|
{
dewif
::
get_secret_code_len
(
currency
,
dewif
,
member_wallet
,
secret_code_type
)
},
)
)
->
i32
{
if
let
Ok
(
secret_code_len
)
=
dewif
::
get_secret_code_len
(
dewif
,
member_wallet
,
secret_code_type
)
{
secret_code_len
as
i32
}
else
{
-
1
}
}
#[no_mangle]
...
...
This diff is collapsed.
Click to expand it.
packages/dubp_rs/lib/dubp.dart
+
11
−
11
View file @
46ee3ec6
...
...
@@ -165,21 +165,21 @@ class DubpRust {
}
/// Get secret code length of `dewif` keypair.
static
Future
<
int
>
getDewifSecretCodeLen
(
static
int
getDewifSecretCodeLen
(
{
String
currency
=
"g1"
,
String
dewif
,
SecretCodeType
secretCodeType
=
SecretCodeType
.
letters
})
async
{
final
completer
=
Completer
<
int
>();
final
sendPort
=
singleCompletePort
<
int
,
String
>(
completer
,
callback:
_handleErrInt
);
native
.
get_dewif_secret_code_len
(
sendPort
.
nativePort
,
Utf8
.
toUtf8
(
currency
),
SecretCodeType
secretCodeType
=
SecretCodeType
.
letters
})
{
int
res
=
native
.
get_dewif_secret_code_len
(
Utf8
.
toUtf8
(
dewif
),
0
,
secretCodeType
.
index
,
);
return
completer
.
future
;
if
(
res
==
-
1
)
{
print
(
'DUBP_RS_ERROR: DEWIF file content is corrupted.'
);
throw
'DUBP_RS_ERROR: DEWIF file content is corrupted.'
;
}
else
{
return
res
;
}
}
/// Get public key (in base 58) of legacy wallet (password + salt)
...
...
@@ -289,7 +289,7 @@ class DubpRust {
}
}
static
int
_handleErrInt
(
String
res
)
{
/*
static int _handleErrInt(String res) {
if (res.startsWith('DUBP_RS_ERROR: ')) {
final error = res;
print(error);
...
...
@@ -297,5 +297,5 @@ class DubpRust {
} else {
return int.parse(res);
}
}
}
*/
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment