Merge remote-tracking branch 'origin/release/0.4.x' into sync_release

fletcher.fan · fletcher.fan · commit 53c4ecf8e227 · 2025-09-30T13:03:38.000+08:00
diff --git a/Dockerfile.l2-node b/Dockerfile.l2-node
@@ -0,0 +1,24 @@
+# Build Stage
+FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.22-ubuntu as builder
+
+# Set working directory and copy necessary files
+COPY . /morph
+WORKDIR /morph/node
+
+# Run build command
+RUN make build
+
+# Final Stage
+FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.22-ubuntu
+
+# Update and install dependencies, then clean up unnecessary files
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy the built binaries from the builder image to the final image
+COPY --from=builder /morph/node/build/bin/tendermint /usr/local/bin/
+COPY --from=builder /morph/node/build/bin/morphnode /usr/local/bin/
+
+# Set the default command
+CMD ["morphnode", "--home", "/data"]
diff --git a/contracts/tasks/mainnet_upgrade.ts b/contracts/tasks/mainnet_upgrade.ts
@@ -110,4 +110,4 @@ task("deploy-st-token")
         )
         await proxy.deployed()
         console.log(`proxy deployed at ${proxy.address}`)
-    })
+    })
diff --git a/go-ethereum b/go-ethereum
@@ -1 +1 @@
-Subproject commit 151913b181b1dba79226e67fd1ccb595d8c60d92
+Subproject commit 4a620872e7f618b97d0fd8481e0cfb3c2ebeacbf
diff --git a/ops/tools/multisend/main.go b/ops/tools/multisend/main.go
@@ -22,7 +22,7 @@ var (
 	chainId     *big.Int
 	fundPrivKey = crypto.ToECDSAUnsafe(hexutil.MustDecode("0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"))
 	urls        = []string{"http://localhost:8945", "http://localhost:8545", "http://localhost:8645", "http://localhost:8745", "http://localhost:8845"}
-	senderNum   = 50
+	senderNum   = 10
 	duration    = 120 * time.Minute
 )
 
@@ -67,7 +67,7 @@ func main() {
 			}(sender, i)
 		}
 		count++
-		time.Sleep(300 * time.Millisecond)
+		time.Sleep(800 * time.Millisecond)
 		fmt.Println()
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -110,4 +110,4 @@ task("deploy-st-token")`
`110`	`110`	`)`
`111`	`111`	`await proxy.deployed()`
`112`	`112`	console.log(`proxy deployed at ${proxy.address}`)
`113`		`- })`
	`113`	`+ })`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ var (`
`22`	`22`	`chainId *big.Int`
`23`	`23`	`fundPrivKey = crypto.ToECDSAUnsafe(hexutil.MustDecode("0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"))`
`24`	`24`	urls = []string{"http://localhost:8945", "http://localhost:8545", "http://localhost:8645", "http://localhost:8745", "http://localhost:8845"}
`25`		`- senderNum = 50`
	`25`	`+ senderNum = 10`
`26`	`26`	`duration = 120 * time.Minute`
`27`	`27`	`)`
`28`	`28`
`@@ -67,7 +67,7 @@ func main() {`
`67`	`67`	`}(sender, i)`
`68`	`68`	`}`
`69`	`69`	`count++`
`70`		`- time.Sleep(300 * time.Millisecond)`
	`70`	`+ time.Sleep(800 * time.Millisecond)`
`71`	`71`	`fmt.Println()`
`72`	`72`	`}`
`73`	`73`	`}`