Merge pull request #8 from smartcontractkit/feat/update-contracts

Author: KuphJr

.changeset/fifty-flowers-reflect.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/functions-toolkit': minor
+---
+
+Updated to latest Functions contracts

README.md

@@ -233,7 +233,7 @@ const estimatedCostInJuels: BigInt = await subscriptionManager.estimateFunctions
   donId, // ID of the DON to which the Functions request will be sent
   subscriptionId, // Subscription ID
   callbackGasLimit, // Total gas used by the consumer contract's callback
-  gasPriceGwei, // Gas price in gWei
+  gasPriceWei, // Gas price in wei
 })
 ```
 

src/SubscriptionManager.ts

@@ -472,7 +472,7 @@ export class SubscriptionManager {
     donId,
     subscriptionId,
     callbackGasLimit,
-    gasPriceGwei,
+    gasPriceWei,
   }: EstimateCostConfig): Promise<BigInt> {
     if (typeof donId !== 'string') {
       throw Error('donId has invalid type')
@@ -488,8 +488,8 @@ export class SubscriptionManager {
       throw Error('Invalid callbackGasLimit')
     }
 
-    if (typeof gasPriceGwei !== 'bigint' || gasPriceGwei <= 0) {
-      throw Error('Invalid gasPriceGwei')
+    if (typeof gasPriceWei !== 'bigint' || gasPriceWei <= 0) {
+      throw Error('Invalid gasPriceWei')
     }
 
     let functionsCoordinatorAddress: string
@@ -520,7 +520,7 @@ export class SubscriptionManager {
         subscriptionId,
         [],
         callbackGasLimit,
-        gasPriceGwei,
+        gasPriceWei,
       )
       return BigInt(estimatedCostInJuels.toString())
     } catch (error) {

src/localFunctionsTestnet.ts

@@ -18,7 +18,7 @@ import {
   LinkTokenSource,
   MockV3AggregatorSource,
   FunctionsRouterSource,
-  MockFunctionsCoordinatorSource,
+  FunctionsCoordinatorTestHelperSource,
   TermsOfServiceAllowListSource,
   FunctionsClientExampleSource,
 } from './v1_contract_sources'
@@ -173,13 +173,9 @@ const handleOracleRequest = async (
     errorHexstring,
   )
 
-  const transmitters31AddressArray = Array(31).fill('0x0000000000000000000000000000000000000000')
-  simulatedTransmitters.forEach((transmitter, i) => {
-    transmitters31AddressArray[i] = transmitter
-  })
   const reportTx = await mockCoordinator
     .connect(admin)
-    .callReport(encodedReport, transmitters31AddressArray, { gasLimit: callReportGasLimit })
+    .callReport(encodedReport, { gasLimit: callReportGasLimit })
   await reportTx.wait(1)
 }
 
@@ -288,8 +284,8 @@ export const deployFunctionsOracle = async (deployer: Wallet): Promise<Functions
     .deploy(linkToken.address, simulatedRouterConfig)
 
   const mockCoordinatorFactory = new ContractFactory(
-    MockFunctionsCoordinatorSource.abi,
-    MockFunctionsCoordinatorSource.bytecode,
+    FunctionsCoordinatorTestHelperSource.abi,
+    FunctionsCoordinatorTestHelperSource.bytecode,
     deployer,
   )
   const mockCoordinator = await mockCoordinatorFactory
@@ -332,7 +328,6 @@ export const deployFunctionsOracle = async (deployer: Wallet): Promise<Functions
     .setThresholdPublicKey(
       '0x' + Buffer.from(simulatedSecretsKeys.thresholdKeys.publicKey).toString('hex'),
     )
-  await mockCoordinator.connect(deployer).setTransmitters(simulatedTransmitters)
 
   return { linkToken, router, mockCoordinator, exampleClient }
 }

src/simulationConfig.ts

@@ -10,6 +10,8 @@ export const simulatedRouterConfig = {
   handleOracleFulfillmentSelector: '0x0ca76175', // handleOracleFulfillment(bytes32 requestId, bytes memory response, bytes memory err)
   gasForCallExactCheck: 5000,
   maxCallbackGasLimits: [300_000, 500_000, 1_000_000],
+  subscriptionDepositMinimumRequests: 0,
+  subscriptionDepositJuels: 0,
 }
 
 export const simulatedCoordinatorConfig = {

src/types.ts

@@ -83,7 +83,7 @@ export type EstimateCostConfig = {
   donId: string
   subscriptionId: BigInt | number | string
   callbackGasLimit: number
-  gasPriceGwei: BigInt
+  gasPriceWei: BigInt
 }
 
 export type SubscriptionInfo = {