From 22fdca5e2d66b15ed65283d36501cfbec4281fa3 Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Thu, 8 Aug 2024 23:26:41 -0400 Subject: [PATCH 1/7] Add sdk-agent server Signed-off-by: Yuanmao Zhu --- src/agent/sdk-agent/cmd/main.go | 10 +++ src/agent/sdk-agent/go.mod | 34 ++++++++ src/agent/sdk-agent/go.sum | 86 +++++++++++++++++++ .../sdk-agent/internal/routers/networks.go | 12 +++ src/agent/sdk-agent/internal/server/server.go | 21 +++++ src/agent/sdk-agent/makefile | 4 + 6 files changed, 167 insertions(+) create mode 100644 src/agent/sdk-agent/cmd/main.go create mode 100644 src/agent/sdk-agent/go.mod create mode 100644 src/agent/sdk-agent/go.sum create mode 100644 src/agent/sdk-agent/internal/routers/networks.go create mode 100644 src/agent/sdk-agent/internal/server/server.go create mode 100644 src/agent/sdk-agent/makefile diff --git a/src/agent/sdk-agent/cmd/main.go b/src/agent/sdk-agent/cmd/main.go new file mode 100644 index 000000000..f8b70a3a3 --- /dev/null +++ b/src/agent/sdk-agent/cmd/main.go @@ -0,0 +1,10 @@ +package main + +import ( + server "github.com/hyperledger/cello/src/agent/sdk-agent/internal/server" +) + +func main() { + s := server.NewServer() + s.Start() +} diff --git a/src/agent/sdk-agent/go.mod b/src/agent/sdk-agent/go.mod new file mode 100644 index 000000000..c8648c390 --- /dev/null +++ b/src/agent/sdk-agent/go.mod @@ -0,0 +1,34 @@ +module github.com/hyperledger/cello/src/agent/sdk-agent + +go 1.18 + +require github.com/gin-gonic/gin v1.10.0 + +require ( + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/crypto v0.23.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/src/agent/sdk-agent/go.sum b/src/agent/sdk-agent/go.sum new file mode 100644 index 000000000..37abc5858 --- /dev/null +++ b/src/agent/sdk-agent/go.sum @@ -0,0 +1,86 @@ +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/src/agent/sdk-agent/internal/routers/networks.go b/src/agent/sdk-agent/internal/routers/networks.go new file mode 100644 index 000000000..2eabcd6bf --- /dev/null +++ b/src/agent/sdk-agent/internal/routers/networks.go @@ -0,0 +1,12 @@ +package routers + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +// getAlbums responds with the list of all albums as JSON. +func GetNetworks(c *gin.Context) { + c.IndentedJSON(http.StatusOK, nil) +} diff --git a/src/agent/sdk-agent/internal/server/server.go b/src/agent/sdk-agent/internal/server/server.go new file mode 100644 index 000000000..41ab92210 --- /dev/null +++ b/src/agent/sdk-agent/internal/server/server.go @@ -0,0 +1,21 @@ +package server + +import ( + routers "github.com/hyperledger/cello/src/agent/sdk-agent/internal/routers" + + "github.com/gin-gonic/gin" +) + +type server struct { +} + +func NewServer() server { + return server{} +} + +func (s *server) Start() { + grouter := gin.Default() + grouter.GET("/networks", routers.GetNetworks) + + grouter.Run("localhost:8080") +} diff --git a/src/agent/sdk-agent/makefile b/src/agent/sdk-agent/makefile new file mode 100644 index 000000000..e330085cd --- /dev/null +++ b/src/agent/sdk-agent/makefile @@ -0,0 +1,4 @@ +run: + go run cmd/main.go + +.PHONY: run From c1c8377816fd07ebe471e764ab06337f8232f681 Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Thu, 8 Aug 2024 23:27:54 -0400 Subject: [PATCH 2/7] remove comments Signed-off-by: Yuanmao Zhu --- src/agent/sdk-agent/internal/routers/networks.go | 1 - 1 file changed, 1 deletion(-) diff --git a/src/agent/sdk-agent/internal/routers/networks.go b/src/agent/sdk-agent/internal/routers/networks.go index 2eabcd6bf..ebad3b699 100644 --- a/src/agent/sdk-agent/internal/routers/networks.go +++ b/src/agent/sdk-agent/internal/routers/networks.go @@ -6,7 +6,6 @@ import ( "github.com/gin-gonic/gin" ) -// getAlbums responds with the list of all albums as JSON. func GetNetworks(c *gin.Context) { c.IndentedJSON(http.StatusOK, nil) } From 27524ca6e0456e00fffbf76f79c5fd03ddd2d2d5 Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Thu, 8 Aug 2024 23:34:47 -0400 Subject: [PATCH 3/7] add channel Signed-off-by: Yuanmao Zhu --- .../sdk-agent/internal/routers/channel.go | 29 +++++++++++++++++++ .../sdk-agent/internal/routers/networks.go | 11 ------- src/agent/sdk-agent/internal/server/server.go | 5 ++-- 3 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 src/agent/sdk-agent/internal/routers/channel.go delete mode 100644 src/agent/sdk-agent/internal/routers/networks.go diff --git a/src/agent/sdk-agent/internal/routers/channel.go b/src/agent/sdk-agent/internal/routers/channel.go new file mode 100644 index 000000000..fe7b01756 --- /dev/null +++ b/src/agent/sdk-agent/internal/routers/channel.go @@ -0,0 +1,29 @@ +package routers + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func GetChannel(c *gin.Context) { + id := c.Query("channel_id") + if id == "" { + channels := []string{"Channel 1", "Channel 2", "Channel 3"} + c.JSON(http.StatusOK, gin.H{ + "channels": channels, + }) + return + } + c.JSON(http.StatusOK, gin.H{ + "message": "Channel ID: " + id, + }) +} + +func CreateChannel(c *gin.Context) { + c.IndentedJSON(http.StatusOK, nil) +} + +func UpdateChannel(c *gin.Context) { + c.IndentedJSON(http.StatusOK, nil) +} diff --git a/src/agent/sdk-agent/internal/routers/networks.go b/src/agent/sdk-agent/internal/routers/networks.go deleted file mode 100644 index ebad3b699..000000000 --- a/src/agent/sdk-agent/internal/routers/networks.go +++ /dev/null @@ -1,11 +0,0 @@ -package routers - -import ( - "net/http" - - "github.com/gin-gonic/gin" -) - -func GetNetworks(c *gin.Context) { - c.IndentedJSON(http.StatusOK, nil) -} diff --git a/src/agent/sdk-agent/internal/server/server.go b/src/agent/sdk-agent/internal/server/server.go index 41ab92210..fc46873b0 100644 --- a/src/agent/sdk-agent/internal/server/server.go +++ b/src/agent/sdk-agent/internal/server/server.go @@ -15,7 +15,8 @@ func NewServer() server { func (s *server) Start() { grouter := gin.Default() - grouter.GET("/networks", routers.GetNetworks) - + grouter.GET("/channels", routers.GetChannel) + grouter.PUT("/channels", routers.UpdateChannel) + grouter.POST("/channels", routers.CreateChannel) grouter.Run("localhost:8080") } From c55d986184e462f0ef59f5942d61cae1c2a1824a Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Thu, 8 Aug 2024 23:38:27 -0400 Subject: [PATCH 4/7] add config tx Signed-off-by: Yuanmao Zhu --- src/agent/sdk-agent/internal/routers/channel.go | 4 ++++ src/agent/sdk-agent/internal/server/server.go | 1 + 2 files changed, 5 insertions(+) diff --git a/src/agent/sdk-agent/internal/routers/channel.go b/src/agent/sdk-agent/internal/routers/channel.go index fe7b01756..885fedc7e 100644 --- a/src/agent/sdk-agent/internal/routers/channel.go +++ b/src/agent/sdk-agent/internal/routers/channel.go @@ -27,3 +27,7 @@ func CreateChannel(c *gin.Context) { func UpdateChannel(c *gin.Context) { c.IndentedJSON(http.StatusOK, nil) } + +func SignConfigTx(c *gin.Context) { + c.IndentedJSON(http.StatusOK, nil) +} diff --git a/src/agent/sdk-agent/internal/server/server.go b/src/agent/sdk-agent/internal/server/server.go index fc46873b0..bec953033 100644 --- a/src/agent/sdk-agent/internal/server/server.go +++ b/src/agent/sdk-agent/internal/server/server.go @@ -18,5 +18,6 @@ func (s *server) Start() { grouter.GET("/channels", routers.GetChannel) grouter.PUT("/channels", routers.UpdateChannel) grouter.POST("/channels", routers.CreateChannel) + grouter.POST("/configtx", routers.SignConfigTx) grouter.Run("localhost:8080") } From d1d779d2459dd395f4035d46dcd3ff466b5eff85 Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Thu, 8 Aug 2024 23:41:03 -0400 Subject: [PATCH 5/7] add config tx Signed-off-by: Yuanmao Zhu --- src/agent/sdk-agent/internal/server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/sdk-agent/internal/server/server.go b/src/agent/sdk-agent/internal/server/server.go index bec953033..3da62ae2c 100644 --- a/src/agent/sdk-agent/internal/server/server.go +++ b/src/agent/sdk-agent/internal/server/server.go @@ -18,6 +18,6 @@ func (s *server) Start() { grouter.GET("/channels", routers.GetChannel) grouter.PUT("/channels", routers.UpdateChannel) grouter.POST("/channels", routers.CreateChannel) - grouter.POST("/configtx", routers.SignConfigTx) + grouter.POST("/channels/:chain_id/signature", routers.SignConfigTx) grouter.Run("localhost:8080") } From 5fd34805d6f946e823d66bbffe38c909165529d4 Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Sat, 17 Aug 2024 21:54:20 -0400 Subject: [PATCH 6/7] add docker container --- src/agent/sdk-agent/Dockerfile | 32 ++++++++++++++++++++++++++++++++ src/agent/sdk-agent/makefile | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/agent/sdk-agent/Dockerfile diff --git a/src/agent/sdk-agent/Dockerfile b/src/agent/sdk-agent/Dockerfile new file mode 100644 index 000000000..35738ae3e --- /dev/null +++ b/src/agent/sdk-agent/Dockerfile @@ -0,0 +1,32 @@ +# Stage 1: Build the Go binary +FROM golang:1.20-alpine AS builder + +# Set the working directory inside the container +WORKDIR /app + +# Copy go.mod and go.sum files +COPY go.mod go.sum ./ + +# Download all dependencies +RUN go mod download + +# Copy the rest of the application code +COPY . . + +# Build the application from cmd/main.go +RUN go build -o server cmd/main.go + +# Stage 2: Run the Go binary +FROM alpine:latest + +# Set the working directory inside the container +WORKDIR /app + +# Copy the binary from the builder stage +COPY --from=builder /app/server . + +# Expose port 8080 to the outside world +EXPOSE 8080 + +# Command to run the executable +CMD ["./server"] diff --git a/src/agent/sdk-agent/makefile b/src/agent/sdk-agent/makefile index e330085cd..f8329f0bd 100644 --- a/src/agent/sdk-agent/makefile +++ b/src/agent/sdk-agent/makefile @@ -1,4 +1,10 @@ run: - go run cmd/main.go + docker run -d -p 8080:8080 --name sdk-server server:latest +build: + docker build -t server:latest . .PHONY: run + +.PHONY: build + + From debd7b96c25bbdf90843c1dcb6515e1ea9437aca Mon Sep 17 00:00:00 2001 From: Yuanmao Zhu Date: Sat, 17 Aug 2024 21:56:53 -0400 Subject: [PATCH 7/7] update channels --- src/agent/sdk-agent/internal/routers/channel.go | 2 +- src/agent/sdk-agent/internal/server/server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/agent/sdk-agent/internal/routers/channel.go b/src/agent/sdk-agent/internal/routers/channel.go index 885fedc7e..e0ac09187 100644 --- a/src/agent/sdk-agent/internal/routers/channel.go +++ b/src/agent/sdk-agent/internal/routers/channel.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" ) -func GetChannel(c *gin.Context) { +func GetChannels(c *gin.Context) { id := c.Query("channel_id") if id == "" { channels := []string{"Channel 1", "Channel 2", "Channel 3"} diff --git a/src/agent/sdk-agent/internal/server/server.go b/src/agent/sdk-agent/internal/server/server.go index 3da62ae2c..1430a4203 100644 --- a/src/agent/sdk-agent/internal/server/server.go +++ b/src/agent/sdk-agent/internal/server/server.go @@ -15,7 +15,7 @@ func NewServer() server { func (s *server) Start() { grouter := gin.Default() - grouter.GET("/channels", routers.GetChannel) + grouter.GET("/channels", routers.GetChannels) grouter.PUT("/channels", routers.UpdateChannel) grouter.POST("/channels", routers.CreateChannel) grouter.POST("/channels/:chain_id/signature", routers.SignConfigTx)