Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for @chainlink/contracts@^1.0.0-beta.0 #203

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Update for @chainlink/contracts@^1.0.0-beta.0 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b6e8ad
Update for @chainlink/contracts@^1.0.0-beta.0
zeuslawyer Jan 10, 2024
d438e3b
adding package.json to make github actions tests pass
zeuslawyer Jan 10, 2024
eee3608
bump beta version. E2E CLI workflow checked on mumbai
zeuslawyer Mar 21, 2024
33d9173
merge from main and put package version at 0.2.0
zeuslawyer Mar 21, 2024
3f6d108
fix merge conflict on package version. reinstated to 0.1.2 to match main
zeuslawyer Mar 26, 2024
422686a
update starter kit minor version as breaking changes to import paths …
zeuslawyer Mar 26, 2024
d9cc925
prettier
zeuslawyer Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions contracts/AutomatedFunctionsConsumer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.19;

import {FunctionsClient} from "@chainlink/contracts/src/v0.8/functions/dev/v1_0_0/FunctionsClient.sol";
import {FunctionsClient} from "@chainlink/contracts/src/v0.8/functions/v1_0_0/FunctionsClient.sol";

import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
import {FunctionsRequest} from "@chainlink/contracts/src/v0.8/functions/dev/v1_0_0/libraries/FunctionsRequest.sol";
import {FunctionsRequest} from "@chainlink/contracts/src/v0.8/functions/v1_0_0/libraries/FunctionsRequest.sol";
import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/AutomationCompatible.sol";

/**
Expand All @@ -15,18 +16,18 @@

// State variables for Chainlink Functions
bytes32 public donId;
bytes public s_requestCBOR;

Check warning on line 19 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
uint64 public s_subscriptionId;

Check warning on line 20 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
uint32 public s_fulfillGasLimit;

Check warning on line 21 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
bytes32 public s_lastRequestId;

Check warning on line 22 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
bytes public s_lastResponse;

Check warning on line 23 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
bytes public s_lastError;

Check warning on line 24 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase

// State variables for Chainlink Automation
uint256 public s_updateInterval;

Check warning on line 27 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
uint256 public s_lastUpkeepTimeStamp;

Check warning on line 28 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
uint256 public s_upkeepCounter;

Check warning on line 29 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
uint256 public s_requestCounter;

Check warning on line 30 in contracts/AutomatedFunctionsConsumer.sol

View workflow job for this annotation

GitHub Actions / Lint 

Variable name must be in mixedCase
uint256 public s_responseCounter;

event OCRResponse(bytes32 indexed requestId, bytes result, bytes err);
Expand Down
4 changes: 2 additions & 2 deletions contracts/FunctionsConsumer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.19;

import {FunctionsClient} from "@chainlink/contracts/src/v0.8/functions/dev/v1_0_0/FunctionsClient.sol";
import {FunctionsClient} from "@chainlink/contracts/src/v0.8/functions/v1_0_0/FunctionsClient.sol";
import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
import {FunctionsRequest} from "@chainlink/contracts/src/v0.8/functions/dev/v1_0_0/libraries/FunctionsRequest.sol";
import {FunctionsRequest} from "@chainlink/contracts/src/v0.8/functions/v1_0_0/libraries/FunctionsRequest.sol";

/**
* @title Chainlink Functions example on-demand consumer contract example
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/LinkToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.4.24;
pragma solidity ^0.8.0;

import "@chainlink/contracts/src/v0.4/LinkToken.sol";
import "@chainlink/contracts/src/v0.8/shared/token/ERC677/LinkToken.sol";
4 changes: 2 additions & 2 deletions contracts/test/MockV3Aggregator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
pragma solidity ^0.8.0;

import "@chainlink/contracts/src/v0.7/tests/MockV3Aggregator.sol";
import "@chainlink/contracts/src/v0.8/tests/MockV3Aggregator.sol";
Loading
Loading