Merge pull request #4 from deso-protocol/feature/proof-of-stake

feature/proof-of-stake

Author: lazynina

Dockerfile

@@ -1,42 +1,53 @@
-FROM alpine:latest AS daodao
+FROM alpine:latest AS postgres-data-handler
 
 RUN apk update
 RUN apk upgrade
-RUN apk add --update go gcc g++ vips-dev
+RUN apk add --update bash go cmake g++ gcc git make vips-dev
 
 WORKDIR /postgres-data-handler/src
 
 COPY postgres-data-handler/go.mod postgres-data-handler/
 COPY postgres-data-handler/go.sum postgres-data-handler/
-COPY core/go.mod core/
-COPY core/go.sum core/
+COPY core/go.mod                  core/
+COPY core/go.sum                  core/
+COPY backend/go.mod               backend/
+COPY backend/go.sum               backend/
+COPY state-consumer/go.mod        state-consumer/
+COPY state-consumer/go.sum        state-consumer/
 
 WORKDIR /postgres-data-handler/src/postgres-data-handler
 
 RUN go mod download
 
 # include postgres data handler src
-COPY postgres-data-handler/entries        entries
-COPY postgres-data-handler/migrations    migrations
+COPY postgres-data-handler/entries    entries
+COPY postgres-data-handler/migrations migrations
 COPY postgres-data-handler/handler    handler
-COPY postgres-data-handler/main.go       .
+COPY postgres-data-handler/main.go    .
 
 # include core src
-COPY core/desohash ../core/desohash
-COPY core/cmd       ../core/cmd
-COPY core/lib       ../core/lib
-COPY core/migrate   ../core/migrate
+COPY core/desohash    ../core/desohash
+COPY core/consensus   ../core/consensus
+COPY core/collections ../core/collections
+COPY core/bls         ../core/bls
+COPY core/cmd         ../core/cmd
+COPY core/lib         ../core/lib
+COPY core/migrate     ../core/migrate
+
+# include backend src
+COPY backend/apis      ../backend/apis
+COPY backend/config    ../backend/config
+COPY backend/cmd       ../backend/cmd
+COPY backend/miner     ../backend/miner
+COPY backend/routes    ../backend/routes
+COPY backend/countries ../backend/countries
+
+# include state-consumer src
+COPY state-consumer/consumer ../state-consumer/consumer
 
 RUN go mod tidy
 
 ## build postgres data handler backend
 RUN GOOS=linux go build -mod=mod -a -installsuffix cgo -o bin/postgres-data-handler main.go
-#
-## create tiny image
-#FROM alpine:latest
-##
-#RUN apk add --update vips-dev
-##
-#COPY --from=daodao /daodao/src/daodao-backend/bin/daodao-backend /daodao/bin/daodao-backend
-#ENTRYPOINT ["/daodao/bin/daodao-backend"]
+
 ENTRYPOINT ["/postgres-data-handler/src/postgres-data-handler/bin/postgres-data-handler"]

Makefile

@@ -0,0 +1,8 @@
+dev:
+	go run .
+
+dev-env:
+	docker compose -f local.docker-compose.yml build && docker compose -f local.docker-compose.yml up
+
+dev-env-down:
+	docker compose -f local.docker-compose.yml down --volumes

entries/access_group.go

@@ -52,7 +52,7 @@ func AccessGroupEncoderToPGStruct(accessGroupEntry *lib.AccessGroupEntry, keyByt
 
 // PostBatchOperation is the entry point for processing a batch of post entries. It determines the appropriate handler
 // based on the operation type and executes it.
-func AccessGroupBatchOperation(entries []*lib.StateChangeEntry, db *bun.DB, params *lib.DeSoParams) error {
+func AccessGroupBatchOperation(entries []*lib.StateChangeEntry, db bun.IDB, params *lib.DeSoParams) error {
 	// We check before we call this function that there is at least one operation type.
 	// We also ensure before this that all entries have the same operation type.
 	operationType := entries[0].OperationType
@@ -69,7 +69,7 @@ func AccessGroupBatchOperation(entries []*lib.StateChangeEntry, db *bun.DB, para
 }
 
 // bulkInsertAccessGroupEntry inserts a batch of access_group entries into the database.
-func bulkInsertAccessGroupEntry(entries []*lib.StateChangeEntry, db *bun.DB, operationType lib.StateSyncerOperationType, params *lib.DeSoParams) error {
+func bulkInsertAccessGroupEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType, params *lib.DeSoParams) error {
 	// Track the unique entries we've inserted so we don't insert the same entry twice.
 	uniqueEntries := consumer.UniqueEntries(entries)
 	// Create a new array to hold the bun struct.
@@ -94,7 +94,7 @@ func bulkInsertAccessGroupEntry(entries []*lib.StateChangeEntry, db *bun.DB, ope
 }
 
 // bulkDeletePostEntry deletes a batch of access_group entries from the database.
-func bulkDeleteAccessGroupEntry(entries []*lib.StateChangeEntry, db *bun.DB, operationType lib.StateSyncerOperationType) error {
+func bulkDeleteAccessGroupEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType) error {
 	// Track the unique entries we've inserted so we don't insert the same entry twice.
 	uniqueEntries := consumer.UniqueEntries(entries)
 

entries/access_group_member.go

@@ -57,7 +57,7 @@ func AccessGroupMemberEncoderToPGStruct(accessGroupMemberEntry *lib.AccessGroupM
 
 // PostBatchOperation is the entry point for processing a batch of post entries. It determines the appropriate handler
 // based on the operation type and executes it.
-func AccessGroupMemberBatchOperation(entries []*lib.StateChangeEntry, db *bun.DB, params *lib.DeSoParams) error {
+func AccessGroupMemberBatchOperation(entries []*lib.StateChangeEntry, db bun.IDB, params *lib.DeSoParams) error {
 	// We check before we call this function that there is at least one operation type.
 	// We also ensure before this that all entries have the same operation type.
 	operationType := entries[0].OperationType
@@ -74,7 +74,7 @@ func AccessGroupMemberBatchOperation(entries []*lib.StateChangeEntry, db *bun.DB
 }
 
 // bulkInsertAccessGroupMemberEntry inserts a batch of access_group_member entries into the database.
-func bulkInsertAccessGroupMemberEntry(entries []*lib.StateChangeEntry, db *bun.DB, operationType lib.StateSyncerOperationType, params *lib.DeSoParams) error {
+func bulkInsertAccessGroupMemberEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType, params *lib.DeSoParams) error {
 	// Track the unique entries we've inserted so we don't insert the same entry twice.
 	uniqueEntries := consumer.UniqueEntries(entries)
 	// Create a new array to hold the bun struct.
@@ -99,7 +99,7 @@ func bulkInsertAccessGroupMemberEntry(entries []*lib.StateChangeEntry, db *bun.D
 }
 
 // bulkDeletePostEntry deletes a batch of access_group_member entries from the database.
-func bulkDeleteAccessGroupMemberEntry(entries []*lib.StateChangeEntry, db *bun.DB, operationType lib.StateSyncerOperationType) error {
+func bulkDeleteAccessGroupMemberEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType) error {
 	// Track the unique entries we've inserted so we don't insert the same entry twice.
 	uniqueEntries := consumer.UniqueEntries(entries)
 

entries/balance.go

@@ -46,7 +46,7 @@ func BalanceEntryEncoderToPGStruct(balanceEntry *lib.BalanceEntry, keyBytes []by
 
 // PostBatchOperation is the entry point for processing a batch of post entries. It determines the appropriate handler
 // based on the operation type and executes it.
-func BalanceBatchOperation(entries []*lib.StateChangeEntry, db *bun.DB, params *lib.DeSoParams) error {
+func BalanceBatchOperation(entries []*lib.StateChangeEntry, db bun.IDB, params *lib.DeSoParams) error {
 	// We check before we call this function that there is at least one operation type.
 	// We also ensure before this that all entries have the same operation type.
 	operationType := entries[0].OperationType
@@ -63,7 +63,7 @@ func BalanceBatchOperation(entries []*lib.StateChangeEntry, db *bun.DB, params *
 }
 
 // bulkInsertBalanceEntry inserts a batch of balance entries into the database.
-func bulkInsertBalanceEntry(entries []*lib.StateChangeEntry, db *bun.DB, operationType lib.StateSyncerOperationType, params *lib.DeSoParams) error {
+func bulkInsertBalanceEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType, params *lib.DeSoParams) error {
 	// Track the unique entries we've inserted so we don't insert the same entry twice.
 	uniqueEntries := consumer.UniqueEntries(entries)
 	// Create a new array to hold the bun struct.
@@ -88,7 +88,7 @@ func bulkInsertBalanceEntry(entries []*lib.StateChangeEntry, db *bun.DB, operati
 }
 
 // bulkDeletePostEntry deletes a batch of balance entries from the database.
-func bulkDeleteBalanceEntry(entries []*lib.StateChangeEntry, db *bun.DB, operationType lib.StateSyncerOperationType) error {
+func bulkDeleteBalanceEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType) error {
 	// Track the unique entries we've inserted so we don't insert the same entry twice.
 	uniqueEntries := consumer.UniqueEntries(entries)