From 306fbd57982f1a5cc2dcdc5b981ac07be1682fc2 Mon Sep 17 00:00:00 2001 From: Vehorny <153144728+vehorny@users.noreply.github.com> Date: Thu, 18 Jan 2024 23:28:19 +0000 Subject: [PATCH 1/4] contracts --- .vscode/settings.json | 2 +- contracts/solidity/emergency/StarknetValidator.sol | 2 +- contracts/src/tests/test_sequencer_uptime_feed.cairo | 2 +- .../src/starkware/starknet/solidity/IStarknetMessaging.sol | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bb4c99574..3f77e7328 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.formatOnSave": true, "editor.formatOnSaveTimeout": 1500, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "files.insertFinalNewline": true } diff --git a/contracts/solidity/emergency/StarknetValidator.sol b/contracts/solidity/emergency/StarknetValidator.sol index cf4191646..3c98f870a 100644 --- a/contracts/solidity/emergency/StarknetValidator.sol +++ b/contracts/solidity/emergency/StarknetValidator.sol @@ -139,7 +139,7 @@ contract StarknetValidator is TypeAndVersionInterface, AggregatorValidatorInterf /** * @notice retries to send the latest answer as update message to L2 - * @dev only with access, useful in cases where a previous x-domain message was handeled unsuccessfully. + * @dev only with access, useful in cases where a previous x-domain message was handled unsuccessfully. */ function retry() external checkAccess returns (bool) { (, int256 latestAnswer, , , ) = AggregatorV3Interface(s_source).latestRoundData(); diff --git a/contracts/src/tests/test_sequencer_uptime_feed.cairo b/contracts/src/tests/test_sequencer_uptime_feed.cairo index 558f40b2b..3a16b5766 100644 --- a/contracts/src/tests/test_sequencer_uptime_feed.cairo +++ b/contracts/src/tests/test_sequencer_uptime_feed.cairo @@ -35,7 +35,7 @@ fn setup() -> (ContractAddress, ContractAddress, ISequencerUptimeFeedDispatcher) let account: ContractAddress = contract_address_const::<777>(); set_caller_address(account); - // Deploy seqeuencer uptime feed + // Deploy sequencer uptime feed let calldata = array![0, // initial status account.into() // owner ]; diff --git a/contracts/vendor/starkware-libs/cairo-lang/src/starkware/starknet/solidity/IStarknetMessaging.sol b/contracts/vendor/starkware-libs/cairo-lang/src/starkware/starknet/solidity/IStarknetMessaging.sol index 7ce51dad3..86feb2616 100644 --- a/contracts/vendor/starkware-libs/cairo-lang/src/starkware/starknet/solidity/IStarknetMessaging.sol +++ b/contracts/vendor/starkware-libs/cairo-lang/src/starkware/starknet/solidity/IStarknetMessaging.sol @@ -11,7 +11,7 @@ interface IStarknetMessaging is IStarknetMessagingEvents { /** Sends a message to an L2 contract. - This function is payable, the payed amount is the message fee. + This function is payable, the paid amount is the message fee. Returns the hash of the message and the nonce of the message. */ From f7b31e4476f990e04f2c1078d21828d72f428bee Mon Sep 17 00:00:00 2001 From: Vehorny <153144728+vehorny@users.noreply.github.com> Date: Thu, 18 Jan 2024 23:29:00 +0000 Subject: [PATCH 2/4] rest contracts test --- contracts/test/ocr2/aggregator.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/test/ocr2/aggregator.test.ts b/contracts/test/ocr2/aggregator.test.ts index 42fc89c95..3efb0c6fe 100644 --- a/contracts/test/ocr2/aggregator.test.ts +++ b/contracts/test/ocr2/aggregator.test.ts @@ -118,7 +118,7 @@ describe('Aggregator', function () { config_digest = response[2] console.log(`Config digest: 0x${config_digest.toString(16)}`) - // Immitate the fetch done by relay to confirm latest_config_details_works + // Imitate the fetch done by relay to confirm latest_config_details_works let block = await starknet.getBlock({ blockNumber: response.block_number }) let events = block.transaction_receipts[0].events @@ -273,7 +273,7 @@ describe('Aggregator', function () { // set up payees let payees = oracles.map((oracle) => ({ transmitter: oracle.transmitter.starknetContract.address, - payee: oracle.transmitter.starknetContract.address, // reusing transmitter acocunts as payees for simplicity + payee: oracle.transmitter.starknetContract.address, // reusing transmitter accounts as payees for simplicity })) await owner.invoke(aggregator, 'set_payees', { payees }) From def9ef01ab8e80dfbf3131182354c59fe1eafc7d Mon Sep 17 00:00:00 2001 From: Vehorny <153144728+vehorny@users.noreply.github.com> Date: Thu, 18 Jan 2024 23:29:28 +0000 Subject: [PATCH 3/4] bootstrap --- docs/integration-tests/README.md | 2 +- integration-tests/common/common.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/integration-tests/README.md b/docs/integration-tests/README.md index 874a88346..bcfad1606 100644 --- a/docs/integration-tests/README.md +++ b/docs/integration-tests/README.md @@ -68,7 +68,7 @@ and [here](../../integration-tests/soak/soak_runner_test.go) 8. Deploy L2 OCR2 contract via Gauntlet 9. Set OCR2 billing via Gauntlet 10. Set OCR2 config details via Gauntlet -11. Set up boostrap and oracle nodes +11. Set up bootstrap and oracle nodes ### Metrics and logs (K8) diff --git a/integration-tests/common/common.go b/integration-tests/common/common.go index 64d4248d8..d0db25415 100644 --- a/integration-tests/common/common.go +++ b/integration-tests/common/common.go @@ -156,7 +156,7 @@ func (c *Common) CreateKeys(env *environment.Environment) ([]client.NodeKeysBund return NKeys, chainlinkK8Nodes, nil } -// CreateJobsForContract Creates and sets up the boostrap jobs as well as OCR jobs +// CreateJobsForContract Creates and sets up the bootstrap jobs as well as OCR jobs func (c *Common) CreateJobsForContract(cc *ChainlinkClient, observationSource string, juelsPerFeeCoinSource string, ocrControllerAddress string, accountAddresses []string) error { // Define node[0] as bootstrap node cc.bootstrapPeers = []client.P2PData{ From aa1966ee1fbbe57b0cedd0691db4fbaa0030a788 Mon Sep 17 00:00:00 2001 From: Vehorny <153144728+vehorny@users.noreply.github.com> Date: Thu, 18 Jan 2024 23:31:52 +0000 Subject: [PATCH 4/4] reverse settings.json --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3f77e7328..bb4c99574 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.formatOnSave": true, "editor.formatOnSaveTimeout": 1500, "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" + "source.fixAll.eslint": true }, "files.insertFinalNewline": true }