Merge branch 'main' into main

ignite · Jan 12, 2024 · 36a20e1 · 36a20e1
2 parents 141f2cd + a4bf334
commit 36a20e1
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,8 +4,13 @@
 
 ### Fixes
 
-- [#3867](https://github.com/ignite/cli/pull/3867) Fix genesis export for ibc modules
 - [#3850](https://github.com/ignite/cli/pull/3871) Fix app.go file detection in apps scaffolded before v28.0.0
+- [#3867](https://github.com/ignite/cli/pull/3867) Fix genesis export for ibc modules
+- [#3869](https://github.com/ignite/cli/pull/3869) Fix .git in parent dir
+
+### Changes
+
+- [#3877](https://github.com/ignite/cli/pull/3877) Change Ignite App extension to "ign"
 
 ## [`v28.1.0`](https://github.com/ignite/cli/releases/tag/v28.1.0)
 

diff --git a/docs/docs/02-guide/05-loan.md b/docs/docs/02-guide/05-loan.md
@@ -16,7 +16,7 @@ In this tutorial you will learn how to:
 - **Implement Loan Transactions:** Walk through coding the logic for initiating, managing, and closing loans.
 - **Create Custom Tokens:** Understand how to create and manage custom tokens within your DeFi ecosystem, vital for lending and borrowing mechanisms.
 - **Integrate Interest Rate Models:** Dive into implementing interest rate models to calculate loan interests dynamically.
-- **Ensure Security and Compliance:** Focus on security, ensure your DeFi module is resistent to common vulnerabilites by validating inputs.
+- **Ensure Security and Compliance:** Focus on security, ensure your DeFi module is resistant to common vulnerabilities by validating inputs.
 - **Test and Debug:** Learn effective strategies for testing your DeFi module and debugging issues that arise during development.
 
 ## Setup and Scaffold

diff --git a/docs/docs/02-guide/06-tokenfactory/01-tokenfactory.md b/docs/docs/02-guide/06-tokenfactory/01-tokenfactory.md
@@ -335,7 +335,7 @@ type BankKeeper interface {
 }
 ```
 
-### Commiting Your Changes
+### Committing Your Changes
 
 Regular commits are vital for tracking progress and ensuring a stable rollback point if needed. After implementing these changes, use the following commands to commit:
 

diff --git a/docs/docs/04-network/04-validator.md b/docs/docs/04-network/04-validator.md
@@ -28,7 +28,7 @@ Launch Id  Chain Id  Source                              Phase
 ```
 
 - `Launch ID` is the unique identifier of the chain on Ignite. This is the ID used to interact with the chain launch.
-- `Chain ID` represents the identifer of the chain network once it will be launched. It should be a unique identifier in
+- `Chain ID` represents the identifier of the chain network once it will be launched. It should be a unique identifier in
   practice but doesn't need to be unique on Ignite.
 - `Source` is the repository URL of the project.
 - `Phase` is the current phase of the chain launch. A chain can have 3 different phases:

diff --git a/docs/docs/apps/02-developing-apps.md b/docs/docs/apps/02-developing-apps.md
@@ -97,7 +97,7 @@ message Manifest {
   // Enables sharing a single app server across all running instances of an Ignite App.
   // Useful if an app adds or extends long running commands.
   //
-  // Example: if an app defines a hook on `ignite chain serve`, a server is instanciated
+  // Example: if an app defines a hook on `ignite chain serve`, a server is instantiated
   // when the command is run. Now if you want to interact with that instance
   // from commands defined in that app, you need to enable shared host, or else the
   // commands will just instantiate separate app servers.
@@ -143,7 +143,7 @@ func (app) Manifest(context.Context) (*plugin.Manifest, error) {
 				Use:   "oracle [name]",
 				Short: "Scaffold an oracle module",
 				Long:  "Long description goes here...",
-				// Optionnal flags is required
+				// Optional flags is required
 				Flags: []*plugin.Flag{
 					{Name: "source", Type: plugin.FlagTypeString, Usage: "the oracle source"},
 				},

diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -4093,9 +4093,9 @@ flux@^4.0.1:
     fbjs "^3.0.1"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.7:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 fork-ts-checker-webpack-plugin@^6.5.0:
   version "6.5.3"

diff --git a/go.mod b/go.mod
@@ -158,7 +158,7 @@ require (
 	github.com/chigopher/pathlib v0.15.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cilium/ebpf v0.9.1 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20231102162011-844f0582c2eb // indirect

diff --git a/go.sum b/go.sum
@@ -295,8 +295,9 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

diff --git a/ignite/pkg/repoversion/repoversion.go b/ignite/pkg/repoversion/repoversion.go
@@ -15,7 +15,7 @@ type Version struct {
 }
 
 func Determine(path string) (v Version, err error) {
-	repo, err := git.PlainOpen(path)
+	repo, err := git.PlainOpenWithOptions(path, &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
 		return Version{}, err
 	}

diff --git a/ignite/services/plugin/plugin.go b/ignite/services/plugin/plugin.go
@@ -202,7 +202,7 @@ func (p Plugin) Manifest() *Manifest {
 }
 
 func (p Plugin) binaryName() string {
-	return fmt.Sprintf("%s.app", p.name)
+	return fmt.Sprintf("%s.ign", p.name)
 }
 
 func (p Plugin) binaryPath() string {
-Original file line number
+Diff line change
@@ Expand Up / @@ -335,7 +335,7 @@ type BankKeeper interface { @@
     }
     ```
-    ### Commiting Your Changes
+    ### Committing Your Changes
     Regular commits are vital for tracking progress and ensuring a stable rollback point if needed. After implementing these changes, use the following commands to commit:
@@ Expand Down @@