Skip to content

Commit 75a57a6

Browse files
authored
Merge branch 'staging' into fix/txn-processing
2 parents 47b5ef7 + cdcf01d commit 75a57a6

File tree

4 files changed

+18
-37
lines changed

4 files changed

+18
-37
lines changed

.github/workflows/build-&-publish-docker-image.yml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -234,19 +234,6 @@ jobs:
234234
version: '1.7'
235235
force: 'false'
236236

237-
- name: "Create Tenderly virtual testnet"
238-
run: |
239-
echo "TENDERLY_CREATION_INFO=$(curl -X POST \
240-
-H "x-access-key: ${{ secrets.TENDERLY_SECRET }}" \
241-
-H "Content-Type: application/json" \
242-
-d '{"slug":"mainnet-dev-${{ env.RUNNER_NUMBER }}-${{ github.run_id }}","displayName":"mainnet-dev-${{ env.RUNNER_NUMBER }}-${{ github.run_id }}","description":"","visibility":"TEAM","tags":{"purpose":"development"},"networkConfig":{"networkId":"1","blockNumber":"18512782","chainConfig":{"chainId":"1"},"baseFeePerGas":"1"},"explorerConfig":{"enabled":false,"verificationVisibility":"bytecode"},"syncState":false}' \
243-
https://api.tenderly.co/api/v1/account/zus_network/project/project/testnet/container)" >> $GITHUB_ENV
244-
245-
- name: "Parse Tenderly virtual testnet creation transaction result"
246-
run: |
247-
echo "TENDERLY_VIRTUAL_TESTNET_ID=$(echo '${{ env.TENDERLY_CREATION_INFO }}' | jq -r '.container.id')" >> $GITHUB_ENV
248-
echo "TENDERLY_VIRTUAL_TESTNET_RPC_ID=$(echo '${{ env.TENDERLY_CREATION_INFO }}' | jq -r '.container.connectivityConfig.endpoints[0].id')" >> $GITHUB_ENV
249-
250237
- name: "Deploy 0Chain"
251238
uses: 0chain/actions/deploy-0chain@master
252239
with:
@@ -256,10 +243,10 @@ jobs:
256243
blobber_image: ${{ env.TAG }}-${{ env.SHORT_SHA }}
257244
validator_image: ${{ env.TAG }}-${{ env.SHORT_SHA }}
258245
SUBGRAPH_API_URL: ${{ secrets.SUBGRAPH_API_URL }}
259-
TENDERLY_VIRTUAL_TESTNET_RPC_ID: ${{ env.TENDERLY_VIRTUAL_TESTNET_RPC_ID }}
246+
TENDERLY_VIRTUAL_TESTNET_RPC_ID: ""
260247
graphnode_sc: ${{ secrets.GRAPHNODE_SC }}
261248
graphnode_network: ${{ secrets.GRAPHNODE_NETWORK }}
262-
graphnode_ethereum_node_url: https://virtual.mainnet.rpc.tenderly.co/${{ env.TENDERLY_VIRTUAL_TESTNET_RPC_ID }}
249+
graphnode_ethereum_node_url: ""
263250
svc_account_secret: ${{ secrets.SVC_ACCOUNT_SECRET }}
264251

265252
- name: "Run System tests"
@@ -273,19 +260,11 @@ jobs:
273260
run_flaky_tests: false
274261
retry_failures: true
275262
run_smoke_tests: ${{ github.ref != 'refs/heads/staging' && github.base_ref != 'staging' && github.ref != 'refs/heads/master' && github.base_ref != 'master' }}
276-
TENDERLY_VIRTUAL_TESTNET_RPC_ID: ${{ env.TENDERLY_VIRTUAL_TESTNET_RPC_ID }}
263+
TENDERLY_VIRTUAL_TESTNET_RPC_ID: ""
277264
DEVOPS_CHANNEL_WEBHOOK_URL: ${{ secrets.DEVOPS_CHANNEL_WEBHOOK_URL }}
278265
S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
279266
S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
280267

281-
- name: "Remove Tenderly virtual testnet"
282-
if: always()
283-
run: |
284-
curl -X DELETE \
285-
-H "x-access-key: ${{ secrets.TENDERLY_SECRET }}" \
286-
-H "Content-Type: application/json" \
287-
https://api.tenderly.co/api/v1/account/zus_network/project/project/testnet/container/${{ env.TENDERLY_VIRTUAL_TESTNET_ID }}
288-
289268
- name: "Set PR status as ${{ job.status }}"
290269
if: ${{ (success() || failure()) && steps.findPr.outputs.number }}
291270
uses: 0chain/actions/set-pr-status@master

code/go/0chain.net/blobbercore/handler/handler_common.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,19 @@ func HomepageHandler(w http.ResponseWriter, r *http.Request) {
9494
node.Self.ID, node.Self.PublicKey, build.BuildTag,
9595
)
9696

97-
fmt.Fprintf(w, "<div>Miners ...\n")
98-
network, _ := client.GetNetwork(context.Background())
99-
for _, miner := range network.Miners {
100-
fmt.Fprintf(w, "%v\n", miner)
101-
}
102-
fmt.Fprintf(w, "</div>\n")
103-
fmt.Fprintf(w, "<div>Sharders ...\n")
104-
for _, sharder := range network.Sharders {
105-
fmt.Fprintf(w, "%v\n", sharder)
97+
network, err := client.GetNetwork(context.Background())
98+
if err == nil {
99+
fmt.Fprintf(w, "<div>Miners ...\n")
100+
for _, miner := range network.Miners {
101+
fmt.Fprintf(w, "%v\n", miner)
102+
}
103+
fmt.Fprintf(w, "</div>\n")
104+
fmt.Fprintf(w, "<div>Sharders ...\n")
105+
for _, sharder := range network.Sharders {
106+
fmt.Fprintf(w, "%v\n", sharder)
107+
}
108+
fmt.Fprintf(w, "</div>\n")
106109
}
107-
fmt.Fprintf(w, "</div>\n")
108110
fmt.Fprintf(w, "</br>")
109111
fmt.Fprintf(w, "<div>Running since %v (Total elapsed time: %v)</div>\n", StartTime.Format(common.DateTimeFormat), time.Since(StartTime))
110112
fmt.Fprintf(w, "</br>")

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.5
66

77
require (
88
github.com/0chain/errors v1.0.3
9-
github.com/0chain/gosdk v1.18.14-0.20241211191555-7ecfc2009500
9+
github.com/0chain/gosdk v1.18.14-0.20241213132439-44330cc9ecb8
1010
github.com/DATA-DOG/go-sqlmock v1.5.0
1111
github.com/didip/tollbooth/v6 v6.1.2
1212
github.com/go-openapi/runtime v0.26.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI=
4040
github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw=
4141
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
4242
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
43-
github.com/0chain/gosdk v1.18.14-0.20241211191555-7ecfc2009500 h1:SOaVdvAo8CCX6MpQ3jkahzd8hSW5dLWaFqKWPJG3V8M=
44-
github.com/0chain/gosdk v1.18.14-0.20241211191555-7ecfc2009500/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
43+
github.com/0chain/gosdk v1.18.14-0.20241213132439-44330cc9ecb8 h1:JvP2ZRYlUT/PQ7dkB4anvgPZXwGBW2sO2SypmKQ9Zu4=
44+
github.com/0chain/gosdk v1.18.14-0.20241213132439-44330cc9ecb8/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
4545
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4646
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4747
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=

0 commit comments

Comments
 (0)