Merge branch 'main' into feat/499/member-nodes

primev · Dec 9, 2024 · 7fd9e7e · 7fd9e7e
2 parents 70ccfff + 00585cf
commit 7fd9e7e
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 21 deletions.
diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        module: [ bridge/standard, external/geth, oracle, p2p ]
+        module: [ bridge/standard, external/geth, oracle, p2p, tools/bidder-cli ]
 
     steps:
       - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}

diff --git a/bridge/standard/cmd/user_cli/main.go b/bridge/standard/cmd/user_cli/main.go
@@ -46,32 +46,28 @@ var (
 		Required: true,
 	}
 	optionL1RPCUrl = &cli.StringFlag{
-		Name:     "l1-rpc-url",
-		Usage:    "URL for L1 RPC",
-		EnvVars:  []string{"L1_RPC_URL"},
-		Required: true,
-		Value:    "https://ethereum-holesky-rpc.publicnode.com",
+		Name:    "l1-rpc-url",
+		Usage:   "URL for L1 RPC",
+		EnvVars: []string{"L1_RPC_URL"},
+		Value:   "https://ethereum-holesky-rpc.publicnode.com",
 	}
 	optionSettlementRPCUrl = &cli.StringFlag{
-		Name:     "settlement-rpc-url",
-		Usage:    "URL for settlement RPC",
-		EnvVars:  []string{"SETTLEMENT_RPC_URL"},
-		Required: true,
-		Value:    "https://chainrpc.testnet.mev-commit.xyz",
+		Name:    "settlement-rpc-url",
+		Usage:   "URL for settlement RPC",
+		EnvVars: []string{"SETTLEMENT_RPC_URL"},
+		Value:   "https://chainrpc.testnet.mev-commit.xyz",
 	}
 	optionL1ContractAddr = &cli.StringFlag{
-		Name:     "l1-contract-addr",
-		Usage:    "address of the L1 gateway contract",
-		EnvVars:  []string{"L1_CONTRACT_ADDR"},
-		Required: true,
-		Value:    config.HoleskyContracts.L1Gateway,
+		Name:    "l1-contract-addr",
+		Usage:   "address of the L1 gateway contract",
+		EnvVars: []string{"L1_CONTRACT_ADDR"},
+		Value:   config.HoleskyContracts.L1Gateway,
 	}
 	optionSettlementContractAddr = &cli.StringFlag{
-		Name:     "settlement-contract-addr",
-		Usage:    "address of the settlement gateway contract",
-		EnvVars:  []string{"SETTLEMENT_CONTRACT_ADDR"},
-		Required: true,
-		Value:    config.TestnetContracts.SettlementGateway,
+		Name:    "settlement-contract-addr",
+		Usage:   "address of the settlement gateway contract",
+		EnvVars: []string{"SETTLEMENT_CONTRACT_ADDR"},
+		Value:   config.TestnetContracts.SettlementGateway,
 	}
 	optionSilent = &cli.BoolFlag{
 		Name:    "silent",

diff --git a/tools/bidder-cli/.goreleaser.yml b/tools/bidder-cli/.goreleaser.yml
@@ -0,0 +1,64 @@
+version: 1
+
+project_name: bidder-cli
+dist: /tmp/dist/bidder-cli
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - arm64
+    dir: ./tools/bidder-cli
+    binary: "{{ .ProjectName }}"
+    flags:
+      - -v
+      - -trimpath
+
+archives:
+  - format: tar.gz
+    name_template: >-
+      {{- .Binary }}_
+      {{- with index .Env "RELEASE_VERSION" -}}
+        {{ . }}
+      {{- else -}}
+        {{- if .IsSnapshot }}{{ .ShortCommit }}
+        {{- else }}{{ .Version }}
+        {{- end }}
+      {{- end -}}
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}
+      {{- end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    format_overrides:
+      - goos: windows
+        format: zip
+
+checksum:
+  name_template: >-
+    {{ .ProjectName }}_
+    {{- with index .Env "RELEASE_VERSION" -}}
+      {{ . }}
+    {{- else -}}
+      {{- if .IsSnapshot }}{{ .ShortCommit }}
+      {{- else }}{{ .Version }}
+      {{- end }}
+    {{- end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
+    _checksums.txt
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"