update CI for stale run cancel, and remove duplicate runs on PR

Author: advaita-saha

.github/workflows/ci.yml

@@ -11,6 +11,8 @@
 name: Nimbus CI
 on:
   push:
+    branches:
+      - master
     paths-ignore:
       - 'doc/**'
       - 'portal/docs/**'
@@ -34,6 +36,10 @@ on:
 
   workflow_dispatch:
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   matrix_config:
     uses: ./.github/workflows/matrix_config.yml

.github/workflows/kurtosis.yml

@@ -25,8 +25,6 @@ on:
       - 'docker/**'
 
   pull_request:
-    branches:
-      - master
     paths-ignore:
       - 'doc/**'
       - 'portal/docs/**'
@@ -37,6 +35,10 @@ on:
       - '.github/workflows/build_base_image.yml'
       - 'docker/**'
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Nimbus eth1 - eth2 interop check

.github/workflows/nimbus_verified_proxy.yml

@@ -11,6 +11,8 @@
 name: Nimbus verified proxy CI
 on:
   push:
+    branches:
+      - master
     paths:
       - '.github/workflows/nimbus_verified_proxy.yml'
       - 'nimbus_verified_proxy/**'
@@ -32,6 +34,10 @@ on:
       - 'Makefile'
       - 'nimbus.nimble'
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   matrix_config:
     uses: ./.github/workflows/matrix_config.yml

.github/workflows/portal.yml

@@ -8,6 +8,8 @@
 name: Nimbus Portal CI
 on:
   push:
+    branches:
+      - master
     paths-ignore:
       - 'doc/**'
       - 'portal/docs/**'
@@ -29,6 +31,10 @@ on:
 
   workflow_dispatch:
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   # separate job so it can run concurrently with other tests
   testutp:

execution_chain/transaction.nim

@@ -12,7 +12,9 @@ import
 
 export addresses, keys, transactions
 
-proc signTransaction*(tx: Transaction, privateKey: PrivateKey, eip155 = true): Transaction =
+proc signTransaction*(
+    tx: Transaction, privateKey: PrivateKey, eip155 = true
+): Transaction =
   result = tx
   result.signature = result.sign(privateKey, eip155)
 
@@ -30,27 +32,19 @@ func validateChainId*(tx: Transaction, chainId: ChainId): bool =
     chainId == tx.chainId
 
 func maxPriorityFeePerGasNorm*(tx: Transaction): GasInt =
-  if tx.txType < TxEip1559:
-    tx.gasPrice
-  else:
-    tx.maxPriorityFeePerGas
+  if tx.txType < TxEip1559: tx.gasPrice else: tx.maxPriorityFeePerGas
 
 func maxFeePerGasNorm*(tx: Transaction): GasInt =
-  if tx.txType < TxEip1559:
-    tx.gasPrice
-  else:
-    tx.maxFeePerGas
+  if tx.txType < TxEip1559: tx.gasPrice else: tx.maxFeePerGas
 
 func effectiveGasPrice*(tx: Transaction, baseFeePerGas: GasInt): GasInt =
   if tx.txType < TxEip1559:
     tx.gasPrice
   else:
-    baseFeePerGas +
-      min(tx.maxPriorityFeePerGas, tx.maxFeePerGas - baseFeePerGas)
+    baseFeePerGas + min(tx.maxPriorityFeePerGas, tx.maxFeePerGas - baseFeePerGas)
 
-func effectiveGasTip*(tx: Transaction; baseFeePerGas: Opt[UInt256]): GasInt =
-  let
-    baseFeePerGas = baseFeePerGas.get(0.u256).truncate(GasInt)
+func effectiveGasTip*(tx: Transaction, baseFeePerGas: Opt[UInt256]): GasInt =
+  let baseFeePerGas = baseFeePerGas.get(0.u256).truncate(GasInt)
 
   min(tx.maxPriorityFeePerGasNorm(), tx.maxFeePerGasNorm() - baseFeePerGas)