Allow decoding of internal function pointers in viaIR compilations (in Solidity 0.8.20)

packages/codec-components/src/react/components/codec/format.errors.deployed-function-in-constructor-error.tsx

@@ -2,12 +2,18 @@ import React from "react";
 import type { Format } from "@truffle/codec";
 import { createCodecComponent } from "../../utils/create-codec-component";
 import { CodecError } from "../common/codec-error";
+import { FunctionInternalRawInfoPcPair } from "./format.values.function-internal-raw-info-pc-pair";
 
 export const { DeployedFunctionInConstructorError } = createCodecComponent(
   "DeployedFunctionInConstructorError",
-  ({ kind, context }: Format.Errors.DeployedFunctionInConstructorError) => (
+  ({
+    kind,
+    context,
+    rawInformation
+  }: Format.Errors.DeployedFunctionInConstructorError) => (
     <CodecError kind={kind}>
-      Deployed-style pointer in {context.typeName} constructor
+      Deployed-style pointer in {context.typeName} constructor&nbsp;
+      <FunctionInternalRawInfoPcPair data={rawInformation} />
     </CodecError>
   )
 );

packages/codec-components/src/react/components/codec/format.errors.malformed-internal-function-error.tsx

@@ -2,17 +2,18 @@ import React from "react";
 import type { Format } from "@truffle/codec";
 import { createCodecComponent } from "../../utils/create-codec-component";
 import { CodecError } from "../common/codec-error";
+import { FunctionInternalRawInfoPcPair } from "./format.values.function-internal-raw-info-pc-pair";
 
 export const { MalformedInternalFunctionError } = createCodecComponent(
   "MalformedInternalFunctionError",
   ({
     kind,
     context,
-    constructorProgramCounter
+    rawInformation
   }: Format.Errors.MalformedInternalFunctionError) => (
     <CodecError kind={kind}>
-      {context.typeName} constructor program counter is nonzero (
-      {constructorProgramCounter})
+      {context.typeName} pointer has zero deployed program counter&nbsp;
+      <FunctionInternalRawInfoPcPair data={rawInformation} />
     </CodecError>
   )
 );

packages/codec-components/src/react/components/codec/format.errors.no-such-internal-function-error.tsx

@@ -2,19 +2,19 @@ import React from "react";
 import type { Format } from "@truffle/codec";
 import { createCodecComponent } from "../../utils/create-codec-component";
 import { CodecError } from "../common/codec-error";
+import { FunctionInternalRawInfo } from "./format.values.function-internal-raw-info";
 
 export const { NoSuchInternalFunctionError } = createCodecComponent(
   "NoSuchInternalFunctionError",
   ({
     kind,
     context,
-    constructorProgramCounter,
-    deployedProgramCounter
+    rawInformation
   }: Format.Errors.NoSuchInternalFunctionError) => (
     <CodecError kind={kind}>
-      {context.typeName} function pointer does not point to a valid function
-      (constructor program counter: {constructorProgramCounter}, deployed
-      program counter: {deployedProgramCounter})
+      {context.typeName} function pointer does not point to a valid
+      function&nbsp;
+      <FunctionInternalRawInfo data={rawInformation} />
     </CodecError>
   )
 );

packages/codec-components/src/react/components/codec/format.values.function-internal-raw-info-index.tsx

@@ -0,0 +1,11 @@
+import React from "react";
+import type { Format } from "@truffle/codec";
+import { createCodecComponent } from "../../utils/create-codec-component";
+import { Code } from "../common/code";
+
+export const { FunctionInternalRawInfoIndex } = createCodecComponent(
+  "FunctionInternalRawInfoIndex",
+  ({ functionIndex }: Format.Values.FunctionInternalRawInfoIndex) => {
+    return <Code>(Function index: {functionIndex})</Code>;
+  }
+);

packages/codec-components/src/react/components/codec/format.values.function-internal-raw-info-pc-pair.tsx

@@ -0,0 +1,19 @@
+import React from "react";
+import type { Format } from "@truffle/codec";
+import { createCodecComponent } from "../../utils/create-codec-component";
+import { Code } from "../common/code";
+
+export const { FunctionInternalRawInfoPcPair } = createCodecComponent(
+  "FunctionInternalRawInfoPcPair",
+  ({
+    deployedProgramCounter,
+    constructorProgramCounter
+  }: Format.Values.FunctionInternalRawInfoPcPair) => {
+    return (
+      <Code>
+        (constructor: {constructorProgramCounter}, deployed:{" "}
+        {deployedProgramCounter})
+      </Code>
+    );
+  }
+);

packages/codec-components/src/react/components/codec/format.values.function-internal-raw-info.tsx

@@ -0,0 +1,16 @@
+import React from "react";
+import type { Format } from "@truffle/codec";
+import { createCodecComponent } from "../../utils/create-codec-component";
+import { FunctionInternalRawInfoPcPair } from "./format.values.function-internal-raw-info-pc-pair";
+import { FunctionInternalRawInfoIndex } from "./format.values.function-internal-raw-info-index";
+import { isFunctionInternalRawInfoPcPair } from "../../../utils";
+
+export const { FunctionInternalRawInfo } = createCodecComponent(
+  "FunctionInternalRawInfo",
+  (data: Format.Values.FunctionInternalRawInfo) =>
+    isFunctionInternalRawInfoPcPair(data) ? (
+      <FunctionInternalRawInfoPcPair data={data} />
+    ) : (
+      <FunctionInternalRawInfoIndex data={data} />
+    )
+);

packages/codec-components/src/react/components/codec/format.values.function-internal-value-info-unknown.tsx

@@ -3,10 +3,14 @@ import type { Format } from "@truffle/codec";
 import { createCodecComponent } from "../../utils/create-codec-component";
 import { useInjectedNode } from "../../contexts/injected-node";
 import { Code } from "../common/code";
+import { FunctionInternalRawInfo } from "./format.values.function-internal-raw-info";
 
 export const { FunctionInternalValueInfoUnknown } = createCodecComponent(
   "FunctionInternalValueInfoUnknown",
-  ({ context }: Format.Values.FunctionInternalValueInfoUnknown) => {
+  ({
+    context,
+    rawInformation
+  }: Format.Values.FunctionInternalValueInfoUnknown) => {
     const { prefix, content } = useInjectedNode();
     return (
       <Code>
@@ -15,7 +19,7 @@ export const { FunctionInternalValueInfoUnknown } = createCodecComponent(
           {context.typeName}
         </Code>
         <Code type="period">.</Code>
-        <Code type="function">?</Code>
+        <FunctionInternalRawInfo data={rawInformation} />
         {content?.suffix}
       </Code>
     );

packages/codec-components/src/react/contexts/custom-components.ts

@@ -147,6 +147,9 @@ export interface CustomComponentsContextValue {
       FunctionExternalValueInfoUnknown: Codec.Format.Values.FunctionExternalValueInfoUnknown;
       FunctionExternalValueInfo: Codec.Format.Values.FunctionExternalValueInfo;
       FunctionExternalValue: Codec.Format.Values.FunctionExternalValue;
+      FunctionInternalRawInfo: Codec.Format.Values.FunctionInternalRawInfo;
+      FunctionInternalRawInfoPcPair: Codec.Format.Values.FunctionInternalRawInfoPcPair;
+      FunctionInternalRawInfoIndex: Codec.Format.Values.FunctionInternalRawInfoIndex;
       FunctionInternalResult: Codec.Format.Values.FunctionInternalResult;
       FunctionInternalValueInfoException: Codec.Format.Values.FunctionInternalValueInfoException;
       FunctionInternalValueInfoKnown: Codec.Format.Values.FunctionInternalValueInfoKnown;

packages/codec-components/src/react/index.ts

@@ -129,6 +129,9 @@ export * from "./components/codec/format.values.function-external-value-info-kno
 export * from "./components/codec/format.values.function-external-value-info";
 export * from "./components/codec/format.values.function-external-value-info-unknown";
 export * from "./components/codec/format.values.function-external-value";
+export * from "./components/codec/format.values.function-internal-raw-info";
+export * from "./components/codec/format.values.function-internal-raw-info-pc-pair";
+export * from "./components/codec/format.values.function-internal-raw-info-index";
 export * from "./components/codec/format.values.function-internal-result";
 export * from "./components/codec/format.values.function-internal-value-info-exception";
 export * from "./components/codec/format.values.function-internal-value-info-known";

packages/codec-components/src/utils/index.ts

@@ -87,6 +87,9 @@ export * from "./type-guards/other/function-external-value-info-invalid";
 export * from "./type-guards/other/function-external-value-info-known";
 export * from "./type-guards/other/function-external-value-info-unknown";
 export * from "./type-guards/other/function-external-value-info";
+export * from "./type-guards/other/function-internal-raw-info-pc-pair";
+export * from "./type-guards/other/function-internal-raw-info-index";
+export * from "./type-guards/other/function-internal-raw-info";
 export * from "./type-guards/other/function-internal-value-info-exception";
 export * from "./type-guards/other/function-internal-value-info-known";
 export * from "./type-guards/other/function-internal-value-info-unknown";

packages/codec-components/src/utils/type-guards/other/function-internal-raw-info-index.ts

@@ -0,0 +1,5 @@
+import type { Format } from "@truffle/codec";
+
+export const isFunctionInternalRawInfoIndex = (
+  data: Format.Values.FunctionInternalRawInfo
+): data is Format.Values.FunctionInternalRawInfoIndex => data.kind === "index";

packages/codec-components/src/utils/type-guards/other/function-internal-raw-info-pc-pair.ts

@@ -0,0 +1,6 @@
+import type { Format } from "@truffle/codec";
+
+export const isFunctionInternalRawInfoPcPair = (
+  data: Format.Values.FunctionInternalRawInfo
+): data is Format.Values.FunctionInternalRawInfoPcPair =>
+  data.kind === "pcpair";

packages/codec-components/src/utils/type-guards/other/function-internal-raw-info.ts

@@ -0,0 +1,2 @@
+// No type guard for FunctionInternalRawInfo
+export {};

packages/codec/lib/ast/types.ts

@@ -12,6 +12,9 @@ export interface AstNode {
   name: string;
   canonicalName?: string;
   linearizedBaseContracts?: number[];
+  internalFunctionIDs?: {
+    [nodeId: string]: number; //note the strings are numeric
+  };
   members?: AstNode[];
   underlyingType?: AstNode;
   nodes?: AstNode[];