fix(soroban): surface the CAP-85 note earlier and name invalid pairings

  Follow-up polish on the auth-entry review UI plus clearer diagnostics for
  malformed contract creations.

  The externally-managed-executable note now leads the auth entry's info
  block instead of trailing it, so the caveat is read before the details it
  qualifies. Its copy drops the positional reference ("the owner contract
  above") and names the row instead ("the executable owner"), which stays
  correct in both placements -- the Operations view still renders the note
  after the executable rows, where the existing Operations__warning spacing
  pattern applies.

Author: aristidesstaffieri

extension/src/popup/components/AuthEntry/index.tsx

@@ -164,6 +164,7 @@ export const AuthEntries = ({ entries }: AuthEntriesProps) => {
                 <span>{t("Contract creation")}</span>
               </div>
               <div className="AuthEntry__InfoBlock">
+                <ExternalExecutableNote />
                 {detail.address && (
                   <KeyValueList
                     operationKey={t("Contract Address")}
@@ -194,7 +195,6 @@ export const AuthEntries = ({ entries }: AuthEntriesProps) => {
                     operationValue={truncateString(detail.salt)}
                   />
                 )}
-                <ExternalExecutableNote />
                 {detail.args && <KeyValueInvokeHostFnArgs args={detail.args} />}
               </div>
             </React.Fragment>

extension/src/popup/components/AuthEntry/styles.scss

@@ -41,6 +41,33 @@
   }
 
   &__InfoBlock {
+    // The executable note leads the block here (rather than trailing the rows
+    // as it does in the Operations view), so it carries its spacing below.
+    > .ExecutableNote {
+      margin-top: 0;
+      margin-bottom: pxToRem(12px);
+    }
+
+    // Only the top-level Parameters block needs separating; the invoke case
+    // nests it inside _Inner, which already provides its own spacing.
+    > .Operations__pair--invoke {
+      margin-top: pxToRem(12px);
+    }
+
+    .Operations--header {
+      display: flex;
+      align-items: center;
+      color: var(--sds-clr-gray-11);
+      margin-bottom: pxToRem(12px);
+
+      svg {
+        flex-shrink: 0;
+        width: pxToRem(16px);
+        height: pxToRem(16px);
+        margin-right: pxToRem(8px);
+      }
+    }
+
     &_Inner {
       padding: pxToRem(12px) pxToRem(16px);
       border-radius: pxToRem(16px);
@@ -187,6 +214,7 @@
 
 .AuthEntryContent {
   width: 100%;
+  padding-top: pxToRem(12px);
   animation: fadeIn 0.2s ease-in-out;
 }
 

extension/src/popup/components/signTransaction/Operations/KeyVal/index.tsx

@@ -470,7 +470,7 @@ export const ExternalExecutableNote = () => {
       <Icon.InfoCircle aria-hidden="true" />
       <span>
         {t(
-          "This contract's code is managed by the owner contract above and can change after you sign.",
+          "This contract's code is managed by the executable owner and can change after you sign.",
         )}
       </span>
     </div>

extension/src/popup/helpers/__tests__/soroban.test.js

@@ -180,6 +180,47 @@ describe("getInvocationArgs", () => {
       salt: "0".repeat(64),
     });
   });
+  it("explains which executable/preimage pairing was invalid when it throws", () => {
+    const assetPreimage = xdr.ContractIdPreimage.contractIdPreimageFromAsset(
+      xdr.Asset.assetTypeNative(),
+    );
+    const addressPreimage =
+      xdr.ContractIdPreimage.contractIdPreimageFromAddress(
+        new xdr.ContractIdPreimageFromAddress({
+          address: new Address(TEST_PUBLIC_KEY).toScAddress(),
+          salt: Buffer.alloc(32),
+        }),
+      );
+
+    const build = (executable, contractIdPreimage) =>
+      new xdr.SorobanAuthorizedInvocation({
+        function:
+          xdr.SorobanAuthorizedFunction.sorobanAuthorizedFunctionTypeCreateContractHostFn(
+            new xdr.CreateContractArgs({ contractIdPreimage, executable }),
+          ),
+        subInvocations: [],
+      });
+
+    // wasm code must be deployed from an address, never derived from an asset
+    expect(() =>
+      getInvocationArgs(
+        build(
+          xdr.ContractExecutable.contractExecutableWasm(Buffer.alloc(32)),
+          assetPreimage,
+        ),
+      ),
+    ).toThrow(/wasm executable.*contractIdPreimageFromAsset/);
+
+    // and a SAC is only ever derived from an asset
+    expect(() =>
+      getInvocationArgs(
+        build(
+          xdr.ContractExecutable.contractExecutableStellarAsset(),
+          addressPreimage,
+        ),
+      ),
+    ).toThrow(/Stellar asset executable.*contractIdPreimageFromAddress/);
+  });
   it("marks an invocation it cannot parse as unrecognized instead of throwing", () => {
     // A wasm executable paired with an asset preimage is decodable XDR but a
     // nonsensical combination -- the kind of thing a future protocol arm or a

extension/src/popup/helpers/soroban.ts

@@ -865,10 +865,15 @@ export function getInvocationArgs(
 
       switch (exec.type) {
         case "contractExecutableWasm": {
-          const details = xdr.expectUnionVariant(
-            preimage,
-            "contractIdPreimageFromAddress",
-          ).fromAddress;
+          // A wasm executable must be paired with an address preimage: the
+          // contract id is derived from deployer + salt. The two arms are
+          // independent in XDR, so the invalid pairings are representable.
+          if (preimage.type !== "contractIdPreimageFromAddress") {
+            throw new Error(
+              `creation function appears invalid: a wasm executable is paired with ${preimage.type} (should be wasm+address or token+asset)`,
+            );
+          }
+          const details = preimage.fromAddress;
 
           const contractDetails = {
             type: "wasm",
@@ -887,12 +892,15 @@ export function getInvocationArgs(
         }
 
         case "contractExecutableStellarAsset": {
+          // A SAC is only ever derived from the asset it wraps.
+          if (preimage.type !== "contractIdPreimageFromAsset") {
+            throw new Error(
+              `creation function appears invalid: a Stellar asset executable is paired with ${preimage.type} (should be wasm+address or token+asset)`,
+            );
+          }
           const sacDetails = {
             type: "sac",
-            asset: Asset.fromOperation(
-              xdr.expectUnionVariant(preimage, "contractIdPreimageFromAsset")
-                .fromAsset,
-            ).toString(),
+            asset: Asset.fromOperation(preimage.fromAsset).toString(),
           } as FnArgsCreateSac;
 
           if (isCreateV2) {

extension/src/popup/locales/en/translation.json

@@ -636,7 +636,7 @@
   "This authorization is for {{address}}.": "This authorization is for {{address}}.",
   "This can be used to sign arbitrary transaction hashes without having to decode them first.": "This can be used to sign arbitrary transaction hashes without having to decode them first.",
   "This collectible is hidden": "This collectible is hidden",
-  "This contract's code is managed by the owner contract above and can change after you sign.": "This contract's code is managed by the owner contract above and can change after you sign.",
+  "This contract's code is managed by the executable owner and can change after you sign.": "This contract's code is managed by the executable owner and can change after you sign.",
   "This is not a valid contract id.": "This is not a valid contract id.",
   "This message is too large for your Ledger to display. Ask the site for a shorter message.": "This message is too large for your Ledger to display. Ask the site for a shorter message.",
   "This site does not appear safe for the following reasons": "This site does not appear safe for the following reasons",

extension/src/popup/locales/pt/translation.json

@@ -636,7 +636,7 @@
   "This authorization is for {{address}}.": "Esta autorização é para {{address}}.",
   "This can be used to sign arbitrary transaction hashes without having to decode them first.": "Isso pode ser usado para assinar hashes de transação arbitrários sem precisar decodificá-los primeiro.",
   "This collectible is hidden": "Este colecionável está oculto",
-  "This contract's code is managed by the owner contract above and can change after you sign.": "O código deste contrato é gerenciado pelo contrato proprietário acima e pode mudar depois que você assinar.",
+  "This contract's code is managed by the executable owner and can change after you sign.": "O código deste contrato é gerenciado pelo proprietário do executável e pode mudar depois que você assinar.",
   "This is not a valid contract id.": "Este não é um ID de contrato válido.",
   "This message is too large for your Ledger to display. Ask the site for a shorter message.": "Esta mensagem é grande demais para o seu Ledger exibir. Peça ao site uma mensagem mais curta.",
   "This site does not appear safe for the following reasons": "Este site não parece seguro pelos seguintes motivos",