feat: align chaining for message signing with spec 2.4.2 (#36)

* bump actions spec to 2.4.2

* relay back 'data' attribute in message signing chain request

Author: tsmbl

bun.lockb

@@ -27,7 +27,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@solana/actions-spec": "~2.4.1",
+    "@solana/actions-spec": "~2.4.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.16.1",

packages/blinks-core/package.json

@@ -1,3 +1,7 @@
+import type {
+  MessageNextActionPostRequest,
+  NextActionPostRequest,
+} from '@solana/actions-spec';
 import {
   type ComponentType,
   useEffect,
@@ -492,12 +496,28 @@ export const BlinkContainer = ({
           return;
         }
 
+        if (response.type === 'message' && !signature) {
+          dispatch({
+            type: ExecutionType.SOFT_RESET,
+            errorMessage: 'Missing signature for message',
+          });
+          return;
+        }
+
         // chain
-        const nextAction = await action.chain(response.links.next, {
-          signature: signature,
-          account: account,
-          state: response.type === 'message' ? response.state : undefined,
-        });
+        const chainData: MessageNextActionPostRequest | NextActionPostRequest =
+          response.type === 'message'
+            ? {
+                signature: signature!,
+                account: account,
+                state: response.state,
+                data: response.data,
+              }
+            : {
+                signature: signature,
+                account: account,
+              };
+        const nextAction = await action.chain(response.links.next, chainData);
 
         // if this is running in partial action mode, then we end the chain, if passed fn returns a null value for the next action
         if (!nextAction || (isPartialAction && !selector?.(nextAction))) {

packages/blinks-core/src/BlinkContainer.tsx

@@ -1,3 +1,4 @@
+import type { MessageNextActionPostRequest } from '@solana/actions-spec';
 import { nanoid } from 'nanoid/non-secure';
 import { proxify, proxifyImage } from '../../utils';
 import { isUrlSameOrigin } from '../../utils/security.ts';
@@ -179,7 +180,9 @@ export class Action {
 
   public async chain<N extends NextActionLink>(
     next: N,
-    chainData?: N extends PostNextActionLink ? NextActionPostRequest : never,
+    chainData?: N extends PostNextActionLink
+      ? MessageNextActionPostRequest | NextActionPostRequest
+      : never,
   ): Promise<Action | null> {
     const id = nanoid();
 

packages/blinks-core/src/api/Action/Action.ts

@@ -38,7 +38,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@solana/actions-spec": "~2.4.1",
+    "@solana/actions-spec": "~2.4.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.16.1",