Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Casper Wallet",
"description": "Securely manage your CSPR tokens and interact with dapps with the self-custody wallet for the Casper blockchain.",
"version": "2.3.0",
"version": "2.3.1",
"author": "MAKE LLC",
"scripts": {
"devtools:redux": "redux-devtools --hostname=localhost",
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_all.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
HASH=$(git rev-parse --short HEAD)

npm run build:chrome && npm run build:firefox && cd ./build && zip -r casper-wallet-2.3.0rc3#$HASH.zip ./* && npm run build:src
npm run build:chrome && npm run build:firefox && cd ./build && zip -r casper-wallet-2.3.1rc1#$HASH.zip ./* && npm run build:src
4 changes: 2 additions & 2 deletions src/background/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ runtime.onMessage.addListener(
);
}

case getType(sdkMethod.getEncryptedMessageRequest): {
case getType(sdkMethod.encryptMessageRequest): {
const origin = getUrlOrigin(sender.url);

const { signingPublicKeyHex, message = '' } = action.payload;
Expand Down Expand Up @@ -597,7 +597,7 @@ runtime.onMessage.addListener(
);

return sendResponse(
sdkMethod.getEncryptedMessageResponse(
sdkMethod.encryptMessageResponse(
{
encryptedMessage
},
Expand Down
4 changes: 2 additions & 2 deletions src/content/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ async function handleSdkMessage(message: SdkEvent | SdkMethod) {
case getType(sdkMethod.signMessageResponse):
case getType(sdkMethod.decryptMessageResponse):
case getType(sdkMethod.decryptMessageError):
case getType(sdkMethod.encryptMessageResponse):
case getType(sdkMethod.encryptMessageError):
case getType(sdkMethod.getActivePublicKeySupportsResponse):
case getType(sdkMethod.getEncryptedMessageResponse):
case getType(sdkMethod.getEncryptedMessageError):
window.dispatchEvent(
new CustomEvent(SdkMethodEventType.Response, {
detail: JSON.stringify(message)
Expand Down
40 changes: 19 additions & 21 deletions src/content/sdk-method.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,25 @@ export const sdkMethod = {
Error,
Meta
>(),
encryptMessageRequest: createAction('CasperWalletProvider:EncryptMessage')<
{
message: string;
signingPublicKeyHex: string;
},
Meta
>(),
encryptMessageResponse: createAction(
'CasperWalletProvider:EncryptMessage:Response'
)<
{
encryptedMessage: string;
},
Meta
>(),
encryptMessageError: createCustomAction(
'CasperWalletProvider:EncryptMessage:Error',
(payload: SdkError, meta: Meta) => ({ payload, meta, error: true })
),
decryptMessageRequest: createAction('CasperWalletProvider:DecryptMessage')<
{
message: string;
Expand Down Expand Up @@ -105,27 +124,6 @@ export const sdkMethod = {
'CasperWalletProvider:GetActivePublicKey:Error',
(payload: SdkError, meta: Meta) => ({ payload, meta, error: true })
),
getEncryptedMessageRequest: createAction(
'CasperWalletProvider:GetEncryptedMessage'
)<
{
message: string;
signingPublicKeyHex: string;
},
Meta
>(),
getEncryptedMessageResponse: createAction(
'CasperWalletProvider:GetEncryptedMessage:Response'
)<
{
encryptedMessage: string;
},
Meta
>(),
getEncryptedMessageError: createCustomAction(
'CasperWalletProvider:GetEncryptedMessage:Error',
(payload: SdkError, meta: Meta) => ({ payload, meta, error: true })
),
getVersionRequest: createAction('CasperWalletProvider:GetVersion')<
void,
Meta
Expand Down
29 changes: 27 additions & 2 deletions src/content/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,27 @@ export const CasperWalletProvider = (options?: CasperWalletProviderOptions) => {
};
});
},
/**
* Get the encrypted message from the Casper Wallet extension
* @returns returns an encrypted message.
* Message max length is 4096 symbols.
*/
encryptMessage(message: string, signingPublicKeyHex: string) {
return fetchFromBackground<
ReturnType<(typeof sdkMethod)['encryptMessageResponse']>['payload']
>(
sdkMethod.encryptMessageRequest(
{
message,
signingPublicKeyHex
},
{
requestId: generateRequestId()
}
),
options
);
},
/**
* Request the decrypt message with the Casper Wallet extension
* @param message - message to decrypt as string
Expand Down Expand Up @@ -282,15 +303,19 @@ export const CasperWalletProvider = (options?: CasperWalletProviderOptions) => {
);
},
/**
* @deprecated // TODO remove in future releases
* Get the encrypted message from the Casper Wallet extension
* @returns returns an encrypted message.
* Message max length is 4096 symbols.
*/
getEncryptedMessage(message: string, signingPublicKeyHex: string) {
console.warn(
'`CasperWalletProvider().getEncryptedMessage` is deprecated and will be removed in future releases, use `CasperWalletProvider().encryptMessage` instead'
);
return fetchFromBackground<
ReturnType<(typeof sdkMethod)['getEncryptedMessageResponse']>['payload']
ReturnType<(typeof sdkMethod)['encryptMessageResponse']>['payload']
>(
sdkMethod.getEncryptedMessageRequest(
sdkMethod.encryptMessageRequest(
{
message,
signingPublicKeyHex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@
CODE_SIGN_ENTITLEMENTS = "Casper Wallet/Casper Wallet.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 143;
CURRENT_PROJECT_VERSION = 144;
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Casper Wallet/Info.plist";
Expand All @@ -654,7 +654,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
OTHER_LDFLAGS = (
"-framework",
SafariServices,
Expand All @@ -677,7 +677,7 @@
CODE_SIGN_ENTITLEMENTS = "Casper Wallet/Casper Wallet.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 143;
CURRENT_PROJECT_VERSION = 144;
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Casper Wallet/Info.plist";
Expand All @@ -691,7 +691,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
OTHER_LDFLAGS = (
"-framework",
SafariServices,
Expand Down
Loading