maint(pg): remove DeployedContractSize struct

hujw77 · Apr 7, 2024 · c7af7ef · c7af7ef
1 parent 0daa8a7
commit c7af7ef
Show file tree

Hide file tree

Showing 13 changed files with 119 additions and 184 deletions.
diff --git a/.changeset/honest-hats-promise.md b/.changeset/honest-hats-promise.md
@@ -0,0 +1,7 @@
+---
+'@sphinx-labs/contracts': patch
+'@sphinx-labs/plugins': patch
+'@sphinx-labs/core': patch
+---
+
+Remove deployedContractSizes
diff --git a/packages/contracts/contracts/foundry/Sphinx.sol b/packages/contracts/contracts/foundry/Sphinx.sol
@@ -21,8 +21,7 @@ import {
     GnosisSafeTransaction,
     ExecutionMode,
     SystemContractInfo,
-    ParsedAccountAccess,
-    DeployedContractSize
+    ParsedAccountAccess
 } from "./SphinxPluginTypes.sol";
 import { SphinxUtils } from "./SphinxUtils.sol";
 import { SphinxConstants } from "./SphinxConstants.sol";

diff --git a/packages/contracts/contracts/foundry/SphinxPluginTypes.sol b/packages/contracts/contracts/foundry/SphinxPluginTypes.sol
@@ -75,11 +75,6 @@ struct ParsedAccountAccess {
     Vm.AccountAccess[] nested;
 }
 
-struct DeployedContractSize {
-    address account;
-    uint size;
-}
-
 /**
  * @notice Contains all of the information that's collected in a deployment on a single chain.
  *         The only difference between this struct and the TypeScript `DeploymentInfo` object is
@@ -112,7 +107,6 @@ struct FoundryDeploymentInfo {
     string sphinxLibraryVersion;
     bytes[] encodedAccountAccesses;
     uint256[] gasEstimates;
-    bytes encodedDeployedContractSizes;
     uint fundsRequestedForSafe;
     uint safeStartingBalance;
 }
@@ -261,10 +255,4 @@ contract SphinxPluginTypes {
         view
         returns (SphinxLeafWithProof[][] memory batches)
     {}
-
-    function deployedContractSizesType()
-        external
-        view
-        returns (DeployedContractSize[] memory deployedContractSizes)
-    {}
 }
diff --git a/packages/contracts/contracts/foundry/SphinxUtils.sol b/packages/contracts/contracts/foundry/SphinxUtils.sol
@@ -26,8 +26,7 @@ import {
     ExecutionMode,
     SystemContractInfo,
     GnosisSafeTransaction,
-    ParsedAccountAccess,
-    DeployedContractSize
+    ParsedAccountAccess
 } from "./SphinxPluginTypes.sol";
 import { SphinxConstants } from "./SphinxConstants.sol";
 import { ICreateCall } from "./interfaces/ICreateCall.sol";
@@ -1011,11 +1010,6 @@ contract SphinxUtils is SphinxConstants, StdUtils {
             "encodedAccountAccesses",
             _deployment.encodedAccountAccesses
         );
-        vm.serializeBytes(
-            deploymentInfoKey,
-            "encodedDeployedContractSizes",
-            _deployment.encodedDeployedContractSizes
-        );
 
         // Next, we'll serialize `uint` values as ABI encoded bytes. We don't serialize them as
         // numbers to prevent the possibility that they lose precision due JavaScript's relatively
@@ -1134,35 +1128,6 @@ contract SphinxUtils is SphinxConstants, StdUtils {
             _access.chainInfo.chainId == _chainId;
     }
 
-    function fetchDeployedContractSizes(
-        Vm.AccountAccess[] memory _accesses,
-        uint256 _chainId
-    ) private view returns (DeployedContractSize[] memory) {
-        uint numCreateAccesses = fetchNumCreateAccesses(_accesses, _chainId);
-        DeployedContractSize[] memory deployedContractSizes = new DeployedContractSize[](
-            numCreateAccesses
-        );
-        uint deployContractSizeIndex = 0;
-        for (uint i = 0; i < _accesses.length; i++) {
-            if (isCreateAccountAccess(_accesses[i], _chainId)) {
-                // We could also read the size of the code from the AccountAccess deployedCode field
-                // We don't do that because Foundry occasionally does not populate that field when
-                // it should.
-                address account = _accesses[i].account;
-                uint size;
-                assembly {
-                    size := extcodesize(account)
-                }
-                deployedContractSizes[deployContractSizeIndex] = DeployedContractSize(
-                    account,
-                    size
-                );
-                deployContractSizeIndex += 1;
-            }
-        }
-        return deployedContractSizes;
-    }
-
     function parseAccountAccesses(
         Vm.AccountAccess[] memory _accesses,
         address _safeAddress,
@@ -1568,10 +1533,6 @@ contract SphinxUtils is SphinxConstants, StdUtils {
 
         parsedAccesses = addBalanceCheckAction(_deploymentInfo, parsedAccesses, _callDepth);
 
-        _deploymentInfo.encodedDeployedContractSizes = abi.encode(
-            fetchDeployedContractSizes(_accesses, _deploymentInfo.chainId)
-        );
-
         // ABI encode each `ParsedAccountAccess` element individually. If, instead, we ABI encode
         // the entire array as a unit, the encoded bytes will be too large for EthersJS to ABI
         // decode, which causes an error. This occurs for large deployments, i.e. greater than 50

diff --git a/packages/contracts/src/networks.ts b/packages/contracts/src/networks.ts
@@ -1,21 +1,18 @@
-import { DeployedContractSize, ParsedAccountAccess } from './types'
+import { ParsedAccountAccess } from './types'
 
 /**
  * Return a hard-coded gas value for Moonbeam, Moonbase Alpha, and Moonriver. We hard-code this
  * value as a temporary solution because these networks have a non-standard gas calculation
  * mechanism.
  *
  * @param baseGas The estimated gas cost according to Foundry.
- * @param deployedContractSizes The sizes of any contracts deployed during this transaction.
  * @param access The ParsedAccountAccess for the transaction.
  * @returns
  */
 export const calculateActionLeafGasForMoonbeam = (
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   foundryGas: string,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  deployedContractSizes: DeployedContractSize[],
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   access: ParsedAccountAccess
 ): string => {
   // This is the maximum Merkle leaf gas size that fits in a batch on these networks. (The max batch
@@ -65,7 +62,6 @@ export type SupportedNetwork = {
   }
   handleNetworkSpecificMerkleLeafGas?: (
     foundryGas: string,
-    deployedContractSizes: DeployedContractSize[],
     access: ParsedAccountAccess
   ) => string
 }

diff --git a/packages/contracts/src/types.ts b/packages/contracts/src/types.ts
@@ -42,11 +42,6 @@ export type ParsedAccountAccess = {
   nested: Array<AccountAccess>
 }
 
-export type DeployedContractSize = {
-  account: string
-  size: string
-}
-
 export type DecodedApproveLeafData = {
   safeProxy: string
   moduleProxy: string

diff --git a/packages/contracts/test/SphinxInitCode.sol b/packages/contracts/test/SphinxInitCode.sol
diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
@@ -10,7 +10,6 @@ import {
   ContractArtifact,
   SphinxMerkleTree,
   ParsedAccountAccess,
-  DeployedContractSize,
 } from '@sphinx-labs/contracts'
 
 import { BuildInfo, CompilerInput } from '../languages/solidity/types'
@@ -119,7 +118,6 @@ export type DeploymentInfo = {
   sphinxLibraryVersion: string
   accountAccesses: Array<ParsedAccountAccess>
   gasEstimates: Array<string>
-  deployedContractSizes: Array<DeployedContractSize>
   fundsRequestedForSafe: string
   safeStartingBalance: string
 }

diff --git a/packages/core/src/networks.ts b/packages/core/src/networks.ts
@@ -1,10 +1,7 @@
 // Warning: The constants in this file are commonly imported from the frontend of the Sphinx Managed website.
 // Be careful when importing external dependencies to this file because they may cause issues when this file
 // is imported by the website.
-import {
-  DeployedContractSize,
-  ParsedAccountAccess,
-} from '@sphinx-labs/contracts'
+import { ParsedAccountAccess } from '@sphinx-labs/contracts'
 import {
   ExplorerName,
   SPHINX_LOCAL_NETWORKS,
@@ -131,17 +128,12 @@ export const fetchDripVersionForNetwork = (chainId: bigint) => {
 export const calculateMerkleLeafGas = (
   chainId: bigint,
   foundryGas: string,
-  deployedContractSizes: DeployedContractSize[],
   access: ParsedAccountAccess
 ) => {
   const network = SPHINX_NETWORKS.find((n) => n.chainId === chainId)
 
   if (network?.handleNetworkSpecificMerkleLeafGas) {
-    return network.handleNetworkSpecificMerkleLeafGas(
-      foundryGas,
-      deployedContractSizes,
-      access
-    )
+    return network.handleNetworkSpecificMerkleLeafGas(foundryGas, access)
   } else {
     return foundryGas
   }

diff --git a/packages/plugins/src/foundry/decode.ts b/packages/plugins/src/foundry/decode.ts
@@ -51,11 +51,6 @@ export const decodeDeploymentInfo = (
     'parsedAccountAccessType'
   )
 
-  const deployedContractSizesFragment = findFunctionFragment(
-    sphinxPluginTypesInterface,
-    'deployedContractSizesType'
-  )
-
   const coder = AbiCoder.defaultAbiCoder()
 
   const {
@@ -78,16 +73,6 @@ export const decodeDeploymentInfo = (
 
   const gasEstimates = abiDecodeUint256Array(parsed.gasEstimates)
 
-  // ABI decode the `deployedContractSizes` array
-  const deployedContractSizesResult = coder.decode(
-    deployedContractSizesFragment.outputs,
-    parsed.encodedDeployedContractSizes
-  )
-  const { deployedContractSizes } = recursivelyConvertResult(
-    deployedContractSizesFragment.outputs,
-    deployedContractSizesResult
-  ) as any
-
   // ABI decode each `ParsedAccountAccess` individually.
   const accountAccesses = parsed.encodedAccountAccesses.map((encoded) => {
     const decodedResult = coder.decode(
@@ -129,7 +114,6 @@ export const decodeDeploymentInfo = (
     sphinxLibraryVersion: abiDecodeString(sphinxLibraryVersion),
     accountAccesses,
     gasEstimates,
-    deployedContractSizes,
     fundsRequestedForSafe,
     safeStartingBalance,
   }
@@ -164,7 +148,6 @@ export const makeNetworkConfig = (
     requireSuccess,
     accountAccesses,
     gasEstimates,
-    deployedContractSizes,
     fundsRequestedForSafe,
     safeStartingBalance,
   } = deploymentInfo
@@ -176,7 +159,6 @@ export const makeNetworkConfig = (
     const gas = calculateMerkleLeafGas(
       BigInt(chainId),
       gasEstimates[i].toString(),
-      deployedContractSizes,
       accountAccesses[i]
     )
 

diff --git a/packages/plugins/test/mocha/artifacts.spec.ts b/packages/plugins/test/mocha/artifacts.spec.ts
@@ -316,7 +316,6 @@ const makeThenRunThenCheckDeployment = async (
     threshold,
     executionMode,
     accountAccesses,
-    [],
     getAnvilRpcUrl
   )
 
@@ -362,7 +361,6 @@ const makeThenRunThenCheckRemoteDeployment = async (
     threshold,
     executionMode,
     accountAccesses,
-    [],
     getAnvilRpcUrl
   )