feat: Remove price-feeder and use Ojo's umee price-feeder for e2e tes…

…ts (#1939)

* Remove price-feeder dir and use umee price-feeder docker file

* e2e working

* Add price-feeder README

* Use latest pf docker image

* Remove price-feeder workflow

* Remove unneccesary pf references

* Fix Makefile conflicts

* Try no experimental

* revert test workflow

* add e2e pf err log

* pf log

* Remove logging code in runPriceFeeeder

* Add log command at failure

* Update log at failure

* bad flag test

* remove bad flag

* build price-feeder container with amd64

* possible fix in actions

* remove container: ubuntu

* Fix health check

* try with ojo pf

* ojo network pf docker container

* remove experimental flag e2e

* Update readme

* Move pf readme to pf dir

* pr comments

* release compatibility matrix

* release note

* change back to experimental e2e

* Use umee pf docker container

* Back to ojo pf container

* umee docker container

.dockerignore

@@ -1,4 +1,3 @@
 build/*
-price-feeder/build/*
 networks
 networks/*

.github/workflows/tests.yml

@@ -124,28 +124,6 @@ jobs:
         run: |
           EXPERIMENTAL=true make test-e2e
 
-  price-feeder:
-    runs-on: ubuntu-latest
-    needs: install-tparse
-    steps:
-      - uses: actions/checkout@v3
-      - uses: technote-space/get-diff-action@v6.1.2
-        with:
-          PATTERNS: |
-            **/**.go
-            price-feeder/go.mod
-            price-feeder/go.sum
-      - uses: actions/setup-go@v4
-        if: env.GIT_DIFF
-        with:
-          go-version: 1.19
-          cache: true
-          cache-dependency-path: price-feeder/go.sum
-      - name: Test price-feeder
-        if: env.GIT_DIFF
-        run: |
-          cd price-feeder && make test-unit
-
   liveness-test:
     needs: install-tparse
     # needs: build-umeed

.mergify.yml

@@ -18,15 +18,6 @@ pull_request_rules:
           {{ title }} (#{{ number }})
           {{ body }}
 
-  - name: Backport patches to the release/price-feeder/v2.x.x branch
-    conditions:
-      - base=main
-      - label=S:backport/price-feeder/v2.x.x
-    actions:
-      backport:
-        branches:
-          - release/price-feeder/v2.x.x
-
   - name: Backport patches to the release/v4.0.x branch
     conditions:
       - base=main

Makefile

@@ -191,7 +191,7 @@ TEST_PACKAGES=./...
 TEST_TARGETS := test-unit test-unit-cover test-race
 TEST_COVERAGE_PROFILE=coverage.txt
 
-UNIT_TEST_TAGS = norace 
+UNIT_TEST_TAGS = norace
 TEST_RACE_TAGS = ""
 TEST_E2E_TAGS = "e2e"
 TEST_E2E_DEPS = docker-build

README.md

@@ -38,6 +38,8 @@ See [Release procedure](CONTRIBUTING.md#release-procedure) for more information
 Since `umeed v3.2` there is a new runtime dependency: `libwasmvm.x86_64.so v1.1.1` is required.
 Building from source will automatically link the `libwasmvm.x86_64.so` created as a part of the build process (you must build on same host as you run the binary, or copy the `libwasmvm.x86_64.so` your lib directory).
 
+After `Price Feeder v2.1.0` the recommended oracle price feeder has been moved to this [repository](https://github.com/ojo-network/price-feeder/tree/umee) with the version prefix `umee/v.x`.
+
 ### Release Compatibility Matrix
 
 | Umee Version | Mainnet | Experimental | Cosmos SDK |  IBC   |  Peggo  | Price Feeder |       Gravity Bridge       |
@@ -51,7 +53,7 @@ Building from source will automatically link the `libwasmvm.x86_64.so` created a
 |    v3.3.x    |    ✓    |      ✗       |  v0.46.6+  | v5.1.x | v1.3.x+ |    v2.0.2    |   umee/v3 v1.5.3-umee-3    |
 |    v4.0.x    |    ✓    |      ✗       |  v0.46.6+  | v5.1.x | v1.3.x+ |    v2.0.3    |   umee/v4 v1.5.3-umee-4    |
 |    v4.1.x    |    ✓    |      ✗       |  v0.46.7+  | v5.2.x | v1.3.x+ |    v2.1.0    |   umee/v4 v1.5.3-umee-4    |
-|    v4.2.x    |    ✓    |      ✗       | v0.46.10+  | v5.2.x | v1.3.x+ |    v2.1.0    |   umee/v4 v1.5.3-umee-4    |
+|    v4.2.x    |    ✓    |      ✗       | v0.46.10+  | v5.2.x | v1.3.x+ | umee/v2.1.1  |   umee/v4 v1.5.3-umee-4    |
 
 ### Active Networks
 

contrib/images/umee.e2e.dockerfile

@@ -12,19 +12,13 @@ WORKDIR /src/umee
 COPY go.mod go.sum ./
 RUN go mod download
 
-## Download go module dependnecies for price-feeder
-WORKDIR /src/umee/price-feeder
-COPY price-feeder/go.mod price-feeder/go.sum ./
-RUN go mod download
-
-## Build umeed and price-feeder
+## Build umeed
 ## optimization: we move setting experimental flag here.
 ENV EXPERIMENTAL $EXPERIMENTAL
 WORKDIR /src/umee
 COPY . .
 RUN if [ "$EXPERIMENTAL" = "true" ] ; then echo "Installing experimental build";else echo "Installing stable build";fi
 RUN BUILD_TAGS=badgerdb make install
-RUN cd price-feeder && make install
 
 ## Prepare the final clear binary
 FROM ubuntu:rolling