Compare commits
No commits in common. "ce9a263b40a3f7f5932bbbd65ae56b26020e7f7c" and "5e02d62a12967e9a3a27aa1b053da351a9ff7d4e" have entirely different histories.
ce9a263b40
...
5e02d62a12
32
cmd/main.go
32
cmd/main.go
@ -16,10 +16,8 @@ import (
|
||||
httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
|
||||
devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
|
||||
apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
|
||||
)
|
||||
|
||||
var (
|
||||
@ -28,31 +26,6 @@ var (
|
||||
menuSeparator = ": "
|
||||
)
|
||||
|
||||
type devEmitter struct {
|
||||
h *apievent.EventsHandler
|
||||
}
|
||||
|
||||
func (d *devEmitter) emit(ctx context.Context, msg apievent.Msg) error {
|
||||
var err error
|
||||
if msg.Typ == apievent.EventTokenTransferTag {
|
||||
tx, ok := msg.Item.(devremote.Tx)
|
||||
if !ok {
|
||||
return fmt.Errorf("not a valid tx")
|
||||
}
|
||||
logg.InfoCtxf(ctx, "tx emit", "tx", tx)
|
||||
ev := tx.ToTransferEvent()
|
||||
err = d.h.Handle(ctx, apievent.EventTokenTransferTag, &ev)
|
||||
} else if msg.Typ == apievent.EventRegistrationTag {
|
||||
acc, ok := msg.Item.(devremote.Account)
|
||||
if !ok {
|
||||
return fmt.Errorf("not a valid tx")
|
||||
}
|
||||
logg.InfoCtxf(ctx, "account emit", "account", acc)
|
||||
ev := acc.ToRegistrationEvent()
|
||||
err = d.h.Handle(ctx, apievent.EventRegistrationTag, &ev)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func main() {
|
||||
config.LoadConfig()
|
||||
@ -157,11 +130,6 @@ func main() {
|
||||
|
||||
if fakeDir != "" {
|
||||
svc := devremote.NewDevAccountService(ctx, fakeDir).WithAutoVoucher(ctx, "FOO", 42)
|
||||
eu := event.NewEventsUpdater(svc, menuStorageService)
|
||||
emitter := &devEmitter{
|
||||
h: eu.ToEventsHandler(),
|
||||
}
|
||||
svc = svc.WithEmitter(emitter.emit)
|
||||
svc.AddVoucher(ctx, "BAR")
|
||||
accountService = svc
|
||||
} else {
|
||||
|
||||
6
go.mod
6
go.mod
@ -4,9 +4,9 @@ go 1.23.4
|
||||
|
||||
require (
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
|
||||
git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113213645-7c697394b5e7
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113213325-5228aef0889b
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250112155828-b55686e830fd
|
||||
git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113085238-f65abf625d34
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113103142-5bf0a0e85893
|
||||
git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d
|
||||
github.com/alecthomas/assert/v2 v2.2.2
|
||||
github.com/gofrs/uuid v4.4.0+incompatible
|
||||
|
||||
12
go.sum
12
go.sum
@ -1,11 +1,11 @@
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d h1:bPAOVZOX4frSGhfOdcj7kc555f8dc9DmMd2YAyC2AMw=
|
||||
git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
|
||||
git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113213645-7c697394b5e7 h1:P+Bi5jcQbnCrLnKNC5k8XDTBsocyZTVifqDyZY6d0w8=
|
||||
git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113213645-7c697394b5e7/go.mod h1:X9aQF93xw3vcW2QftJfzLewvbotRM0U00DRtdmFw294=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113213325-5228aef0889b h1:6SieNUSEKbkjzquuwazs/lVG56zdEWF10zQQEMRJfMs=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113213325-5228aef0889b/go.mod h1:E6W7ZOa7ZvVr0Bc5ot0LNSwpSPYq4hXlAIvEPy3AJ7U=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250112155828-b55686e830fd h1:OG20aG/sC5yNaU2/rzoAKYp2f0u4lmGP5/Qax8UQD5c=
|
||||
git.grassecon.net/grassrootseconomics/common v0.0.0-20250112155828-b55686e830fd/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
|
||||
git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113085238-f65abf625d34 h1:Pl4OFKTeSehSTMMRUFosZUIDyUZRdXqm6CFn0+5+4qs=
|
||||
git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250113085238-f65abf625d34/go.mod h1:PEjJnAH5gYcjb4RRevaPCswa5VGGNqHSuyapZvIVR6w=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113103142-5bf0a0e85893 h1:MyDINzwY1sjfXkIFoc+6T5lXF/1xdFV6yjHrpSNZzWM=
|
||||
git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250113103142-5bf0a0e85893/go.mod h1:E6W7ZOa7ZvVr0Bc5ot0LNSwpSPYq4hXlAIvEPy3AJ7U=
|
||||
git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d h1:q/NO1rEgK3pia32D/tCq5hXfEuJp84COZRwceFvy/MM=
|
||||
git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d/go.mod h1:AH15xABcvaJr1TCGlih3oGSuwWC0E5IdbHQwuu+E1KI=
|
||||
github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
|
||||
)
|
||||
|
||||
const (
|
||||
// TODO: consolidate with loaded flags
|
||||
accountCreatedFlag = 9
|
||||
)
|
||||
|
||||
// handle custodial registration.
|
||||
//
|
||||
// TODO: implement account created in userstore instead, so that
|
||||
// the need for persister and state use here is eliminated (it
|
||||
// introduces concurrency risks)
|
||||
func (eh *EventsUpdater) handleCustodialRegistration(ctx context.Context, ev any) error {
|
||||
o, ok := ev.(*apievent.EventCustodialRegistration)
|
||||
if !ok {
|
||||
return fmt.Errorf("invalid event for custodial registration")
|
||||
}
|
||||
return eh.HandleCustodialRegistration(ctx, o)
|
||||
}
|
||||
|
||||
func (eu *EventsUpdater) HandleCustodialRegistration(ctx context.Context, ev *apievent.EventCustodialRegistration) error {
|
||||
pe, userStore, err := eu.getStore(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
identity, err := store.IdentityFromAddress(ctx, userStore, ev.Account)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = pe.Load(identity.SessionId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
st := pe.GetState()
|
||||
st.SetFlag(accountCreatedFlag)
|
||||
return pe.Save(identity.SessionId)
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"git.defalsify.org/vise.git/persist"
|
||||
"git.defalsify.org/vise.git/logging"
|
||||
"git.grassecon.net/grassrootseconomics/visedriver/storage"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
|
||||
apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
|
||||
)
|
||||
|
||||
var (
|
||||
logg = logging.NewVanilla().WithDomain("sarafu-vise.handlers.event")
|
||||
)
|
||||
|
||||
type EventsUpdater struct {
|
||||
api remote.AccountService
|
||||
formatFunc func(string, int, any) string
|
||||
store storage.StorageService
|
||||
}
|
||||
|
||||
func NewEventsUpdater(api remote.AccountService, store storage.StorageService) *EventsUpdater {
|
||||
return &EventsUpdater{
|
||||
api: api,
|
||||
formatFunc: func(tag string, i int, o any) string {
|
||||
return fmt.Sprintf("%d %v", i, o)
|
||||
},
|
||||
store: store,
|
||||
}
|
||||
}
|
||||
|
||||
func (eu *EventsUpdater) ToEventsHandler() *apievent.EventsHandler {
|
||||
eh := apievent.NewEventsHandler()
|
||||
eh = eh.WithHandler(apievent.EventTokenMintTag, eu.handleTokenMint)
|
||||
eh = eh.WithHandler(apievent.EventTokenTransferTag, eu.handleTokenTransfer)
|
||||
eh = eh.WithHandler(apievent.EventRegistrationTag, eu.handleCustodialRegistration)
|
||||
return eh
|
||||
}
|
||||
|
||||
func (eu *EventsUpdater) handleNoop(ctx context.Context, ev any) error {
|
||||
logg.WarnCtxf(ctx, "noop event handler")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (eu *EventsUpdater) getStore(ctx context.Context) (*persist.Persister, *store.UserDataStore, error) {
|
||||
userDb, err := eu.store.GetUserdataDb(ctx)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
userStore := &store.UserDataStore{
|
||||
Db: userDb,
|
||||
}
|
||||
pr, err := eu.store.GetPersister(ctx)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
return pr, userStore, nil
|
||||
}
|
||||
@ -1,205 +0,0 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"git.defalsify.org/vise.git/db"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
|
||||
storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
|
||||
"git.grassecon.net/grassrootseconomics/common/identity"
|
||||
apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
|
||||
)
|
||||
|
||||
// execute all
|
||||
func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, tokenAddress string) error {
|
||||
err := eu.updateTokenList(ctx, identity, userStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
userStore.Db.SetSession(identity.SessionId)
|
||||
activeSym, err := userStore.ReadEntry(ctx, identity.SessionId, storedb.DATA_ACTIVE_SYM)
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
if !db.IsNotFound(err) {
|
||||
return err
|
||||
}
|
||||
if activeSym == nil {
|
||||
activeSym, err = eu.toSym(ctx, tokenAddress)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
err = eu.updateDefaultToken(ctx, identity, userStore, string(activeSym))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = eu.updateTokenTransferList(ctx, identity, userStore)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
// set default token to given symbol.
|
||||
func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
|
||||
pfxDb := toPrefixDb(userStore, identity.SessionId)
|
||||
// TODO: the activeSym input should instead be newline separated list?
|
||||
tokenData, err := store.GetVoucherData(ctx, pfxDb, activeSym)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return store.UpdateVoucherData(ctx, userStore, identity.SessionId, tokenData)
|
||||
}
|
||||
|
||||
|
||||
// handle token transfer.
|
||||
//
|
||||
// if from and to are NOT the same, handle code will be executed once for each side of the transfer.
|
||||
func (eh *EventsUpdater) handleTokenTransfer(ctx context.Context, ev any) error {
|
||||
o, ok := ev.(*apievent.EventTokenTransfer)
|
||||
if !ok {
|
||||
fmt.Errorf("invalid event for token transfer")
|
||||
}
|
||||
return eh.HandleTokenTransfer(ctx, o)
|
||||
}
|
||||
func (eu *EventsUpdater) HandleTokenTransfer(ctx context.Context, ev *apievent.EventTokenTransfer) error {
|
||||
_, userStore, err := eu.getStore(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
identity, err := store.IdentityFromAddress(ctx, userStore, ev.From)
|
||||
if err != nil {
|
||||
if !db.IsNotFound(err) {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
err = eu.updateToken(ctx, identity, userStore, ev.VoucherAddress)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if strings.Compare(ev.To, ev.From) != 0 {
|
||||
identity, err = store.IdentityFromAddress(ctx, userStore, ev.To)
|
||||
if err != nil {
|
||||
if !db.IsNotFound(err) {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
err = eu.updateToken(ctx, identity, userStore, ev.VoucherAddress)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// handle token mint.
|
||||
func (eh *EventsUpdater) handleTokenMint(ctx context.Context, ev any) error {
|
||||
o, ok := ev.(*apievent.EventTokenMint)
|
||||
if !ok {
|
||||
fmt.Errorf("invalid event for token mint")
|
||||
}
|
||||
return eh.HandleTokenMint(ctx, o)
|
||||
}
|
||||
func (eu *EventsUpdater) HandleTokenMint(ctx context.Context, ev *apievent.EventTokenMint) error {
|
||||
_, userStore, err := eu.getStore(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
identity, err := store.IdentityFromAddress(ctx, userStore, ev.To)
|
||||
if err != nil {
|
||||
if !db.IsNotFound(err) {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
err = eu.updateToken(ctx, identity, userStore, ev.VoucherAddress)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// use api to resolve address to token symbol.
|
||||
func (eu *EventsUpdater) toSym(ctx context.Context, address string) ([]byte, error) {
|
||||
voucherData, err := eu.api.VoucherData(ctx, address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return []byte(voucherData.TokenSymbol), nil
|
||||
}
|
||||
|
||||
// refresh and store token list.
|
||||
func (eu *EventsUpdater) updateTokenList(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore) error {
|
||||
holdings, err := eu.api.FetchVouchers(ctx, identity.ChecksumAddress)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
metadata := store.ProcessVouchers(holdings)
|
||||
_ = metadata
|
||||
|
||||
// TODO: make sure subprefixdb is thread safe when using gdbm
|
||||
// TODO: why is address session here unless explicitly set
|
||||
pfxDb := toPrefixDb(userStore, identity.SessionId)
|
||||
|
||||
typ := storedb.ToBytes(storedb.DATA_VOUCHER_SYMBOLS)
|
||||
err = pfxDb.Put(ctx, typ, []byte(metadata.Symbols))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
typ = storedb.ToBytes(storedb.DATA_VOUCHER_BALANCES)
|
||||
err = pfxDb.Put(ctx, typ, []byte(metadata.Balances))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
typ = storedb.ToBytes(storedb.DATA_VOUCHER_DECIMALS)
|
||||
err = pfxDb.Put(ctx, typ, []byte(metadata.Decimals))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
typ = storedb.ToBytes(storedb.DATA_VOUCHER_ADDRESSES)
|
||||
err = pfxDb.Put(ctx, typ, []byte(metadata.Addresses))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// refresh and store transaction history.
|
||||
func (eu *EventsUpdater) updateTokenTransferList(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore) error {
|
||||
var r []string
|
||||
|
||||
txs, err := eu.api.FetchTransactions(ctx, identity.ChecksumAddress)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i, tx := range(txs) {
|
||||
r = append(r, eu.formatFunc(apievent.EventTokenTransferTag, i, tx))
|
||||
}
|
||||
|
||||
s := strings.Join(r, "\n")
|
||||
|
||||
return userStore.WriteEntry(ctx, identity.SessionId, storedb.DATA_TRANSACTIONS, []byte(s))
|
||||
}
|
||||
|
||||
func toPrefixDb(userStore *store.UserDataStore, sessionId string) storedb.PrefixDb {
|
||||
userStore.Db.SetSession(sessionId)
|
||||
prefix := storedb.ToBytes(db.DATATYPE_USERDATA)
|
||||
return store.StoreToPrefixDb(userStore, prefix)
|
||||
}
|
||||
@ -6,8 +6,6 @@ import (
|
||||
visedb "git.defalsify.org/vise.git/db"
|
||||
storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
|
||||
"git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
|
||||
"git.grassecon.net/grassrootseconomics/common/hex"
|
||||
"git.grassecon.net/grassrootseconomics/common/identity"
|
||||
)
|
||||
|
||||
// TODO: Rename interface, "datastore" is redundant naming and too general
|
||||
@ -41,37 +39,3 @@ func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, ty
|
||||
func StoreToPrefixDb(userStore *UserDataStore, pfx []byte) storedb.PrefixDb {
|
||||
return storedb.NewSubPrefixDb(userStore.Db, pfx)
|
||||
}
|
||||
|
||||
// IdentityFromAddress fully populates and Identity object from a given
|
||||
// checksum address.
|
||||
//
|
||||
// It is the caller's responsibility to ensure that a valid checksum address
|
||||
// is passed.
|
||||
func IdentityFromAddress(ctx context.Context, userStore *UserDataStore, address string) (identity.Identity, error) {
|
||||
var err error
|
||||
var ident identity.Identity
|
||||
|
||||
ident.ChecksumAddress = address
|
||||
ident.NormalAddress, err = hex.NormalizeHex(ident.ChecksumAddress)
|
||||
if err != nil {
|
||||
return ident, err
|
||||
}
|
||||
ident.SessionId, err = getSessionIdByAddress(ctx, userStore, ident.NormalAddress)
|
||||
if err != nil {
|
||||
return ident, err
|
||||
}
|
||||
return ident, nil
|
||||
}
|
||||
|
||||
// load matching session from address from db store.
|
||||
func getSessionIdByAddress(ctx context.Context, userStore *UserDataStore, address string) (string, error) {
|
||||
// TODO: replace with userdatastore when double sessionid issue fixed
|
||||
//r, err := store.ReadEntry(ctx, address, common.DATA_PUBLIC_KEY_REVERSE)
|
||||
userStore.Db.SetPrefix(visedb.DATATYPE_USERDATA)
|
||||
userStore.Db.SetSession(address)
|
||||
r, err := userStore.Db.Get(ctx, storedb.PackKey(storedb.DATA_PUBLIC_KEY_REVERSE, []byte{}))
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return string(r), nil
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user