From dd40ff21fedb0f800ff0f2ac8536e1eaafc0aaff Mon Sep 17 00:00:00 2001
From: Ava Howell <ava@avahowell.me>
Date: Wed, 6 Dec 2023 13:55:08 -0800
Subject: [PATCH] penumbra: update proof spec to new multistore format (#1355)

* penumbra: update proof spec to new multistore format

* penumbra: use new commitment prefix

---------

Co-authored-by: Justin Tieri <37750742+jtieri@users.noreply.github.com>
---
 relayer/chains/penumbra/provider.go |  2 +-
 relayer/chains/penumbra/tx.go       | 23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/relayer/chains/penumbra/provider.go b/relayer/chains/penumbra/provider.go
index cade2b968..a580322ee 100644
--- a/relayer/chains/penumbra/provider.go
+++ b/relayer/chains/penumbra/provider.go
@@ -185,7 +185,7 @@ func (cc *PenumbraProvider) Timeout() string {
 }
 
 func (cc *PenumbraProvider) CommitmentPrefix() commitmenttypes.MerklePrefix {
-	return commitmenttypes.NewMerklePrefix([]byte("PenumbraAppHash"))
+	return commitmenttypes.NewMerklePrefix([]byte("ibc-data"))
 }
 
 // Address returns the chains configured address as a string
diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go
index 6136d2fe0..de4def253 100644
--- a/relayer/chains/penumbra/tx.go
+++ b/relayer/chains/penumbra/tx.go
@@ -2024,28 +2024,7 @@ var JmtSpec = &ics23.ProofSpec{
 	PrehashKeyBeforeComparison: true,
 }
 
-var ApphashSpec = &ics23.ProofSpec{
-	LeafSpec: &ics23.LeafOp{
-		Prefix:       nil,
-		Hash:         ics23.HashOp_SHA256,
-		Length:       ics23.LengthOp_NO_PREFIX,
-		PrehashKey:   ics23.HashOp_NO_HASH,
-		PrehashValue: ics23.HashOp_NO_HASH,
-	},
-	InnerSpec: &ics23.InnerSpec{
-		Hash:            ics23.HashOp_SHA256,
-		MaxPrefixLength: 0,
-		MinPrefixLength: 0,
-		ChildOrder:      []int32{0, 1},
-		ChildSize:       32,
-		EmptyChild:      nil,
-	},
-	MinDepth:                   0,
-	MaxDepth:                   1,
-	PrehashKeyBeforeComparison: false,
-}
-
-var PenumbraProofSpecs = []*ics23.ProofSpec{JmtSpec, ApphashSpec}
+var PenumbraProofSpecs = []*ics23.ProofSpec{JmtSpec, JmtSpec}
 
 // NewClientState creates a new tendermint client state tracking the dst chain.
 func (cc *PenumbraProvider) NewClientState(