Merge branch 'main' into get-anchor-fix

penumbra-zone · Dec 7, 2023 · acbfe8d · acbfe8d
2 parents c20ae5b + dd40ff2
commit acbfe8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git 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
@@ -2018,28 +2018,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(