feat(abigen): Revert to geth abigen due to foundry update (#232)

berachain · Feb 17, 2023 · 2d66028 · 2d66028
1 parent bb3fd8b
commit 2d66028
Show file tree

Hide file tree

Showing 20 changed files with 2,008 additions and 224 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ executors:
     docker:
       - image: cimg/go:1.19
         environment:
-          FOUNDRY_COMMIT: 3d5f03836dc5820ba95dadd736d0b17a3c7b4583
+          FOUNDRY_COMMIT: e2fa2b5f8940d283f54df1ec701967276a934e97
     resource_class: xlarge
   machine:
       machine:

diff --git a/build/mage/forge.go b/build/mage/forge.go
@@ -29,7 +29,7 @@ import (
 
 var (
 	// Commands.
-	forgeBuild = mi.RunCmdV("forge", "build")
+	forgeBuild = mi.RunCmdV("forge", "build", "--extra-output-files", "bin", "--extra-output-files", "abi")
 	forgeClean = mi.RunCmdV("forge", "clean")
 	forgeTest  = mi.RunCmdV("forge", "test")
 	forgeFmt   = mi.RunCmdV("forge", "fmt")

diff --git a/build/setup.go b/build/setup.go
@@ -41,9 +41,10 @@ var (
 	golines          = "github.com/segmentio/golines"
 	goimports        = "golang.org/x/tools/cmd/goimports"
 	rlpgen           = "github.com/ethereum/go-ethereum/rlp/rlpgen"
+	abigen           = "github.com/ethereum/go-ethereum/cmd/abigen"
 
 	allTools = []string{buf, gosec, golangcilint, addlicense,
-		goimportsReviser, moq, ginkgo, golines, goimports, rlpgen}
+		goimportsReviser, moq, ginkgo, golines, goimports, rlpgen, abigen}
 )
 
 // Setup runs the setup script for the current OS.

diff --git a/build/tools/tools.go b/build/tools/tools.go
@@ -32,6 +32,7 @@ package tools
 import (
 	_ "github.com/bufbuild/buf/cmd/buf"
 	_ "github.com/cosmos/gosec/v2/cmd/gosec"
+	_ "github.com/ethereum/go-ethereum/cmd/abigen"
 	_ "github.com/ethereum/go-ethereum/rlp/rlpgen"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "github.com/google/addlicense"

diff --git a/cmd/abigen/generator/generator.go b/cmd/abigen/generator/generator.go
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go
diff --git a/eth/core/precompile/container/factories_test.go b/eth/core/precompile/container/factories_test.go
@@ -34,7 +34,12 @@ import (
 	. "github.com/onsi/gomega"
 )
 
+var (
+	mockPrecompile, _ = solidity.MockPrecompileMetaData.GetAbi()
+)
+
 var _ = Describe("Container Factories", func() {
+
 	Context("Stateless Container Factory", func() {
 		var scf *container.StatelessFactory
 
@@ -138,7 +143,7 @@ type mockStateful struct {
 
 func (ms *mockStateful) ABIMethods() map[string]abi.Method {
 	return map[string]abi.Method{
-		"getOutput": solidity.MockPrecompileInterface.ABI.Methods["getOutput"],
+		"getOutput": mockPrecompile.Methods["getOutput"],
 	}
 }
 
@@ -158,8 +163,8 @@ type badMockStateful struct {
 
 func (bms *badMockStateful) ABIMethods() map[string]abi.Method {
 	return map[string]abi.Method{
-		"getOutput":        solidity.MockPrecompileInterface.ABI.Methods["getOutput"],
-		"getOutputPartial": solidity.MockPrecompileInterface.ABI.Methods["getOutputPartial"],
+		"getOutput":        mock.Methods["getOutput"],
+		"getOutputPartial": mock.Methods["getOutputPartial"],
 	}
 }
 

diff --git a/eth/core/precompile/container/stateful_test.go b/eth/core/precompile/container/stateful_test.go
@@ -128,11 +128,11 @@ var _ = Describe("Stateful Container", func() {
 // MOCKS BELOW.
 
 var (
-	mock                = solidity.MockPrecompileInterface
-	getOutputABI        = mock.ABI.Methods["getOutput"]
-	getOutputPartialABI = mock.ABI.Methods["getOutputPartial"]
-	contractFuncAddrABI = mock.ABI.Methods["contractFunc"]
-	contractFuncStrABI  = mock.ABI.Methods["contractFuncStr"]
+	mock, _             = solidity.MockPrecompileMetaData.GetAbi()
+	getOutputABI        = mock.Methods["getOutput"]
+	getOutputPartialABI = mock.Methods["getOutputPartial"]
+	contractFuncAddrABI = mock.Methods["contractFunc"]
+	contractFuncStrABI  = mock.Methods["contractFuncStr"]
 	mockIdsToMethods    = map[string]*container.Method{
 		utils.UnsafeBytesToStr(getOutputABI.ID): {
 			AbiSig:      getOutputABI.Sig,

diff --git a/eth/testutil/contracts/solidity/gen.go b/eth/testutil/contracts/solidity/gen.go
@@ -20,5 +20,5 @@
 
 package solidity
 
-//go:generate go run github.com/berachain/stargazer/cmd/abigen solidity ./out/SolmateERC20.sol/SolmateERC20.json ./generated/solmate_erc20.abigen.go SolmateERC20Contract
-//go:generate go run github.com/berachain/stargazer/cmd/abigen solidity ./out/MockPrecompileInterface.sol/MockPrecompileInterface.json ./generated/mock_precompile_interface.abigen.go MockPrecompileInterface
+//go:generate abigen --pkg generated --abi ./out/SolmateERC20.sol/SolmateERC20.abi.json --bin ./out/SolmateERC20.sol/SolmateERC20.bin --out ./generated/solmate_erc20.abigen.go --type SolmateERC20
+//go:generate abigen --pkg generated --abi ./out/MockPrecompileInterface.sol/MockPrecompileInterface.abi.json --out ./generated/mock_precompile_interface.abigen.go --type MockPrecompile