Check grafting from pre 0.0.6 to 0.0.6 and later

.github/workflows/ci.yml

@@ -153,7 +153,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
       - name: Start anvil
-        run: anvil --gas-limit 100000000000 --base-fee 1 --block-time 2 --port 3021 &
+        run: anvil --gas-limit 100000000000 --base-fee 1 --block-time 2 --timestamp 1743944919 --port 3021 &
 
       - name: Install graph CLI
         run: curl -sSL http://cli.thegraph.com/install.sh | sudo bash

tests/docker-compose.yml

@@ -23,7 +23,7 @@ services:
     image: ghcr.io/foundry-rs/foundry:stable
     ports:
       - '3021:8545'
-    command: "'anvil --host 0.0.0.0 --gas-limit 100000000000 --base-fee 1 --block-time 5 --mnemonic \"test test test test test test test test test test test junk\"'"
+    command: "'anvil --host 0.0.0.0 --gas-limit 100000000000 --base-fee 1 --block-time 2 --timestamp 1743944919 --mnemonic \"test test test test test test test test test test test junk\"'"
 
 # graph-node ports:
 #   json-rpc: 8020

tests/integration-tests/base/abis/Contract.abi

@@ -0,0 +1,33 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "x",
+        "type": "uint16"
+      }
+    ],
+    "name": "Trigger",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint16",
+        "name": "x",
+        "type": "uint16"
+      }
+    ],
+    "name": "emitTrigger",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

tests/integration-tests/base/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "base-subgraph",
+  "version": "0.1.0",
+  "scripts": {
+    "build-contracts": "../../common/build-contracts.sh",
+    "codegen": "graph codegen --skip-migrations",
+    "test": "yarn build-contracts && truffle test --compile-none --network test",
+    "create:test": "graph create test/base-subgraph --node $GRAPH_NODE_ADMIN_URI",
+    "deploy:test": "graph deploy test/base-subgraph --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
+  },
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.69.0",
+    "@graphprotocol/graph-ts": "0.34.0",
+    "solc": "^0.8.2"
+  },
+  "dependencies": {
+    "@truffle/contract": "^4.3",
+    "@truffle/hdwallet-provider": "^1.2",
+    "apollo-fetch": "^0.7.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-register": "^6.26.0",
+    "gluegun": "^4.6.1",
+    "truffle": "^5.2"
+  }
+}

tests/integration-tests/base/schema.graphql

@@ -0,0 +1,5 @@
+type BaseData @entity(immutable: true) {
+  id: ID!
+  data: String!
+  blockNumber: BigInt!
+} 

tests/integration-tests/base/src/mapping.ts

@@ -0,0 +1,9 @@
+import { ethereum } from '@graphprotocol/graph-ts'
+import { BaseData } from '../generated/schema'
+
+export function handleBlock(block: ethereum.Block): void {
+  let entity = new BaseData(block.number.toString())
+  entity.data = 'from base'
+  entity.blockNumber = block.number
+  entity.save()
+} 

tests/integration-tests/base/subgraph.yaml

@@ -0,0 +1,25 @@
+specVersion: 0.0.5
+description: Base Subgraph
+repository: https://github.com/graphprotocol/graph-node
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: SimpleContract
+    network: test
+    source:
+      address: "0x5FbDB2315678afecb367f032d93F642f64180aa3"
+      abi: SimpleContract
+      startBlock: 0
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      entities:
+        - BaseData
+      abis:
+        - name: SimpleContract
+          file: ./abis/Contract.abi
+      blockHandlers:
+        - handler: handleBlock
+      file: ./src/mapping.ts 

tests/integration-tests/grafted/abis/Contract.abi

@@ -0,0 +1,33 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "x",
+        "type": "uint16"
+      }
+    ],
+    "name": "Trigger",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint16",
+        "name": "x",
+        "type": "uint16"
+      }
+    ],
+    "name": "emitTrigger",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

tests/integration-tests/grafted/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "grafted-subgraph",
+  "version": "0.1.0",
+  "scripts": {
+    "build-contracts": "../../common/build-contracts.sh",
+    "codegen": "graph codegen --skip-migrations",
+    "test": "yarn build-contracts && truffle test --compile-none --network test",
+    "create:test": "graph create test/grafted-subgraph --node $GRAPH_NODE_ADMIN_URI",
+    "deploy:test": "graph deploy test/grafted-subgraph --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
+  },
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.69.0",
+    "@graphprotocol/graph-ts": "0.34.0",
+    "solc": "^0.8.2"
+  },
+  "dependencies": {
+    "@truffle/contract": "^4.3",
+    "@truffle/hdwallet-provider": "^1.2",
+    "apollo-fetch": "^0.7.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-register": "^6.26.0",
+    "gluegun": "^4.6.1",
+    "truffle": "^5.2"
+  }
+}

tests/integration-tests/grafted/schema.graphql

@@ -0,0 +1,5 @@
+type GraftedData @entity(immutable: true) {
+  id: ID!
+  data: String!
+  blockNumber: BigInt!
+} 

tests/integration-tests/grafted/src/mapping.ts

@@ -0,0 +1,9 @@
+import { ethereum } from '@graphprotocol/graph-ts'
+import { GraftedData } from '../generated/schema'
+
+export function handleBlock(block: ethereum.Block): void {
+  let entity = new GraftedData(block.number.toString())
+  entity.data = 'to grafted'
+  entity.blockNumber = block.number
+  entity.save()
+} 

tests/integration-tests/grafted/subgraph.yaml

@@ -0,0 +1,30 @@
+specVersion: 0.0.6
+description: Grafted Subgraph
+repository: https://github.com/graphprotocol/graph-node
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: SimpleContract
+    network: test
+    source:
+      address: "0x5FbDB2315678afecb367f032d93F642f64180aa3"
+      abi: SimpleContract
+      startBlock: 0
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      entities:
+        - GraftedData
+      abis:
+        - name: SimpleContract
+          file: ./abis/Contract.abi
+      blockHandlers:
+        - handler: handleBlock
+      file: ./src/mapping.ts
+features:
+  - grafting
+graft:
+  base: QmQpiC9bJGFssQfeZippfQ7rcTv7QA67X7jUejc8nV125F
+  block: 2

tests/src/contract.rs

@@ -7,7 +7,7 @@ use graph::prelude::{
         api::{Eth, Namespace},
         contract::{tokens::Tokenize, Contract as Web3Contract, Options},
         transports::Http,
-        types::{Address, Bytes, TransactionReceipt},
+        types::{Address, Block, BlockId, BlockNumber, Bytes, TransactionReceipt, H256},
     },
 };
 // web3 version 0.18 does not expose this; once the graph crate updates to
@@ -165,4 +165,13 @@ impl Contract {
         }
         Ok(contracts)
     }
+
+    pub async fn latest_block() -> Option<Block<H256>> {
+        let eth = Self::eth();
+        let block = eth
+            .block(BlockId::Number(BlockNumber::Latest))
+            .await
+            .unwrap_or_default();
+        block
+    }
 }

tests/src/subgraph.rs

@@ -164,7 +164,7 @@ impl Subgraph {
     }
 
     /// Make a GraphQL query to the index node API
-    pub async fn index_with_vars(&self, text: &str, vars: Value) -> anyhow::Result<Value> {
+    pub async fn query_with_vars(text: &str, vars: Value) -> anyhow::Result<Value> {
         let endpoint = CONFIG.graph_node.index_node_uri();
         graphql_query_with_vars(&endpoint, text, vars).await
     }