Skip to content

Commit

Permalink
Merge pull request #1528 from api3dao/renovate/devdependencies-(non-m…
Browse files Browse the repository at this point in the history
…ajor)

Update devDependencies (non-major)
  • Loading branch information
amarthadan authored Mar 8, 2023
2 parents a85a586 + 75664b3 commit ab87b4c
Show file tree
Hide file tree
Showing 44 changed files with 1,904 additions and 2,028 deletions.
2 changes: 2 additions & 0 deletions .changeset/curvy-spiders-dress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/sharp-bikes-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.github/
**/node_modules/**
**/dist/**
!docker/scripts/dist
!docker/scripts/dist/**
**/build/**
**/coverage/**

Expand Down
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ config.json

# Third party modules
**/.terraform/**

# !!! Temporary until the proper formatting is sorted out !!!
# https://github.com/api3dao/airnode/issues/1660
packages/airnode-protocol/contracts
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"docker:build:latest": "yarn docker:build:packaging && yarn docker:build:images:latest",
"docker:build:local": "yarn docker:build:packaging && yarn docker:build:images:local",
"docker:build:packaging": "yarn docker:scripts:build && docker build --tag api3/airnode-packaging:latest --file docker/Dockerfile .",
"docker:scripts:build": "ncc build docker/scripts/cli.ts -o docker/scripts/dist --no-cache --minify --source-map --transpile-only",
"docker:scripts:build": "ncc build docker/scripts/cli.ts -o docker/scripts/dist --no-cache --source-map --transpile-only",
"docker:scripts:docker:build": "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock api3/airnode-packaging:latest docker build",
"docker:scripts:docker:build:latest": "yarn docker:scripts:docker:build",
"docker:scripts:docker:build:local": "yarn docker:scripts:docker:build --npm-registry local --npm-tag snapshot-local --docker-tags local",
Expand Down Expand Up @@ -106,30 +106,30 @@
"dependencies": {},
"devDependencies": {
"@api3/promise-utils": "^0.3.0",
"@changesets/changelog-github": "^0.4.7",
"@changesets/cli": "^2.25.1",
"@octokit/core": "^4.1.0",
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.0",
"@octokit/core": "^4.2.0",
"@types/libsodium-wrappers": "^0.7.10",
"@types/node": "^18.13.0",
"@typescript-eslint/eslint-plugin": "^5.41.0",
"@typescript-eslint/parser": "^5.41.0",
"@vercel/ncc": "^0.34.0",
"axios": "^1.2.2",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"@vercel/ncc": "^0.36.1",
"axios": "^1.3.3",
"comment-json": "^4.2.3",
"eslint": "^8.26.0",
"eslint": "^8.34.0",
"eslint-plugin-functional": "^5.0.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^27.1.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
"fast-glob": "^3.2.12",
"husky": "^8.0.1",
"lerna": "^6.0.1",
"libsodium-wrappers": "^0.7.10",
"prettier": "^2.8.1",
"prettier-plugin-solidity": "^1.0.0-dev.24",
"husky": "^8.0.3",
"lerna": "^6.5.1",
"libsodium-wrappers": "^0.7.11",
"prettier": "^2.8.4",
"prettier-plugin-solidity": "^1.1.2",
"rimraf": "^4.2.0",
"solhint": "^3.3.7",
"solhint": "^3.3.8",
"ts-node": "^10.9.1",
"typescript": "^4.8.4",
"yargs": "^17.6.0"
"typescript": "^4.9.5",
"yargs": "^17.7.0"
}
}
6 changes: 3 additions & 3 deletions packages/airnode-abi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@types/lodash": "^4.14.186",
"jest": "^29.2.2",
"@types/lodash": "^4.14.191",
"jest": "^29.4.3",
"rimraf": "^4.2.0",
"typescript": "^4.8.4"
"typescript": "^4.9.5"
}
}
17 changes: 9 additions & 8 deletions packages/airnode-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@nomiclabs/hardhat-ethers": "^2.2.1",
"@nomiclabs/hardhat-waffle": "^2.0.3",
"@types/lodash": "^4.14.186",
"@types/mocha": "^10.0.0",
"chai": "^4.3.6",
"@nomiclabs/hardhat-ethers": "^2.2.2",
"@nomiclabs/hardhat-waffle": "^2.0.5",
"@types/chai": "^4.3.4",
"@types/lodash": "^4.14.191",
"@types/mocha": "^10.0.1",
"chai": "^4.3.7",
"ethereum-waffle": "^4.0.10",
"hardhat": "2.10.2",
"jest": "^29.2.2",
"jest": "^29.4.3",
"rimraf": "^4.2.0",
"ts-jest": "^29.0.3",
"typescript": "^4.8.4"
"ts-jest": "^29.0.5",
"typescript": "^4.9.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { artificialTypes } from '../constants';
import { ResponseType, ValueType } from '../types';

type ArtificialTypeMapping = {
readonly [key in typeof artificialTypes[number]]: string;
readonly [key in (typeof artificialTypes)[number]]: string;
};

const artificialTypeToSolidityType: ArtificialTypeMapping = {
Expand Down
2 changes: 1 addition & 1 deletion packages/airnode-adapter/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export interface Config {

export type ValueType = string | BigNumber | boolean | Array<ValueType>;

export type BaseResponseType = typeof baseResponseTypes[number];
export type BaseResponseType = (typeof baseResponseTypes)[number];
// Use might pass a complex type (e.g. int256[3][]) which we cannot type
export type ResponseType = string;

Expand Down
10 changes: 5 additions & 5 deletions packages/airnode-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
"yargs": "^17.6.2"
},
"devDependencies": {
"@types/lodash": "^4.14.186",
"@types/lodash": "^4.14.191",
"@types/node": "^18.13.0",
"@types/yargs": "^17.0.13",
"jest": "^29.2.2",
"@types/yargs": "^17.0.22",
"jest": "^29.4.3",
"rimraf": "^4.2.0",
"ts-jest": "^29.0.3",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^4.8.4"
"typescript": "^4.9.5"
}
}
2 changes: 1 addition & 1 deletion packages/airnode-deployer/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG npmRegistryUrl=https://registry.npmjs.org/
ARG npmTag=latest

ENV name="airnode-deployer" \
baseTerraformURL="https://releases.hashicorp.com/terraform/1.2.3/terraform_1.2.3_linux_" \
baseTerraformURL="https://releases.hashicorp.com/terraform/1.3.9/terraform_1.3.9_linux_" \
appDir="/app"
ENV packageName="@api3/${name}"

Expand Down
18 changes: 9 additions & 9 deletions packages/airnode-deployer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@
"zod": "^3.20.6"
},
"devDependencies": {
"@google-cloud/functions-framework": "^3.1.2",
"@google-cloud/functions-framework": "^3.1.3",
"@types/adm-zip": "^0.5.0",
"@types/aws-lambda": "^8.10.108",
"@types/lodash": "^4.14.186",
"@types/aws-lambda": "^8.10.110",
"@types/lodash": "^4.14.191",
"@types/node": "^18.13.0",
"@types/yargs": "^17.0.13",
"@types/yargs": "^17.0.22",
"copyfiles": "^2.4.1",
"esbuild-loader": "^2.20.0",
"jest": "^29.2.2",
"esbuild-loader": "^2.21.0",
"jest": "^29.4.3",
"rimraf": "^4.2.0",
"ts-jest": "^29.0.3",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^4.8.4",
"webpack": "^5.74.0",
"typescript": "^4.9.5",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"webpack-ignore-dynamic-require": "^1.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/airnode-deployer/terraform/aws/backend.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.2"
required_version = "~> 1.3"

backend "s3" {
key = "terraform.tfstate"
Expand Down
7 changes: 3 additions & 4 deletions packages/airnode-deployer/terraform/aws/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 3.71"
version = "~> 4.56"
}
}

required_version = "~> 1.2"
required_version = "~> 1.3"
}

provider "aws" {
profile = "default"
region = var.aws_region
region = var.aws_region
}
2 changes: 1 addition & 1 deletion packages/airnode-deployer/terraform/gcp/backend.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "~> 1.2"
required_version = "~> 1.3"

backend "gcs" {
}
Expand Down
38 changes: 20 additions & 18 deletions packages/airnode-deployer/terraform/gcp/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,20 @@ module "run" {
module "startCoordinator" {
source = "./modules/function"

name = "${local.name_prefix}-startCoordinator"
entry_point = "startCoordinator"
source_dir = var.handler_dir
memory_size = 512
timeout = 65
configuration_file = var.configuration_file
secrets_file = var.secrets_file
region = var.gcp_region
project = var.gcp_project
schedule_interval = 1
max_instances = var.disable_concurrency_reservation ? null : 1
invoke_targets = [module.run.function_name]
name = "${local.name_prefix}-startCoordinator"
entry_point = "startCoordinator"
source_dir = var.handler_dir
memory_size = 512
timeout = 65
configuration_file = var.configuration_file
secrets_file = var.secrets_file
region = var.gcp_region
project = var.gcp_project
schedule_interval = 1
max_instances = var.disable_concurrency_reservation ? null : 1
invoke_targets = {
run = module.run.function_name
}
airnode_bucket = var.airnode_bucket
deployment_bucket_dir = var.deployment_bucket_dir
environment_variables = {
Expand Down Expand Up @@ -148,9 +150,9 @@ module "httpGw" {
}
project = var.gcp_project

invoke_targets = [
module.httpReq[0].function_name
]
invoke_targets = {
httpReq = module.httpReq[0].function_name
}

depends_on = [
google_project_service.apigateway_api,
Expand Down Expand Up @@ -198,9 +200,9 @@ module "httpSignedGw" {
}
project = var.gcp_project

invoke_targets = [
module.httpSignedReq[0].function_name
]
invoke_targets = {
httpSignedReq = module.httpSignedReq[0].function_name
}

depends_on = [
google_project_service.apigateway_api,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ resource "google_project_iam_member" "api_gateway_logging_writer_role" {
}

resource "google_cloudfunctions_function_iam_member" "invoker" {
for_each = toset(var.invoke_targets)
for_each = var.invoke_targets

cloud_function = each.key
cloud_function = each.value
role = "roles/cloudfunctions.invoker"
member = "serviceAccount:${google_service_account.api_gateway_service_account.email}"
project = var.project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ variable "template_variables" {

variable "invoke_targets" {
description = "Names of cloud functions that can be invoked from the APIGateway"
type = list(string)
default = []
type = map(string)
default = {}
}

variable "project" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ resource "google_project_iam_member" "function_logging_writer_role" {
}

resource "google_cloudfunctions_function_iam_member" "invoker" {
for_each = toset(var.invoke_targets)
for_each = var.invoke_targets

cloud_function = each.key
cloud_function = each.value
role = "roles/cloudfunctions.invoker"
member = "serviceAccount:${google_service_account.function_service_account.email}"
project = var.project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ variable "timeout" {

variable "invoke_targets" {
description = "Names of other cloud functions that can be invoked from the cloud function"
type = list(string)
default = []
type = map(string)
default = {}
}

variable "schedule_interval" {
Expand Down
4 changes: 2 additions & 2 deletions packages/airnode-deployer/terraform/gcp/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.7"
version = "~> 4.54"
}
}

required_version = "~> 1.2"
required_version = "~> 1.3"
}

provider "google" {
Expand Down
4 changes: 2 additions & 2 deletions packages/airnode-deployer/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {
loader: 'esbuild-loader',
options: {
loader: 'ts',
target: 'es2015',
target: 'es2021',
},
exclude: /node_modules/,
},
Expand All @@ -36,7 +36,7 @@ module.exports = {
optimization: {
minimizer: [
new ESBuildMinifyPlugin({
target: 'es2015', // Syntax to compile to (see options below for possible values)
target: 'es2021', // Syntax to compile to (see options below for possible values)
}),
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ contract Requester is RrpRequesterV0 {
incomingFulfillments[requestId] = true;
}

function fulfill(bytes32 requestId, bytes calldata data)
external
onlyAirnodeRrp
{
function fulfill(
bytes32 requestId,
bytes calldata data
) external onlyAirnodeRrp {
require(incomingFulfillments[requestId], "No such request made");
delete incomingFulfillments[requestId];
int256 decodedData = abi.decode(data, (int256));
Expand Down
Loading

0 comments on commit ab87b4c

Please sign in to comment.