chain/ethereum: return a boolean instead of entire code for eth_get_code

chain/ethereum/src/runtime/runtime_adapter.rs

@@ -28,8 +28,8 @@ use graph::{
     semver::Version,
     slog::Logger,
 };
+use graph_runtime_wasm::asc_abi::class::{AscBigInt, AscEnumArray, AscWrapped, EthereumValueKind};
 use itertools::Itertools;
-use graph_runtime_wasm::asc_abi::class::{AscBigInt, AscEnumArray, EthereumValueKind, Uint8Array};
 
 use super::abi::{AscUnresolvedContractCall, AscUnresolvedContractCall_0_0_4};
 
@@ -56,8 +56,8 @@ pub const ETHEREUM_CALL: Gas = Gas::new(5_000_000_000);
 // TODO: Determine the appropriate gas cost for `ETH_GET_BALANCE`, initially aligned with `ETHEREUM_CALL`.
 pub const ETH_GET_BALANCE: Gas = Gas::new(5_000_000_000);
 
-// TODO: Determine the appropriate gas cost for `ETH_GET_CODE`, initially aligned with `ETHEREUM_CALL`.
-pub const ETH_GET_CODE: Gas = Gas::new(5_000_000_000);
+// TODO: Determine the appropriate gas cost for `ETH_HAS_CODE`, initially aligned with `ETHEREUM_CALL`.
+pub const ETH_HAS_CODE: Gas = Gas::new(5_000_000_000);
 
 pub struct RuntimeAdapter {
     pub eth_adapters: Arc<EthereumNetworkAdapters>,
@@ -120,13 +120,13 @@ impl blockchain::RuntimeAdapter<Chain> for RuntimeAdapter {
 
         let eth_adapters = self.eth_adapters.cheap_clone();
         let ethereum_get_code = HostFn {
-            name: "ethereum.getCode",
+            name: "ethereum.hasCode",
             func: Arc::new(move |ctx, wasm_ptr| {
                 let eth_adapter = eth_adapters.cheapest_with(&NodeCapabilities {
                     archive,
                     traces: false,
                 })?;
-                eth_get_code(&eth_adapter, ctx, wasm_ptr).map(|ptr| ptr.wasm_ptr())
+                eth_has_code(&eth_adapter, ctx, wasm_ptr).map(|ptr| ptr.wasm_ptr())
             }),
         };
 
@@ -209,17 +209,17 @@ fn eth_get_balance(
     }
 }
 
-fn eth_get_code(
+fn eth_has_code(
     eth_adapter: &EthereumAdapter,
     ctx: HostFnCtx<'_>,
     wasm_ptr: u32,
-) -> Result<AscPtr<Uint8Array>, HostExportError> {
+) -> Result<AscPtr<AscWrapped<bool>>, HostExportError> {
     ctx.gas
-        .consume_host_fn_with_metrics(ETH_GET_CODE, "eth_get_code")?;
+        .consume_host_fn_with_metrics(ETH_HAS_CODE, "eth_has_code")?;
 
     if ctx.heap.api_version() < API_VERSION_0_0_9 {
         return Err(HostExportError::Deterministic(anyhow!(
-            "ethereum.getCode call is not supported before API version 0.0.9"
+            "ethereum.hasCode call is not supported before API version 0.0.9"
         )));
     }
 
@@ -232,10 +232,11 @@ fn eth_get_code(
         eth_adapter
             .get_code(logger, address, block_ptr.clone())
             .compat(),
-    );
+    )
+    .map(|v| !v.0.is_empty());
 
     match result {
-        Ok(v) => Ok(asc_new(ctx.heap, &v, &ctx.gas)?),
+        Ok(v) => Ok(asc_new(ctx.heap, &AscWrapped { inner: v }, &ctx.gas)?),
         // Retry on any kind of error
         Err(EthereumRpcError::Web3Error(e)) => Err(HostExportError::PossibleReorg(e.into())),
         Err(EthereumRpcError::Timeout) => Err(HostExportError::PossibleReorg(

tests/integration-tests/ethereum-api-tests/package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@graphprotocol/graph-cli": "0.69.0",
-    "@graphprotocol/graph-ts": "0.34.0-alpha-20240311104414-5f75d93",
+    "@graphprotocol/graph-ts": "0.34.0-alpha-20240319121936-1ceb12b",
     "solc": "^0.8.2"
   },
   "dependencies": {

tests/integration-tests/ethereum-api-tests/schema.graphql

@@ -1,5 +1,5 @@
 type Foo @entity {
   id: ID!
   balance: BigInt!
-  code: Bytes!
+  hasCode: Boolean!
 }

tests/integration-tests/ethereum-api-tests/src/mapping.ts

@@ -13,14 +13,14 @@ export function handleTrigger(event: Trigger): void {
   let address_str = dataSource.context().getString("contract");
   let address = Address.fromString(address_str);
 
-  let code = ethereum.getCode(address);
+  let hasCode = ethereum.hasCode(address);
 
   if (!entity) {
     entity = new Foo(event.params.x.toString());
   }
 
   entity.balance = balance;
-  entity.code = code;
+  entity.hasCode = hasCode;
 
   entity.save();
 }

tests/integration-tests/yarn.lock

@@ -911,10 +911,10 @@
   dependencies:
     assemblyscript "0.19.10"
 
-"@graphprotocol/[email protected]20240311104414-5f75d93":
-  version "0.34.0-alpha-20240311104414-5f75d93"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.34.0-alpha-20240311104414-5f75d93.tgz#1d8826127e02b39379565b50a6113c4d1f09f794"
-  integrity sha512-Z5FCd/kfqR5r/truhuDYO/K2KOKZxau7PDeEFkVIB1SZFFz/FThVYboGldTL3xF278Fxu/cYaBQGMpTJy4nqYQ==
+"@graphprotocol/[email protected]20240319121936-1ceb12b":
+  version "0.34.0-alpha-20240319121936-1ceb12b"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.34.0-alpha-20240319121936-1ceb12b.tgz#5adc6aa0ad4d5f4d2f002b91b817cfa5f989aba4"
+  integrity sha512-N4n5B62cbdduHlbaeddg0v6GujLkrdRoBi1aHEVLMcfIQpPzw3fyK4dNDMLmO85PHnzuKCkucVel2RyRKqtPYA==
   dependencies:
     assemblyscript "0.19.10"
 

tests/tests/integration_tests.rs

@@ -15,7 +15,6 @@ use std::time::{Duration, Instant};
 
 use anyhow::{anyhow, bail, Context};
 use futures::StreamExt;
-use graph::prelude::hex;
 use graph::prelude::serde_json::{json, Value};
 use graph_tests::contract::Contract;
 use graph_tests::helpers::{run_checked, TestFile};
@@ -31,9 +30,7 @@ type TestFn = Box<
         + Send,
 >;
 
-struct TestContext {
-    contracts: Vec<Contract>,
-}
+struct TestContext {}
 
 enum TestStatus {
     Ok,
@@ -145,9 +142,7 @@ impl TestCase {
             status!(&self.name, "Subgraph ({}) has failed", subgraph.deployment);
         }
 
-        let ctx = TestContext {
-            contracts: contracts.to_vec(),
-        };
+        let ctx = TestContext {};
 
         status!(&self.name, "Starting test");
         let subgraph2 = subgraph.clone();
@@ -428,30 +423,21 @@ async fn test_block_handlers(subgraph: Subgraph, _ctx: TestContext) -> anyhow::R
     Ok(())
 }
 
-async fn test_eth_api(subgraph: Subgraph, ctx: TestContext) -> anyhow::Result<()> {
+async fn test_eth_api(subgraph: Subgraph, _ctx: TestContext) -> anyhow::Result<()> {
     assert!(subgraph.healthy);
 
-    let simple_contract = ctx
-        .contracts
-        .iter()
-        .find(|c| c.name == "SimpleContract")
-        .unwrap();
-
-    let code = simple_contract.code().await;
-    let code_hex = hex::encode(&code.0);
-
     let expected_response = json!({
         "foo": {
             "id": "1",
             "balance": "10000000000000000000000",
-            "code": format!("0x{}", code_hex),
+            "hasCode": true,
         }
     });
 
     query_succeeds(
         "Balance should be right",
         &subgraph,
-        "{ foo(id: \"1\") { id balance code } }",
+        "{ foo(id: \"1\") { id balance hasCode } }",
         expected_response,
     )
     .await?;