Merge pull request #757 from cybercongress/v4-clock-module

Addec clock (cron) module
cybercongress · Jul 25, 2024 · 043b31b · 043b31b
2 parents 563c22c + 474a601
commit 043b31b
Show file tree

Hide file tree

Showing 55 changed files with 9,614 additions and 1,034 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,4 +56,4 @@ contracts
 # Scripts
 *.mjs
 
-std_test.wasm
+*.wasm
diff --git a/Makefile b/Makefile
@@ -149,7 +149,7 @@ protoVer=0.13.1
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 
-proto-all: proto-format proto-lint proto-gen format
+proto-all: proto-format proto-lint proto-gen
 
 proto-gen:
 	@echo "Generating Protobuf files"

diff --git a/app/helpers/global_errors.go b/app/helpers/global_errors.go
@@ -6,7 +6,7 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-const codespace = "juno-global"
+const codespace = "cyber-global"
 
 var (
 	ErrInvalidAddress            = sdkerrors.ErrInvalidAddress

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/x/nft"
 	nftkeeper "github.com/cosmos/cosmos-sdk/x/nft/keeper"
+	clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types"
 	tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper"
 	tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types"
 	"path/filepath"
@@ -87,6 +88,8 @@ import (
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 
 	govv1beta "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+
+	clockkeeper "github.com/cybercongress/go-cyber/v4/x/clock/keeper"
 )
 
 var (
@@ -156,6 +159,8 @@ type AppKeepers struct {
 	GridKeeper         gridkeeper.Keeper
 	DmnKeeper          *dmnkeeper.Keeper
 	ResourcesKeeper    resourceskeeper.Keeper
+	ContractKeeper     wasmtypes.ContractOpsKeeper
+	ClockKeeper        clockkeeper.Keeper
 
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
 	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
@@ -523,6 +528,15 @@ func NewAppKeepers(
 		wasmOpts...,
 	)
 
+	appKeepers.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(&appKeepers.WasmKeeper)
+	appKeepers.ClockKeeper = clockkeeper.NewKeeper(
+		appKeepers.keys[clocktypes.StoreKey],
+		appCodec,
+		appKeepers.WasmKeeper,
+		appKeepers.ContractKeeper,
+		govModAddress,
+	)
+
 	appKeepers.DmnKeeper.SetWasmKeeper(appKeepers.WasmKeeper)
 
 	// register wasm gov proposal types

diff --git a/app/keepers/keys.go b/app/keepers/keys.go
@@ -23,6 +23,7 @@ import (
 	ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types"
 	tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types"
 
 	liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types"
@@ -49,6 +50,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		ibctransfertypes.StoreKey,
 		ibcfeetypes.StoreKey,
 		wasmtypes.StoreKey,
+		clocktypes.StoreKey,
 		// our additions
 		liquiditytypes.StoreKey,
 		bandwidthtypes.StoreKey,

diff --git a/app/modules.go b/app/modules.go
@@ -49,6 +49,7 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
 	ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	"github.com/cybercongress/go-cyber/v4/x/clock"
 	"github.com/cybercongress/go-cyber/v4/x/tokenfactory"
 	tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types"
 
@@ -72,6 +73,7 @@ import (
 	stakingwrap "github.com/cybercongress/go-cyber/v4/x/staking"
 
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
+	clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types"
 )
 
 // ModuleBasics TODO add notes which modules have functional blockers
@@ -110,6 +112,7 @@ var ModuleBasics = module.NewBasicManager(
 	dmn.AppModuleBasic{},
 	resources.AppModuleBasic{},
 	tokenfactory.AppModuleBasic{},
+	clock.AppModuleBasic{},
 	// https://github.com/cosmos/ibc-go/blob/main/docs/docs/05-migrations/08-v6-to-v7.md
 	ibctm.AppModuleBasic{},
 	solomachine.AppModuleBasic{},
@@ -164,6 +167,7 @@ func appModules(
 		// NOTE add Bank Proxy here to resolve issue when new neuron is created during token-factory token transfer
 		// TODO add storage listener to update neurons memory index out of cyberbank proxy
 		tokenfactory.NewAppModule(app.AppKeepers.TokenFactoryKeeper, app.AppKeepers.AccountKeeper, app.CyberbankKeeper.Proxy, app.GetSubspace(tokenfactorytypes.ModuleName)),
+		clock.NewAppModule(appCodec, app.AppKeepers.ClockKeeper),
 	}
 }
 
@@ -220,14 +224,15 @@ func orderBeginBlockers() []string {
 		nft.ModuleName,
 		consensusparamtypes.ModuleName,
 		// additional modules
+		ibctransfertypes.ModuleName,
+		ibcexported.ModuleName,
 		liquiditytypes.ModuleName,
 		dmntypes.ModuleName,
+		clocktypes.ModuleName,
 		bandwidthtypes.ModuleName,
 		cyberbanktypes.ModuleName,
 		graphtypes.ModuleName,
 		gridtypes.ModuleName,
-		ibctransfertypes.ModuleName,
-		ibcexported.ModuleName,
 		ranktypes.ModuleName,
 		resourcestypes.ModuleName,
 		ibcfeetypes.ModuleName,
@@ -260,15 +265,16 @@ func orderEndBlockers() []string {
 		ibctransfertypes.ModuleName,
 		ibcexported.ModuleName,
 		ibcfeetypes.ModuleName,
+		clocktypes.ModuleName,
 		tokenfactorytypes.ModuleName,
-		graphtypes.ModuleName,
 		dmntypes.ModuleName,
 		gridtypes.ModuleName,
 		resourcestypes.ModuleName,
 		liquiditytypes.ModuleName,
 		wasm.ModuleName,
 		cyberbanktypes.ModuleName,
 		bandwidthtypes.ModuleName,
+		graphtypes.ModuleName,
 		ranktypes.ModuleName,
 	}
 }
@@ -298,6 +304,7 @@ func orderInitBlockers() []string {
 		ibcexported.ModuleName,
 		liquiditytypes.ModuleName,
 		ibcfeetypes.ModuleName,
+		clocktypes.ModuleName,
 		tokenfactorytypes.ModuleName,
 		wasm.ModuleName,
 		bandwidthtypes.ModuleName,

diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go
@@ -5,6 +5,7 @@ import (
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	"github.com/cosmos/cosmos-sdk/x/nft"
+	clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types"
 	tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types"
 
 	resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types"
@@ -24,6 +25,7 @@ var Upgrade = upgrades.Upgrade{
 			resourcestypes.ModuleName,
 			tokenfactorytypes.ModuleName,
 			nft.ModuleName,
+			clocktypes.ModuleName,
 		},
 	},
 }
diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	generaltypes "github.com/cybercongress/go-cyber/v4/types"
+	clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types"
 	tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types"
 	"time"
 
@@ -129,6 +130,14 @@ func CreateV4UpgradeHandler(
 		}
 		logger.Info("set tokenfactory params")
 
+		// x/clock
+		if err := keepers.ClockKeeper.SetParams(ctx, clocktypes.Params{
+			ContractGasLimit: 250_000, // TODO update
+		}); err != nil {
+			return nil, err
+		}
+		logger.Info("set clock params")
+
 		after := time.Now()
 
 		ctx.Logger().Info("migration time", "duration_ms", after.Sub(before).Milliseconds())
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,4 +56,4 @@ contracts @@
     # Scripts
     *.mjs
-    std_test.wasm
+    *.wasm