Format e2e contracts and ci check

.github/workflows/checks.yml

@@ -32,6 +32,9 @@ jobs:
       - name: Lint
         run: make lint
 
+      - name: Lint contracts
+        run: cd suave && forge fmt --check
+
       - name: Build contracts
         run: cd suave && forge build
 

Makefile

@@ -54,3 +54,6 @@ devnet-up:
 
 devnet-down:
 	docker-compose -f ./suave/devenv/docker-compose.yml down
+
+fmt-contracts:
+	cd suave && forge fmt

suave/e2e/contracts.go

@@ -18,7 +18,6 @@ var (
 	MevShareBundleSenderContract = newArtifact("bids.sol/MevShareBundleSenderContract.json")
 	buildEthBlockContract        = newArtifact("bids.sol/EthBlockBidContract.json")
 	ethBlockBidSenderContract    = newArtifact("bids.sol/EthBlockBidSenderContract.json")
-	suaveLibContract             = newArtifact("SuaveAbi.sol/SuaveAbi.json")
 	exampleCallSourceContract    = newArtifact("example.sol/ExampleEthCallSource.json")
 	exampleCallTargetContract    = newArtifact("example.sol/ExampleEthCallTarget.json")
 )

suave/e2e/workflow_test.go

@@ -735,7 +735,7 @@ func TestBlockBuildingPrecompiles(t *testing.T) {
 	require.NoError(t, err)
 
 	{ // Test the bundle simulation precompile through eth_call
-		calldata, err := suaveLibContract.Abi.Methods["simulateBundle"].Inputs.Pack(bundleBytes)
+		calldata, err := artifacts.SuaveAbi.Methods["simulateBundle"].Inputs.Pack(bundleBytes)
 		require.NoError(t, err)
 
 		var simResult hexutil.Bytes
@@ -785,7 +785,7 @@ func TestBlockBuildingPrecompiles(t *testing.T) {
 			FeeRecipient: common.Address{0x42},
 		}
 
-		packed, err := suaveLibContract.Abi.Methods["buildEthBlock"].Inputs.Pack(payloadArgsTuple, bid.Id, "")
+		packed, err := artifacts.SuaveAbi.Methods["buildEthBlock"].Inputs.Pack(payloadArgsTuple, bid.Id, "")
 		require.NoError(t, err)
 
 		var simResult hexutil.Bytes
@@ -799,7 +799,7 @@ func TestBlockBuildingPrecompiles(t *testing.T) {
 
 		require.NotNil(t, simResult)
 
-		unpacked, err := suaveLibContract.Abi.Methods["buildEthBlock"].Outputs.Unpack(simResult)
+		unpacked, err := artifacts.SuaveAbi.Methods["buildEthBlock"].Outputs.Unpack(simResult)
 		require.NoError(t, err)
 
 		// TODO: test builder bid
@@ -1446,7 +1446,7 @@ func requireNoRpcError(t *testing.T, rpcErr error) {
 			require.NoError(t, rpcErr, decodedError)
 		}
 
-		unpacked, err := suaveLibContract.Abi.Errors["PeekerReverted"].Inputs.Unpack(decodedError[4:])
+		unpacked, err := artifacts.SuaveAbi.Errors["PeekerReverted"].Inputs.Unpack(decodedError[4:])
 		if err != nil {
 			require.NoError(t, err, rpcErr.Error())
 		} else {