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 to Functions Contracts v1.3.0 #57

Merged
merged 4 commits into from
Mar 18, 2024
Merged

Update to Functions Contracts v1.3.0 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de8f91a
Update to Functions Contracts v1.3.0
justinkaseman Mar 18, 2024
595bf30
Add changeset
justinkaseman Mar 18, 2024
8684b8b
Update lockfiles
KuphJr Mar 18, 2024
b5ac24b
lint
KuphJr Mar 18, 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: 5 additions & 0 deletions .changeset/light-cooks-move.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@chainlink/functions-toolkit': minor
---

Update to Functions Contracts v1.3.0
5 changes: 3 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 16 additions & 3 deletions src/localFunctionsTestnet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
simulatedSecretsKeys,
DEFAULT_MAX_ON_CHAIN_RESPONSE_BYTES,
numberOfSimulatedNodeExecutions,
simulatedLinkUsdPrice,
} from './simulationConfig'
import {
LinkTokenSource,
Expand Down Expand Up @@ -367,9 +368,12 @@ export const deployFunctionsOracle = async (deployer: Wallet): Promise<Functions
MockV3AggregatorSource.bytecode,
deployer,
)
const linkPriceFeed = await linkPriceFeedFactory
const linkEthPriceFeed = await linkPriceFeedFactory
.connect(deployer)
.deploy(18, simulatedLinkEthPrice)
const linkUsdPriceFeed = await linkPriceFeedFactory
.connect(deployer)
.deploy(8, simulatedLinkUsdPrice)

const routerFactory = new ContractFactory(
FunctionsRouterSource.abi,
Expand All @@ -387,14 +391,23 @@ export const deployFunctionsOracle = async (deployer: Wallet): Promise<Functions
)
const mockCoordinator = await mockCoordinatorFactory
.connect(deployer)
.deploy(router.address, simulatedCoordinatorConfig, linkPriceFeed.address)
.deploy(
router.address,
simulatedCoordinatorConfig,
linkEthPriceFeed.address,
linkUsdPriceFeed.address,
)

const allowlistFactory = new ContractFactory(
TermsOfServiceAllowListSource.abi,
TermsOfServiceAllowListSource.bytecode,
deployer,
)
const allowlist = await allowlistFactory.connect(deployer).deploy(simulatedAllowListConfig)
const initialAllowedSenders: string[] = []
const initialBlockedSenders: string[] = []
const allowlist = await allowlistFactory
.connect(deployer)
.deploy(simulatedAllowListConfig, initialAllowedSenders, initialBlockedSenders)

const setAllowListIdTx = await router.setAllowListId(
utils.formatBytes32String(simulatedAllowListId),
Expand Down
9 changes: 7 additions & 2 deletions src/simulationConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const simulatedLinkEthPrice = BigInt('1000000000000000')
export const simulatedLinkEthPrice = BigInt('6000000000000000')
export const simulatedLinkUsdPrice = BigInt('1500000000')

export const simulatedDonId = 'local-functions-testnet'

Expand All @@ -20,10 +21,14 @@ export const simulatedCoordinatorConfig = {
gasOverheadBeforeCallback: 44_615,
gasOverheadAfterCallback: 44_615,
requestTimeoutSeconds: 0, // 300 is used on actual mainnet & testnet blockchains
donFee: 0,
donFeeCentsUsd: 0,
maxSupportedRequestDataVersion: 1,
fulfillmentGasPriceOverEstimationBP: 0,
fallbackNativePerUnitLink: BigInt('5000000000000000'),
minimumEstimateGasPriceWei: 1000000000, // 1 gwei
fallbackUsdPerUnitLink: 1400000000,
fallbackUsdPerUnitLinkDecimals: 8,
operationFeeCentsUsd: 0,
}

export const simulatedAllowListConfig = {
Expand Down
Loading
Loading