Merge branch 'main' into FMS-122/view-feeds-manager-nav-in-mobile

Author: jkongie

src/screens/Job/JobView.tsx

@@ -80,6 +80,7 @@ const JOB_PAYLOAD__SPEC = gql`
     }
     ... on VRFSpec {
       evmChainID
+      gasLanePrice
       coordinatorAddress
       fromAddresses
       minIncomingConfirmations
@@ -107,7 +108,6 @@ const JOB_PAYLOAD__SPEC = gql`
       fromAddress
     }
     ... on BootstrapSpec {
-      id
       contractID
       relay
       monitoringEndpoint

src/screens/Job/generateJobDefinition.test.ts

@@ -461,6 +461,7 @@ juelsPerFeeCoinSource = "1000000000"
         chunkSize: 25,
         backoffInitialDelay: '1m',
         backoffMaxDelay: '1h',
+        gasLanePrice: '200 gwei',
       },
       observationSource:
         '    fetch    [type=http method=POST url="http://localhost:8001" requestData="{\\"hi\\": \\"hello\\"}"];\n    parse    [type=jsonparse path="data,result"];\n    multiply [type=multiply times=100];\n    fetch -> parse -> multiply;\n',
@@ -486,6 +487,7 @@ batchFulfillmentGasMultiplier = 1
 chunkSize = 25
 backoffInitialDelay = "1m"
 backoffMaxDelay = "1h"
+gasLanePrice = "200 gwei"
 observationSource = """
     fetch    [type=http method=POST url="http://localhost:8001" requestData="{\\\\"hi\\\\": \\\\"hello\\\\"}"];
     parse    [type=jsonparse path="data,result"];
@@ -543,7 +545,6 @@ observationSource = """
       gasLimit: 1000,
       spec: {
         __typename: 'BootstrapSpec',
-        id: '',
         contractID: '0x0000000000000000000000000000000000000000',
         relay: 'evm',
         relayConfig: {
@@ -564,7 +565,6 @@ schemaVersion = 1
 name = "bootstrap"
 externalJobID = "00000000-0000-0000-0000-0000000000001"
 gasLimit = 1_000
-id = ""
 contractID = "0x0000000000000000000000000000000000000000"
 relay = "evm"
 monitoringEndpoint = "https://monitoring.endpoint"

src/screens/Job/generateJobDefinition.ts

@@ -215,6 +215,7 @@ export const generateJobDefinition = (
           'chunkSize',
           'backoffInitialDelay',
           'backoffMaxDelay',
+          'gasLanePrice',
         ),
         ...extractObservationSourceField(job),
       }
@@ -245,7 +246,6 @@ export const generateJobDefinition = (
         ...extractJobFields(job),
         ...extractSpecFields(
           job.spec,
-          'id',
           'contractID',
           'relay',
           'relayConfig',