all: fix build after upstream merge

calbera · calbera · commit 95e5259662cf · 2025-11-06T16:10:43.000-03:00
diff --git a/build/ci.go b/build/ci.go
@@ -707,7 +707,7 @@ func doKeeperArchive(cmdline []string) {
 
 	var (
 		env    = build.Env()
-		vsn    = version.Archive(env.Commit)
+		vsn    = version.Archive(env.Tag, env.Commit)
 		keeper = "keeper-" + vsn + ".tar.gz"
 	)
 	maybeSkipArchive(env)
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
@@ -236,7 +236,7 @@ func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {
 		s.txtypes.set(SetCodeTxType)
 	}
 	if fork >= forks.Prague1 {
-		s.txtypes[PoLTxType] = struct{}{}
+		s.txtypes.set(PoLTxType)
 	}
 	return s
 }

Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ func doKeeperArchive(cmdline []string) {`
`707`	`707`
`708`	`708`	`var (`
`709`	`709`	`env = build.Env()`
`710`		`- vsn = version.Archive(env.Commit)`
	`710`	`+ vsn = version.Archive(env.Tag, env.Commit)`
`711`	`711`	`keeper = "keeper-" + vsn + ".tar.gz"`
`712`	`712`	`)`
`713`	`713`	`maybeSkipArchive(env)`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {`
`236`	`236`	`s.txtypes.set(SetCodeTxType)`
`237`	`237`	`}`
`238`	`238`	`if fork >= forks.Prague1 {`
`239`		`- s.txtypes[PoLTxType] = struct{}{}`
	`239`	`+ s.txtypes.set(PoLTxType)`
`240`	`240`	`}`
`241`	`241`	`return s`
`242`	`242`	`}`