feat: add l1_to_l2_gas_ratio in rollup info and fix GetAllRollup's pa…

…ram (#1071)
Finschia · Aug 10, 2023 · 95ec1c0 · 95ec1c0
1 parent fa85f8a
commit 95ec1c0
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 85 deletions.
diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md
@@ -9732,6 +9732,7 @@ Msg defines the Msg service.
 | ----- | ---- | ----- | ----------- |
 | `rollup_name` | [string](#string) |  |  |
 | `creator` | [string](#string) |  |  |
+| `l1_to_l2_gas_ratio` | [uint64](#uint64) |  |  |
 | `permissioned_addresses` | [Sequencers](#finschia.or.rollup.v1.Sequencers) |  |  |
 
 
@@ -10055,6 +10056,7 @@ Params defines the parameters for the module.
 | ----- | ---- | ----- | ----------- |
 | `rollup_name` | [string](#string) |  |  |
 | `creator` | [string](#string) |  |  |
+| `l1_to_l2_gas_ratio` | [uint64](#uint64) |  |  |
 | `permissioned_addresses` | [Sequencers](#finschia.or.rollup.v1.Sequencers) |  |  |
 
 

diff --git a/proto/finschia/or/rollup/v1/rollup.proto b/proto/finschia/or/rollup/v1/rollup.proto
@@ -11,7 +11,8 @@ option go_package = "github.com/Finschia/finschia-sdk/x/or/rollup/types";
 message Rollup {
   string rollup_name = 1;
   string creator     = 2;
-  Sequencers permissioned_addresses = 3 [(gogoproto.nullable) = false];
+  uint64 l1_to_l2_gas_ratio = 3;
+  Sequencers permissioned_addresses = 4 [(gogoproto.nullable) = false];
 }
 
 message Sequencer {

diff --git a/proto/finschia/or/rollup/v1/tx.proto b/proto/finschia/or/rollup/v1/tx.proto
@@ -20,7 +20,8 @@ service Msg {
 message MsgCreateRollup {
   string rollup_name = 1;
   string creator = 2;
-  Sequencers permissioned_addresses = 3 [(gogoproto.nullable) = false];
+  uint64 l1_to_l2_gas_ratio = 3;
+  Sequencers permissioned_addresses = 4 [(gogoproto.nullable) = false];
 }
 
 message MsgRegisterSequencer {

diff --git a/x/or/demo/prepare_rollup.sh b/x/or/demo/prepare_rollup.sh
@@ -22,7 +22,7 @@ INITBALANCE=$(simd query bank balances $SEQUENCERADDRESS --home $BASE_DIR --outp
 echo $INITBALANCE
 
 echo "# Create rollup"
-simd tx rollup create-rollup $ROLLUPNAME --from $SEQUENCER --keyring-backend=test --home $BASE_DIR --chain-id sim -y
+simd tx rollup create-rollup $ROLLUPNAME 5 --from $SEQUENCER --keyring-backend=test --home $BASE_DIR --chain-id sim -y
 
 sleep 5
 

diff --git a/x/or/rollup/client/cli/tx.go b/x/or/rollup/client/cli/tx.go
@@ -3,6 +3,7 @@ package cli
 import (
 	"encoding/json"
 	"fmt"
+	"strconv"
 
 	"github.com/Finschia/finschia-sdk/client"
 	"github.com/Finschia/finschia-sdk/client/flags"
@@ -40,14 +41,18 @@ func GetTxCmd() *cobra.Command {
 func NewCreateRollupCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		// TODO: If rollup:sequencer=1:N, add [max-sequencers] parameter
-		Use:   "create-rollup [rollup_name] [permissioned-addresses]",
+		Use:   "create-rollup [rollup_name] [l1_to_l2_gas_ratio] [permissioned-addresses]",
 		Short: "Create a new rollup",
-		Args:  cobra.RangeArgs(1, 2),
+		Args:  cobra.RangeArgs(2, 3),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			argRollupName := args[0]
+			argL1ToL2GasRatio, err := strconv.ParseUint(args[1], 10, 64)
+			if err != nil {
+				return err
+			}
 			argPermissionedAddresses := new(types.Sequencers)
-			if len(args) == 2 {
-				err = json.Unmarshal([]byte(args[1]), argPermissionedAddresses)
+			if len(args) == 3 {
+				err = json.Unmarshal([]byte(args[2]), argPermissionedAddresses)
 				if err != nil {
 					return err
 				}
@@ -61,6 +66,7 @@ func NewCreateRollupCmd() *cobra.Command {
 			msg := types.NewMsgCreateRollup(
 				argRollupName,
 				clientCtx.GetFromAddress().String(),
+				argL1ToL2GasRatio,
 				argPermissionedAddresses,
 			)
 

diff --git a/x/or/rollup/keeper/msg_server.go b/x/or/rollup/keeper/msg_server.go
@@ -30,6 +30,7 @@ func (k msgServer) CreateRollup(goCtx context.Context, msg *types.MsgCreateRollu
 	rollup := types.Rollup{
 		RollupName:            msg.RollupName,
 		Creator:               msg.Creator,
+		L1ToL2GasRatio:        msg.L1ToL2GasRatio,
 		PermissionedAddresses: msg.PermissionedAddresses,
 	}
 

diff --git a/x/or/rollup/keeper/rollup.go b/x/or/rollup/keeper/rollup.go
@@ -3,7 +3,6 @@ package keeper
 import (
 	"github.com/Finschia/finschia-sdk/store/prefix"
 	sdk "github.com/Finschia/finschia-sdk/types"
-	"github.com/Finschia/finschia-sdk/types/query"
 	"github.com/Finschia/finschia-sdk/x/or/rollup/types"
 )
 
@@ -24,7 +23,7 @@ func (k Keeper) SetRollup(ctx sdk.Context, rollup types.Rollup) {
 	store.Set(types.RollupKey(rollup.RollupName), b)
 }
 
-func (k Keeper) GetAllRollup(ctx sdk.Context, pagination *query.PageRequest) (list []types.Rollup) {
+func (k Keeper) GetAllRollup(ctx sdk.Context) (list []types.Rollup) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.RollupKeyPrefix)
 	iterator := sdk.KVStorePrefixIterator(store, []byte{})
 

diff --git a/x/or/rollup/types/message_create_rollup.go b/x/or/rollup/types/message_create_rollup.go
@@ -13,10 +13,11 @@ const (
 
 var _ sdk.Msg = (*MsgCreateRollup)(nil)
 
-func NewMsgCreateRollup(rollupName, creator string, permissionedAddresses *Sequencers) *MsgCreateRollup {
+func NewMsgCreateRollup(rollupName, creator string, l1ToL2GasRatio uint64, permissionedAddresses *Sequencers) *MsgCreateRollup {
 	return &MsgCreateRollup{
 		RollupName:            rollupName,
 		Creator:               creator,
+		L1ToL2GasRatio:        l1ToL2GasRatio,
 		PermissionedAddresses: *permissionedAddresses,
 	}
 }

diff --git a/x/or/rollup/types/rollup.pb.go b/x/or/rollup/types/rollup.pb.go