Skip to content

Commit 152f721

Browse files
committed
disable execution of the cron msgs
1 parent 9629237 commit 152f721

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ replace (
88
cosmossdk.io/api => github.com/scrtlabs/cosmos-sdk-api v0.7.6-secret.0
99
cosmossdk.io/store => github.com/scrtlabs/cosmos-sdk-store v1.1.1-secret.1
1010
cosmossdk.io/x/tx => github.com/scrtlabs/cosmos-sdk-x-tx v0.13.7-secret.0
11-
github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v0.38.17-secret-6
12-
github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.50.14-secret.2
11+
github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v0.38.17-secret-8
12+
github.com/cosmos/cosmos-sdk => github.com/scrtlabs/cosmos-sdk v0.50.14-secret.4
1313
github.com/cosmos/iavl => github.com/scrtlabs/iavl v1.2.2-secret.0
1414
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
1515

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,8 +1609,8 @@ github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWR
16091609
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
16101610
github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=
16111611
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
1612-
github.com/scrtlabs/cosmos-sdk v0.50.14-secret.2 h1:ZZtAeop8ObILDa9jMpm7OnqBzqkMlOFGK6fe0FIKouQ=
1613-
github.com/scrtlabs/cosmos-sdk v0.50.14-secret.2/go.mod h1:9b0JEhqRylg/qFe/TY47dcYZREHFmw1C2H9Hb+eYhyE=
1612+
github.com/scrtlabs/cosmos-sdk v0.50.14-secret.4 h1:YU8JJIC2LGoZ3Z8+ezgv8WI21XKxVPMOUjsbaPtw+yc=
1613+
github.com/scrtlabs/cosmos-sdk v0.50.14-secret.4/go.mod h1:otdpIqWbky7zjfzbcoAOHC0BwHruG9MWemfMx9f+rKk=
16141614
github.com/scrtlabs/cosmos-sdk-api v0.7.6-secret.0 h1:9IGLySVhC2qSrxT3fZvvqwjKsnXWSSKnywQDzT8y1Gs=
16151615
github.com/scrtlabs/cosmos-sdk-api v0.7.6-secret.0/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38=
16161616
github.com/scrtlabs/cosmos-sdk-store v1.1.1-secret.1 h1:TELtwBkSg0xBrs2ObFE0pVVWF6E31fPCDX2tk8OiJPo=
@@ -1619,8 +1619,8 @@ github.com/scrtlabs/cosmos-sdk-x-tx v0.13.7-secret.0 h1:i3k5706sDHKhaCvzokB+n33/
16191619
github.com/scrtlabs/cosmos-sdk-x-tx v0.13.7-secret.0/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
16201620
github.com/scrtlabs/iavl v1.2.2-secret.0 h1:P96PL1Lf8OBSW9pMrlaRxhceZ4z9Hc7jk12g9ShWeHw=
16211621
github.com/scrtlabs/iavl v1.2.2-secret.0/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
1622-
github.com/scrtlabs/tendermint v0.38.17-secret-6 h1:X06gihMRdhOtp5YWx03hhwsntcRrl43tu5N0SVXihqI=
1623-
github.com/scrtlabs/tendermint v0.38.17-secret-6/go.mod h1:v3Ig0sYd0ZzXf4V5A/M4PoBohQZYI9Wlg6gBALw1Qs8=
1622+
github.com/scrtlabs/tendermint v0.38.17-secret-8 h1:qHJwAlmBoK/sbbKgUCs1tFwoac11NaSBqcpIXdOsYlI=
1623+
github.com/scrtlabs/tendermint v0.38.17-secret-8/go.mod h1:v3Ig0sYd0ZzXf4V5A/M4PoBohQZYI9Wlg6gBALw1Qs8=
16241624
github.com/scrtlabs/tm-secret-enclave v1.13.0 h1:a2xH0G96chEM8Ntwlq/Fh36r4dg0ijKWTaOy0oqFsqg=
16251625
github.com/scrtlabs/tm-secret-enclave v1.13.0/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME=
16261626
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=

x/compute/module.go

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ import (
1616
sdk "github.com/cosmos/cosmos-sdk/types"
1717
"github.com/cosmos/cosmos-sdk/types/module"
1818
"github.com/scrtlabs/SecretNetwork/go-cosmwasm/api"
19-
wasmtypes "github.com/scrtlabs/SecretNetwork/go-cosmwasm/types"
2019
"github.com/scrtlabs/SecretNetwork/x/compute/client/cli"
2120
"github.com/scrtlabs/SecretNetwork/x/compute/internal/keeper"
2221
"github.com/scrtlabs/SecretNetwork/x/compute/internal/types"
23-
crontypes "github.com/scrtlabs/SecretNetwork/x/cron/types"
2422
tmenclave "github.com/scrtlabs/tm-secret-enclave"
2523
)
2624

@@ -161,13 +159,13 @@ func (am AppModule) BeginBlock(c context.Context) error {
161159
ctx := c.(sdk.Context)
162160
block_header := ctx.BlockHeader()
163161

164-
execCronMsgs, bytesCronMsgs, err := am.keeper.GetScheduledMsgs(ctx, crontypes.ExecutionStage_EXECUTION_STAGE_BEGIN_BLOCKER)
165-
if err != nil {
166-
ctx.Logger().Error("Failed to get scheduled cron msgs")
167-
return err
168-
}
162+
// execCronMsgs, bytesCronMsgs, err := am.keeper.GetScheduledMsgs(ctx, crontypes.ExecutionStage_EXECUTION_STAGE_BEGIN_BLOCKER)
163+
// if err != nil {
164+
// ctx.Logger().Error("Failed to get scheduled cron msgs")
165+
// return err
166+
// }
169167

170-
cron_msgs := tm_type.Data{Txs: bytesCronMsgs}
168+
cron_msgs := tm_type.Data{Txs: [][]byte{}}
171169
cron_data, err := cron_msgs.Marshal()
172170
if err != nil {
173171
ctx.Logger().Error("Failed to marshal cron_msgs")
@@ -202,13 +200,13 @@ func (am AppModule) BeginBlock(c context.Context) error {
202200
return err
203201
}
204202

205-
for idx, msg := range execCronMsgs {
206-
ctx = ctx.WithTxBytes(bytesCronMsgs[idx])
207-
_, err := am.keeper.Execute(ctx, msg.Contract, msg.Sender, msg.Msg, msg.SentFunds, msg.CallbackSig, wasmtypes.HandleTypeExecute)
208-
if err != nil {
209-
ctx.Logger().Error("Failed to execute cron message", "error", err)
210-
}
211-
}
203+
// for idx, msg := range execCronMsgs {
204+
// ctx = ctx.WithTxBytes(bytesCronMsgs[idx])
205+
// _, err := am.keeper.Execute(ctx, msg.Contract, msg.Sender, msg.Msg, msg.SentFunds, msg.CallbackSig, wasmtypes.HandleTypeExecute)
206+
// if err != nil {
207+
// ctx.Logger().Error("Failed to execute cron message", "error", err)
208+
// }
209+
// }
212210

213211
am.keeper.SetRandomSeed(ctx, random, validator_set_evidence)
214212
} else {
@@ -221,13 +219,13 @@ func (am AppModule) BeginBlock(c context.Context) error {
221219
func (am AppModule) EndBlock(c context.Context) error {
222220
ctx := c.(sdk.Context)
223221

224-
_, bytesCronMsgs, err := am.keeper.GetScheduledMsgs(ctx, crontypes.ExecutionStage_EXECUTION_STAGE_END_BLOCKER)
225-
if err != nil {
226-
ctx.Logger().Error("Failed to get scheduled cron msgs")
227-
return err
228-
}
222+
// _, _, err := am.keeper.GetScheduledMsgs(ctx, crontypes.ExecutionStage_EXECUTION_STAGE_END_BLOCKER)
223+
// if err != nil {
224+
// ctx.Logger().Error("Failed to get scheduled cron msgs")
225+
// return err
226+
// }
229227

230-
cron_msgs := tm_type.Data{Txs: bytesCronMsgs}
228+
cron_msgs := tm_type.Data{Txs: [][]byte{}}
231229
cron_data, err := cron_msgs.Marshal()
232230
if err != nil {
233231
ctx.Logger().Error("Failed to marshal cron_msgs")

0 commit comments

Comments
 (0)