Skip to content

Commit f16dae3

Browse files
Xingchen LiaoCyson
Xingchen Liao
and
Cyson
authored
Remove x/nitro from genesis version (#732)
* Remove x/nitro from genesis version * Change upgrade handler to no-ops --------- Co-authored-by: Cyson <cyson@Cysons-MBP.attlocal.net>
1 parent f632170 commit f16dae3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+16
-11221
lines changed

‎.gitignore

-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ loadtest/contracts/**.json
3434

3535
loadtest_results.txt
3636

37-
# nitro-replayer
38-
nitro-replayer/target
39-
nitro-replayer/Cargo.lock
40-
# nitro mac artifact
41-
x/nitro/replay/libnitro_replayer.dylib
42-
4337
# parallelization test build artifact
4438
parallelization/**/artifacts/
4539
parallelization/**/target/

‎Makefile

-17
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ BUILDDIR ?= $(CURDIR)/build
77
export PROJECT_HOME=$(shell git rev-parse --show-toplevel)
88
export GO_PKG_PATH=$(HOME)/go/pkg
99
export GO111MODULE = on
10-
NITRO_RELEASE_PATH := $(PROJECT_HOME)/nitro-replayer/target/release
11-
NITRO_LIB_PATH := $(PROJECT_HOME)/x/nitro/
1210

1311
# process build tags
1412

@@ -69,9 +67,6 @@ all: lint install
6967
install: go.sum
7068
go install $(BUILD_FLAGS) ./cmd/seid
7169

72-
# In case when running seid fails with nitro issue or if you make changes to nitro, please use install-all
73-
install-all: build-nitro install
74-
7570
install-price-feeder: go.sum
7671
go install $(BUILD_FLAGS) ./oracle/price-feeder
7772

@@ -96,18 +91,6 @@ build:
9691
build-price-feeder:
9792
go build $(BUILD_FLAGS) -o ./build/price-feeder ./oracle/price-feeder
9893

99-
# In case running seid fails with nitro issue or if you make changes to nitro, please use build-all
100-
build-all: build-nitro build
101-
102-
build-nitro:
103-
@cd $(PROJECT_HOME)/nitro-replayer && cargo build --release
104-
if [ -f "$(NITRO_RELEASE_PATH)/libnitro_replayer.dylib" ]; then \
105-
cp $(NITRO_RELEASE_PATH)/libnitro_replayer.dylib $(NITRO_LIB_PATH)/replay; \
106-
fi
107-
if [ -f "$(NITRO_RELEASE_PATH)/libnitro_replayer.x86_64.so" ]; then \
108-
cp $(NITRO_RELEASE_PATH)/libnitro_replayer.x86_64.so $(NITRO_LIB_PATH)/replay; \
109-
fi
110-
11194
clean:
11295
rm -rf ./build
11396

‎app/ante.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/sei-protocol/sei-chain/utils/tracing"
1616
"github.com/sei-protocol/sei-chain/x/dex"
1717
dexkeeper "github.com/sei-protocol/sei-chain/x/dex/keeper"
18-
nitrokeeper "github.com/sei-protocol/sei-chain/x/nitro/keeper"
1918
"github.com/sei-protocol/sei-chain/x/oracle"
2019
oraclekeeper "github.com/sei-protocol/sei-chain/x/oracle/keeper"
2120
)
@@ -30,7 +29,6 @@ type HandlerOptions struct {
3029
WasmKeeper *wasm.Keeper
3130
OracleKeeper *oraclekeeper.Keeper
3231
DexKeeper *dexkeeper.Keeper
33-
NitroKeeper *nitrokeeper.Keeper
3432
AccessControlKeeper *aclkeeper.Keeper
3533
TXCounterStoreKey sdk.StoreKey
3634

@@ -56,9 +54,6 @@ func NewAnteHandlerAndDepGenerator(options HandlerOptions) (sdk.AnteHandler, sdk
5654
if options.OracleKeeper == nil {
5755
return nil, nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "oracle keeper is required for ante builder")
5856
}
59-
if options.NitroKeeper == nil {
60-
return nil, nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "nitro keeper is required for ante builder")
61-
}
6257
if options.AccessControlKeeper == nil {
6358
return nil, nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "accesscontrol keeper is required for ante builder")
6459
}
@@ -75,7 +70,7 @@ func NewAnteHandlerAndDepGenerator(options HandlerOptions) (sdk.AnteHandler, sdk
7570

7671
anteDecorators := []sdk.AnteFullDecorator{
7772
sdk.CustomDepWrappedAnteDecorator(ante.NewSetUpContextDecorator(antedecorators.GetGasMeterSetter(*options.AccessControlKeeper)), depdecorators.GasMeterSetterDecorator{}), // outermost AnteDecorator. SetUpContext must be called first
78-
antedecorators.NewGaslessDecorator([]sdk.AnteFullDecorator{ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker)}, *options.OracleKeeper, *options.NitroKeeper),
73+
antedecorators.NewGaslessDecorator([]sdk.AnteFullDecorator{ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker)}, *options.OracleKeeper),
7974
sdk.DefaultWrappedAnteDecorator(wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit)), // after setup context to enforce limits early
8075
sdk.DefaultWrappedAnteDecorator(ante.NewRejectExtensionOptionsDecorator()),
8176
oracle.NewSpammingPreventionDecorator(*options.OracleKeeper),

‎app/ante_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ func (suite *AnteTestSuite) SetupTest(isCheckTx bool) {
8989
WasmKeeper: &suite.App.WasmKeeper,
9090
OracleKeeper: &suite.App.OracleKeeper,
9191
DexKeeper: &suite.App.DexKeeper,
92-
NitroKeeper: &suite.App.NitroKeeper,
9392
AccessControlKeeper: &suite.App.AccessControlKeeper,
9493
TracingInfo: tracingInfo,
9594
},

‎app/antedecorators/gasless.go

+4-21
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,17 @@ import (
99
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1010
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
1111
dextypes "github.com/sei-protocol/sei-chain/x/dex/types"
12-
nitrokeeper "github.com/sei-protocol/sei-chain/x/nitro/keeper"
13-
nitrotypes "github.com/sei-protocol/sei-chain/x/nitro/types"
1412
oraclekeeper "github.com/sei-protocol/sei-chain/x/oracle/keeper"
1513
oracletypes "github.com/sei-protocol/sei-chain/x/oracle/types"
1614
)
1715

1816
type GaslessDecorator struct {
1917
wrapped []sdk.AnteFullDecorator
2018
oracleKeeper oraclekeeper.Keeper
21-
nitroKeeper nitrokeeper.Keeper
2219
}
2320

24-
func NewGaslessDecorator(wrapped []sdk.AnteFullDecorator, oracleKeeper oraclekeeper.Keeper, nitroKeeper nitrokeeper.Keeper) GaslessDecorator {
25-
return GaslessDecorator{wrapped: wrapped, oracleKeeper: oracleKeeper, nitroKeeper: nitroKeeper}
21+
func NewGaslessDecorator(wrapped []sdk.AnteFullDecorator, oracleKeeper oraclekeeper.Keeper) GaslessDecorator {
22+
return GaslessDecorator{wrapped: wrapped, oracleKeeper: oracleKeeper}
2623
}
2724

2825
func (gd GaslessDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
@@ -36,7 +33,7 @@ func (gd GaslessDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool,
3633
}
3734
gas := feeTx.GetGas()
3835
// If non-zero gas limit is provided by the TX, we then consider it exempt from the gasless TX, and then prioritize it accordingly
39-
isGasless, err := isTxGasless(tx, ctx, gd.oracleKeeper, gd.nitroKeeper)
36+
isGasless, err := isTxGasless(tx, ctx, gd.oracleKeeper)
4037
if err != nil {
4138
return ctx, err
4239
}
@@ -96,15 +93,14 @@ func (gd GaslessDecorator) AnteDeps(txDeps []sdkacltypes.AccessOperation, tx sdk
9693
},
9794
}...)
9895
default:
99-
// TODO: add tx gasless deps for nitro for nitrokeeper read
10096
continue
10197
}
10298
}
10399

104100
return next(append(txDeps, deps...), tx)
105101
}
106102

107-
func isTxGasless(tx sdk.Tx, ctx sdk.Context, oracleKeeper oraclekeeper.Keeper, nitroKeeper nitrokeeper.Keeper) (bool, error) {
103+
func isTxGasless(tx sdk.Tx, ctx sdk.Context, oracleKeeper oraclekeeper.Keeper) (bool, error) {
108104
if len(tx.GetMsgs()) == 0 {
109105
// empty TX shouldn't be gasless
110106
return false, nil
@@ -125,10 +121,6 @@ func isTxGasless(tx sdk.Tx, ctx sdk.Context, oracleKeeper oraclekeeper.Keeper, n
125121
if err != nil || !isGasless {
126122
return false, err
127123
}
128-
case *nitrotypes.MsgRecordTransactionData:
129-
if !nitroRecordTxDataGasless(m, ctx, nitroKeeper) {
130-
return false, nil
131-
}
132124
default:
133125
return false, nil
134126
}
@@ -190,12 +182,3 @@ func oracleVoteIsGasless(msg *oracletypes.MsgAggregateExchangeRateVote, ctx sdk.
190182
// otherwise we allow it
191183
return true, nil
192184
}
193-
194-
func nitroRecordTxDataGasless(msg *nitrotypes.MsgRecordTransactionData, ctx sdk.Context, keeper nitrokeeper.Keeper) bool {
195-
for _, signer := range msg.GetSigners() {
196-
if !keeper.IsTxSenderWhitelisted(ctx, signer.String()) {
197-
return false
198-
}
199-
}
200-
return true
201-
}

‎app/antedecorators/gasless_test.go

+9-42
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ import (
99
"github.com/cosmos/cosmos-sdk/types/accesscontrol"
1010
"github.com/cosmos/cosmos-sdk/x/staking"
1111
"github.com/sei-protocol/sei-chain/app/antedecorators"
12-
keepertest "github.com/sei-protocol/sei-chain/testutil/keeper"
1312
"github.com/sei-protocol/sei-chain/x/dex/types"
14-
nitrokeeper "github.com/sei-protocol/sei-chain/x/nitro/keeper"
15-
nitrotypes "github.com/sei-protocol/sei-chain/x/nitro/types"
1613
oraclekeeper "github.com/sei-protocol/sei-chain/x/oracle/keeper"
1714
oracletypes "github.com/sei-protocol/sei-chain/x/oracle/types"
1815
"github.com/stretchr/testify/require"
@@ -96,9 +93,9 @@ func (t FakeTx) FeeGranter() sdk.AccAddress {
9693
return nil
9794
}
9895

99-
func CallGaslessDecoratorWithMsg(ctx sdk.Context, msg sdk.Msg, oracleKeeper oraclekeeper.Keeper, nitroKeeper nitrokeeper.Keeper) error {
96+
func CallGaslessDecoratorWithMsg(ctx sdk.Context, msg sdk.Msg, oracleKeeper oraclekeeper.Keeper) error {
10097
anteDecorators := []sdk.AnteFullDecorator{
101-
antedecorators.NewGaslessDecorator([]sdk.AnteFullDecorator{sdk.DefaultWrappedAnteDecorator(FakeAnteDecoratorGasReqd{})}, oracleKeeper, nitroKeeper),
98+
antedecorators.NewGaslessDecorator([]sdk.AnteFullDecorator{sdk.DefaultWrappedAnteDecorator(FakeAnteDecoratorGasReqd{})}, oracleKeeper),
10299
}
103100
chainedHandler, depGen := sdk.ChainAnteDecorators(anteDecorators...)
104101
fakeTx := FakeTx{
@@ -118,7 +115,7 @@ func TestGaslessDecorator(t *testing.T) {
118115
output = ""
119116
anteDecorators := []sdk.AnteFullDecorator{
120117
FakeAnteDecoratorOne{},
121-
antedecorators.NewGaslessDecorator([]sdk.AnteFullDecorator{FakeAnteDecoratorTwo{}}, oraclekeeper.Keeper{}, nitrokeeper.Keeper{}),
118+
antedecorators.NewGaslessDecorator([]sdk.AnteFullDecorator{FakeAnteDecoratorTwo{}}, oraclekeeper.Keeper{}),
122119
FakeAnteDecoratorThree{},
123120
}
124121
chainedHandler, depGen := sdk.ChainAnteDecorators(anteDecorators...)
@@ -166,12 +163,12 @@ func TestOracleVoteGasless(t *testing.T) {
166163
}
167164

168165
// reset gasless
169-
err = CallGaslessDecoratorWithMsg(ctx, &vote1, input.OracleKeeper, nitrokeeper.Keeper{})
166+
err = CallGaslessDecoratorWithMsg(ctx, &vote1, input.OracleKeeper)
170167
require.Error(t, err)
171168

172169
// reset gasless
173170
gasless = true
174-
err = CallGaslessDecoratorWithMsg(ctx, &vote2, input.OracleKeeper, nitrokeeper.Keeper{})
171+
err = CallGaslessDecoratorWithMsg(ctx, &vote2, input.OracleKeeper)
175172
require.NoError(t, err)
176173
require.True(t, gasless)
177174
}
@@ -180,7 +177,7 @@ func TestDexPlaceOrderGasless(t *testing.T) {
180177
// this needs to be updated if its changed from constant true
181178
// reset gasless
182179
gasless = true
183-
err := CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &types.MsgPlaceOrders{}, oraclekeeper.Keeper{}, nitrokeeper.Keeper{})
180+
err := CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &types.MsgPlaceOrders{}, oraclekeeper.Keeper{})
184181
require.NoError(t, err)
185182
require.True(t, gasless)
186183
}
@@ -202,44 +199,14 @@ func TestDexCancelOrderGasless(t *testing.T) {
202199
// not whitelisted
203200
// reset gasless
204201
gasless = true
205-
err := CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &cancelMsg1, oraclekeeper.Keeper{}, nitrokeeper.Keeper{})
202+
err := CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &cancelMsg1, oraclekeeper.Keeper{})
206203
require.NoError(t, err)
207204
require.False(t, gasless)
208205

209206
// whitelisted
210207
// reset gasless
211208
gasless = true
212-
err = CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &cancelMsg2, oraclekeeper.Keeper{}, nitrokeeper.Keeper{})
213-
require.NoError(t, err)
214-
require.True(t, gasless)
215-
}
216-
217-
func TestNitroRecordTxDataGasless(t *testing.T) {
218-
keeper, ctx := keepertest.NitroKeeper(t)
219-
// set with non-whitelisted addr
220-
nonWhitelistedMsg := nitrotypes.MsgRecordTransactionData{
221-
Sender: "someone",
222-
Slot: 1,
223-
StateRoot: "1234",
224-
Txs: []string{"5678"},
225-
}
226-
// reset gasless
227-
gasless = true
228-
err := CallGaslessDecoratorWithMsg(ctx, &nonWhitelistedMsg, oraclekeeper.Keeper{}, *keeper)
229-
require.NoError(t, err)
230-
require.False(t, gasless)
231-
232-
// set with whitelisted addr
233-
keeper.SetParams(ctx, nitrotypes.Params{WhitelistedTxSenders: []string{"sei14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sh9m79m"}})
234-
whitelistedMsg := nitrotypes.MsgRecordTransactionData{
235-
Sender: "sei14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sh9m79m",
236-
Slot: 1,
237-
StateRoot: "1234",
238-
Txs: []string{"5678"},
239-
}
240-
// reset gasless
241-
gasless = true
242-
err = CallGaslessDecoratorWithMsg(ctx, &whitelistedMsg, oraclekeeper.Keeper{}, *keeper)
209+
err = CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &cancelMsg2, oraclekeeper.Keeper{})
243210
require.NoError(t, err)
244211
require.True(t, gasless)
245212
}
@@ -248,7 +215,7 @@ func TestNonGaslessMsg(t *testing.T) {
248215
// this needs to be updated if its changed from constant true
249216
// reset gasless
250217
gasless = true
251-
err := CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &types.MsgRegisterContract{}, oraclekeeper.Keeper{}, nitrokeeper.Keeper{})
218+
err := CallGaslessDecoratorWithMsg(sdk.NewContext(nil, tmproto.Header{}, false, nil), &types.MsgRegisterContract{}, oraclekeeper.Keeper{})
252219
require.NoError(t, err)
253220
require.False(t, gasless)
254221
}

0 commit comments

Comments
 (0)