v1.24

Makefile

@@ -153,6 +153,9 @@ go.sum: go.mod
 build_cli:
 	CGO_LDFLAGS=$(CGO_LDFLAGS) go build -o secretcli -mod=readonly $(GCFLAGS) -tags "$(filter-out sgx, $(GO_TAGS)) secretcli" -ldflags '$(LD_FLAGS)' ./cmd/secretd
 
+build-nosgx:
+	go build -o secretd-nosgx -mod=readonly $(GCFLAGS) -tags "$(filter-out sgx, $(GO_TAGS)) nosgx" -ldflags '$(LD_FLAGS)' ./cmd/secretd
+
 build_local_no_rust:
 	cp go-cosmwasm/target/$(BUILD_PROFILE)/libgo_cosmwasm.so go-cosmwasm/api
 	CGO_LDFLAGS=$(CGO_LDFLAGS) go build -mod=readonly $(GCFLAGS) -tags "$(GO_TAGS)" -ldflags '$(LD_FLAGS)' ./cmd/secretd

app/app.go

@@ -3,10 +3,8 @@ package app
 import (
 	"bytes"
 	"encoding/base64"
-	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"path/filepath"
 	"syscall"
 

app/keepers/keepers.go

@@ -550,6 +550,17 @@
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	ak.ComputeKeeper = &computeKeeper
+
+	// Provide registered StoreKey instances so ApplyCrossModuleOps
+	// resolves names to the exact pointers CacheMultiStore expects.
+	{
+		sk := make(map[string]storetypes.StoreKey, len(ak.keys))
+		for name, key := range ak.keys {
+			sk[name] = key
+		}
+		ak.ComputeKeeper.SetStoreKeys(sk)
+	}
+
 	wasmHooks.ContractKeeper = ak.ComputeKeeper
 
 	// Compute receive: Switch -> Fee -> Packet Forward -> WASM Hooks

app/upgrades/v1.23.3/upgrade.go

@@ -0,0 +1,39 @@
+package v1_23_2
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"cosmossdk.io/log"
+	store "cosmossdk.io/store/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/scrtlabs/SecretNetwork/app/keepers"
+	"github.com/scrtlabs/SecretNetwork/app/upgrades"
+)
+
+const upgradeName = "v1.23.3"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          upgradeName,
+	CreateUpgradeHandler: createUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}
+
+func createUpgradeHandler(mm *module.Manager, _ *keepers.SecretAppKeepers, configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		logger := log.NewLogger(os.Stderr)
+		logger.Info(` _    _ _____   _____ _____            _____  ______ `)
+		logger.Info(`| |  | |  __ \ / ____|  __ \     /\   |  __ \|  ____|`)
+		logger.Info(`| |  | | |__) | |  __| |__) |   /  \  | |  | | |__   `)
+		logger.Info(`| |  | |  ___/| | |_ |  _  /   / /\ \ | |  | |  __|  `)
+		logger.Info(`| |__| | |    | |__| | | \ \  / ____ \| |__| | |____ `)
+		logger.Info(` \____/|_|     \_____|_|  \_\/_/    \_\_____/|______|`)
+
+		logger.Info(fmt.Sprintf("Running module migrations for %s...", upgradeName))
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

cmd/secretd/root.go

@@ -341,10 +341,16 @@ func newApp_internal(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts
 		panic(err)
 	}
 
+	// Get compute config and set environment variable for recorder
+	computeConfig := compute.GetConfig(appOpts)
+	if computeConfig.StoreSGXData {
+		os.Setenv("SECRET_STORE_SGX_DATA", "true")
+	}
+
 	res := app.NewSecretNetworkApp(logger, db, traceStore, true,
 		bootstrap,
 		appOpts,
-		compute.GetConfig(appOpts),
+		computeConfig,
 		baseapp.SetPruning(pruningOpts),
 		baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))),
 		baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))),

go-cosmwasm/api/callbacks.go

@@ -1,5 +1,5 @@
-//go:build !secretcli
-// +build !secretcli
+//go:build !secretcli && !nosgx
+// +build !secretcli,!nosgx
 
 package api
 
@@ -84,6 +84,14 @@ type Gas = uint64
 // https://github.com/cosmos/cosmos-sdk/blob/18890a225b46260a9adc587be6fa1cc2aff101cd/store/types/gas.go#L34
 type GasMeter interface {
 	GasConsumed() Gas
+	ConsumeGas(amount Gas, descriptor string)
+}
+
+// OriginalGasMeter is an interface for gas meters that wrap another meter
+// This allows us to access the underlying meter for accurate callback gas measurement
+type OriginalGasMeter interface {
+	GasMeter
+	OriginalMeter() GasMeter
 }
 
 /****** DB ********/

go-cosmwasm/api/callbacks_cgo.go

@@ -1,5 +1,5 @@
-//go:build !secretcli
-// +build !secretcli
+//go:build !secretcli && !nosgx
+// +build !secretcli,!nosgx
 
 package api
 

go-cosmwasm/api/callbacks_mock.go

@@ -92,6 +92,7 @@ type Gas = uint64
 // // https://github.com/cosmos/cosmos-sdk/blob/18890a225b46260a9adc587be6fa1cc2aff101cd/store/types/gas.go#L34
 type GasMeter interface {
 	GasConsumed() Gas
+	ConsumeGas(amount Gas, descriptor string)
 }
 
 // /****** DB ********/

go-cosmwasm/api/callbacks_nosgx.go

@@ -0,0 +1,34 @@
+//go:build !secretcli && nosgx
+
+package api
+
+import (
+	dbm "github.com/cosmos/cosmos-db"
+)
+
+const GasMultiplier = 1000
+
+type Gas = uint64
+
+type GasMeter interface {
+	GasConsumed() Gas
+	ConsumeGas(amount Gas, descriptor string)
+}
+
+type KVStore interface {
+	Get(key []byte) []byte
+	Set(key, value []byte)
+	Delete(key []byte)
+	Iterator(start, end []byte) dbm.Iterator
+	ReverseIterator(start, end []byte) dbm.Iterator
+}
+
+type (
+	HumanAddress     func([]byte) (string, uint64, error)
+	CanonicalAddress func(string) ([]byte, uint64, error)
+)
+
+type GoAPI struct {
+	HumanAddress     HumanAddress
+	CanonicalAddress CanonicalAddress
+}