Merge branch 'main' into bengt/fix-build-network-2

anoma · Jun 28, 2023 · 4a4d365 · 4a4d365
2 parents 2f784b5 + fdeaf23
commit 4a4d365
Show file tree

Hide file tree

Showing 30 changed files with 260 additions and 135 deletions.
diff --git a/.changelog/v0.17.5/improvements/1619-masp-checked.md b/.changelog/v0.17.5/improvements/1619-masp-checked.md
@@ -0,0 +1,2 @@
+- Check MASP parameters are correct in the ledger node.
+  ([#1619](https://github.com/anoma/namada/pull/1619))
diff --git a/.changelog/v0.17.5/summary.md b/.changelog/v0.17.5/summary.md
@@ -0,0 +1,2 @@
+Namada 0.17.5 is a maintenance release chiefly addressing MASP
+parameter validation.
diff --git a/.github/workflows/build-and-test-bridge.yml b/.github/workflows/build-and-test-bridge.yml
@@ -323,7 +323,7 @@ jobs:
       - name: Build
         run: make build-release${{ matrix.make.suffix }}
         env:
-          RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
+          RUSTFLAGS: "-C linker=clang -C debug_assertions=true -C link-arg=-fuse-ld=/usr/local/bin/mold"
       - name: Upload target binaries
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -346,7 +346,7 @@ jobs:
       - name: Build
         run: make build-release${{ matrix.make.suffix }}
         env:
-          RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold"
+          RUSTFLAGS: "-C linker=clang -C debug_assertions=true -C link-arg=-fuse-ld=/usr/local/bin/mold"
       - name: Upload target binaries
         uses: actions/upload-artifact@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v0.17.5
+
+Namada 0.17.5 is a maintenance release chiefly addressing MASP
+parameter validation.
+
+### IMPROVEMENTS
+
+- Check MASP parameters are correct in the ledger node.
+  ([#1619](https://github.com/anoma/namada/pull/1619))
+
 ## v0.17.4
 
 Namada 0.17.4 is a minor release improving the codebase by bumping the rust toolchain.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ keywords = ["blockchain", "privacy", "crypto", "protocol", "network"]
 license = "GPL-3.0"
 readme = "README.md"
 repository = "https://github.com/anoma/namada"
-version = "0.17.4"
+version = "0.17.5"
 
 [workspace.dependencies]
 ark-bls12-381 = {version = "0.3"}

diff --git a/docker/namada/Dockerfile b/docker/namada/Dockerfile
@@ -26,7 +26,7 @@ RUN make build-release
 FROM golang:1.18.0 as tendermint-builder
 WORKDIR /app
 
-RUN git clone -b v0.1.4-abciplus --single-branch https://github.com/heliaxdev/tendermint.git && cd tendermint && make build
+RUN git clone -b v0.37.2 --single-branch https://github.com/cometbft/cometbft.git && cd cometbft && make build
 
 FROM debian:bullseye-slim AS runtime
 ENV NAMADA_BASE_DIR=/.namada 
@@ -41,7 +41,7 @@ COPY --from=builder --chmod=0755 /app/target/release/namada /usr/local/bin
 COPY --from=builder --chmod=0755 /app/target/release/namadan /usr/local/bin
 COPY --from=builder --chmod=0755 /app/target/release/namadaw /usr/local/bin
 COPY --from=builder --chmod=0755 /app/target/release/namadac /usr/local/bin
-COPY --from=tendermint-builder --chmod=0755 /app/tendermint/build/tendermint /usr/local/bin
+COPY --from=tendermint-builder --chmod=0755 /app/cometbft/build/cometbft /usr/local/bin
 
 EXPOSE 26656
 EXPOSE 26660

diff --git a/scripts/build_network.sh b/scripts/build_network.sh
@@ -217,5 +217,4 @@ main() {
     package "$@"
 }
 
-
 main "$@"
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -128,7 +128,7 @@ wasmer-engine-universal = {version = "=2.2.0", optional = true}
 wasmer-vm = {version = "2.2.0", optional = true}
 wasmparser.workspace = true
 masp_primitives.workspace = true
-masp_proofs.workspace = true
+masp_proofs = { workspace = true, features = ["download-params"] }
 rand = {version = "0.8", default-features = false, optional = true}
 rand_core = {version = "0.6", default-features = false, optional = true}
 zeroize.workspace = true