Merge branch 'master' into alfred/pool-swap

use a default pool and the active voucher to perform a swap
use the userstore instead of the prefixdb
2025-05-19 16:44:16 +03:00 · 2025-05-19 03:13:09 +03:00 · 2025-05-19 02:30:12 +03:00 · 2025-05-19 02:29:47 +03:00 · 2025-05-19 02:28:01 +03:00 · 2025-05-19 02:27:23 +03:00
6 changed files with 9 additions and 32 deletions
--- a/.env.example
+++ b/.env.example
@@ -21,10 +21,3 @@ LANGUAGES=eng, swa

 #Alias search domains
 ALIAS_SEARCH_DOMAINS=sarafu.local, sarafu.eth
-
-#Pool swap
-DEFAULT_POOL_NAME="Kenya ROLA Pool"
-DEFAULT_POOL_SYMBOL=ROLA
-DEFAULT_POOL_CONTRACT_ADDRESS=0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e
-DEFAULT_LIMITER_ADDRESS=
-DEFAULT_VOUCHER_REGISTRY=
--- a/config/config.go
+++ b/config/config.go
@@ -25,7 +25,7 @@ const (
 	defaultSSHHost  string = "127.0.0.1"
 	defaultSSHPort  uint   = 7122
 	defaultHTTPHost string = "127.0.0.1"
-	defaultHTTPPort uint   = 7123
+	defaultHTTPPort uint     = 7123
 	defaultDomain          = "sarafu.local"
 )

@@ -52,6 +52,7 @@ func SearchDomains() []string {
 	return ParsedDomains
 }

+
 func Language() string {
 	return viseconfig.DefaultLanguage
 }
@@ -75,15 +76,3 @@ func PortSSH() uint {
 func ATEndpoint() string {
 	return env.GetEnv("AT_ENDPOINT", "/")
 }
-
-func DefaultPoolAddress() string {
-	return env.GetEnv("DEFAULT_POOL_CONTRACT_ADDRESS", "")
-}
-
-func DefaultPoolName() string {
-	return env.GetEnv("DEFAULT_POOL_NAME", "")
-}
-
-func DefaultPoolSymbol() string {
-	return env.GetEnv("DEFAULT_POOL_SYMBOL", "")
-}
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.23.4
 require (
 	git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9
 	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1
 	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2
--- a/go.sum
+++ b/go.sum
@@ -12,8 +12,6 @@ git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-ee434dba6980/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1 h1:0hvILlGkZnXO8o7nZth4xu77vAS4zVQ6Ae0rb5x/Idg=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30 h1:iZVmR/4xSoxahtkMBXs/z1HUSSnr+x1m+9AxXIgTvb0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
--- a/handlers/application/menuhandler.go
+++ b/handlers/application/menuhandler.go
@@ -2738,9 +2738,9 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 	}

 	defaultPool := dataserviceapi.PoolDetails{
-		PoolName:            config.DefaultPoolName(),
-		PoolSymbol:          config.DefaultPoolSymbol(),
-		PoolContractAdrress: config.DefaultPoolAddress(),
+		PoolName:            "Kenya ROLA Pool",
+		PoolSymbol:          "ROLA",
+		PoolContractAdrress: "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
 		LimiterAddress:      "",
 		VoucherRegistry:     "",
 	}
@@ -2762,14 +2762,11 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 		return res, err
 	}

-	logg.InfoCtxf(ctx, "CheckTokenInPool", "response", r, "active_pool_address", activePoolAddress, "address", activeAddress)
-
 	if !r.CanSwapFrom {
 		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
 		res.Content = l.Get(
-			"%s is not in %s. Please update your voucher and try again.",
+			"%s is not in the KENYA ROLA POOL. Please update your voucher and try again.",
 			activeSym,
-			config.DefaultPoolName(),
 		)
 		return res, nil
 	}
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@@ -37,5 +37,5 @@ msgstr "Ombi lako limetumwa. Utapokea SMS wakati %s %s yako itakapobadilishwa ku
 msgid "%s balance: %s\n"
 msgstr "%s salio: %s\n"

-msgid "%s is not in %s. Please update your voucher and try again."
-msgstr "%s haipo kwenye %s. Tafadhali badilisha sarafu yako na ujaribu tena."
+msgid "%s is not in the KENYA ROLA POOL. Please update your voucher and try again."
+msgstr "%s haipo kwenye BWAWA LA KENYA ROLA. Tafadhali badilisha sarafu yako na ujaribu tena."
Author	SHA1	Message	Date
alfred-mk	d60f5461e6	Merge branch 'master' into alfred/pool-swap	2025-05-19 16:44:16 +03:00
alfred-mk	35d562ffdd	use a default pool and the active voucher to perform a swap	2025-05-19 03:13:09 +03:00
alfred-mk	7d8631fa87	use the userstore instead of the prefixdb	2025-05-19 02:30:12 +03:00
alfred-mk	c8159113f0	updated the correct swap data keys and use the userstore instead of the prefixdb	2025-05-19 02:29:47 +03:00
alfred-mk	126415050c	removed unused functions	2025-05-19 02:28:01 +03:00
alfred-mk	5b989d83e1	fix UI	2025-05-19 02:27:23 +03:00
alfred-mk	7199d0f3e0	add a message and translation for the missing voucher in the default pool	2025-05-19 02:26:37 +03:00
alfred-mk	feea74c2c9	add a RELOAD for the back navigation from swap_limit	2025-05-19 02:25:40 +03:00
alfred-mk	b6dcf65ea3	add a catch fow when the active voucher is not in the default pool	2025-05-19 02:24:42 +03:00
alfred-mk	da7b6e93e1	navigate directly to the swap_to_list	2025-05-19 02:21:56 +03:00
alfred-mk	97be43b9ec	use updated sarafu-api package	2025-05-19 02:00:40 +03:00
alfred-mk	a9ecb1bbae	removed unused vis files and templates	2025-05-19 01:59:59 +03:00
alfred-mk	7e2e3c3722	upgMerge branch 'master' into alfred/pool-swap	2025-05-14 12:15:40 +03:00
alfred-mk	724d11b4db	Added TestGetSwapToVoucherData	2025-03-13 17:09:00 +03:00
alfred-mk	2ace3606bc	Added TestUpdateSwapFromVoucherData	2025-03-13 13:19:58 +03:00
alfred-mk	ab5299fae2	Added TestGetSwapFromVoucherData	2025-03-13 13:15:38 +03:00
alfred-mk	c407dd1702	Added TestReadSwapPreviewData	2025-03-13 13:10:58 +03:00
alfred-mk	9729a6442b	Added TestReadSwapData	2025-03-13 13:05:51 +03:00
alfred-mk	fd0c9cbc68	Updated sarafu-api package	2025-03-13 10:17:16 +03:00
alfred-mk	2eef202a1a	Capitalize the Swap menu option	2025-03-13 09:30:57 +03:00
alfred-mk	1df102db9f	Updated the SwapMaxLimit func to use the GetSwapFromTokenMaxLimit and set a flag when the max limit is invalid	2025-03-12 10:48:36 +03:00
alfred-mk	8292f76334	Updated the sarafu-api package	2025-03-12 10:46:45 +03:00
alfred-mk	ec8dc2fb1d	Added a catch for the flag_low_swap_amount	2025-03-12 10:46:11 +03:00
alfred-mk	6a91049ffb	Added a flag_low_swap_amount and vis files for when the swap max limit is less than 0.1	2025-03-12 10:45:38 +03:00
alfred-mk	d13d24f032	Update the conflicting input numbers on main.vis	2025-03-12 10:44:09 +03:00
alfred-mk	46d5c2f035	pass the correct arguments to the swap functions	2025-03-10 17:16:44 +03:00
alfred-mk	69ea52d91c	use data fetched from sarafu-api	2025-03-10 16:48:19 +03:00
alfred-mk	450cba07c7	Use the latest sarafu-api	2025-03-10 16:45:04 +03:00
alfred-mk	16380dbe49	Use the GetPoolSwapQuote and PoolSwap functions for live data	2025-03-06 18:58:25 +03:00
alfred-mk	2a46de9a6f	Use the latest sarafu-api changes with pool swap functionality	2025-03-06 18:57:24 +03:00
alfred-mk	baff75da50	Add swap functionality using dummy data	2025-03-06 09:25:55 +03:00
alfred-mk	d6047827a4	link swap related functions	2025-03-06 09:24:48 +03:00
alfred-mk	6642fc0137	added the swap_initiated vis node	2025-03-06 09:23:53 +03:00
alfred-mk	c367984930	move the catch for flag_account_authorized to the swap_preview node	2025-03-06 09:23:28 +03:00
alfred-mk	21922e2b62	added translation for the swap request confirmation	2025-03-06 09:22:53 +03:00
alfred-mk	a21186bd59	use a single swap.go file for swap helper functions	2025-03-05 17:00:44 +03:00
alfred-mk	28eefb6197	make the ReadStringEntry func accessible	2025-03-05 16:36:37 +03:00
alfred-mk	3e9a67b34e	added the swap preview vis files	2025-03-04 21:21:59 +03:00
alfred-mk	2a2d43c279	added the swap limit vis files	2025-03-04 21:21:40 +03:00
alfred-mk	a1f0e4dcfe	added functions to process the pool data and match based on the provided input	2025-03-04 21:21:02 +03:00
alfred-mk	ee07bf11f8	added helper functions to process the swap to and swap from voucher data	2025-03-04 21:20:05 +03:00
alfred-mk	cb1d129eda	added swap db keys	2025-03-04 21:18:25 +03:00
alfred-mk	e8978413a5	added pool db processing	2025-02-26 13:10:15 +03:00
alfred-mk	566503956d	added pool_swap menu nodes	2025-02-26 13:09:29 +03:00
alfred-mk	c5dbe966c4	added flag_incorrect_pool flag	2025-02-26 13:08:00 +03:00
alfred-mk	1221372424	use latest ussd-data-service package	2025-02-26 13:07:11 +03:00