Skip to content
This repository was archived by the owner on Jun 12, 2023. It is now read-only.

Commit 1d29ef8

Browse files
authored
fix: show falsy fields in signMessage prompt (#154)
* remove filter on `messageCreator` * chor: link types * chore: update snap manifest * chore: update snap manifest
1 parent 997c895 commit 1d29ef8

4 files changed

Lines changed: 44 additions & 46 deletions

File tree

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
declare module "@zondax/filecoin-signing-tools/js" {
22

3-
export class ExtendedKey {
4-
constructor(privateKey: Buffer, testnet?: boolean)
5-
address: string;
6-
privateKey: Buffer | Uint8Array;
7-
publicKey: Buffer | Uint8Array;
8-
// getters
9-
get public_raw(): Uint8Array;
10-
get private_raw(): Uint8Array;
11-
get public_hexstring(): string;
12-
get private_hexstring(): string;
13-
get public_base64(): string;
14-
get private_base64(): string;
3+
export class ExtendedKey {
4+
constructor(privateKey: Buffer, testnet?: boolean)
5+
address: string;
6+
privateKey: Buffer | Uint8Array;
7+
publicKey: Buffer | Uint8Array;
8+
// getters
9+
get public_raw(): Uint8Array;
10+
get private_raw(): Uint8Array;
11+
get public_hexstring(): string;
12+
get private_hexstring(): string;
13+
get public_base64(): string;
14+
get private_base64(): string;
15+
}
16+
17+
export interface Message {
18+
to: string;
19+
from: string;
20+
nonce: number;
21+
value: string;
22+
gasfeecap: string;
23+
gaspremium: string;
24+
gaslimit: number;
25+
method: number;
26+
params?: string;
27+
}
28+
29+
export interface SignedMessage {
30+
message: Message;
31+
signature: {
32+
data: string;
33+
type: number;
1534
}
35+
}
1636

17-
export interface Message {
18-
to: string;
19-
from: string;
20-
nonce: number;
21-
value: string;
22-
gasfeecap: string;
23-
gaspremium: string;
24-
gaslimit: number;
25-
method: number;
26-
params?: string;
27-
}
28-
29-
export interface SignedMessage {
30-
message: Message;
31-
signature: {
32-
data: string;
33-
type: number;
34-
}
35-
}
37+
export function generateMnemonic(): string;
38+
export function keyDeriveFromSeed(seed: string, path: string): ExtendedKey;
3639

37-
export function generateMnemonic(): string;
38-
export function keyDeriveFromSeed(seed: string, path: string): ExtendedKey;
40+
export function transactionSerializeRaw(transaction: Message): Buffer;
41+
export function transactionSerialize(transaction: Message): string;
3942

40-
export function transactionSerializeRaw(transaction: Message): Buffer;
41-
export function transactionSerialize(transaction: Message): string;
43+
export function transactionSignRaw(unsignedMessage: Message | string, privateKey: string): Buffer;
44+
export function transactionSign(unsignedMessage: Message, privateKey: string): SignedMessage;
4245

43-
export function transactionSignRaw(unsignedMessage: Message | string, privateKey: string): Buffer;
44-
export function transactionSign(unsignedMessage: Message, privateKey: string): SignedMessage;
46+
export function keyRecover(privateKey: Buffer, testnet: boolean): ExtendedKey;
4547

46-
export function keyRecover(privateKey: Buffer, testnet: boolean): ExtendedKey;
47-
48-
export interface Buffer {
49-
toString(encoding: "utf8" | "hex" | "binary" | "base64" | "ascii"): string;
50-
}
48+
export interface Buffer {
49+
toString(encoding: "utf8" | "hex" | "binary" | "base64" | "ascii"): string;
50+
}
5151
}

packages/snap/snap.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/Chainsafe/filsnap.git"
88
},
99
"source": {
10-
"shasum": "b8r5tRhmxX7VLYW/Q7XKfAzbqtWKJfJQ6WpUMQe208w=",
10+
"shasum": "upyI4dkSj0mtx/Vf2wAbymVqJW7xZmhzQlT189rXznI=",
1111
"location": {
1212
"npm": {
1313
"filePath": "dist/bundle.js",

packages/snap/src/rpc/signMessage.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ export async function signMessage(
5050
[
5151
{message: 'to:', value: message.to},
5252
{message: 'from:', value: message.from},
53-
{message: 'value:', value: message.value !== '0'
54-
&& `${new FilecoinNumber(message.value, 'attofil').toFil()} FIL`},
53+
{message: 'value:', value: `${new FilecoinNumber(message.value, 'attofil').toFil()} FIL`},
5554
{message: 'method:', value: message.method},
5655
{message: 'params:', value: message.params},
5756
{message: 'gas limit:', value: `${message.gaslimit} aFIL`},

packages/snap/src/util/messageCreator.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ interface Message {
44
}
55

66
export const messageCreator = (messages: Message[]): string => messages
7-
.filter(({ value }) => !!value)
87
.map(({ message, value,}) => message + ' ' + value)
98
.join('\n');

0 commit comments

Comments
 (0)