diff --git a/cmd/service/api.go b/cmd/service/api.go index 1be94c0..9fa2738 100644 --- a/cmd/service/api.go +++ b/cmd/service/api.go @@ -27,8 +27,12 @@ func initApiServer(custodialContainer *custodial) *echo.Echo { apiRoute := server.Group("/api") apiRoute.POST("/account/create", api.CreateAccountHandler( - custodialContainer.taskerClient, custodialContainer.keystore, + custodialContainer.taskerClient, + )) + + apiRoute.POST("/sign/transfer", api.SignTransferHandler( + custodialContainer.taskerClient, )) return server diff --git a/go.mod b/go.mod index 6a6ed4d..2085185 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( github.com/deckarep/golang-set v1.8.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/georgysavva/scany/v2 v2.0.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect @@ -59,6 +60,9 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/nats-io/nats.go v1.23.0 // indirect + github.com/nats-io/nkeys v0.3.0 // indirect + github.com/nats-io/nuid v1.0.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/onsi/gomega v1.24.1 // indirect github.com/pelletier/go-toml v1.7.0 // indirect @@ -66,7 +70,7 @@ require ( github.com/prometheus/tsdb v0.10.0 // indirect github.com/rivo/uniseg v0.4.3 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect - github.com/rogpeppe/go-internal v1.8.1 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/spf13/cast v1.3.1 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect @@ -78,11 +82,11 @@ require ( github.com/valyala/histogram v1.2.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/crypto v0.3.0 // indirect - golang.org/x/net v0.4.0 // indirect + golang.org/x/crypto v0.5.0 // indirect + golang.org/x/net v0.5.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/sys v0.4.0 // indirect + golang.org/x/text v0.6.0 // indirect golang.org/x/time v0.2.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/go-playground/assert.v1 v1.2.1 // indirect diff --git a/go.sum b/go.sum index e7dc595..dbc76f4 100644 --- a/go.sum +++ b/go.sum @@ -169,6 +169,8 @@ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/georgysavva/scany/v2 v2.0.0 h1:RGXqxDv4row7/FYoK8MRXAZXqoWF/NM+NP0q50k3DKU= +github.com/georgysavva/scany/v2 v2.0.0/go.mod h1:sigOdh+0qb/+aOs3TVhehVT10p8qJL7K/Zhyz8vWo38= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -478,6 +480,12 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/nats-io/nats.go v1.23.0 h1:lR28r7IX44WjYgdiKz9GmUeW0uh/m33uD3yEjLZ2cOE= +github.com/nats-io/nats.go v1.23.0/go.mod h1:ki/Scsa23edbh8IRZbCuNXR9TDcbvfaSijKtaqQgw+Q= +github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= +github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -555,6 +563,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -650,9 +660,12 @@ golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -715,6 +728,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -795,6 +810,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -807,6 +824,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/internal/api/account.go b/internal/api/account.go index 703880c..06ba08d 100644 --- a/internal/api/account.go +++ b/internal/api/account.go @@ -1,22 +1,41 @@ package api import ( + "encoding/json" "net/http" "github.com/grassrootseconomics/cic-custodial/internal/keystore" "github.com/grassrootseconomics/cic-custodial/internal/tasker" + "github.com/grassrootseconomics/cic-custodial/internal/tasker/task" "github.com/grassrootseconomics/cic-custodial/pkg/keypair" "github.com/labstack/echo/v4" ) // CreateAccountHandler route. -// POST: /api/account/create. -// Returns the public key and tasker account prep receipt. +// POST: /api/account/create +// JSON Body: +// trackingId -> Unique string +// Returns the public key. func CreateAccountHandler( - taskerClient *tasker.TaskerClient, keystore keystore.Keystore, + taskerClient *tasker.TaskerClient, ) func(echo.Context) error { return func(c echo.Context) error { + var accountRequest struct { + TrackingId string `json:"trackingId" validate:"required"` + } + + if err := c.Bind(&accountRequest); err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, errResp{ + Ok: false, + Code: INTERNAL_ERROR, + }) + } + + if err := c.Validate(accountRequest); err != nil { + return err + } + generatedKeyPair, err := keypair.Generate() if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, errResp{ @@ -33,24 +52,38 @@ func CreateAccountHandler( }) } + taskPayload, err := json.Marshal(task.AccountPayload{ + PublicKey: generatedKeyPair.Public, + TrackingId: accountRequest.TrackingId, + }) + if err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, errResp{ + Ok: false, + Code: INTERNAL_ERROR, + }) + } + + _, err = taskerClient.CreateTask( + tasker.PrepareAccountTask, + tasker.DefaultPriority, + &tasker.Task{ + Id: accountRequest.TrackingId, + Payload: taskPayload, + }, + ) + if err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, errResp{ + Ok: false, + Code: INTERNAL_ERROR, + }) + } + return c.JSON(http.StatusOK, okResp{ Ok: true, Result: H{ - "publicKey": generatedKeyPair.Public, - "keyId": id, + "publicKey": generatedKeyPair.Public, + "custodialId": id, }, }) } } - -// AccountStatusHandler route. -// GET: /api/account/status. -// Check if an account is ready to be used. -// Returns the status as a bool. -func AccountStatusHandler() func(echo.Context) error { - return func(c echo.Context) error { - return c.JSON(http.StatusOK, okResp{ - Ok: true, - }) - } -} diff --git a/internal/api/sign.go b/internal/api/sign.go new file mode 100644 index 0000000..6b587b0 --- /dev/null +++ b/internal/api/sign.go @@ -0,0 +1,71 @@ +package api + +import ( + "encoding/json" + "net/http" + + "github.com/grassrootseconomics/cic-custodial/internal/tasker" + "github.com/labstack/echo/v4" +) + +// SignTxHandler route. +// POST: /api/sign/transfer +// JSON Body: +// trackingId -> Unique string +// from -> ETH address +// to -> ETH address +// voucherAddress -> ETH address +// amount -> int (6 d.p. precision) +// e.g. 1000000 = 1 VOUCHER +// Returns the task id. +func SignTransferHandler( + taskerClient *tasker.TaskerClient, +) func(echo.Context) error { + return func(c echo.Context) error { + var transferRequest struct { + TrackingId string `json:"trackingId" validate:"required"` + From string `json:"from" validate:"required,eth_address"` + To string `json:"to" validate:"required,eth_addr"` + VoucherAddress string `json:"voucherAddress" validate:"required,eth_addr"` + Amount int64 `json:"amount" validate:"required,numeric"` + } + + if err := c.Bind(&transferRequest); err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, errResp{ + Ok: false, + Code: INTERNAL_ERROR, + }) + } + + if err := c.Validate(transferRequest); err != nil { + return err + } + + taskPayload, err := json.Marshal(transferRequest) + if err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, errResp{ + Ok: false, + Code: INTERNAL_ERROR, + }) + } + + _, err = taskerClient.CreateTask( + tasker.TransferTokenTask, + tasker.HighPriority, + &tasker.Task{ + Id: transferRequest.TrackingId, + Payload: taskPayload, + }, + ) + if err != nil { + return echo.NewHTTPError(http.StatusInternalServerError, errResp{ + Ok: false, + Code: INTERNAL_ERROR, + }) + } + + return c.JSON(http.StatusOK, okResp{ + Ok: true, + }) + } +} diff --git a/internal/keystore/postgres.go b/internal/keystore/postgres.go index 72308d0..d5cab2b 100644 --- a/internal/keystore/postgres.go +++ b/internal/keystore/postgres.go @@ -31,10 +31,12 @@ func NewPostgresKeytore(o Opts) Keystore { // WriteKeyPair inserts a keypair into the db and returns the linked id. func (ks *PostgresKeystore) WriteKeyPair(ctx context.Context, keypair keypair.Key) (uint, error) { - var id uint + var ( + id uint + ) if err := ks.db.QueryRow(ctx, ks.queries.WriteKeyPair, keypair.Public, keypair.Private).Scan(&id); err != nil { - return 0, err + return id, err } return id, nil @@ -42,7 +44,9 @@ func (ks *PostgresKeystore) WriteKeyPair(ctx context.Context, keypair keypair.Ke // LoadPrivateKey loads a private key as a crypto primitive for direct use. An id is used to search for the private key. func (ks *PostgresKeystore) LoadPrivateKey(ctx context.Context, publicKey string) (*ecdsa.PrivateKey, error) { - var privateKeyString string + var ( + privateKeyString string + ) if err := ks.db.QueryRow(ctx, ks.queries.LoadKeyPair, publicKey).Scan(&privateKeyString); err != nil { return nil, err diff --git a/internal/queries/queries.go b/internal/queries/queries.go index ffe33e7..fb3d173 100644 --- a/internal/queries/queries.go +++ b/internal/queries/queries.go @@ -11,6 +11,9 @@ type Queries struct { WriteKeyPair string `query:"write-key-pair"` LoadKeyPair string `query:"load-key-pair"` // OTX + CreateOTX string `query:"create-otx"` + // Dispatch + CreateDispatchStatus string `query:"create-dispatch-status"` } func LoadQueries(q goyesql.Queries) (*Queries, error) { diff --git a/internal/store/dispatch.go b/internal/store/dispatch.go new file mode 100644 index 0000000..772339d --- /dev/null +++ b/internal/store/dispatch.go @@ -0,0 +1,25 @@ +package store + +import ( + "context" +) + +type Status string + +func (s *PostgresStore) CreateDispatchStatus(ctx context.Context, dispatch DispatchStatus) (uint, error) { + var ( + id uint + ) + + if err := s.db.QueryRow( + ctx, + s.queries.CreateDispatchStatus, + dispatch.OtxId, + dispatch.Status, + dispatch.TrackingId, + ).Scan(&id); err != nil { + return id, err + } + + return id, nil +} diff --git a/internal/store/otx.go b/internal/store/otx.go new file mode 100644 index 0000000..8a092bb --- /dev/null +++ b/internal/store/otx.go @@ -0,0 +1,25 @@ +package store + +import "context" + +func (s *PostgresStore) CreateOTX(ctx context.Context, otx OTX) (uint, error) { + var ( + id uint + ) + + if err := s.db.QueryRow( + ctx, + s.queries.CreateOTX, + otx.RawTx, + otx.TxHash, + otx.From, + otx.Data, + otx.GasPrice, + otx.Nonce, + otx.TrackingId, + ).Scan(&id); err != nil { + return id, err + } + + return id, nil +} diff --git a/internal/store/postgres.go b/internal/store/postgres.go new file mode 100644 index 0000000..97c4dfe --- /dev/null +++ b/internal/store/postgres.go @@ -0,0 +1,25 @@ +package store + +import ( + "github.com/grassrootseconomics/cic-custodial/internal/queries" + "github.com/jackc/pgx/v5/pgxpool" +) + +type ( + Opts struct { + PostgresPool *pgxpool.Pool + Queries *queries.Queries + } + + PostgresStore struct { + db *pgxpool.Pool + queries *queries.Queries + } +) + +func NewPostgresStore(o Opts) Store { + return &PostgresStore{ + db: o.PostgresPool, + queries: o.Queries, + } +} diff --git a/internal/store/store.go b/internal/store/store.go new file mode 100644 index 0000000..fcb4a32 --- /dev/null +++ b/internal/store/store.go @@ -0,0 +1,32 @@ +package store + +import ( + "context" + + "github.com/grassrootseconomics/cic-custodial/pkg/status" +) + +type ( + OTX struct { + RawTx string + TxHash string + From string + Data string + GasPrice uint64 + Nonce uint64 + TrackingId string + } + + DispatchStatus struct { + OtxId uint + Status status.Status + TrackingId string + } + + Store interface { + // OTX (Custodial originating transactions). + CreateOTX(ctx context.Context, otx OTX) (id uint, err error) + // Dispatch status. + CreateDispatchStatus(ctx context.Context, dispatch DispatchStatus) (id uint, err error) + } +) diff --git a/internal/tasker/task/system.go b/internal/tasker/task/account.go similarity index 56% rename from internal/tasker/task/system.go rename to internal/tasker/task/account.go index c5c1bb2..d5cddf4 100644 --- a/internal/tasker/task/system.go +++ b/internal/tasker/task/account.go @@ -2,6 +2,7 @@ package task import ( "context" + "encoding/hex" "encoding/json" "fmt" "math/big" @@ -9,27 +10,40 @@ import ( "github.com/bsm/redislock" celo "github.com/grassrootseconomics/cic-celo-sdk" "github.com/grassrootseconomics/cic-custodial/internal/nonce" + "github.com/grassrootseconomics/cic-custodial/internal/store" "github.com/grassrootseconomics/cic-custodial/internal/tasker" "github.com/grassrootseconomics/w3-celo-patch" "github.com/grassrootseconomics/w3-celo-patch/module/eth" "github.com/hibiken/asynq" + "github.com/nats-io/nats.go" ) -type SystemPayload struct { - PublicKey string `json:"publicKey"` -} +type ( + AccountPayload struct { + PublicKey string `json:"publicKey"` + TrackingId string `json:"trackingId"` + } + + accountEventPayload struct { + TrackingId string `json:"trackingId"` + } +) func PrepareAccount( - nonceProvider nonce.Noncestore, + js nats.JetStreamContext, + noncestore nonce.Noncestore, taskerClient *tasker.TaskerClient, ) func(context.Context, *asynq.Task) error { return func(ctx context.Context, t *asynq.Task) error { - var p SystemPayload + var ( + p AccountPayload + ) + if err := json.Unmarshal(t.Payload(), &p); err != nil { - return fmt.Errorf("json.Unmarshal failed: %v: %w", err, asynq.SkipRetry) + return err } - if err := nonceProvider.SetNewAccountNonce(ctx, p.PublicKey); err != nil { + if err := noncestore.SetNewAccountNonce(ctx, p.PublicKey); err != nil { return err } @@ -55,21 +69,40 @@ func PrepareAccount( return err } + eventPayload := &accountEventPayload{ + TrackingId: p.TrackingId, + } + + eventJson, err := json.Marshal(eventPayload) + if err != nil { + return err + } + + _, err = js.Publish("CUSTODIAL.accountNewNonce", eventJson) + if err != nil { + return err + } + return nil } } func GiftGasProcessor( celoProvider *celo.Provider, - nonceProvider nonce.Noncestore, + js nats.JetStreamContext, lockProvider *redislock.Client, + noncestore nonce.Noncestore, + pg store.Store, system *tasker.SystemContainer, taskerClient *tasker.TaskerClient, ) func(context.Context, *asynq.Task) error { return func(ctx context.Context, t *asynq.Task) error { - var p SystemPayload + var ( + p AccountPayload + ) + if err := json.Unmarshal(t.Payload(), &p); err != nil { - return fmt.Errorf("json.Unmarshal failed: %v: %w", err, asynq.SkipRetry) + return err } lock, err := lockProvider.Obtain(ctx, system.LockPrefix+system.PublicKey, system.LockTimeout, nil) @@ -78,11 +111,12 @@ func GiftGasProcessor( } defer lock.Release(ctx) - nonce, err := nonceProvider.Acquire(ctx, system.PublicKey) + nonce, err := noncestore.Acquire(ctx, system.PublicKey) if err != nil { return err } + // TODO: Review gas params builtTx, err := celoProvider.SignGasTransferTx( system.PrivateKey, celo.GasTransferTxOpts{ @@ -93,17 +127,49 @@ func GiftGasProcessor( }, ) if err != nil { - if err := nonceProvider.Return(ctx, p.PublicKey); err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { return err } - return fmt.Errorf("nonce.Return failed: %v: %w", err, asynq.SkipRetry) + + return err + } + + rawTx, err := builtTx.MarshalBinary() + if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err + } + + id, err := pg.CreateOTX(ctx, store.OTX{ + RawTx: hex.EncodeToString(rawTx), + TxHash: builtTx.Hash().Hex(), + From: system.PublicKey, + Data: string(builtTx.Data()), + GasPrice: builtTx.GasPrice().Uint64(), + Nonce: builtTx.Nonce(), + }) + if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err } disptachJobPayload, err := json.Marshal(TxPayload{ - Tx: builtTx, + OtxId: id, + TrackingId: p.TrackingId, + Tx: builtTx, }) if err != nil { - return fmt.Errorf("json.Marshal failed: %v: %w", err, asynq.SkipRetry) + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err } _, err = taskerClient.CreateTask( @@ -114,6 +180,28 @@ func GiftGasProcessor( }, ) if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err + } + + eventPayload := &accountEventPayload{ + TrackingId: p.TrackingId, + } + + eventJson, err := json.Marshal(eventPayload) + if err != nil { + return err + } + + _, err = js.Publish("CUSTODIAL.giftNewAccountGas", eventJson) + if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + return err } @@ -123,18 +211,21 @@ func GiftGasProcessor( func GiftTokenProcessor( celoProvider *celo.Provider, - nonceProvider nonce.Noncestore, + js nats.JetStreamContext, lockProvider *redislock.Client, + noncestore nonce.Noncestore, + pg store.Store, system *tasker.SystemContainer, taskerClient *tasker.TaskerClient, ) func(context.Context, *asynq.Task) error { return func(ctx context.Context, t *asynq.Task) error { - var p SystemPayload - if err := json.Unmarshal(t.Payload(), &p); err != nil { - return fmt.Errorf("json.Unmarshal failed: %v: %w", err, asynq.SkipRetry) - } + var ( + p AccountPayload + ) - publicKey := w3.A(p.PublicKey) + if err := json.Unmarshal(t.Payload(), &p); err != nil { + return err + } lock, err := lockProvider.Obtain(ctx, system.LockPrefix+system.PublicKey, system.LockTimeout, nil) if err != nil { @@ -142,38 +233,70 @@ func GiftTokenProcessor( } defer lock.Release(ctx) - nonce, err := nonceProvider.Acquire(ctx, system.PublicKey) + nonce, err := noncestore.Acquire(ctx, system.PublicKey) if err != nil { return err } - input, err := system.Abis["mint"].EncodeArgs(publicKey, system.GiftableTokenValue) + input, err := system.Abis["mintTo"].EncodeArgs(w3.A(p.PublicKey), system.GiftableTokenValue) if err != nil { - return fmt.Errorf("ABI encode failed %v: %w", err, asynq.SkipRetry) + return err } + // TODO: Review gas params. builtTx, err := celoProvider.SignContractExecutionTx( system.PrivateKey, celo.ContractExecutionTxOpts{ ContractAddress: system.GiftableToken, InputData: input, - GasPrice: celo.FixedMinGas, + GasPrice: big.NewInt(20000000000), GasLimit: system.TokenTransferGasLimit, Nonce: nonce, }, ) if err != nil { - if err := nonceProvider.Return(ctx, p.PublicKey); err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { return err } - return fmt.Errorf("nonce.Return failed: %v: %w", err, asynq.SkipRetry) + return err + } + + rawTx, err := builtTx.MarshalBinary() + if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err + } + + id, err := pg.CreateOTX(ctx, store.OTX{ + RawTx: hex.EncodeToString(rawTx), + TxHash: builtTx.Hash().Hex(), + From: system.PublicKey, + Data: string(builtTx.Data()), + GasPrice: builtTx.GasPrice().Uint64(), + Nonce: builtTx.Nonce(), + }) + if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err } disptachJobPayload, err := json.Marshal(TxPayload{ - Tx: builtTx, + OtxId: id, + TrackingId: p.TrackingId, + Tx: builtTx, }) if err != nil { - return fmt.Errorf("json.Marshal failed: %v: %w", err, asynq.SkipRetry) + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err } _, err = taskerClient.CreateTask( @@ -184,6 +307,28 @@ func GiftTokenProcessor( }, ) if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + + return err + } + + eventPayload := &accountEventPayload{ + TrackingId: p.TrackingId, + } + + eventJson, err := json.Marshal(eventPayload) + if err != nil { + return err + } + + _, err = js.Publish("CUSTODIAL.giftNewAccountVoucher", eventJson) + if err != nil { + if err := noncestore.Return(ctx, system.PublicKey); err != nil { + return err + } + return err } @@ -192,6 +337,7 @@ func GiftTokenProcessor( } // TODO: https://github.com/grassrootseconomics/cic-custodial/issues/43 +// TODO: func RefillGasProcessor( celoProvider *celo.Provider, nonceProvider nonce.Noncestore, @@ -201,7 +347,7 @@ func RefillGasProcessor( ) func(context.Context, *asynq.Task) error { return func(ctx context.Context, t *asynq.Task) error { var ( - p SystemPayload + p AccountPayload balance big.Int ) if err := json.Unmarshal(t.Payload(), &p); err != nil { diff --git a/internal/tasker/task/dispatch.go b/internal/tasker/task/dispatch.go index 1d6ef89..08ca0d5 100644 --- a/internal/tasker/task/dispatch.go +++ b/internal/tasker/task/dispatch.go @@ -3,21 +3,35 @@ package task import ( "context" "encoding/json" - "fmt" "github.com/celo-org/celo-blockchain/common" "github.com/celo-org/celo-blockchain/core/types" celo "github.com/grassrootseconomics/cic-celo-sdk" + "github.com/grassrootseconomics/cic-custodial/internal/store" + "github.com/grassrootseconomics/cic-custodial/pkg/status" "github.com/grassrootseconomics/w3-celo-patch/module/eth" "github.com/hibiken/asynq" + "github.com/nats-io/nats.go" ) -type TxPayload struct { - Tx *types.Transaction `json:"tx"` -} +type ( + TxPayload struct { + OtxId uint `json:"otxId"` + TrackingId string `json:"trackingId"` + Tx *types.Transaction `json:"tx"` + } + + dispatchEventPayload struct { + TrackingId string + TxHash string + } +) func TxDispatch( celoProvider *celo.Provider, + js nats.JetStreamContext, + pg store.Store, + ) func(context.Context, *asynq.Task) error { return func(ctx context.Context, t *asynq.Task) error { var ( @@ -26,14 +40,53 @@ func TxDispatch( ) if err := json.Unmarshal(t.Payload(), &p); err != nil { - return fmt.Errorf("json.Unmarshal failed: %v: %w", err, asynq.SkipRetry) + return err + } + + dispatchStatus := store.DispatchStatus{ + OtxId: p.OtxId, + TrackingId: p.TrackingId, + } + + eventPayload := &dispatchEventPayload{ + TrackingId: p.TrackingId, } - // TODO: Handle all fail cases if err := celoProvider.Client.CallCtx( ctx, eth.SendTx(p.Tx).Returns(&txHash), ); err != nil { + // TODO: Coreect error status + dispatchStatus.Status = status.FailGasPrice + + _, err := pg.CreateDispatchStatus(ctx, dispatchStatus) + if err != nil { + return err + } + + eventJson, err := json.Marshal(eventPayload) + if err != nil { + return err + } + + _, err = js.Publish("CUSTODIAL.dispatchFail", eventJson, nats.MsgId(txHash.Hex())) + if err != nil { + return err + } + + return err + } + + dispatchStatus.TrackingId = status.Successful + eventPayload.TxHash = txHash.Hex() + + eventJson, err := json.Marshal(eventPayload) + if err != nil { + return err + } + + _, err = js.Publish("CUSTODIAL.dispatchSuccessful", eventJson, nats.MsgId(txHash.Hex())) + if err != nil { return err } diff --git a/internal/tasker/task/sign.go b/internal/tasker/task/sign.go new file mode 100644 index 0000000..27d8de0 --- /dev/null +++ b/internal/tasker/task/sign.go @@ -0,0 +1,183 @@ +package task + +import ( + "context" + "encoding/hex" + "encoding/json" + "math/big" + + "github.com/bsm/redislock" + celo "github.com/grassrootseconomics/cic-celo-sdk" + "github.com/grassrootseconomics/cic-custodial/internal/keystore" + "github.com/grassrootseconomics/cic-custodial/internal/nonce" + "github.com/grassrootseconomics/cic-custodial/internal/store" + "github.com/grassrootseconomics/cic-custodial/internal/tasker" + "github.com/grassrootseconomics/w3-celo-patch" + "github.com/hibiken/asynq" + "github.com/nats-io/nats.go" + "github.com/zerodha/logf" +) + +type ( + TransferPayload struct { + TrackingId string `json:"trackingId"` + From string `json:"from" ` + To string `json:"to"` + VoucherAddress string `json:"voucherAddress"` + Amount int64 `json:"amount"` + } + + transferEventPayload struct { + DispatchTaskId string `json:"dispatchTaskId"` + OTXId uint `json:"otxId"` + TrackingId string `json:"trackingId"` + TxHash string `json:"txHash"` + } +) + +func SignTransfer( + celoProvider *celo.Provider, + js nats.JetStreamContext, + keystore keystore.Keystore, + lockProvider *redislock.Client, + noncestore nonce.Noncestore, + pg store.Store, + system *tasker.SystemContainer, + taskerClient *tasker.TaskerClient, + logger logf.Logger, +) func(context.Context, *asynq.Task) error { + return func(ctx context.Context, t *asynq.Task) error { + var ( + p TransferPayload + ) + + if err := json.Unmarshal(t.Payload(), &p); err != nil { + return err + } + + lock, err := lockProvider.Obtain( + ctx, + system.LockPrefix+p.From, + system.LockTimeout, + nil, + ) + if err != nil { + return err + } + defer lock.Release(ctx) + + key, err := keystore.LoadPrivateKey(ctx, p.From) + if err != nil { + return err + } + + nonce, err := noncestore.Acquire(ctx, p.From) + if err != nil { + return err + } + + input, err := system.Abis["transfer"].EncodeArgs(w3.A(p.To), big.NewInt(p.Amount)) + if err != nil { + return err + } + + // TODO: Review gas params. + builtTx, err := celoProvider.SignContractExecutionTx( + key, + celo.ContractExecutionTxOpts{ + ContractAddress: w3.A(p.VoucherAddress), + InputData: input, + GasPrice: big.NewInt(20000000000), + GasLimit: system.TokenTransferGasLimit, + Nonce: nonce, + }, + ) + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + rawTx, err := builtTx.MarshalBinary() + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + id, err := pg.CreateOTX(ctx, store.OTX{ + RawTx: hex.EncodeToString(rawTx), + TxHash: builtTx.Hash().Hex(), + From: p.From, + Data: string(builtTx.Data()), + GasPrice: builtTx.GasPrice().Uint64(), + Nonce: builtTx.Nonce(), + }) + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + disptachJobPayload, err := json.Marshal(TxPayload{ + OtxId: id, + TrackingId: p.TrackingId, + Tx: builtTx, + }) + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + dispatchTask, err := taskerClient.CreateTask( + tasker.TxDispatchTask, + tasker.HighPriority, + &tasker.Task{ + Payload: disptachJobPayload, + }, + ) + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + eventPayload := &transferEventPayload{ + DispatchTaskId: dispatchTask.ID, + OTXId: id, + TrackingId: p.TrackingId, + TxHash: builtTx.Hash().Hex(), + } + + eventJson, err := json.Marshal(eventPayload) + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + _, err = js.Publish("CUSTODIAL.transferSign", eventJson, nats.MsgId(builtTx.Hash().Hex())) + if err != nil { + if err := noncestore.Return(ctx, p.From); err != nil { + return err + } + + return err + } + + return nil + } +} diff --git a/migrations/001_keystore.sql b/migrations/001_keystore.sql index 13b349c..6e20878 100644 --- a/migrations/001_keystore.sql +++ b/migrations/001_keystore.sql @@ -1,3 +1,4 @@ +-- Keystore table CREATE TABLE IF NOT EXISTS keystore ( id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, public_key TEXT NOT NULL, diff --git a/migrations/002_custodial_db.sql b/migrations/002_custodial_db.sql new file mode 100644 index 0000000..4c68dec --- /dev/null +++ b/migrations/002_custodial_db.sql @@ -0,0 +1,23 @@ +-- Origin tx table +CREATE TABLE IF NOT EXISTS otx ( + id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + tracking_id TEXT NOT NULL, + raw_tx TEXT NOT NULL, + tx_hash TEXT NOT NULL, + from TEXT NOT NULL, + data TEXT NOT NULL, + gas_price bigint NOT NULL, + nonce int NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP +) +CREATE INDEX IF NOT EXISTS tx_hash_idx ON otx USING hash(tx_hash); +CREATE INDEX IF NOT EXISTS from_idx ON otx USING hash(from); + +-- Dispatch status table +CREATE TABLE IF NOT EXISTS dispatch ( + id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + otx_id INT REFERENCES otx(id), + status TEXT NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP +) +CREATE INDEX IF NOT EXISTS dispatch_receipt_idx ON dispatch USING hash(dispatch_receipt); diff --git a/pkg/status/status.go b/pkg/status/status.go new file mode 100644 index 0000000..bceba7c --- /dev/null +++ b/pkg/status/status.go @@ -0,0 +1,9 @@ +package status + +type Status string + +const ( + Unknown = "UNKNOWN" + Successful = "SUCCESSFUL" + FailGasPrice = "FAIL_GAS_PRICE" +) diff --git a/queries.sql b/queries.sql index 8e3acdd..e320239 100644 --- a/queries.sql +++ b/queries.sql @@ -12,3 +12,36 @@ INSERT INTO keystore(public_key, private_key) VALUES($1, $2) RETURNING id SELECT private_key FROM keystore WHERE id=$1 -- OTX queries + +--name: create-otx +-- Create a new locally originating tx +-- $1: raw_tx +-- $2: tx_hash +-- $3: from +-- $4: data +-- $5: gas_price +-- $6: nonce +-- $7: tracking_id +INSERT INTO otx( + raw_tx, + tx_hash, + from, + data, + gas_price, + nonce, + tracking_id +) VALUES($1, $2, $3, $4, $5, $6, $7) RETURNING id + + +-- Dispatch status queries + +--name: create-dispatch-status +-- Create a new dispatch status +-- $1: otx_id +-- $2: status +-- £3: tracking_id +INSERT INTO otx( + otx_id, + status, + tracking_id +) VALUES($1, $2, $3) RETURNING id \ No newline at end of file