Merge branch 'master' into v1.15.0-beta.0

scrtlabs · Dec 4, 2024 · 68bcd0c · 68bcd0c
2 parents 5a82dc2 + 3fe10ff
commit 68bcd0c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/client/docs/static/openapi/index.html b/client/docs/static/openapi/index.html
diff --git a/client/docs/static/openapi/openapi.yaml b/client/docs/static/openapi/openapi.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: Secret Network
   description: A REST interface for queries and transactions
-  version: v1.12
+  version: v1.14
 paths:
   /cosmos/auth/v1beta1/accounts:
     get:

diff --git a/client/docs/static/swagger/swagger.yaml b/client/docs/static/swagger/swagger.yaml
@@ -2,7 +2,7 @@ swagger: '2.0'
 info:
   title: Secret Network
   description: A REST interface for queries and transactions
-  version: v1.12
+  version: v1.14
 paths:
   /cosmos/auth/v1beta1/accounts:
     get:

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/x/compute/internal/keeper/keeper.go b/x/compute/internal/keeper/keeper.go
@@ -159,7 +159,6 @@ func NewKeeper(
 	}
 	// always wrap the messenger, even if it was replaced by an option
 	keeper.messenger = callDepthMessageHandler{keeper.messenger, keeper.maxCallDepth}
-
 	keeper.queryPlugins = DefaultQueryPlugins(govKeeper, distKeeper, mintKeeper, bankKeeper, stakingKeeper, queryRouter, &keeper, channelKeeper).Merge(customPlugins)
 
 	return keeper

diff --git a/x/compute/internal/keeper/test_common.go b/x/compute/internal/keeper/test_common.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -1133,6 +1134,6 @@ func makeBlockIDRandom() tmtypes.BlockID {
 func txhash(t *testing.T, ctx sdk.Context) string {
 	require.NotEmpty(t, ctx.TxBytes())
 	txhashBz := sha256.Sum256(ctx.TxBytes())
-	txhash := hex.EncodeToString(txhashBz[:])
+	txhash := strings.ToUpper(hex.EncodeToString(txhashBz[:]))
 	return txhash
 }
diff --git a/x/compute/internal/types/types.go b/x/compute/internal/types/types.go
@@ -157,7 +157,7 @@ func NewEnv(ctx sdk.Context, creator sdk.AccAddress, deposit sdk.Coins, contract
 
 	if txCounter, ok := TXCounter(ctx); ok {
 		txhashBz := sha256.Sum256(ctx.TxBytes())
-		txhash := hex.EncodeToString(txhashBz[:])
+		txhash := strings.ToUpper(hex.EncodeToString(txhashBz[:]))
 
 		env.Transaction = &wasmTypes.TransactionInfo{
 			Index: txCounter,