V5.0.x nft

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # CODEOWNERS: https://help.github.com/articles/about-codeowners/
 
-*       @colin-axner @AdityaSripal @crodriguezvega @seantking @charleenfei @damiannolan
+*       @colin-axner @AdityaSripal @crodriguezvega @seantking @charleenfei @damiannolan @chatton
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only
@@ -14,19 +14,29 @@
 # CODEOWNERS for the core IBC module
 
 /modules/core/ @colin-axner @fedekunze @AdityaSripal 
-/proto/core/ @colin-axner @fedekunze @AdityaSripal 
+/proto/ibc/core/ @colin-axner @fedekunze @AdityaSripal 
+
+## CODEOWNERS for core/02-client
+
+/modules/core/02-client @colin-axner @fedekunze @AdityaSripal @seantking @damiannolan
+/proto/ibc/core/client @colin-axner @fedekunze @AdityaSripal @seantking @damiannolan
 
 # CODEOWNERS for the light-clients
 
-/modules/light-clients/ @colin-axner @fedekunze @AdityaSripal 
-/proto/lightclients/ @colin-axner @fedekunze @AdityaSripal 
+/modules/light-clients/ @colin-axner @fedekunze @AdityaSripal @seantking @damiannolan
+/proto/ibc/lightclients/ @colin-axner @fedekunze @AdityaSripal @seantking @damiannolan
 
 # CODEOWNERS for ICS 20
 
 /modules/apps/transfer/ @colin-axner @fedekunze @AdityaSripal 
-/proto/applications/transfer/ @colin-axner @fedekunze @AdityaSripal 
+/proto/ibc/applications/transfer/ @colin-axner @fedekunze @AdityaSripal 
 
 # CODEOWNERS for interchain-accounts module
 
 /modules/apps/27-interchain-accounts/ @seantking @colin-axner @AdityaSripal @damiannolan
-/proto/applications/interchain_accounts/ @seantking @colin-axner @AdityaSripal @damiannolan
+/proto/ibc/applications/interchain_accounts/ @seantking @colin-axner @AdityaSripal @damiannolan
+
+# CODEOWNERS for fee module
+
+/modules/apps/29-fee/ @AdityaSripal @seantking @charleenfei @colin-axner @damiannolan 
+/proto/ibc/applications/fee/ @AdityaSripal @seantking @charleenfei @colin-axner @damiannolan

.github/ISSUE_TEMPLATE/bug-report.md

@@ -20,6 +20,10 @@ through the appropriate channels won't receive any bounty.
 
 <!-- Concisely describe the issue -->
 
+## Expected Behaviour
+
+<!-- What is the expected behaviour? -->
+
 ## Version
 
 <!-- git commit hash or release version -->

.github/mergify.yml

@@ -18,67 +18,67 @@ pull_request_rules:
         commit_message_template: |
            {{ title }} (#{{ number }})
            {{ body }}
-  - name: backport patches to v1.1.x branch
+  - name: backport patches to v2.1.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.1.x
+      - label=backport-to-v2.1.x
     actions:
       backport:
         branches:
-          - release/v1.1.x
-  - name: backport patches to v1.2.x branch
+          - release/v2.1.x
+  - name: backport patches to v2.2.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.2.x
+      - label=backport-to-v2.2.x
     actions:
       backport:
         branches:
-          - release/v1.2.x
-  - name: backport patches to v1.3.x branch
+          - release/v2.2.x
+  - name: backport patches to v2.3.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.3.x
+      - label=backport-to-v2.3.x
     actions:
       backport:
         branches:
-          - release/v1.3.x
-  - name: backport patches to v1.4.x branch
+          - release/v2.3.x
+  - name: backport patches to v2.4.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.4.x
+      - label=backport-to-v2.4.x
     actions:
       backport:
         branches:
-          - release/v1.4.x          
-  - name: backport patches to v2.0.x branch
+          - release/v2.4.x
+  - name: backport patches to v3.0.x branch
     conditions:
       - base=main
-      - label=backport-to-v2.0.x
+      - label=backport-to-v3.0.x
     actions:
       backport:
         branches:
-          - release/v2.0.x
-  - name: backport patches to v2.1.x branch
+          - release/v3.0.x
+  - name: backport patches to v3.1.x branch
     conditions:
       - base=main
-      - label=backport-to-v2.1.x
+      - label=backport-to-v3.1.x
     actions:
       backport:
         branches:
-          - release/v2.1.x
-  - name: backport patches to v2.2.x branch
+          - release/v3.1.x
+  - name: backport patches to v3.2.x branch
     conditions:
       - base=main
-      - label=backport-to-v2.2.x
+      - label=backport-to-v3.2.x
     actions:
       backport:
         branches:
-          - release/v2.2.x            
-  - name: backport patches to v3.0.x branch
+          - release/v3.2.x
+  - name: backport patches to v4.0.x branch
     conditions:
       - base=main
-      - label=backport-to-v3.0.x
+      - label=backport-to-v4.0.x
     actions:
       backport:
         branches:
-          - release/v3.0.x
+          - release/v4.0.x  

.github/scripts/build_test_matrix.go

@@ -0,0 +1,129 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+const (
+	testNamePrefix     = "Test"
+	testFileNameSuffix = "_test.go"
+	e2eTestDirectory   = "e2e"
+)
+
+// GithubActionTestMatrix represents
+type GithubActionTestMatrix struct {
+	Include []TestSuitePair `json:"include"`
+}
+
+type TestSuitePair struct {
+	Test  string `json:"test"`
+	Suite string `json:"suite"`
+}
+
+func main() {
+	githubActionMatrix, err := getGithubActionMatrixForTests(e2eTestDirectory)
+	if err != nil {
+		fmt.Printf("error generating github action json: %s", err)
+		os.Exit(1)
+	}
+
+	ghBytes, err := json.Marshal(githubActionMatrix)
+	if err != nil {
+		fmt.Printf("error marshalling github action json: %s", err)
+		os.Exit(1)
+	}
+	fmt.Println(string(ghBytes))
+}
+
+// getGithubActionMatrixForTests returns a json string representing the contents that should go in the matrix
+// field in a github action workflow. This string can be used with `fromJSON(str)` to dynamically build
+// the workflow matrix to include all E2E tests under the e2eRootDirectory directory.
+func getGithubActionMatrixForTests(e2eRootDirectory string) (GithubActionTestMatrix, error) {
+	testSuiteMapping := map[string][]string{}
+	fset := token.NewFileSet()
+	err := filepath.Walk(e2eRootDirectory, func(path string, info fs.FileInfo, err error) error {
+		// only look at test files
+		if !strings.HasSuffix(path, testFileNameSuffix) {
+			return nil
+		}
+
+		f, err := parser.ParseFile(fset, path, nil, 0)
+		if err != nil {
+			return fmt.Errorf("failed parsing file: %s", err)
+		}
+
+		suiteNameForFile, testCases, err := extractSuiteAndTestNames(f)
+		if err != nil {
+			return fmt.Errorf("failed extracting test suite name and test cases: %s", err)
+		}
+
+		testSuiteMapping[suiteNameForFile] = testCases
+
+		return nil
+	})
+	if err != nil {
+		return GithubActionTestMatrix{}, err
+	}
+
+	gh := GithubActionTestMatrix{
+		Include: []TestSuitePair{},
+	}
+
+	for testSuiteName, testCases := range testSuiteMapping {
+		for _, testCaseName := range testCases {
+			gh.Include = append(gh.Include, TestSuitePair{
+				Test:  testCaseName,
+				Suite: testSuiteName,
+			})
+		}
+	}
+
+	return gh, nil
+}
+
+// extractSuiteAndTestNames extracts the name of the test suite function as well
+// as all tests associated with it in the same file.
+func extractSuiteAndTestNames(file *ast.File) (string, []string, error) {
+	var suiteNameForFile string
+	var testCases []string
+
+	for _, d := range file.Decls {
+		if f, ok := d.(*ast.FuncDecl); ok {
+			functionName := f.Name.Name
+			if isTestSuiteMethod(f) {
+				if suiteNameForFile != "" {
+					return "", nil, fmt.Errorf("found a second test function: %s when %s was already found", f.Name.Name, suiteNameForFile)
+				}
+				suiteNameForFile = functionName
+				continue
+			}
+			if isTestFunction(f) {
+				testCases = append(testCases, functionName)
+			}
+		}
+	}
+	if suiteNameForFile == "" {
+		return "", nil, fmt.Errorf("file %s had no test suite test case", file.Name.Name)
+	}
+	return suiteNameForFile, testCases, nil
+}
+
+// isTestSuiteMethod returns true if the function is a test suite function.
+// e.g. func TestFeeMiddlewareTestSuite(t *testing.T) { ... }
+func isTestSuiteMethod(f *ast.FuncDecl) bool {
+	return strings.HasPrefix(f.Name.Name, testNamePrefix) && len(f.Type.Params.List) == 1
+}
+
+// isTestFunction returns true if the function name starts with "Test" and has no parameters.
+// as test suite functions do not accept a *testing.T.
+func isTestFunction(f *ast.FuncDecl) bool {
+	return strings.HasPrefix(f.Name.Name, testNamePrefix) && len(f.Type.Params.List) == 0
+}