Merge pull request #1730 from scrtlabs/sgx_whitelist

Sgx whitelist

Author: valdok

app/app.go

@@ -14,6 +14,8 @@ import (
 	ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"
 	ibcswitchtypes "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types"
 
+	cosmwasm_api "github.com/scrtlabs/SecretNetwork/go-cosmwasm/api"
+
 	"cosmossdk.io/client/v2/autocli"
 	"cosmossdk.io/core/appmodule"
 	circuittypes "cosmossdk.io/x/circuit/types"
@@ -67,6 +69,8 @@ import (
 	v1_20 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.20"
 	v1_21 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.21"
 	v1_21_7 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.21.7"
+	v1_22 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.22"
+	v1_23 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.23"
 	v1_4 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.4"
 	v1_5 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.5"
 	v1_6 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.6"
@@ -144,6 +148,8 @@ var (
 		v1_20.Upgrade,
 		v1_21.Upgrade,
 		v1_21_7.Upgrade,
+		v1_22.Upgrade,
+		v1_23.Upgrade,
 	}
 )
 
@@ -448,41 +454,57 @@ func (app *SecretNetworkApp) RotateStore() {
 	}
 }
 
-func (app *SecretNetworkApp) UpdateOneKey(ctx sdk.Context, filePath string, keyID string) {
-	keyB64, err := os.ReadFile(filePath)
-	if err != nil {
-		return
-	}
-
-	keyBz, err := base64.StdEncoding.DecodeString(string(keyB64))
-	if err != nil {
+func (app *SecretNetworkApp) UpdateOneKey(ctx sdk.Context, keyID string, value []byte) {
+	if len(value) == 0 {
 		return
 	}
 
-	keyNew := reg.MasterKey{Bytes: keyBz}
+	keyNew := reg.MasterKey{Bytes: value}
 	ctx2 := sdk.UnwrapSDKContext(ctx)
 
 	keyOld := app.AppKeepers.RegKeeper.GetMasterKey(ctx2, keyID)
 	if (keyOld == nil) || !bytes.Equal(keyOld.Bytes, keyNew.Bytes) {
 		app.AppKeepers.RegKeeper.SetMasterKey(ctx2, keyNew, keyID)
-		fmt.Printf("%s set to %s\n", keyID, keyB64)
+
+		value_b64 := base64.StdEncoding.EncodeToString(value)
+		fmt.Printf("%s set to %s\n", keyID, value_b64)
 	}
 }
 
 func (app *SecretNetworkApp) UpdateNetworkKeys() {
 	ms := app.BaseApp.CommitMultiStore() // cms is the CommitMultiStore in Cosmos SDK apps
 	ctx := sdk.NewContext(ms, cmtproto.Header{}, false, app.Logger())
 
-	app.UpdateOneKey(ctx, reg.NodeExchMasterKeyPath, reg.MasterNodeKeyId)
-	app.UpdateOneKey(ctx, reg.IoExchMasterKeyPath, reg.MasterIoKeyId)
+	var node_pk, io_pk []byte
+
+	for i := 0; ; i++ {
+		{
+			next_node_pk, next_io_pk := cosmwasm_api.GetNetworkPubkey(uint32(i))
+
+			// Stop when both buffers are empty
+			if len(next_node_pk) == 0 && len(next_io_pk) == 0 {
+				break
+			}
+
+			node_pk = next_node_pk
+			io_pk = next_io_pk
+		}
+
+		// node_pk_b64 := base64.StdEncoding.EncodeToString(node_pk)
+		// io_pk_b64 := base64.StdEncoding.EncodeToString(io_pk)
+		// fmt.Printf("iSeed=%d, nodePK=%s, ioPK=%s\n", i, node_pk_b64, io_pk_b64)
+	}
+
+	app.UpdateOneKey(ctx, reg.MasterNodeKeyId, node_pk)
+	app.UpdateOneKey(ctx, reg.MasterIoKeyId, io_pk)
 }
 
 func (app *SecretNetworkApp) Initialize() {
 	ms := app.BaseApp.CommitMultiStore() // cms is the CommitMultiStore in Cosmos SDK apps
 
 	ctx := sdk.NewContext(ms, cmtproto.Header{}, false, app.Logger())
 
-	_ = app.AppKeepers.ComputeKeeper.SetValidatorSetEvidence(ctx)
+	_ = app.AppKeepers.ComputeKeeper.SetEnclaveColdEvidences(ctx)
 	app.UpdateNetworkKeys()
 }
 

app/upgrades/v1.22/upgrade.go

@@ -0,0 +1,39 @@
+package v1_22
+
+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.22"
+
+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)
+	}
+}

app/upgrades/v1.23/upgrade.go

@@ -0,0 +1,39 @@
+package v1_23
+
+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"
+
+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)
+	}
+}