diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 166692f..24dfc84 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -5,6 +5,11 @@ on: branches: - "main" +concurrency: + # Cancel old runs if there is a new commit in the same branch + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: integration: runs-on: ubuntu-latest diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 790db14..f048909 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -4,6 +4,11 @@ on: pull_request: types: [opened, synchronize] +concurrency: + # Cancel old runs if there is a new commit in the same branch + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: integration: runs-on: ubuntu-latest diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index c16de2a..9210543 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -56,6 +56,14 @@ func CreateUpgradeHandler( return nil, err } + /** Custom migrations **/ + // Disable default EVM Channels + params := ek.GetParams(ctx) + params.EVMChannels = []string{} + if err := ek.SetParams(ctx, params); err != nil { + logger.Error("failed to remove EVMChannels from evm params", "error", err.Error()) + return nil, err + } // Add XRP bank metadata for ERC20 recognition bk.SetDenomMetaData(ctx, banktypes.Metadata{ Base: "axrp", diff --git a/go.sum b/go.sum index fa072fb..5e83d8a 100644 --- a/go.sum +++ b/go.sum @@ -229,6 +229,8 @@ github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/Peersyst/evmos/v19 v19.2.0-exrp.5 h1:zrnwpBX6Ake5m0JW+ARKZcVK+B6n7wZErR1W7L4MqrI= +github.com/Peersyst/evmos/v19 v19.2.0-exrp.5/go.mod h1:Lhs/n3iXgIb1uc5gYljhxzl80i9z5Lhs6GsPrlMMvg4= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=