Skip to content

Commit 5aaa22d

Browse files
KukoomomoKukoomomo
authored
Merge branch 'main' into feature/audit_fix
2 parents 82379a9 + 18b49b2 commit 5aaa22d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+13439
-349
lines changed

‎contracts/src/deploy-config/holesky.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const config = {
1414
l2BaseFee: 0.1, // Gwei
1515

1616
// verify contract config
17-
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
17+
programVkey: '0x0044eed79d39a90e842c5f5e599d019cbe63c1719300f1366f9dc4d3729f7810',
1818
// rollup contract config
1919
// initialize config
2020
finalizationPeriodSeconds: 600,

‎contracts/src/deploy-config/hoodi.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const config = {
1717
l2BaseFee: 0.1, // Gwei
1818

1919
// verify contract config
20-
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
20+
programVkey: '0x0044eed79d39a90e842c5f5e599d019cbe63c1719300f1366f9dc4d3729f7810',
2121
// rollup contract config
2222
// initialize config
2323
finalizationPeriodSeconds: 600,

‎contracts/src/deploy-config/l1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const config = {
1717
l2BaseFee: 0.1, // Gwei
1818

1919
// verify contract config
20-
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
20+
programVkey: '0x0044eed79d39a90e842c5f5e599d019cbe63c1719300f1366f9dc4d3729f7810',
2121
// rollup contract config
2222
// initialize config
2323
finalizationPeriodSeconds: 10,

‎contracts/src/deploy-config/qanetl1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const config = {
1414
l2BaseFee: 0.1, // Gwei
1515

1616
// verify contract config
17-
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
17+
programVkey: '0x0044eed79d39a90e842c5f5e599d019cbe63c1719300f1366f9dc4d3729f7810',
1818
// rollup contract config
1919
// initialize config
2020
finalizationPeriodSeconds: 600,

‎contracts/src/deploy-config/sepolia.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const config = {
1818
/**
1919
* ---to---legacy property
2020
*/
21-
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
21+
programVkey: '0x0044eed79d39a90e842c5f5e599d019cbe63c1719300f1366f9dc4d3729f7810',
2222
rollupMinDeposit: 0.0001,
2323
rollupProofWindow: 86400,
2424
rollupGenesisBlockNumber: 0,

‎contracts/src/deploy-config/testnetl1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const config = {
1313
sequencerWindowSize: 200,
1414
channelTimeout: 120,
1515

16-
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
16+
programVkey: '0x0044eed79d39a90e842c5f5e599d019cbe63c1719300f1366f9dc4d3729f7810',
1717
rollupMinDeposit: 1,
1818
rollupProofWindow: 100,
1919
rollupGenesisBlockNumber: 0,

‎go-ethereum‎

Submodule go-ethereum updated 1118 files

‎node/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
GITCOMMIT := $(shell git rev-parse HEAD)
1+
GITCOMMIT := $(shell git rev-parse --short HEAD)
22
GITDATE := $(shell git show -s --format='%ct')
3+
VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
4+
BUILD_TIME := $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
35

46
LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
57
LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
8+
LDFLAGSSTRING +=-X main.Version=$(VERSION)
9+
LDFLAGSSTRING +=-X main.BuildTime=$(BUILD_TIME)
610
LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
711

812
morphnode:

‎node/cmd/node/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func main() {
4141
app.Action = L2NodeMain
4242
app.Commands = []cli.Command{
4343
keyConverterCmd,
44+
versionCmd,
4445
}
4546
err := app.Run(os.Args)
4647
if err != nil {

‎node/cmd/node/version.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package main
2+
3+
import (
4+
"fmt"
5+
"runtime"
6+
7+
"github.com/urfave/cli"
8+
)
9+
10+
// Version information, set via -ldflags
11+
var (
12+
Version = "dev"
13+
GitCommit = "unknown"
14+
BuildTime = "unknown"
15+
)
16+
17+
var versionCmd = cli.Command{
18+
Name: "version",
19+
Aliases: []string{"v"},
20+
Usage: "show version information",
21+
Action: func(ctx *cli.Context) error {
22+
fmt.Printf("morphnode %s\n", Version)
23+
fmt.Printf("Git Commit: %s\n", GitCommit)
24+
fmt.Printf("Build Time: %s\n", BuildTime)
25+
fmt.Printf("Go Version: %s\n", runtime.Version())
26+
fmt.Printf("OS/Arch: %s/%s\n", runtime.GOOS, runtime.GOARCH)
27+
return nil
28+
},
29+
}

0 commit comments

Comments
 (0)