Skip to content

Commit 2b4b107

Browse files
committed
Merge branch 'main' into kirill/1010-streamer-pagination
2 parents 54f08aa + 78c49cc commit 2b4b107

File tree

82 files changed

+4746
-1147
lines changed

Some content is hidden

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

82 files changed

+4746
-1147
lines changed

app/apptesting/test_suite.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,18 @@ func (s *KeeperTestHelper) CreateRollappByName(name string) {
5454
Creator: alice,
5555
RollappId: name,
5656
InitialSequencer: "*",
57-
Bech32Prefix: strings.ToLower(rand.Str(3)),
58-
GenesisChecksum: "1234567890abcdefg",
5957
Alias: strings.ToLower(rand.Str(7)),
6058
VmType: rollapptypes.Rollapp_EVM,
59+
GenesisInfo: rollapptypes.GenesisInfo{
60+
Bech32Prefix: strings.ToLower(rand.Str(3)),
61+
GenesisChecksum: "1234567890abcdefg",
62+
InitialSupply: sdk.NewInt(1000),
63+
NativeDenom: &rollapptypes.DenomMetadata{
64+
Display: "DEN",
65+
Base: "aden",
66+
Exponent: 18,
67+
},
68+
},
6169
Metadata: &rollapptypes.RollappMetadata{
6270
Website: "https://dymension.xyz",
6371
Description: "Sample description",

app/upgrades/v4/upgrade.go

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -199,24 +199,31 @@ func ConvertOldRollappToNew(oldRollapp rollapptypes.Rollapp) rollapptypes.Rollap
199199
Frozen: oldRollapp.Frozen,
200200
RegisteredDenoms: oldRollapp.RegisteredDenoms,
201201
// TODO: regarding missing data - https://github.com/dymensionxyz/dymension/issues/986
202-
Bech32Prefix: oldRollapp.RollappId[:5], // placeholder data
203-
GenesisChecksum: string(crypto.Sha256([]byte(oldRollapp.RollappId))), // placeholder data
204-
VmType: rollapptypes.Rollapp_EVM, // placeholder data
202+
VmType: rollapptypes.Rollapp_EVM, // placeholder data
205203
Metadata: &rollapptypes.RollappMetadata{
206-
Website: "",
207-
Description: "",
208-
LogoUrl: "",
209-
Telegram: "",
210-
X: "",
211-
GenesisUrl: "",
212-
DisplayName: "",
213-
Tagline: "",
214-
TokenSymbol: "",
215-
FeeBaseDenom: "",
216-
NativeBaseDenom: "",
204+
Website: "",
205+
Description: "",
206+
LogoUrl: "",
207+
Telegram: "",
208+
X: "",
209+
GenesisUrl: "",
210+
DisplayName: "",
211+
Tagline: "",
212+
FeeDenom: nil,
213+
},
214+
GenesisInfo: rollapptypes.GenesisInfo{
215+
Bech32Prefix: oldRollapp.RollappId[:5], // placeholder data
216+
GenesisChecksum: string(crypto.Sha256([]byte(oldRollapp.RollappId))), // placeholder data
217+
NativeDenom: &rollapptypes.DenomMetadata{
218+
Display: "DEN", // placeholder data
219+
Base: "aden", // placeholder data
220+
Exponent: 6, // placeholder data
221+
},
222+
InitialSupply: sdk.NewInt(100000), // placeholder data
223+
Sealed: true,
217224
},
218225
InitialSequencer: "*",
219-
Sealed: true,
226+
Launched: true,
220227
}
221228
}
222229

0 commit comments

Comments
 (0)