Chainlink Contracts v1 update

package.json

@@ -37,7 +37,7 @@
     "@astrojs/react": "^3.0.4",
     "@astrojs/sitemap": "^3.0.3",
     "@chainlink/components": "^0.4.5",
-    "@chainlink/contracts": "^0.8.0",
+    "@chainlink/contracts": "^1.0.0-beta.0",
     "@chainlink/contracts-ccip": "^1.2.1",
     "@chainlink/design-system": "^0.1.50",
     "@chainlink/solana-sdk": "^0.2.2",

public/samples/APIRequests/APIConsumer.sol

@@ -34,8 +34,8 @@ contract APIConsumer is ChainlinkClient, ConfirmedOwner {
      *
      */
     constructor() ConfirmedOwner(msg.sender) {
-        setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
-        setChainlinkOracle(0x6090149792dAAeE9D1D568c9f9a6F6B46AA29eFD);
+        _setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
+        _setChainlinkOracle(0x6090149792dAAeE9D1D568c9f9a6F6B46AA29eFD);
         jobId = "ca98366cc7314957b8c012c72f05aeeb";
         fee = (1 * LINK_DIVISIBILITY) / 10; // 0,1 * 10**18 (Varies by network and job)
     }
@@ -45,14 +45,14 @@ contract APIConsumer is ChainlinkClient, ConfirmedOwner {
      * data, then multiply by 1000000000000000000 (to remove decimal places from data).
      */
     function requestVolumeData() public returns (bytes32 requestId) {
-        Chainlink.Request memory req = buildChainlinkRequest(
+        Chainlink.Request memory req = _buildChainlinkRequest(
             jobId,
             address(this),
             this.fulfill.selector
         );
 
         // Set the URL to perform the GET request on
-        req.add(
+        req._add(
             "get",
             "https://min-api.cryptocompare.com/data/pricemultifull?fsyms=ETH&tsyms=USD"
         );
@@ -68,14 +68,14 @@ contract APIConsumer is ChainlinkClient, ConfirmedOwner {
         //   }
         //  }
         // request.add("path", "RAW.ETH.USD.VOLUME24HOUR"); // Chainlink nodes prior to 1.0.0 support this format
-        req.add("path", "RAW,ETH,USD,VOLUME24HOUR"); // Chainlink nodes 1.0.0 and later support this format
+        req._add("path", "RAW,ETH,USD,VOLUME24HOUR"); // Chainlink nodes 1.0.0 and later support this format
 
         // Multiply the result by 1000000000000000000 to remove decimals
         int256 timesAmount = 10 ** 18;
-        req.addInt("times", timesAmount);
+        req._addInt("times", timesAmount);
 
         // Sends the request
-        return sendChainlinkRequest(req, fee);
+        return _sendChainlinkRequest(req, fee);
     }
 
     /**
@@ -93,7 +93,7 @@ contract APIConsumer is ChainlinkClient, ConfirmedOwner {
      * Allow withdraw of Link tokens from the contract
      */
     function withdrawLink() public onlyOwner {
-        LinkTokenInterface link = LinkTokenInterface(chainlinkTokenAddress());
+        LinkTokenInterface link = LinkTokenInterface(_chainlinkTokenAddress());
         require(
             link.transfer(msg.sender, link.balanceOf(address(this))),
             "Unable to transfer"

public/samples/APIRequests/APIConsumerForwarder.sol

@@ -28,25 +28,25 @@ contract APIConsumerForwarder is ChainlinkClient, ConfirmedOwner {
      * @dev Check https://docs.chain.link/docs/link-token-contracts/ for LINK address for the right network
      */
     constructor() ConfirmedOwner(msg.sender) {
-        setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
+        _setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
     }
 
     function requestEthereumPrice(
         address _oracle,
         string memory _jobId
     ) public onlyOwner {
-        Chainlink.Request memory req = buildChainlinkRequest(
+        Chainlink.Request memory req = _buildChainlinkRequest(
             stringToBytes32(_jobId),
             address(this),
             this.fulfillEthereumPrice.selector
         );
-        req.add(
+        req._add(
             "get",
             "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD"
         );
-        req.add("path", "USD");
-        req.addInt("times", 100);
-        sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT);
+        req._add("path", "USD");
+        req._addInt("times", 100);
+        _sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT);
     }
 
     /**
@@ -57,15 +57,15 @@ contract APIConsumerForwarder is ChainlinkClient, ConfirmedOwner {
         address _oracle,
         string memory _jobId
     ) public onlyOwner {
-        Chainlink.Request memory req = buildChainlinkRequest(
+        Chainlink.Request memory req = _buildChainlinkRequest(
             stringToBytes32(_jobId),
             address(this),
             this.fulfillFirstId.selector
         );
 
         // Set the URL to perform the GET request on
         // API docs: https://www.coingecko.com/en/api/documentation?
-        req.add(
+        req._add(
             "get",
             "https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&per_page=10"
         );
@@ -80,9 +80,9 @@ contract APIConsumerForwarder is ChainlinkClient, ConfirmedOwner {
         // ...
         // .. }]
         // request.add("path", "0.id"); // Chainlink nodes prior to 1.0.0 support this format
-        req.add("path", "0,id"); // Chainlink nodes 1.0.0 and later support this format
+        req._add("path", "0,id"); // Chainlink nodes 1.0.0 and later support this format
         // Sends the request
-        sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT);
+        _sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT);
     }
 
     function fulfillEthereumPrice(
@@ -105,11 +105,11 @@ contract APIConsumerForwarder is ChainlinkClient, ConfirmedOwner {
     }
 
     function getChainlinkToken() public view returns (address) {
-        return chainlinkTokenAddress();
+        return _chainlinkTokenAddress();
     }
 
     function withdrawLink() public onlyOwner {
-        LinkTokenInterface link = LinkTokenInterface(chainlinkTokenAddress());
+        LinkTokenInterface link = LinkTokenInterface(_chainlinkTokenAddress());
         require(
             link.transfer(msg.sender, link.balanceOf(address(this))),
             "Unable to transfer"
@@ -122,7 +122,7 @@ contract APIConsumerForwarder is ChainlinkClient, ConfirmedOwner {
         bytes4 _callbackFunctionId,
         uint256 _expiration
     ) public onlyOwner {
-        cancelChainlinkRequest(
+        _cancelChainlinkRequest(
             _requestId,
             _payment,
             _callbackFunctionId,

public/samples/APIRequests/ATestnetConsumer.sol

@@ -26,25 +26,25 @@ contract ATestnetConsumer is ChainlinkClient, ConfirmedOwner {
      * @dev Check https://docs.chain.link/docs/link-token-contracts/ for LINK address for the right network
      */
     constructor() ConfirmedOwner(msg.sender) {
-        setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
+        _setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
     }
 
     function requestEthereumPrice(
         address _oracle,
         string memory _jobId
     ) public onlyOwner {
-        Chainlink.Request memory req = buildChainlinkRequest(
+        Chainlink.Request memory req = _buildChainlinkRequest(
             stringToBytes32(_jobId),
             address(this),
             this.fulfillEthereumPrice.selector
         );
-        req.add(
+        req._add(
             "get",
             "https://min-api.cryptocompare.com/data/price?fsym=ETH&tsyms=USD"
         );
-        req.add("path", "USD");
-        req.addInt("times", 100);
-        sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT);
+        req._add("path", "USD");
+        req._addInt("times", 100);
+        _sendChainlinkRequestTo(_oracle, req, ORACLE_PAYMENT);
     }
 
     function fulfillEthereumPrice(
@@ -56,11 +56,11 @@ contract ATestnetConsumer is ChainlinkClient, ConfirmedOwner {
     }
 
     function getChainlinkToken() public view returns (address) {
-        return chainlinkTokenAddress();
+        return _chainlinkTokenAddress();
     }
 
     function withdrawLink() public onlyOwner {
-        LinkTokenInterface link = LinkTokenInterface(chainlinkTokenAddress());
+        LinkTokenInterface link = LinkTokenInterface(_chainlinkTokenAddress());
         require(
             link.transfer(msg.sender, link.balanceOf(address(this))),
             "Unable to transfer"
@@ -73,7 +73,7 @@ contract ATestnetConsumer is ChainlinkClient, ConfirmedOwner {
         bytes4 _callbackFunctionId,
         uint256 _expiration
     ) public onlyOwner {
-        cancelChainlinkRequest(
+        _cancelChainlinkRequest(
             _requestId,
             _payment,
             _callbackFunctionId,

public/samples/APIRequests/FetchFromArray.sol

@@ -35,8 +35,8 @@ contract FetchFromArray is ChainlinkClient, ConfirmedOwner {
      *
      */
     constructor() ConfirmedOwner(msg.sender) {
-        setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
-        setChainlinkOracle(0x6090149792dAAeE9D1D568c9f9a6F6B46AA29eFD);
+        _setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
+        _setChainlinkOracle(0x6090149792dAAeE9D1D568c9f9a6F6B46AA29eFD);
         jobId = "7d80a6386ef543a3abb52817f6707e3b";
         fee = (1 * LINK_DIVISIBILITY) / 10; // 0,1 * 10**18 (Varies by network and job)
     }
@@ -46,15 +46,15 @@ contract FetchFromArray is ChainlinkClient, ConfirmedOwner {
      * data which is located in a list
      */
     function requestFirstId() public returns (bytes32 requestId) {
-        Chainlink.Request memory req = buildChainlinkRequest(
+        Chainlink.Request memory req = _buildChainlinkRequest(
             jobId,
             address(this),
             this.fulfill.selector
         );
 
         // Set the URL to perform the GET request on
         // API docs: https://www.coingecko.com/en/api/documentation?
-        req.add(
+        req._add(
             "get",
             "https://api.coingecko.com/api/v3/coins/markets?vs_currency=usd&per_page=10"
         );
@@ -69,9 +69,9 @@ contract FetchFromArray is ChainlinkClient, ConfirmedOwner {
         // ...
         // .. }]
         // request.add("path", "0.id"); // Chainlink nodes prior to 1.0.0 support this format
-        req.add("path", "0,id"); // Chainlink nodes 1.0.0 and later support this format
+        req._add("path", "0,id"); // Chainlink nodes 1.0.0 and later support this format
         // Sends the request
-        return sendChainlinkRequest(req, fee);
+        return _sendChainlinkRequest(req, fee);
     }
 
     /**
@@ -89,7 +89,7 @@ contract FetchFromArray is ChainlinkClient, ConfirmedOwner {
      * Allow withdraw of Link tokens from the contract
      */
     function withdrawLink() public onlyOwner {
-        LinkTokenInterface link = LinkTokenInterface(chainlinkTokenAddress());
+        LinkTokenInterface link = LinkTokenInterface(_chainlinkTokenAddress());
         require(
             link.transfer(msg.sender, link.balanceOf(address(this))),
             "Unable to transfer"

public/samples/APIRequests/GenericBigWord.sol

@@ -37,8 +37,8 @@ contract GenericLargeResponse is ChainlinkClient, ConfirmedOwner {
      *
      */
     constructor() ConfirmedOwner(msg.sender) {
-        setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
-        setChainlinkOracle(0x6090149792dAAeE9D1D568c9f9a6F6B46AA29eFD);
+        _setChainlinkToken(0x779877A7B0D9E8603169DdbD7836e478b4624789);
+        _setChainlinkOracle(0x6090149792dAAeE9D1D568c9f9a6F6B46AA29eFD);
         jobId = "7da2702f37fd48e5b1b9a5715e3509b6";
         fee = (1 * LINK_DIVISIBILITY) / 10; // 0,1 * 10**18 (Varies by network and job)
     }
@@ -47,17 +47,17 @@ contract GenericLargeResponse is ChainlinkClient, ConfirmedOwner {
      * @notice Request variable bytes from the oracle
      */
     function requestBytes() public {
-        Chainlink.Request memory req = buildChainlinkRequest(
+        Chainlink.Request memory req = _buildChainlinkRequest(
             jobId,
             address(this),
             this.fulfillBytes.selector
         );
-        req.add(
+        req._add(
             "get",
             "https://ipfs.io/ipfs/QmZgsvrA1o1C8BGCrx6mHTqR1Ui1XqbCrtbMVrRLHtuPVD?filename=big-api-response.json"
         );
-        req.add("path", "image");
-        sendChainlinkRequest(req, fee);
+        req._add("path", "image");
+        _sendChainlinkRequest(req, fee);
     }
 
     event RequestFulfilled(bytes32 indexed requestId, bytes indexed data);
@@ -79,7 +79,7 @@ contract GenericLargeResponse is ChainlinkClient, ConfirmedOwner {
      * Allow withdraw of Link tokens from the contract
      */
     function withdrawLink() public onlyOwner {
-        LinkTokenInterface link = LinkTokenInterface(chainlinkTokenAddress());
+        LinkTokenInterface link = LinkTokenInterface(_chainlinkTokenAddress());
         require(
             link.transfer(msg.sender, link.balanceOf(address(this))),
             "Unable to transfer"