Merge branch 'master' into dev/aeddi/ci-go-version-file

gnolang · Dec 7, 2024 · a07c1ed · a07c1ed
2 parents e24aed4 + 53cee96
commit a07c1ed
Show file tree

Hide file tree

Showing 249 changed files with 1,689 additions and 2,509 deletions.
diff --git a/.github/golangci.yml b/.github/golangci.yml
@@ -51,6 +51,7 @@ linters-settings:
     excludes:
       - G204 # Subprocess launched with a potential tainted input or cmd arguments
       - G306 # Expect WriteFile permissions to be 0600 or less
+      - G115 # Integer overflow conversion, no solution to check the overflow in time of convert, so linter shouldn't check the overflow.
   stylecheck:
     checks: [ "all", "-ST1022", "-ST1003" ]
   errorlint:

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
@@ -33,8 +33,8 @@ jobs:
   # handle the parallel processing of the pull-requests
   define-prs-matrix:
     name: Define PRs matrix
-    # Prevent bot from retriggering itself
-    if: ${{ github.actor != vars.GH_BOT_LOGIN }}
+    # Prevent bot from retriggering itself and ignore event emitted by codecov
+    if: ${{ github.actor != vars.GH_BOT_LOGIN && github.actor != 'codecov[bot]' }}
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read

diff --git a/.github/workflows/lint_template.yml b/.github/workflows/lint_template.yml
@@ -25,4 +25,4 @@ jobs:
           working-directory: ${{ inputs.modulepath }}
           args:
             --config=${{ github.workspace }}/.github/golangci.yml
-          version: v1.59 # sync with misc/devdeps
+          version: v1.62 # sync with misc/devdeps
diff --git a/contribs/github-bot/internal/check/comment.go b/contribs/github-bot/internal/check/comment.go
@@ -28,7 +28,7 @@ var (
 	// Regex for capturing only the checkboxes.
 	checkboxes = regexp.MustCompile(`(?m:^- \[[ x]\])`)
 	// Regex used to capture markdown links.
-	markdownLink = regexp.MustCompile(`\[(.*)\]\(.*\)`)
+	markdownLink = regexp.MustCompile(`\[(.*)\]\([^)]*\)`)
 )
 
 // These structures contain the necessary information to generate

diff --git a/contribs/github-bot/internal/config/config.go b/contribs/github-bot/internal/config/config.go
@@ -27,12 +27,12 @@ type ManualCheck struct {
 func Config(gh *client.GitHub) ([]AutomaticCheck, []ManualCheck) {
 	auto := []AutomaticCheck{
 		{
-			Description: "Maintainers must be able to edit this pull request",
+			Description: "Maintainers must be able to edit this pull request ([more info](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork))",
 			If:          c.Always(),
 			Then:        r.MaintainerCanModify(),
 		},
 		{
-			Description: "The pull request head branch must be up-to-date with its base",
+			Description: "The pull request head branch must be up-to-date with its base ([more info](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch))",
 			If:          c.Always(),
 			Then:        r.UpToDateWith(gh, r.PR_BASE),
 		},

diff --git a/contribs/gnodev/cmd/gnodev/main.go b/contribs/gnodev/cmd/gnodev/main.go
@@ -61,18 +61,20 @@ type devCfg struct {
 	webRemoteHelperAddr string
 
 	// Node Configuration
-	minimal    bool
-	verbose    bool
-	noWatch    bool
-	noReplay   bool
-	maxGas     int64
-	chainId    string
-	serverMode bool
-	unsafeAPI  bool
+	minimal     bool
+	verbose     bool
+	noWatch     bool
+	noReplay    bool
+	maxGas      int64
+	chainId     string
+	chainDomain string
+	serverMode  bool
+	unsafeAPI   bool
 }
 
 var defaultDevOptions = &devCfg{
 	chainId:             "dev",
+	chainDomain:         "gno.land",
 	maxGas:              10_000_000_000,
 	webListenerAddr:     "127.0.0.1:8888",
 	nodeRPCListenerAddr: "127.0.0.1:26657",
@@ -203,6 +205,13 @@ func (c *devCfg) RegisterFlags(fs *flag.FlagSet) {
 		"set node ChainID",
 	)
 
+	fs.StringVar(
+		&c.chainDomain,
+		"chain-domain",
+		defaultDevOptions.chainDomain,
+		"set node ChainDomain",
+	)
+
 	fs.BoolVar(
 		&c.noWatch,
 		"no-watch",

diff --git a/contribs/gnodev/cmd/gnodev/setup_node.go b/contribs/gnodev/cmd/gnodev/setup_node.go
@@ -57,7 +57,7 @@ func setupDevNodeConfig(
 	balances gnoland.Balances,
 	pkgspath []gnodev.PackagePath,
 ) *gnodev.NodeConfig {
-	config := gnodev.DefaultNodeConfig(cfg.root)
+	config := gnodev.DefaultNodeConfig(cfg.root, cfg.chainDomain)
 
 	config.Logger = logger
 	config.Emitter = emitter

diff --git a/contribs/gnodev/pkg/dev/node.go b/contribs/gnodev/pkg/dev/node.go
@@ -43,9 +43,10 @@ type NodeConfig struct {
 	NoReplay              bool
 	MaxGasPerBlock        int64
 	ChainID               string
+	ChainDomain           string
 }
 
-func DefaultNodeConfig(rootdir string) *NodeConfig {
+func DefaultNodeConfig(rootdir, domain string) *NodeConfig {
 	tmc := gnoland.NewDefaultTMConfig(rootdir)
 	tmc.Consensus.SkipTimeoutCommit = false // avoid time drifting, see issue #1507
 	tmc.Consensus.WALDisabled = true
@@ -65,6 +66,7 @@ func DefaultNodeConfig(rootdir string) *NodeConfig {
 		DefaultDeployer:       defaultDeployer,
 		BalancesList:          balances,
 		ChainID:               tmc.ChainID(),
+		ChainDomain:           domain,
 		TMConfig:              tmc,
 		SkipFailingGenesisTxs: true,
 		MaxGasPerBlock:        10_000_000_000,
@@ -487,7 +489,7 @@ func (n *Node) rebuildNode(ctx context.Context, genesis gnoland.GnoGenesisState)
 	}
 
 	// Setup node config
-	nodeConfig := newNodeConfig(n.config.TMConfig, n.config.ChainID, genesis)
+	nodeConfig := newNodeConfig(n.config.TMConfig, n.config.ChainID, n.config.ChainDomain, genesis)
 	nodeConfig.GenesisTxResultHandler = n.genesisTxResultHandler
 	// Speed up stdlib loading after first start (saves about 2-3 seconds on each reload).
 	nodeConfig.CacheStdlibLoad = true
@@ -566,10 +568,10 @@ func (n *Node) genesisTxResultHandler(ctx sdk.Context, tx std.Tx, res sdk.Result
 	return
 }
 
-func newNodeConfig(tmc *tmcfg.Config, chainid string, appstate gnoland.GnoGenesisState) *gnoland.InMemoryNodeConfig {
+func newNodeConfig(tmc *tmcfg.Config, chainid, chaindomain string, appstate gnoland.GnoGenesisState) *gnoland.InMemoryNodeConfig {
 	// Create Mocked Identity
 	pv := gnoland.NewMockedPrivValidator()
-	genesis := gnoland.NewDefaultGenesisConfig(chainid)
+	genesis := gnoland.NewDefaultGenesisConfig(chainid, chaindomain)
 	genesis.AppState = appstate
 
 	// Add self as validator
@@ -583,10 +585,11 @@ func newNodeConfig(tmc *tmcfg.Config, chainid string, appstate gnoland.GnoGenesi
 		},
 	}
 
-	return &gnoland.InMemoryNodeConfig{
+	cfg := &gnoland.InMemoryNodeConfig{
 		PrivValidator: pv,
 		TMConfig:      tmc,
 		Genesis:       genesis,
 		VMOutput:      os.Stdout,
 	}
+	return cfg
 }
diff --git a/contribs/gnodev/pkg/dev/node_test.go b/contribs/gnodev/pkg/dev/node_test.go
@@ -38,7 +38,7 @@ func TestNewNode_NoPackages(t *testing.T) {
 	logger := log.NewTestingLogger(t)
 
 	// Call NewDevNode with no package should work
-	cfg := DefaultNodeConfig(gnoenv.RootDir())
+	cfg := DefaultNodeConfig(gnoenv.RootDir(), "gno.land")
 	cfg.Logger = logger
 	node, err := NewDevNode(ctx, cfg)
 	require.NoError(t, err)
@@ -66,7 +66,7 @@ func Render(_ string) string { return "foo" }
 	logger := log.NewTestingLogger(t)
 
 	// Call NewDevNode with no package should work
-	cfg := DefaultNodeConfig(gnoenv.RootDir())
+	cfg := DefaultNodeConfig(gnoenv.RootDir(), "gno.land")
 	cfg.PackagesPathList = []PackagePath{pkgpath}
 	cfg.Logger = logger
 	node, err := NewDevNode(ctx, cfg)
@@ -475,7 +475,7 @@ func generateTestingPackage(t *testing.T, nameFile ...string) PackagePath {
 }
 
 func createDefaultTestingNodeConfig(pkgslist ...PackagePath) *NodeConfig {
-	cfg := DefaultNodeConfig(gnoenv.RootDir())
+	cfg := DefaultNodeConfig(gnoenv.RootDir(), "gno.land")
 	cfg.PackagesPathList = pkgslist
 	return cfg
 }

diff --git a/contribs/gnodev/pkg/dev/packages.go b/contribs/gnodev/pkg/dev/packages.go
@@ -138,7 +138,7 @@ func (pm PackagesMap) Load(fee std.Fee, start time.Time) ([]gnoland.TxWithMetada
 		}
 
 		// Open files in directory as MemPackage.
-		memPkg := gno.ReadMemPackage(modPkg.Dir, modPkg.Name)
+		memPkg := gno.MustReadMemPackage(modPkg.Dir, modPkg.Name)
 		if err := memPkg.Validate(); err != nil {
 			return nil, fmt.Errorf("invalid package: %w", err)
 		}

diff --git a/contribs/gnogenesis/go.mod b/contribs/gnogenesis/go.mod
@@ -53,7 +53,6 @@ require (
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/grpc v1.65.0 // indirect

diff --git a/contribs/gnogenesis/go.sum b/contribs/gnogenesis/go.sum
diff --git a/contribs/gnogenesis/internal/balances/balances_export.go b/contribs/gnogenesis/internal/balances/balances_export.go
@@ -60,6 +60,7 @@ func execBalancesExport(cfg *balancesCfg, io commands.IO, args []string) error {
 	if err != nil {
 		return fmt.Errorf("unable to create output file, %w", err)
 	}
+	defer outputFile.Close()
 
 	// Save the balances
 	for _, balance := range state.Balances {

diff --git a/contribs/gnomigrate/go.mod b/contribs/gnomigrate/go.mod
@@ -48,7 +48,6 @@ require (
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
 	google.golang.org/grpc v1.65.0 // indirect

diff --git a/contribs/gnomigrate/go.sum b/contribs/gnomigrate/go.sum
diff --git a/examples/gno.land/p/demo/acl/gno.mod b/examples/gno.land/p/demo/acl/gno.mod
@@ -1,8 +1 @@
 module gno.land/p/demo/acl
-
-require (
-	gno.land/p/demo/avl v0.0.0-latest
-	gno.land/p/demo/testutils v0.0.0-latest
-	gno.land/p/demo/uassert v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-)
diff --git a/examples/gno.land/p/demo/avl/pager/gno.mod b/examples/gno.land/p/demo/avl/pager/gno.mod
@@ -1,8 +1 @@
 module gno.land/p/demo/avl/pager
-
-require (
-	gno.land/p/demo/avl v0.0.0-latest
-	gno.land/p/demo/uassert v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/urequire v0.0.0-latest
-)
diff --git a/examples/gno.land/p/demo/avlhelpers/gno.mod b/examples/gno.land/p/demo/avlhelpers/gno.mod
@@ -1,3 +1 @@
 module gno.land/p/demo/avlhelpers
-
-require gno.land/p/demo/avl v0.0.0-latest
diff --git a/examples/gno.land/p/demo/blog/gno.mod b/examples/gno.land/p/demo/blog/gno.mod
@@ -1,7 +1 @@
 module gno.land/p/demo/blog
-
-require (
-	gno.land/p/demo/avl v0.0.0-latest
-	gno.land/p/demo/mux v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-)
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		module gno.land/p/demo/avlhelpers

		require gno.land/p/demo/avl v0.0.0-latest