Use the newer version of builder which extracts non-essential tools

CoreumFoundation · Jan 24, 2025 · 569c88f · 569c88f
1 parent 2381b02
commit 569c88f
Show file tree

Hide file tree

Showing 11 changed files with 620 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,10 @@ znet-start:
 znet-remove:
 	$(BUILDER) znet remove
 
+.PHONY: setup
+setup:
+	$(BUILDER) setup
+
 .PHONY: lint
 lint:
 	$(BUILDER) lint

diff --git a/README.md b/README.md
@@ -8,6 +8,14 @@ The specification is described [here](spec/spec.md).
 
 ## Relayer
 
+## Prerequisites
+
+You may need to install required binaries and docker images.
+
+```bash 
+make setup
+```
+
 ### Build relayer binary
 
 ```bash 

diff --git a/build/bridge/generate.go b/build/bridge/generate.go
@@ -3,8 +3,8 @@ package bridge
 import (
 	"context"
 
+	"github.com/CoreumFoundation/coreumbridge-xrpl/build/tools"
 	"github.com/CoreumFoundation/crust/build/golang"
-	"github.com/CoreumFoundation/crust/build/tools"
 	"github.com/CoreumFoundation/crust/build/types"
 )
 

diff --git a/build/go.mod b/build/go.mod
@@ -1,6 +1,6 @@
 module github.com/CoreumFoundation/coreumbridge-xrpl/build
 
-go 1.21
+go 1.23.3
 
 // Crust replacements
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
@@ -32,7 +32,7 @@ replace (
 
 require (
 	github.com/CoreumFoundation/coreum/build v0.0.0-20240617083016-5a1fbce5d2bc
-	github.com/CoreumFoundation/crust v0.0.0-20240618072929-2f1dbe86e20b
+	github.com/CoreumFoundation/crust v0.0.0-20250122103008-8aa8b7b7214e
 	github.com/pkg/errors v0.9.1
 )
 

diff --git a/build/index.go b/build/index.go
@@ -6,6 +6,7 @@ import (
 	"github.com/CoreumFoundation/coreumbridge-xrpl/build/bridge"
 	"github.com/CoreumFoundation/crust/build/crust"
 	"github.com/CoreumFoundation/crust/build/golang"
+	"github.com/CoreumFoundation/crust/build/tools"
 	"github.com/CoreumFoundation/crust/build/types"
 )
 
@@ -24,6 +25,7 @@ var Commands = map[string]types.Command{
 	"build/contract":    {Fn: bridge.BuildSmartContract, Description: "Builds smart contract"},
 	"fuzz-test":         {Fn: bridge.RunFuzzTests, Description: "Runs fuzz tests"},
 	"generate":          {Fn: bridge.Generate, Description: "Generates artifacts"},
+	"setup":             {Fn: tools.InstallAll, Description: "Installs all the required tools"},
 	"images":            {Fn: bridge.BuildRelayerDockerImage, Description: "Builds relayer docker image"},
 	"integration-tests": {Fn: bridge.RunAllIntegrationTests, Description: "Runs integration tests"},
 	"integration-tests/xrpl": {Fn: bridge.RunIntegrationTests(bridge.TestXRPL),

diff --git a/build/tools/tools.go b/build/tools/tools.go
@@ -8,7 +8,10 @@ import (
 )
 
 // CoreumBridgeXRPLWASMV110 is the previous version of bridge smart contract.
-const CoreumBridgeXRPLWASMV110 tools.Name = "coreumbridge-xrpl-wasm-v1.1.0"
+const (
+	CoreumBridgeXRPLWASMV110 tools.Name = "coreumbridge-xrpl-wasm-v1.1.0"
+	Mockgen                  tools.Name = "mockgen"
+)
 
 // Tools is a list of tools required by the bridge builder.
 var Tools = []tools.Tool{
@@ -27,9 +30,21 @@ var Tools = []tools.Tool{
 			},
 		},
 	},
+
+	// https://github.com/uber-go/mock/releases
+	tools.GoPackageTool{
+		Name:    Mockgen,
+		Version: "v0.4.0",
+		Package: "go.uber.org/mock/mockgen",
+	},
 }
 
 // EnsureBridgeXRPLWASM ensures bridge smart contract is available.
 func EnsureBridgeXRPLWASM(ctx context.Context, _ types.DepsFunc) error {
 	return tools.Ensure(ctx, CoreumBridgeXRPLWASMV110, tools.TargetPlatformLocal)
 }
+
+// EnsureMockgen ensures that mockgen is available.
+func EnsureMockgen(ctx context.Context, deps types.DepsFunc) error {
+	return tools.Ensure(ctx, Mockgen, tools.TargetPlatformLocal)
+}
diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.21
+go 1.23.3
 
 use (
 	./build

diff --git a/go.work.sum b/go.work.sum
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/CoreumFoundation/coreumbridge-xrpl/integration-tests
 
-go 1.21
+go 1.23.3
 
 // same replacements as in coreum
 replace (

diff --git a/relayer/Dockerfile b/relayer/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21.2-alpine3.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.23.3-alpine3.20 as builder
 
 RUN apk add --no-cache make git
 
@@ -19,7 +19,7 @@ ARG GOARCH=amd64
 
 RUN make build-relayer GOOS=${GOOS} GOARCH=${GOARCH}
 
-FROM --platform=$TARGETPLATFORM  alpine:3.18
+FROM --platform=$TARGETPLATFORM  alpine:3.20
 
 COPY --from=builder /code/build/coreumbridge-xrpl-relayer /bin/coreumbridge-xrpl-relayer
 

diff --git a/relayer/go.mod b/relayer/go.mod
@@ -1,6 +1,6 @@
 module github.com/CoreumFoundation/coreumbridge-xrpl/relayer
 
-go 1.21
+go 1.23.3
 
 // same replacements as in coreum
 replace (
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    go 1.21
+    go 1.23.3
     use (
     	./build
@@ Expand Down @@