From 3d4db015cd8cdbc83246a529c28c326543bc4bef Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Mon, 12 Dec 2022 10:55:15 +0100 Subject: [PATCH 1/8] fix: retry script improvements --- networks/index.ts | 4 ++-- subtasks.ts | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/networks/index.ts b/networks/index.ts index 20fcb69c..ae35b949 100644 --- a/networks/index.ts +++ b/networks/index.ts @@ -1,7 +1,7 @@ import { NETWORKS } from '../constants'; export const networks = [ - { name: NETWORKS.DEVELOP, enabled: true }, + { name: NETWORKS.DEVELOP, enabled: false }, { name: NETWORKS.KOVAN, enabled: false }, { name: NETWORKS.MUMBAI, enabled: false }, { name: NETWORKS.HARMONYTESTNET, enabled: false }, @@ -14,7 +14,7 @@ export const networks = [ { name: NETWORKS.BSC, enabled: false }, { name: NETWORKS.AVALANCHE, enabled: false }, { name: NETWORKS.AVALANCHEV2, enabled: false }, - { name: NETWORKS.ARBITRUMV2, enabled: false }, + { name: NETWORKS.ARBITRUMV2, enabled: true }, { name: NETWORKS.ARBITRUMNOVA, enabled: false }, { name: NETWORKS.ARBITRUMTESTNET, enabled: false }, { name: NETWORKS.DEVELOP_AVALANCHE, enabled: false }, diff --git a/subtasks.ts b/subtasks.ts index 3d8570d7..def53740 100644 --- a/subtasks.ts +++ b/subtasks.ts @@ -1881,11 +1881,37 @@ subtask(SUB_TASK_NAMES.REQUEST_SLI, undefined).setAction( let tx; if (taskArgs.retry) { console.log('Retrying request...'); + + // const linkToken = await get(CONTRACT_NAMES.LinkToken); + + // const token = await ERC20__factory.connect(linkToken.address, signer); + + // let approval = await token.approve( + // '0x834B065cf4Ac904E4bFfd983Ec2b2A6c8Af8AD7E', + // toWei('10') + // ); + + // approval.wait(); + const messenger = IMessenger__factory.connect( await sla.messengerAddress(), await ethers.getSigner(deployer) ); - tx = await messenger.retryRequest(slaAddress, nextVerifiablePeriod); + + tx = await messenger.retryRequest( + sla.address, + Number(nextVerifiablePeriod), + { + ...(hre.network.config.gas !== 'auto' && + hre.network.config.chainId != 137 && { + gasLimit: hre.network.config.gas, + }), + ...(hre.network.config.gas !== 'auto' && + hre.network.config.chainId == 137 && { + gasPrice: hre.network.config.gas, + }), + } + ); } else { console.log('Requesting SLI...'); tx = await slaRegistry.requestSLI( From b3a9bf42decdd49eb033a3e8faf7f89562c92af1 Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Mon, 12 Dec 2022 15:08:54 +0100 Subject: [PATCH 2/8] feat: Operator contract --- contracts/chainlink/Operator.sol | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 contracts/chainlink/Operator.sol diff --git a/contracts/chainlink/Operator.sol b/contracts/chainlink/Operator.sol new file mode 100644 index 00000000..895723b4 --- /dev/null +++ b/contracts/chainlink/Operator.sol @@ -0,0 +1,4 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.0; + +import '@chainlink/contracts/src/v0.7/Operator.sol'; \ No newline at end of file From 1f15771b10238cf952bd6c578fbe9d66854e8b8c Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Wed, 14 Dec 2022 12:39:21 +0100 Subject: [PATCH 3/8] chore: updated toml spec --- .../chainlink-nodes/example-v2-job-spec.toml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 services/chainlink-nodes/example-v2-job-spec.toml diff --git a/services/chainlink-nodes/example-v2-job-spec.toml b/services/chainlink-nodes/example-v2-job-spec.toml new file mode 100644 index 00000000..9334fce6 --- /dev/null +++ b/services/chainlink-nodes/example-v2-job-spec.toml @@ -0,0 +1,23 @@ +type = "directrequest" +schemaVersion = 1 +name = "StakingParametricRequestJob" +forwardingAllowed = false +maxTaskDuration = "0s" +contractAddress = "0x6Dc1147ca16C020579642D90042CeA252474fD67" +minContractPaymentLinkJuels = "0" +observationSource = """ + decode_log [type=ethabidecodelog + abi="OracleRequest(bytes32 indexed specId, address requester, bytes32 requestId, uint256 payment, address callbackAddr, bytes4 callbackFunctionId, uint256 cancelExpiration, uint256 dataVersion, bytes data)" + data="$(jobRun.logData)" + topics="$(jobRun.logTopics)"] + decode_cbor [type=cborparse data="$(decode_log.data)"] + fetch [type=bridge name="staking-parametric" requestData="{\\"id\\": $(jobSpec.externalJobID), \\"data\\": { \\"sla_monitoring_start\\": $(decode_cbor.sla_monitoring_start), \\"sla_monitoring_end\\": $(decode_cbor.sla_monitoring_end), \\"sla_address\\": $(decode_cbor.sla_address), \\"network_name\\": $(decode_cbor.network_name)}}"] + parse [type=jsonparse path="data,result" data="$(fetch)"] + encode_data [type=ethabiencode abi="(uint256 value)" data="{ \\"value\\": $(parse) }"] + encode_tx [type=ethabiencode + abi="fulfillOracleRequest2(bytes32 requestId, uint256 payment, address callbackAddress, bytes4 callbackFunctionId, uint256 expiration, bytes calldata data)" + data="{\\"requestId\\": $(decode_log.requestId), \\"payment\\": $(decode_log.payment), \\"callbackAddress\\": $(decode_log.callbackAddr), \\"callbackFunctionId\\": $(decode_log.callbackFunctionId), \\"expiration\\": $(decode_log.cancelExpiration), \\"data\\": $(encode_data)}" + ] + submit_tx [type=ethtx to="0x6Dc1147ca16C020579642D90042CeA252474fD67" data="$(encode_tx)"] + decode_log -> decode_cbor -> fetch -> parse -> encode_data -> encode_tx -> submit_tx +""" From 1c1499d2a33c6248153624c844cc4d841cdab6fe Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Wed, 14 Dec 2022 13:37:48 +0100 Subject: [PATCH 4/8] fix: working toml job spec --- services/chainlink-nodes/example-v2-job-spec.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/chainlink-nodes/example-v2-job-spec.toml b/services/chainlink-nodes/example-v2-job-spec.toml index 9334fce6..206a6fb1 100644 --- a/services/chainlink-nodes/example-v2-job-spec.toml +++ b/services/chainlink-nodes/example-v2-job-spec.toml @@ -1,6 +1,6 @@ type = "directrequest" schemaVersion = 1 -name = "StakingParametricRequestJob" +name = "StakingParametricReq" forwardingAllowed = false maxTaskDuration = "0s" contractAddress = "0x6Dc1147ca16C020579642D90042CeA252474fD67" @@ -15,9 +15,9 @@ observationSource = """ parse [type=jsonparse path="data,result" data="$(fetch)"] encode_data [type=ethabiencode abi="(uint256 value)" data="{ \\"value\\": $(parse) }"] encode_tx [type=ethabiencode - abi="fulfillOracleRequest2(bytes32 requestId, uint256 payment, address callbackAddress, bytes4 callbackFunctionId, uint256 expiration, bytes calldata data)" + abi="fulfillOracleRequest(bytes32 requestId, uint256 payment, address callbackAddress, bytes4 callbackFunctionId, uint256 expiration, bytes32 data)" data="{\\"requestId\\": $(decode_log.requestId), \\"payment\\": $(decode_log.payment), \\"callbackAddress\\": $(decode_log.callbackAddr), \\"callbackFunctionId\\": $(decode_log.callbackFunctionId), \\"expiration\\": $(decode_log.cancelExpiration), \\"data\\": $(encode_data)}" ] submit_tx [type=ethtx to="0x6Dc1147ca16C020579642D90042CeA252474fD67" data="$(encode_tx)"] decode_log -> decode_cbor -> fetch -> parse -> encode_data -> encode_tx -> submit_tx -""" +""" \ No newline at end of file From 85c60188b9d1cff6476b4a7a32659879d7c29f90 Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Thu, 15 Dec 2022 15:17:40 +0100 Subject: [PATCH 5/8] fix: develop network --- deploy/operator.ts | 0 networks/index.ts | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 deploy/operator.ts diff --git a/deploy/operator.ts b/deploy/operator.ts new file mode 100644 index 00000000..e69de29b diff --git a/networks/index.ts b/networks/index.ts index ae35b949..20fcb69c 100644 --- a/networks/index.ts +++ b/networks/index.ts @@ -1,7 +1,7 @@ import { NETWORKS } from '../constants'; export const networks = [ - { name: NETWORKS.DEVELOP, enabled: false }, + { name: NETWORKS.DEVELOP, enabled: true }, { name: NETWORKS.KOVAN, enabled: false }, { name: NETWORKS.MUMBAI, enabled: false }, { name: NETWORKS.HARMONYTESTNET, enabled: false }, @@ -14,7 +14,7 @@ export const networks = [ { name: NETWORKS.BSC, enabled: false }, { name: NETWORKS.AVALANCHE, enabled: false }, { name: NETWORKS.AVALANCHEV2, enabled: false }, - { name: NETWORKS.ARBITRUMV2, enabled: true }, + { name: NETWORKS.ARBITRUMV2, enabled: false }, { name: NETWORKS.ARBITRUMNOVA, enabled: false }, { name: NETWORKS.ARBITRUMTESTNET, enabled: false }, { name: NETWORKS.DEVELOP_AVALANCHE, enabled: false }, From a718a955d09eb7e39cba22ad9337918a0a2f4bb3 Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Thu, 15 Dec 2022 15:22:43 +0100 Subject: [PATCH 6/8] fix: solidity version of operator --- contracts/chainlink/Operator.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/chainlink/Operator.sol b/contracts/chainlink/Operator.sol index 895723b4..8c2f8112 100644 --- a/contracts/chainlink/Operator.sol +++ b/contracts/chainlink/Operator.sol @@ -1,4 +1,4 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.6.0; +pragma solidity ^0.7.0; import '@chainlink/contracts/src/v0.7/Operator.sol'; \ No newline at end of file From 5dd688e47c6828611b90dcae4fabc7c1f3da7d97 Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Tue, 3 Jan 2023 12:37:45 +0100 Subject: [PATCH 7/8] fix: pragma --- hardhat.config.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hardhat.config.ts b/hardhat.config.ts index 3606a293..bc7867f8 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -42,6 +42,15 @@ const config: HardhatUserConfig = { }, }, }, + { + version: '^0.7.0', + settings: { + optimizer: { + enabled: true, + runs: 200, + }, + }, + }, { version: '0.6.6', settings: { From e70380948ad473741c6f163ceb203c81f1da4731 Mon Sep 17 00:00:00 2001 From: Wilhem Pujar Date: Tue, 9 May 2023 21:05:20 +0200 Subject: [PATCH 8/8] Update example-v2-job-spec.toml --- services/chainlink-nodes/example-v2-job-spec.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/chainlink-nodes/example-v2-job-spec.toml b/services/chainlink-nodes/example-v2-job-spec.toml index 206a6fb1..1393c6c2 100644 --- a/services/chainlink-nodes/example-v2-job-spec.toml +++ b/services/chainlink-nodes/example-v2-job-spec.toml @@ -3,7 +3,7 @@ schemaVersion = 1 name = "StakingParametricReq" forwardingAllowed = false maxTaskDuration = "0s" -contractAddress = "0x6Dc1147ca16C020579642D90042CeA252474fD67" +contractAddress = "0xFooBar" minContractPaymentLinkJuels = "0" observationSource = """ decode_log [type=ethabidecodelog @@ -18,6 +18,6 @@ observationSource = """ abi="fulfillOracleRequest(bytes32 requestId, uint256 payment, address callbackAddress, bytes4 callbackFunctionId, uint256 expiration, bytes32 data)" data="{\\"requestId\\": $(decode_log.requestId), \\"payment\\": $(decode_log.payment), \\"callbackAddress\\": $(decode_log.callbackAddr), \\"callbackFunctionId\\": $(decode_log.callbackFunctionId), \\"expiration\\": $(decode_log.cancelExpiration), \\"data\\": $(encode_data)}" ] - submit_tx [type=ethtx to="0x6Dc1147ca16C020579642D90042CeA252474fD67" data="$(encode_tx)"] + submit_tx [type=ethtx to="0xFooBar" data="$(encode_tx)"] decode_log -> decode_cbor -> fetch -> parse -> encode_data -> encode_tx -> submit_tx -""" \ No newline at end of file +"""