resolve all

client/docs/swagger-ui/swagger.yaml

@@ -589,13 +589,7 @@ paths:
                      Example 4: Pack and unpack a message in Go
 
                          foo := &pb.Foo{...}
-<<<<<<< HEAD
+
-<<<<<<< HEAD
-                         any, err := ptypes.MarshalAny(foo)
-                         ...
-                         foo := &pb.Foo{}
-                         if err := ptypes.UnmarshalAny(any, foo); err != nil {
-=======
                          any, err := anypb.New(foo)
                          if err != nil {
                            ...
@@ -603,8 +597,6 @@ paths:
                          ...
                          foo := &pb.Foo{}
                          if err := any.UnmarshalTo(foo); err != nil {
->>>>>>> v0.20.0
-=======
                          any, err := anypb.New(foo)
                          if err != nil {
                            ...
@@ -612,7 +604,6 @@ paths:
                          ...
                          foo := &pb.Foo{}
                          if err := any.UnmarshalTo(foo); err != nil {
->>>>>>> v0.21.0
                            ...
                          }
 
@@ -1775,22 +1766,14 @@ paths:
                         title: >-
                           Eip-4345 (bomb delay) switch block (nil = no fork, 0 =
                           already activated)
-<<<<<<< HEAD
-<<<<<<< HEAD
                       merge_fork_block:
                         type: string
                         title: >-
                           EIP-3675 (TheMerge) switch block (nil = no fork, 0 =
                           already in merge proceedings)
-=======
                       gray_glacier_block:
                         type: string
                         title: >-
-=======
-                      gray_glacier_block:
-                        type: string
-                        title: >-
->>>>>>> v0.21.0
                           EIP-5133 (bomb delay) switch block (nil = no fork, 0 =
                           already activated)
                       merge_netsplit_block:
@@ -1798,10 +1781,6 @@ paths:
                         title: >-
                           Virtual fork after The Merge to use as a network
                           splitter
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
                     description: >-
                       ChainConfig defines the Ethereum ChainConfig parameters
                       using *sdk.Int values
@@ -1811,17 +1790,7 @@ paths:
                     type: boolean
                     description: >-
                       Allow unprotected transactions defines if replay-protected
-<<<<<<< HEAD
+                      (i.e non EIP155 signed) transactions can be executed on the state machine.
-<<<<<<< HEAD
-                      (i.e non EIP155 
-=======
-                      (i.e non EIP155
->>>>>>> v0.20.0
-=======
-                      (i.e non EIP155
->>>>>>> v0.21.0
-
-                      signed) transactions can be executed on the state machine.
                 title: Params defines the EVM module parameters
             description: >-
               QueryParamsResponse defines the response type for querying x/evm
@@ -2582,19 +2551,12 @@ paths:
           in: query
           required: false
           type: string
-<<<<<<< HEAD
-<<<<<<< HEAD
         - name: trace_config.overrides.merge_fork_block
           description: >-
             EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
             merge proceedings).
-=======
         - name: trace_config.overrides.gray_glacier_block
           description: >-
-=======
-        - name: trace_config.overrides.gray_glacier_block
-          description: >-
->>>>>>> v0.21.0
             EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
             activated).
           in: query
@@ -2602,10 +2564,6 @@ paths:
           type: string
         - name: trace_config.overrides.merge_netsplit_block
           description: Virtual fork after The Merge to use as a network splitter.
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
           in: query
           required: false
           type: string
@@ -3068,19 +3026,12 @@ paths:
           in: query
           required: false
           type: string
-<<<<<<< HEAD
-<<<<<<< HEAD
         - name: trace_config.overrides.merge_fork_block
           description: >-
             EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
             merge proceedings).
-=======
         - name: trace_config.overrides.gray_glacier_block
           description: >-
-=======
-        - name: trace_config.overrides.gray_glacier_block
-          description: >-
->>>>>>> v0.21.0
             EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
             activated).
           in: query
@@ -3088,10 +3039,6 @@ paths:
           type: string
         - name: trace_config.overrides.merge_netsplit_block
           description: Virtual fork after The Merge to use as a network splitter.
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
           in: query
           required: false
           type: string
@@ -3371,8 +3318,6 @@ paths:
           type: string
       tags:
         - Query
-<<<<<<< HEAD
-<<<<<<< HEAD
   /cosmos/auth/v1beta1/accounts:
     get:
       summary: Accounts returns all the existing accounts
@@ -14298,31 +14243,19 @@ definitions:
         title: >-
           Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
           activated)
-<<<<<<< HEAD
-<<<<<<< HEAD
       merge_fork_block:
         type: string
         title: >-
           EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in merge
           proceedings)
-=======
       gray_glacier_block:
         type: string
         title: >-
-=======
-      gray_glacier_block:
-        type: string
-        title: >-
->>>>>>> v0.21.0
           EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
           activated)
       merge_netsplit_block:
         type: string
         title: Virtual fork after The Merge to use as a network splitter
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
     description: >-
       ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
       values
@@ -14725,31 +14658,19 @@ definitions:
             title: >-
               Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
               activated)
-<<<<<<< HEAD
-<<<<<<< HEAD
           merge_fork_block:
             type: string
             title: >-
               EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
               merge proceedings)
-=======
           gray_glacier_block:
             type: string
             title: >-
-=======
-          gray_glacier_block:
-            type: string
-            title: >-
->>>>>>> v0.21.0
               EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
               activated)
           merge_netsplit_block:
             type: string
             title: Virtual fork after The Merge to use as a network splitter
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
         description: >-
           ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
           values
@@ -14759,17 +14680,7 @@ definitions:
         type: boolean
         description: >-
           Allow unprotected transactions defines if replay-protected (i.e non
-<<<<<<< HEAD
+          EIP155 signed) transactions can be executed on the state machine.
-<<<<<<< HEAD
-          EIP155 
-=======
-          EIP155
->>>>>>> v0.20.0
-=======
-          EIP155
->>>>>>> v0.21.0
-
-          signed) transactions can be executed on the state machine.
     title: Params defines the EVM module parameters
   ethermint.evm.v1.QueryAccountResponse:
     type: object
@@ -14922,31 +14833,19 @@ definitions:
                 title: >-
                   Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
                   activated)
-<<<<<<< HEAD
-<<<<<<< HEAD
               merge_fork_block:
                 type: string
                 title: >-
                   EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already
                   in merge proceedings)
-=======
               gray_glacier_block:
                 type: string
                 title: >-
-=======
-              gray_glacier_block:
-                type: string
-                title: >-
->>>>>>> v0.21.0
                   EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
                   activated)
               merge_netsplit_block:
                 type: string
                 title: Virtual fork after The Merge to use as a network splitter
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
             description: >-
               ChainConfig defines the Ethereum ChainConfig parameters using
               *sdk.Int values
@@ -14956,17 +14855,7 @@ definitions:
             type: boolean
             description: >-
               Allow unprotected transactions defines if replay-protected (i.e
-<<<<<<< HEAD
+              non EIP155 signed) transactions can be executed on the state machine.
-<<<<<<< HEAD
-              non EIP155 
-=======
-              non EIP155
->>>>>>> v0.20.0
-=======
-              non EIP155
->>>>>>> v0.21.0
-
-              signed) transactions can be executed on the state machine.
         title: Params defines the EVM module parameters
     description: >-
       QueryParamsResponse defines the response type for querying x/evm
@@ -15105,31 +14994,20 @@ definitions:
             title: >-
               Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already
               activated)
-<<<<<<< HEAD
+
-<<<<<<< HEAD
           merge_fork_block:
             type: string
             title: >-
               EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in
               merge proceedings)
-=======
           gray_glacier_block:
             type: string
             title: >-
-=======
-          gray_glacier_block:
-            type: string
-            title: >-
->>>>>>> v0.21.0
               EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already
               activated)
           merge_netsplit_block:
             type: string
             title: Virtual fork after The Merge to use as a network splitter
-<<<<<<< HEAD
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0
         description: >-
           ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int
           values
@@ -15480,8 +15358,6 @@ definitions:
                   "@type": "type.googleapis.com/google.protobuf.Duration",
                   "value": "1.212s"
                 }
-<<<<<<< HEAD
-<<<<<<< HEAD
   cosmos.auth.v1beta1.Params:
     type: object
     properties:
@@ -21442,7 +21318,3 @@ definitions:
       application's
 
       state transition machine.
-=======
->>>>>>> v0.20.0
-=======
->>>>>>> v0.21.0

tests/integration_tests/configs/default.jsonnet

@@ -4,13 +4,6 @@
     cmd: 'laconicd',
     'start-flags': '--trace',
     config: {
-<<<<<<< HEAD
-      consensus: {
-        // larger timeout for more stable mempool tests
-        timeout_commit: '2s',
-      },
-=======
->>>>>>> v0.21.0
       mempool: {
         // use v1 mempool to enable tx prioritization
         version: 'v1',

tests/integration_tests/test_upgrade.py

@@ -92,12 +92,6 @@ def test_cosmovisor_upgrade(custom_ethermint: Ethermint):
     - check that queries on legacy blocks still works after upgrade.
     """
     cli = custom_ethermint.cosmos_cli()
-<<<<<<< HEAD
-    height = cli.block_height()
-    target_height = height + 10
-    print("upgrade height", target_height)
-=======
->>>>>>> v0.21.0
 
     w3 = custom_ethermint.w3
     contract, _ = deploy_contract(w3, CONTRACTS["TestERC20A"])

testutil/network/network.go

@@ -330,7 +330,9 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
 			} else {
 				_, jsonRPCPort, err := server.FreeTCPAddr()
 				if err != nil {
-					return nil, err
+					// ignore semgrep: Missing mutex unlock before returning from a function.
+					// unlocking in cleanup func
+					return nil, err // nosemgrep
 				}
 				appCfg.JSONRPC.Address = fmt.Sprintf("127.0.0.1:%s", jsonRPCPort)
 			}