update feeder dependency (#364)

* update feeder dependency

* exit feeder when node exits

* update twap proto definition

* update env example

* update feeder dependency to v0.2.8

* update golang version in Dockerfile to 1.23

* update runtime alpine version

* fix  runtime alpine package version

Author: leonz789

.env.example

@@ -1,2 +1,2 @@
 ALCHEMY_API_KEY=
-ANKR_API_KEY=
+BOOTSTRAP=

Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /go/src/github.com/imua-xyz/imuachain
 
 COPY go.mod go.sum ./
 
-RUN apk add --no-cache ca-certificates=20241121-r1 build-base=0.5-r3 git=2.47.3-r0 linux-headers=6.6-r1
+RUN apk add --no-cache ca-certificates=~20241121 build-base=~0.5 git=~2.47.3 linux-headers=~6.6
 
 RUN --mount=type=bind,target=. --mount=type=secret,id=GITHUB_TOKEN \
     git config --global url."https://$(cat /run/secrets/GITHUB_TOKEN)@github.com/".insteadOf "https://github.com/"; \
@@ -16,19 +16,19 @@ COPY . .
 
 RUN make build && go install github.com/MinseokOh/toml-cli@latest
 
-FROM alpine:3.19
+FROM alpine:3.21
 
 WORKDIR /root
 
 COPY --from=build-env /go/src/github.com/imua-xyz/imuachain/build/imuad /usr/bin/imuad
 COPY --from=build-env /go/bin/toml-cli /usr/bin/toml-cli
 
 RUN apk add --no-cache \
-	ca-certificates=20241121-r1 \
-	libstdc++~=13.2 \
-	jq~=1.7 \
-	curl~=8.12.1-r0 \
-	bash~=5.2 \
+	ca-certificates=~20241121 \
+	libstdc++=~14.2.0 \
+	jq=~1.7.1 \
+	curl=~8.12.1 \
+	bash=~5.2.37 \
     && addgroup -g 1000 imua \
     && adduser -S -h /home/imua -D imua -u 1000 -G imua
 

client/docs/swagger-ui/swagger.json

@@ -19078,6 +19078,7 @@
                       }
                     },
                     "accumulated_price": {
+                      "title": "accumulated price of the token",
                       "type": "object",
                       "properties": {
                         "price": {
@@ -19093,13 +19094,17 @@
                           "type": "string",
                           "title": "timestamp when the price is corresponded"
                         },
-                        "round_id": {
+                        "last_round_id": {
                           "type": "string",
                           "format": "uint64",
                           "title": "roundid of the price if the source is deteministic"
+                        },
+                        "start_round_id": {
+                          "type": "string",
+                          "format": "uint64",
+                          "title": "start_round_id is used to indicate the round id of the first price in this accumulator"
                         }
-                      },
-                      "title": "price with its specified timestamp and roundid(if from deteministic source)"
+                      }
                     }
                   }
                 }
@@ -43989,6 +43994,35 @@
       },
       "description": "Params defines the parameters for the module."
     },
+    "imuachain.oracle.v1.PriceAcc": {
+      "type": "object",
+      "properties": {
+        "price": {
+          "type": "string",
+          "title": "price"
+        },
+        "decimal": {
+          "type": "integer",
+          "format": "int32",
+          "title": "decimal of the corresponding price"
+        },
+        "timestamp": {
+          "type": "string",
+          "title": "timestamp when the price is corresponded"
+        },
+        "last_round_id": {
+          "type": "string",
+          "format": "uint64",
+          "title": "roundid of the price if the source is deteministic"
+        },
+        "start_round_id": {
+          "type": "string",
+          "format": "uint64",
+          "title": "start_round_id is used to indicate the round id of the first price in this accumulator"
+        }
+      },
+      "title": "PriceAcc is used for price accumulator, which is used to store the latest accumulated price"
+    },
     "imuachain.oracle.v1.PriceEpoch": {
       "type": "object",
       "properties": {
@@ -44178,6 +44212,7 @@
           }
         },
         "accumulated_price": {
+          "title": "accumulated price of the token",
           "type": "object",
           "properties": {
             "price": {
@@ -44193,13 +44228,17 @@
               "type": "string",
               "title": "timestamp when the price is corresponded"
             },
-            "round_id": {
+            "last_round_id": {
               "type": "string",
               "format": "uint64",
               "title": "roundid of the price if the source is deteministic"
+            },
+            "start_round_id": {
+              "type": "string",
+              "format": "uint64",
+              "title": "start_round_id is used to indicate the round id of the first price in this accumulator"
             }
-          },
-          "title": "price with its specified timestamp and roundid(if from deteministic source)"
+          }
         }
       },
       "title": "prices of all rounds of a specific token"
@@ -44743,6 +44782,7 @@
               }
             },
             "accumulated_price": {
+              "title": "accumulated price of the token",
               "type": "object",
               "properties": {
                 "price": {
@@ -44758,13 +44798,17 @@
                   "type": "string",
                   "title": "timestamp when the price is corresponded"
                 },
-                "round_id": {
+                "last_round_id": {
                   "type": "string",
                   "format": "uint64",
                   "title": "roundid of the price if the source is deteministic"
+                },
+                "start_round_id": {
+                  "type": "string",
+                  "format": "uint64",
+                  "title": "start_round_id is used to indicate the round id of the first price in this accumulator"
                 }
-              },
-              "title": "price with its specified timestamp and roundid(if from deteministic source)"
+              }
             }
           }
         }

cmd/imuad/external.go

@@ -4,9 +4,11 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"os/signal"
 	"regexp"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"
 
 	sdkserver "github.com/cosmos/cosmos-sdk/server"
@@ -148,6 +150,18 @@ func launchFeeder(configFile, sourcesConfPath, binPath, mnemonic string, logger
 			cmd.Stdout = os.Stdout
 			cmd.Stderr = os.Stderr
 
+			sig := make(chan os.Signal, 1)
+			signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
+			go func() {
+				<-sig
+				if cmd.Process != nil {
+					if err := cmd.Process.Kill(); err != nil {
+						logger.Error("failed to kill process", "pid", cmd.Process.Pid, "err", err)
+					} else {
+						logger.Info("feeder subprocess terminated by signal", "pid", cmd.Process.Pid)
+					}
+				}
+			}()
 			if err := cmd.Start(); err != nil {
 				logger.Error("failed to start feeder subprocess", "err", err)
 				return

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
-	github.com/imua-xyz/price-feeder v0.0.0-00010101000000-000000000000
+	github.com/imua-xyz/price-feeder v0.2.8
 	github.com/onsi/ginkgo/v2 v2.15.0
 	github.com/onsi/gomega v1.31.1
 	github.com/pkg/errors v0.9.1
@@ -297,8 +297,6 @@ replace (
 	// Security Advisory https://github.com/advisories/GHSA-h395-qcrw-5vmq
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1
 
-	github.com/imua-xyz/price-feeder => github.com/leonz789/price-feeder v0.0.0-20250629150533-749113c62e2a
-
 	// replace broken goleveldb
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	//fix cosmos-sdk error

go.sum

@@ -1176,6 +1176,8 @@ github.com/imua-xyz/cosmos-sdk v0.47.5-evmos.2.0.20250312095401-0035968c59f0 h1:
 github.com/imua-xyz/cosmos-sdk v0.47.5-evmos.2.0.20250312095401-0035968c59f0/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c=
 github.com/imua-xyz/evmos/v16 v16.0.3-0.20250515032007-e21b41cb9b20 h1:OvRREovoBRCGwSkaGiEzgpOSjLhGeldeWBPWcJH8oWA=
 github.com/imua-xyz/evmos/v16 v16.0.3-0.20250515032007-e21b41cb9b20/go.mod h1:aPzVlrI2p5Jb0tETC15f4CVRYwzChGy+Wp6SebGc6tE=
+github.com/imua-xyz/price-feeder v0.2.8 h1:fLxmtBN0zdpe0XpXu1zurCPP/nYCtGpc6PG3k1Q83RU=
+github.com/imua-xyz/price-feeder v0.2.8/go.mod h1:z3oRSlLZ59UgzmlKr4Vhw9WGB42AOS8uXr6/bQ7UoVA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -1252,8 +1254,6 @@ github.com/ledgerwatch/erigon-lib v0.0.0-20230210071639-db0e7ed11263 h1:LGEzZvf3
 github.com/ledgerwatch/erigon-lib v0.0.0-20230210071639-db0e7ed11263/go.mod h1:OXgMDuUo2lZ3NpH29ZvMYbk+LxFd5ffDl2Z2mGMuY/I=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/leonz789/price-feeder v0.0.0-20250629150533-749113c62e2a h1:2z/krlOqh/H3vsEjFiN9mCeD6zLEzOIx+rMV8M/ewiI=
-github.com/leonz789/price-feeder v0.0.0-20250629150533-749113c62e2a/go.mod h1:z3oRSlLZ59UgzmlKr4Vhw9WGB42AOS8uXr6/bQ7UoVA=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=

networks/local/imuachain/Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:1.23.11-alpine3.21 AS build
-RUN apk add --no-cache build-base=0.5-r3 git=2.47.3-r0 linux-headers=6.6-r1
+RUN apk add --no-cache build-base=~0.5 git=~2.47.3 linux-headers=~6.6
 # Set working directory for the build
 WORKDIR /go/work
 # Add source files
@@ -11,10 +11,10 @@ RUN LEDGER_ENABLED=false make build
 #####################################
 FROM alpine:3.21 AS run
 RUN apk add --no-cache \
-    libstdc++=14.2.0-r4 \
-    bash=5.2.37-r0 \
-    curl=8.12.1-r1 \
-    jq=1.7.1-r0 \
+    libstdc++=~14.2.0 \
+    bash=~5.2.37 \
+    curl=~8.12.1 \
+    jq=~1.7.1 \
  && addgroup -g 1000 imua \
  && adduser -S -h /home/imua -D imua -u 1000 -G imua
 EXPOSE 26656 26657 1317 9090 8545 8546

proto/imuachain/oracle/v1/price.proto

@@ -57,3 +57,17 @@ message PriceEpoch {
   // timestamp when the price is corresponded
   string timestamp = 5;
 }
+
+// PriceAcc is used for price accumulator, which is used to store the latest accumulated price
+message PriceAcc {
+  // price
+  string price = 1;
+  // decimal of the corresponding price
+  int32 decimal = 2;
+  // timestamp when the price is corresponded
+  string timestamp = 3;
+  // roundid of the price if the source is deteministic
+  uint64 last_round_id = 4 [(gogoproto.customname) = "LastRoundID"];
+  // start_round_id is used to indicate the round id of the first price in this accumulator
+  uint64 start_round_id = 5 [(gogoproto.customname) = "StartRoundID"];
+}

proto/imuachain/oracle/v1/prices.proto

@@ -17,5 +17,5 @@ message Prices {
   // TWAP of the token
   PriceEpoch twap = 4;
   // accumulated price of the token
-  PriceTimeRound accumulated_price = 5;
+  PriceAcc accumulated_price = 5;
 }