Specify bindings struct name

This is necessary because we have multiple contracts in the same bindings package.
shutter-network · Apr 7, 2024 · 1bb7f0d · 1bb7f0d
1 parent 91e289e
commit 1bb7f0d
Show file tree

Hide file tree

Showing 7 changed files with 1,255 additions and 1,256 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,6 @@ SHELL := /usr/bin/env bash
 lower = $(shell echo '$1' | tr '[:upper:]' '[:lower:]')
 
 CONTRACTS := $(basename $(notdir $(wildcard ./src/*.sol)))
-BINDINGS := $(foreach contract,$(CONTRACTS),$(call lower,$(contract)))
 
 all: forge gen
 .PHONY: all forge gen
@@ -14,7 +13,7 @@ forge:
 gen:
 	go run gen/gen.go -config genconfig.toml -base-path ./
 
-$(BINDINGS:%=bindings/%.go): forge
-	abigen --abi <(jq '.["abi"]' "out/$(basename $(notdir $@)).sol/$(basename $(notdir $@)).json") --pkg bindings --out $@
+$(CONTRACTS:%=bindings/%.go): forge
+	abigen --abi <(jq '.["abi"]' "out/$(basename $(notdir $@)).sol/$(basename $(notdir $@)).json") --pkg bindings --type $(basename $(notdir $@)) --out $@
 
-bindings: $(BINDINGS:%=bindings/%.go)
+bindings: $(CONTRACTS:%=bindings/%.go)
diff --git a/bindings/eonkeypublish.go b/bindings/eonkeypublish.go
diff --git a/bindings/inbox.go b/bindings/inbox.go
diff --git a/bindings/keybroadcastcontract.go b/bindings/keybroadcastcontract.go
diff --git a/bindings/keyperset.go b/bindings/keyperset.go
diff --git a/bindings/keypersetmanager.go b/bindings/keypersetmanager.go
diff --git a/bindings/restrictedpausable.go b/bindings/restrictedpausable.go