conflicts

2021-04-17 12:00:07 +02:00
parent 20f9a72908
commit 5a3d514ba0
173 changed files with 19392 additions and 13626 deletions
@@ -30,15 +30,10 @@ message GenesisState {
 message GenesisAccount {
  // address defines an ethereum hex formated address of an account
  string address = 1;
-  // balance defines the available evm tokens for the account
-  string balance = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable) = false
-  ];
  // code defines the hex bytes of the account code.
-  string code = 3;
+  string code = 2;
  // storage defines the set of state key values for the account.
-  repeated State storage = 4 [
+  repeated State storage = 3 [
    (gogoproto.nullable) = false,
    (gogoproto.castrepeated) = "Storage"
  ];