From 85304fd8b4f220394b631b1831e9f206c7c37a5a Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Sun, 26 Oct 2025 16:22:04 -0400
Subject: [PATCH] chore(ci): migrate scopes to toml format

---
 .github/Repo.toml   |  18 ++++++
 .github/scopes.json | 150 --------------------------------------------
 Makefile            |  20 +++++-
 3 files changed, 37 insertions(+), 151 deletions(-)
 create mode 100644 .github/Repo.toml
 delete mode 100644 .github/scopes.json

diff --git a/.github/Repo.toml b/.github/Repo.toml
new file mode 100644
index 000000000..1e5969a9b
--- /dev/null
+++ b/.github/Repo.toml
@@ -0,0 +1,18 @@
+[scopes]
+ante = ["app/ante"]
+api = ["api/dex", "api/did", "api/dwn", "api/svc", "api"]
+app = ["app/context", "app/decorators", "app/params", "app/upgrades", "app"]
+chains = ["chains"]
+ci = ["Makefile", ".github"]
+cli = ["app/commands"]
+cmd = ["cmd/snrd", "cmd"]
+config = ["networks/localnet", "networks/testnet", "networks"]
+deps = ["go.sum", "go.mod"]
+dex = ["proto/dex", "x/dex"]
+did = ["proto/did", "x/did"]
+docs = ["docs"]
+dwn = ["proto/dwn", "x/dwn"]
+proto = ["proto"]
+scripts = ["scripts"]
+svc = ["proto/svc", "x/svc"]
+test = ["test/e2e", "test/integration", "test/oauth", "test"]
diff --git a/.github/scopes.json b/.github/scopes.json
deleted file mode 100644
index d0824f49b..000000000
--- a/.github/scopes.json
+++ /dev/null
@@ -1,150 +0,0 @@
-[
-  {
-    "scope": "deps",
-    "path": "go.sum"
-  },
-  {
-    "scope": "deps",
-    "path": "go.mod"
-  },
-  {
-    "scope": "api",
-    "path": "api/dex"
-  },
-  {
-    "scope": "api",
-    "path": "api/did"
-  },
-  {
-    "scope": "api",
-    "path": "api/dwn"
-  },
-  {
-    "scope": "api",
-    "path": "api/svc"
-  },
-  {
-    "scope": "api",
-    "path": "api"
-  },
-  {
-    "scope": "ante",
-    "path": "app/ante"
-  },
-  {
-    "scope": "cli",
-    "path": "app/commands"
-  },
-  {
-    "scope": "app",
-    "path": "app/context"
-  },
-  {
-    "scope": "app",
-    "path": "app/decorators"
-  },
-  {
-    "scope": "app",
-    "path": "app/params"
-  },
-  {
-    "scope": "app",
-    "path": "app/upgrades"
-  },
-  {
-    "scope": "app",
-    "path": "app"
-  },
-  {
-    "scope": "chains",
-    "path": "chains"
-  },
-  {
-    "scope": "cmd",
-    "path": "cmd/snrd"
-  },
-  {
-    "scope": "cmd",
-    "path": "cmd"
-  },
-  {
-    "scope": "docs",
-    "path": "docs"
-  },
-  {
-    "scope": "config",
-    "path": "networks/localnet"
-  },
-  {
-    "scope": "config",
-    "path": "networks/testnet"
-  },
-  {
-    "scope": "config",
-    "path": "networks"
-  },
-  {
-    "scope": "dex",
-    "path": "proto/dex"
-  },
-  {
-    "scope": "did",
-    "path": "proto/did"
-  },
-  {
-    "scope": "dwn",
-    "path": "proto/dwn"
-  },
-  {
-    "scope": "svc",
-    "path": "proto/svc"
-  },
-  {
-    "scope": "proto",
-    "path": "proto"
-  },
-  {
-    "scope": "scripts",
-    "path": "scripts"
-  },
-  {
-    "scope": "test",
-    "path": "test/e2e"
-  },
-  {
-    "scope": "test",
-    "path": "test/integration"
-  },
-  {
-    "scope": "test",
-    "path": "test/oauth"
-  },
-  {
-    "scope": "test",
-    "path": "test"
-  },
-  {
-    "scope": "dex",
-    "path": "x/dex"
-  },
-  {
-    "scope": "did",
-    "path": "x/did"
-  },
-  {
-    "scope": "dwn",
-    "path": "x/dwn"
-  },
-  {
-    "scope": "svc",
-    "path": "x/svc"
-  },
-  {
-    "scope": "ci",
-    "path": "Makefile"
-  },
-  {
-    "scope": "ci",
-    "path": ".github"
-  }
-]
diff --git a/Makefile b/Makefile
index 9bf2c52a2..f02170313 100644
--- a/Makefile
+++ b/Makefile
@@ -253,6 +253,19 @@ test-e2e-all:
 	@gum log --level info "Running all e2e tests"
 	@cd test/e2e && go test -race -v ./tests/...
 
+e2e-usdc-swap-did:
+	@gum log --level info "Running USDC Swap E2E tests with DID integration"
+	@gum log --level warn "Note: These tests require manual setup. See test/e2e/usdc-swap-did/README.md"
+	@cd test/e2e/usdc-swap-did && make test
+
+e2e-usdc-swap-did-setup:
+	@gum log --level info "Running USDC Swap E2E test setup..."
+	@cd test/e2e/usdc-swap-did && bash setup.sh
+
+e2e-usdc-swap-did-verbose:
+	@gum log --level info "Running USDC Swap E2E tests (verbose mode)"
+	@cd test/e2e/usdc-swap-did && make test-verbose
+
 test-build-snrd: build
 	@ls -la build/snrd
 	@chmod +x build/snrd
@@ -306,7 +319,7 @@ test-proto:
 test-benchmark:
 	@go test -mod=readonly -bench=. ./...
 
-.PHONY: test test-all test-unit test-race test-cover test-tdd test-module test-benchmark
+.PHONY: test test-all test-unit test-race test-cover test-tdd test-module test-benchmark test-e2e test-e2e-all e2e-usdc-swap-did e2e-usdc-swap-did-setup e2e-usdc-swap-did-verbose
 
 ###############################################################################
 ###                                Protobuf                                 ###
@@ -402,6 +415,11 @@ help:
 	@gum log --level info "  test-e2e-all        Run all e2e tests"
 	@gum log --level info "  test-module         Test specific module (MODULE=did|dwn|svc)"
 	@gum log --level info ""
+	@gum log --level info "🔄 E2E Test Suites:"
+	@gum log --level info "  e2e-usdc-swap-did           Run USDC swap E2E tests"
+	@gum log --level info "  e2e-usdc-swap-did-setup     Interactive setup for USDC swap tests"
+	@gum log --level info "  e2e-usdc-swap-did-verbose   Run USDC swap tests with verbose output"
+	@gum log --level info ""
 	@gum log --level info "📚 Module Testing Examples:"
 	@gum log --level info "  make test-module MODULE=did           # Test DID module"
 	@gum log --level info "  make test-module MODULE=dwn VARIANT=cover  # DWN with coverage"