Merge branch 'feature/multiple-contracts-code-gen' into develop

codegen/sinkchoice.go

@@ -0,0 +1,12 @@
+package codegen
+
+//go:generate go-enum -f=$GOFILE --marshal --names --nocase
+
+// ENUM(
+//
+//		No
+//		Db
+//	 Graph
+//
+// )
+type SinkChoice int

codegen/templates/ethereum/Cargo.toml.gotmpl

@@ -16,7 +16,11 @@ prost = "0.11"
 prost-types = "0.11"
 substreams = "0.5"
 substreams-ethereum = "0.9"
+{{- if eq .sinkChoice 1 }}
 substreams-database-change = "1"
+{{- else if eq .sinkChoice 2 }}
+substreams-entity-change = "1"
+{{- end }}
 
 # Required so that ethabi > ethereum-types build correctly under wasm32-unknown-unknown
 [target.wasm32-unknown-unknown.dependencies]

codegen/templates/ethereum/Makefile

@@ -1,4 +1,3 @@
-ENDPOINT ?= mainnet.eth.streamingfast.io:443
 CARGO_VERSION := $(shell cargo version 2>/dev/null)
 
 .PHONY: build
@@ -12,11 +11,11 @@ endif
 
 .PHONY: run
 run: build
-	substreams run -e $(ENDPOINT) substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
+	substreams run substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
 
 .PHONY: gui
 gui: build
-	substreams gui -e $(ENDPOINT) substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
+	substreams gui substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
 
 .PHONY: protogen
 protogen:

codegen/templates/ethereum/Makefile.gotmpl

@@ -1,4 +1,3 @@
-ENDPOINT ?= mainnet.eth.streamingfast.io:443
 CARGO_VERSION := $(shell cargo version 2>/dev/null)
 
 .PHONY: build
@@ -12,11 +11,11 @@ endif
 
 .PHONY: run
 run: build
-	substreams run -e $(ENDPOINT) substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
+	substreams run substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
 
 .PHONY: gui
 gui: build
-	substreams gui -e $(ENDPOINT) substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
+	substreams gui substreams.yaml map_events $(if $(START_BLOCK),-s $(START_BLOCK)) $(if $(STOP_BLOCK),-t $(STOP_BLOCK))
 
 .PHONY: protogen
 protogen:

codegen/templates/ethereum/build.rs

@@ -6,20 +6,32 @@ use std::fs::File;
 use std::io::Write;
 
 fn main() -> Result<(), anyhow::Error> {
-    let contents = fs::read_to_string("abi/contract.abi.json")
-        .expect("Should have been able to read the file");
+    let file_names = [
+        "abi/contract.abi.json",
+    ];
+    let file_output_names = [
+        "src/abi/contract.rs",
+    ];
 
-    // sanitize fields and attributes starting with an underscore
-    let regex = Regex::new(r#"("\w+"\s?:\s?")_(\w+")"#).unwrap();
-    let sanitized_abi_file = regex.replace_all(contents.as_str(), "${1}u_${2}");
+    let mut i = 0;
+    for f in file_names {
+        let contents = fs::read_to_string(f)
+            .expect("Should have been able to read the file");
 
-    // do not modify the original abi
-    let mut file = File::create("/tmp/contract.abi.json")?;
-    file.write_all(sanitized_abi_file.as_bytes())?;
+        // sanitize fields and attributes starting with an underscore
+        let regex = Regex::new(r#"("\w+"\s?:\s?")_(\w+")"#).unwrap();
+        let sanitized_abi_file = regex.replace_all(contents.as_str(), "${1}u_${2}");
 
-    Abigen::new("Contract", "/tmp/contract.abi.json")?
-        .generate()?
-        .write_to_file("src/abi/contract.rs")?;
+        // do not modify the original abi
+        let mut file = File::create("/tmp/contract.abi.json")?;
+        file.write_all(sanitized_abi_file.as_bytes())?;
+
+        Abigen::new("Contract", "/tmp/contract.abi.json")?
+            .generate()?
+            .write_to_file(file_output_names[i])?;
+
+        i = i+1;
+    }
 
     Ok(())
 }

codegen/templates/ethereum/build.rs.gotmpl

@@ -0,0 +1,42 @@
+use anyhow::{Ok, Result};
+use regex::Regex;
+use substreams_ethereum::Abigen;
+use std::fs;
+use std::fs::File;
+use std::io::Write;
+
+fn main() -> Result<(), anyhow::Error> {
+    {{- $numberOfContracts := len .ethereumContracts }}
+    let file_names = [
+        {{- range $i, $contract := .ethereumContracts }}
+        "abi/{{ $contract.GetName }}{{ if eq $numberOfContracts 1 }}{{ else }}_{{ end }}contract.abi.json",
+        {{- end }}
+    ];
+    let file_output_names = [
+        {{- range $i, $contract := .ethereumContracts }}
+        "src/abi/{{ $contract.GetName }}{{ if eq $numberOfContracts 1 }}{{ else }}_{{ end }}contract.rs",
+        {{- end }}
+    ];
+
+    let mut i = 0;
+    for f in file_names {
+        let contents = fs::read_to_string(f)
+            .expect("Should have been able to read the file");
+
+        // sanitize fields and attributes starting with an underscore
+        let regex = Regex::new(r#"("\w+"\s?:\s?")_(\w+")"#).unwrap();
+        let sanitized_abi_file = regex.replace_all(contents.as_str(), "${1}u_${2}");
+
+        // do not modify the original abi
+        let mut file = File::create("/tmp/contract.abi.json")?;
+        file.write_all(sanitized_abi_file.as_bytes())?;
+
+        Abigen::new("Contract", "/tmp/contract.abi.json")?
+            .generate()?
+            .write_to_file(file_output_names[i])?;
+
+        i = i+1;
+    }
+
+    Ok(())
+}

codegen/templates/ethereum/generate.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/streamingfast/substreams/codegen"
+
 	"github.com/streamingfast/cli"
 	"github.com/streamingfast/eth-go"
 	"github.com/streamingfast/substreams/codegen/templates"
@@ -20,7 +22,23 @@ func main() {
 
 	chain := templates.EthereumChainsByID["Mainnet"]
 
-	project, err := templates.NewEthereumProject("substreams-init-test", "substreams_init_test", chain, eth.MustNewAddress("0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d"), abi, string(abiContent), 123)
+	ethereumContracts := []*templates.EthereumContract{templates.NewEthereumContract(
+		"substreams-init-tests",
+		eth.MustNewAddress("0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d"),
+		nil,
+		abi,
+		string(abiContent),
+	)}
+
+	project, err := templates.NewEthereumProject(
+		"substreams-init-test",
+		"substreams_init_test",
+		chain,
+		ethereumContracts,
+		123,
+		codegen.SinkChoiceDb,
+	)
+
 	cli.NoError(err, "Unable to create Ethereum project")
 
 	files, err := project.Render()

codegen/templates/ethereum/proto/contract.proto.gotmpl

@@ -3,17 +3,22 @@ syntax = "proto3";
 import "google/protobuf/timestamp.proto";
 
 package contract.v1;
-
+{{ $numberOfContracts := len .ethereumContracts }}
+{{- $eventsCounter := 0 }}
 message Events {
-    {{- range $index, $event := $.events }}
+    {{- range $i, $contract := .ethereumContracts }}
+    {{- range $index, $event := $contract.GetEvents }}
     {{- $proto := $event.Proto }}
-    repeated {{$proto.MessageName}} {{$proto.OutputModuleFieldName}} = {{ add $index 1 }};
+    {{- $eventsCounter = add $eventsCounter 1 }}
+    repeated {{ if ne $numberOfContracts 1 }}{{ $contract.GetName }}_{{ end }}{{$proto.MessageName}} {{ if ne $numberOfContracts 1 }}{{ $contract.GetName }}_{{ end }}{{$proto.OutputModuleFieldName}} = {{ $eventsCounter }};
+    {{- end}}
     {{- end}}
 }
 
-{{- range $event := $.events }}
+{{- range $i, $contract := .ethereumContracts}}
+{{- range $event := $contract.GetEvents }}
 {{ $proto := $event.Proto }}
-message {{$proto.MessageName}} {
+message {{ if ne $numberOfContracts 1 }}{{ $contract.GetName }}_{{ end }}{{ $proto.MessageName }} {
     string evt_tx_hash = 1;
     uint32 evt_index = 2;
     google.protobuf.Timestamp evt_block_time = 3;
@@ -23,3 +28,4 @@ message {{$proto.MessageName}} {
     {{- end}}
 }
 {{- end}}
+{{- end}}

codegen/templates/ethereum/results/dbsink/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "substreams-init-test"
+version = "0.0.1"
+edition = "2021"
+
+[lib]
+name = "substreams"
+crate-type = ["cdylib"]
+
+[dependencies]
+ethabi = "17"
+hex-literal = "0.3.4"
+num-bigint = "0.4"
+num-traits = "0.2.15"
+prost = "0.11"
+prost-types = "0.11"
+substreams = "0.5"
+substreams-ethereum = "0.9"
+substreams-database-change = "1"
+
+# Required so that ethabi > ethereum-types build correctly under wasm32-unknown-unknown
+[target.wasm32-unknown-unknown.dependencies]
+getrandom = { version = "0.2", features = ["custom"] }
+
+[build-dependencies]
+anyhow = "1"
+substreams-ethereum = "0.9"
+regex = "1.8"
+
+[profile.release]
+lto = true
+opt-level = 's'
+strip = "debuginfo"