Merge branch 'main' into aaronc/ipfs-resolver

regen-network · Mar 5, 2024 · b699d23 · b699d23
2 parents db0a7f3 + 3b21ecd
commit b699d23
Show file tree

Hide file tree

Showing 153 changed files with 64,380 additions and 14,076 deletions.
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - name: Set up QEMU

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: make build
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -72,33 +72,33 @@ jobs:
             x/intertx/go.mod
             x/intertx/go.sum
         if: matrix.module == 'x/intertx'
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55
           working-directory: "."
         if: steps.git-diff-app.outputs.diff
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55
           working-directory: "types"
         if: steps.git-diff-types.outputs.diff
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55
           working-directory: "x/data"
         if: steps.git-diff-data.outputs.diff
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55
           working-directory: "x/ecocredit"
         if: steps.git-diff-ecocredit.outputs.diff
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55
           working-directory: "x/intertx"
         if: steps.git-diff-intertx.outputs.diff
 
@@ -131,7 +131,7 @@ jobs:
         with:
           PATTERNS: |
             **/**.proto
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: steps.git-diff-proto.outputs.diff

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - name: Set up QEMU

diff --git a/.github/workflows/sims-nightly.yml b/.github/workflows/sims-nightly.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: NUM_BLOCKS=100 make sim-app-multi-seed
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: NUM_BLOCKS=100 make sim-import-export-multi-seed
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: NUM_BLOCKS=100 make sim-after-import-multi-seed
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: NUM_BLOCKS=20 make sim-determinism-multi-seed
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -35,7 +35,7 @@ jobs:
             **/**.go
             **/go.mod
             **/go.sum
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF
@@ -54,7 +54,7 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF
@@ -73,7 +73,7 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF
@@ -92,7 +92,7 @@ jobs:
             **/**.go
             **/go.mod
             **/go.sum
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -37,7 +37,7 @@ jobs:
             **/**.go
             **/go.mod
             **/go.sum
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF || github.ref == 'refs/heads/main'
@@ -109,7 +109,7 @@ jobs:
             **/**.go
             **/go.mod
             **/go.sum
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
         if: env.GIT_DIFF || github.ref == 'refs/heads/main'

diff --git a/.golangci.yml b/.golangci.yml
@@ -5,7 +5,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - errcheck
     - exportloopref

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### x/data
+
+#### Changed
+- [#2102](https://github.com/regen-network/regen-ledger/pull/2102) Deprecate `regen.data.v1` and migrate to the `regen.data.v2` protobuf API which enables off-chain coordination of supported algorithms and file types.
+
+### x/ecocredit
+
+#### Added
+- [#2107](https://github.com/regen-network/regen-ledger/pull/2107) Add `BurnRegen` method.
+
 ## [v5.1.2](https://github.com/regen-network/regen-ledger/releases/tag/v5.1.2) - 2023-06-28
 
 ### General

diff --git a/api/go.mod b/api/go.mod
@@ -1,15 +1,15 @@
 module github.com/regen-network/regen-ledger/api/v2
 
-go 1.19
+go 1.21
 
 require (
 	github.com/cosmos/cosmos-proto v1.0.0-beta.3
 	github.com/cosmos/cosmos-sdk/api v0.1.0
 	github.com/cosmos/cosmos-sdk/orm v1.0.0-alpha.12
 	github.com/cosmos/gogoproto v1.4.11
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
-	google.golang.org/grpc v1.59.0
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917
+	google.golang.org/grpc v1.61.0
+	google.golang.org/protobuf v1.32.0
 )
 
 require (
@@ -25,18 +25,18 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
 	github.com/google/btree v1.0.0 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
 	github.com/tendermint/tm-db v0.6.7 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
-	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
 )
 
 // https://github.com/regen-network/regen-ledger/security/dependabot/105