From 2cae58b0bf92115f0b98efdfa33119fe909be726 Mon Sep 17 00:00:00 2001 From: hiletmis <31757771+hiletmis@users.noreply.github.com> Date: Mon, 25 Aug 2025 13:33:41 +0300 Subject: [PATCH 1/6] Replace @api3/chains with latest @api3/contracts --- packages/airnode-examples/package.json | 1 + packages/airnode-node/package.json | 2 +- packages/airnode-protocol/package.json | 2 +- yarn.lock | 228 ++++++++++++++++--------- 4 files changed, 154 insertions(+), 79 deletions(-) diff --git a/packages/airnode-examples/package.json b/packages/airnode-examples/package.json index 5163e23a2..21bf3828e 100644 --- a/packages/airnode-examples/package.json +++ b/packages/airnode-examples/package.json @@ -39,6 +39,7 @@ "@api3/airnode-node": "^0.15.0", "@api3/airnode-protocol": "^0.15.0", "@api3/airnode-utilities": "^0.15.0", + "@api3/contracts": "^27.0.0", "ethers": "^5.7.2", "is-wsl": "^2.2.0" }, diff --git a/packages/airnode-node/package.json b/packages/airnode-node/package.json index 99f5bcbf4..c303577f3 100644 --- a/packages/airnode-node/package.json +++ b/packages/airnode-node/package.json @@ -29,7 +29,7 @@ "@api3/airnode-protocol": "^0.15.0", "@api3/airnode-utilities": "^0.15.0", "@api3/airnode-validator": "^0.15.0", - "@api3/chains": "^8.1.1", + "@api3/contracts": "^27.0.0", "@api3/commons": "^0.9.0", "@api3/ois": "2.3.2", "@api3/promise-utils": "^0.4.0", diff --git a/packages/airnode-protocol/package.json b/packages/airnode-protocol/package.json index 34a4e8946..8350b56e3 100644 --- a/packages/airnode-protocol/package.json +++ b/packages/airnode-protocol/package.json @@ -29,7 +29,7 @@ "write-example-env-file": "hardhat run scripts/write-example-env-file.ts" }, "devDependencies": { - "@api3/chains": "^8.1.1", + "@api3/contracts": "^27.0.0", "@nomicfoundation/hardhat-verify": "^2.0.6", "@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-waffle": "^2.0.6", diff --git a/yarn.lock b/yarn.lock index 82c054664..9b18a1fd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,10 +7,15 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@adraffy/ens-normalize@1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7" - integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q== +"@adraffy/ens-normalize@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069" + integrity sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw== + +"@adraffy/ens-normalize@^1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.11.0.tgz#42cc67c5baa407ac25059fcd7d405cc5ecdb0c33" + integrity sha512-/3DDPKHqqIqxUULp8yP4zODUY1i+2xvVWsv8A79xGWdCAG+8sb0hRh0Rk2QyOJUnnbyPUAZYcpBuRe3nS2OIUg== "@ampproject/remapping@^2.2.0": version "2.3.0" @@ -27,14 +32,6 @@ dependencies: "@openzeppelin/contracts" "4.8.2" -"@api3/chains@^8.1.1": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@api3/chains/-/chains-8.1.1.tgz#1f292eba31e4395d89c6b067f2b2a86955fca0b6" - integrity sha512-2woMgPksMEzH2tU7ZH5tHNHr9qbZDG+bEWcAGcs+A3/GJKNBaTmxVerIyTo4IZA9f6vN91i7fH3UPAq/S8KQDw== - dependencies: - viem "^2.16.5" - zod "^3.23.8" - "@api3/commons@^0.9.0": version "0.9.0" resolved "https://registry.yarnpkg.com/@api3/commons/-/commons-0.9.0.tgz#b6f61c78a80a83a57fe8a06ad67b25251c637cdb" @@ -66,6 +63,16 @@ winston-console-format "^1.0.8" zod "^3.22.4" +"@api3/contracts@^27.0.0": + version "27.0.0" + resolved "https://registry.yarnpkg.com/@api3/contracts/-/contracts-27.0.0.tgz#5b5dcbb42054fbc7d2ff6d6260fdf8242c88bfc9" + integrity sha512-FPjsKqTI4o737kIdO5K5mCUw1Uij0UOLkd7fjkiD63Dhxz1p5NQQzeuigpXtnyhG7kqXtmOoBSZeOxzpK2b/lA== + dependencies: + ethers "^6.13.2" + viem "^2.23.2" + yargs "^17.7.2" + zod "^4.0.15" + "@api3/ois@2.3.2", "@api3/ois@^2.3.0": version "2.3.2" resolved "https://registry.yarnpkg.com/@api3/ois/-/ois-2.3.2.tgz#1707a7311e7db55384b8b2ea7513eccb0dfd8846" @@ -2469,6 +2476,18 @@ dependencies: glob "7.1.7" +"@noble/ciphers@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc" + integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw== + +"@noble/curves@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35" + integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw== + dependencies: + "@noble/hashes" "1.3.2" + "@noble/curves@1.3.0", "@noble/curves@~1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.3.0.tgz#01be46da4fd195822dab821e72f71bf4aeec635e" @@ -2476,34 +2495,39 @@ dependencies: "@noble/hashes" "1.3.3" -"@noble/curves@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.4.0.tgz#f05771ef64da724997f69ee1261b2417a49522d6" - integrity sha512-p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg== +"@noble/curves@1.9.6": + version "1.9.6" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.6.tgz#b45ebedca85bb75782f6be7e7f120f0c423c99e0" + integrity sha512-GIKz/j99FRthB8icyJQA51E8Uk5hXmdyThjgQXRKiv9h0zeRlzSCLIzFw6K1LotZ3XuB7yzlf76qk7uBmTdFqA== dependencies: - "@noble/hashes" "1.4.0" + "@noble/hashes" "1.8.0" -"@noble/curves@^1.4.0", "@noble/curves@~1.4.0": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.4.2.tgz#40309198c76ed71bc6dbf7ba24e81ceb4d0d1fe9" - integrity sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw== +"@noble/curves@^1.9.1", "@noble/curves@~1.9.0": + version "1.9.7" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.7.tgz#79d04b4758a43e4bca2cbdc62e7771352fa6b951" + integrity sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw== dependencies: - "@noble/hashes" "1.4.0" + "@noble/hashes" "1.8.0" "@noble/hashes@1.2.0", "@noble/hashes@~1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.2.0.tgz#a3150eeb09cc7ab207ebf6d7b9ad311a9bdbed12" integrity sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ== +"@noble/hashes@1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39" + integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== + "@noble/hashes@1.3.3", "@noble/hashes@~1.3.2": version "1.3.3" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699" integrity sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA== -"@noble/hashes@1.4.0", "@noble/hashes@^1.4.0", "@noble/hashes@~1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426" - integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg== +"@noble/hashes@1.8.0", "@noble/hashes@^1.8.0", "@noble/hashes@~1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a" + integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A== "@noble/secp256k1@1.7.1", "@noble/secp256k1@~1.7.0": version "1.7.1" @@ -3214,10 +3238,10 @@ resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.5.tgz#1d85d17269fe97694b9c592552dd9e5e33552157" integrity sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ== -"@scure/base@~1.1.6": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.7.tgz#fe973311a5c6267846aa131bc72e96c5d40d2b30" - integrity sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g== +"@scure/base@~1.2.5": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.2.6.tgz#ca917184b8231394dd8847509c67a0be522e59f6" + integrity sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg== "@scure/bip32@1.1.5": version "1.1.5" @@ -3237,14 +3261,14 @@ "@noble/hashes" "~1.3.2" "@scure/base" "~1.1.4" -"@scure/bip32@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.4.0.tgz#4e1f1e196abedcef395b33b9674a042524e20d67" - integrity sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg== +"@scure/bip32@1.7.0", "@scure/bip32@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.7.0.tgz#b8683bab172369f988f1589640e53c4606984219" + integrity sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw== dependencies: - "@noble/curves" "~1.4.0" - "@noble/hashes" "~1.4.0" - "@scure/base" "~1.1.6" + "@noble/curves" "~1.9.0" + "@noble/hashes" "~1.8.0" + "@scure/base" "~1.2.5" "@scure/bip39@1.1.1": version "1.1.1" @@ -3262,13 +3286,13 @@ "@noble/hashes" "~1.3.2" "@scure/base" "~1.1.4" -"@scure/bip39@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.3.0.tgz#0f258c16823ddd00739461ac31398b4e7d6a18c3" - integrity sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ== +"@scure/bip39@1.6.0", "@scure/bip39@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.6.0.tgz#475970ace440d7be87a6086cbee77cb8f1a684f9" + integrity sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A== dependencies: - "@noble/hashes" "~1.4.0" - "@scure/base" "~1.1.6" + "@noble/hashes" "~1.8.0" + "@scure/base" "~1.2.5" "@sentry/core@5.30.0": version "5.30.0" @@ -4417,6 +4441,13 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a" integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== +"@types/node@22.7.5": + version "22.7.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.5.tgz#cfde981727a7ab3611a481510b473ae54442b92b" + integrity sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ== + dependencies: + undici-types "~6.19.2" + "@types/node@^10.0.3": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" @@ -4993,10 +5024,15 @@ abbrev@^2.0.0: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== -abitype@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.0.5.tgz#29d0daa3eea867ca90f7e4123144c1d1270774b6" - integrity sha512-YzDhti7cjlfaBhHutMaboYB21Ha3rXR9QTkNJFzYC4kC8YclaiwPBBBJY8ejFdu2wnJeZCVZSMlQJ7fi8S6hsw== +abitype@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.0.8.tgz#3554f28b2e9d6e9f35eb59878193eabd1b9f46ba" + integrity sha512-ZeiI6h3GnW06uYDLx0etQtX/p8E24UaHHBj57RSjK7YBFe7iuVn07EDpOeP451D06sF27VOz9JJPlIKJmXgkEg== + +abitype@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.0.9.tgz#f66940f69caf2b6c190088a017e289dbe41090a6" + integrity sha512-oN0S++TQmlwWuB+rkA6aiEefLv3SP+2l/tC5mux/TLj6qdA6rF15Vbpex4fHovLsMkwLwTIRj8/Q8vXCS3GfOg== abort-controller@^3.0.0: version "3.0.0" @@ -5087,6 +5123,11 @@ aes-js@3.0.0: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw== +aes-js@4.0.0-beta.5: + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.5.tgz#8d2452c52adedebc3a3e28465d858c11ca315873" + integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q== + agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -8157,6 +8198,19 @@ ethers@^5.7.0, ethers@^5.7.2, ethers@~5.7.0: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" +ethers@^6.13.2: + version "6.15.0" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.15.0.tgz#2980f2a3baf0509749b7e21f8692fa8a8349c0e3" + integrity sha512-Kf/3ZW54L4UT0pZtsY/rf+EkBU7Qi5nnhonjUb8yTXcxH3cdcWrV2cRyk0Xk/4jK6OoHhxxZHriyhje20If2hQ== + dependencies: + "@adraffy/ens-normalize" "1.10.1" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "22.7.5" + aes-js "4.0.0-beta.5" + tslib "2.7.0" + ws "8.17.1" + ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -8193,6 +8247,11 @@ eventemitter2@~0.4.14: resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ== +eventemitter3@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -10106,10 +10165,10 @@ isomorphic-ws@^4.0.1: resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== -isows@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.4.tgz#810cd0d90cc4995c26395d2aa4cfa4037ebdf061" - integrity sha512-hEzjY+x9u9hPmBom9IIAqdJCwNLax+xrPb51vEPpERoFlIxgmZcHzsT5jKG06nvInKOBGvReAVz80Umed5CczQ== +isows@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.7.tgz#1c06400b7eed216fbba3bcbd68f12490fc342915" + integrity sha512-I1fSfDCZL5P0v33sVqeTDSpcstAg/N+wF5HS033mogOVIp4B+oHC7oOCsA3axAbBSGTJ8QubbNmnIRN/h8U7hg== isstream@~0.1.2: version "0.1.2" @@ -12470,6 +12529,20 @@ outdent@^0.5.0: resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.5.0.tgz#9e10982fdc41492bb473ad13840d22f9655be2ff" integrity sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q== +ox@0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/ox/-/ox-0.8.7.tgz#234812627f931aaf5bd45728a50c9a42a26e76db" + integrity sha512-W1f0FiMf9NZqtHPEDEAEkyzZDwbIKfmH2qmQx8NNiQ/9JhxrSblmtLJsSfTtQG5YKowLOnBlLVguCyxm/7ztxw== + dependencies: + "@adraffy/ens-normalize" "^1.11.0" + "@noble/ciphers" "^1.3.0" + "@noble/curves" "^1.9.1" + "@noble/hashes" "^1.8.0" + "@scure/bip32" "^1.7.0" + "@scure/bip39" "^1.6.0" + abitype "^1.0.8" + eventemitter3 "5.0.1" + p-cancelable@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050" @@ -14928,6 +15001,11 @@ tslib@1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== +tslib@2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== + tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -15372,20 +15450,19 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -viem@^2.16.5: - version "2.18.0" - resolved "https://registry.yarnpkg.com/viem/-/viem-2.18.0.tgz#ea0d037f0db356e6d71f1251243825345d6dc08f" - integrity sha512-HA4Dj+PCNWvvZDThWcUPg0sjiS8uwGRaxs3CMBOASL/j0p2pD4nR9vY/y/pAiRr491hGCnrSCVCmb/qqA57wIw== - dependencies: - "@adraffy/ens-normalize" "1.10.0" - "@noble/curves" "1.4.0" - "@noble/hashes" "1.4.0" - "@scure/bip32" "1.4.0" - "@scure/bip39" "1.3.0" - abitype "1.0.5" - isows "1.0.4" - webauthn-p256 "0.0.5" - ws "8.17.1" +viem@^2.23.2: + version "2.35.1" + resolved "https://registry.yarnpkg.com/viem/-/viem-2.35.1.tgz#8555c6cbe645048d172e162d50b8f6d91f63d64e" + integrity sha512-BVGrI2xzMa+cWaUhhMuq+RV6t/8aHN08QAPG07OMFb3PBWc0AYubRMyIuxMKncFe8lJdxfRWNRYv1agoM/xSlQ== + dependencies: + "@noble/curves" "1.9.6" + "@noble/hashes" "1.8.0" + "@scure/bip32" "1.7.0" + "@scure/bip39" "1.6.0" + abitype "1.0.8" + isows "1.0.7" + ox "0.8.7" + ws "8.18.3" vizion@~2.2.1: version "2.2.1" @@ -15433,14 +15510,6 @@ web3-utils@^1.3.6: randombytes "^2.1.0" utf8 "3.0.0" -webauthn-p256@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/webauthn-p256/-/webauthn-p256-0.0.5.tgz#0baebd2ba8a414b21cc09c0d40f9dd0be96a06bd" - integrity sha512-drMGNWKdaixZNobeORVIqq7k5DsRC9FnG201K2QjeOoQLmtSDaSsVZdkg6n5jUALJKcAG++zBPJXmv6hy0nWFg== - dependencies: - "@noble/curves" "^1.4.0" - "@noble/hashes" "^1.4.0" - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -15792,6 +15861,11 @@ ws@8.17.1: resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== +ws@8.18.3: + version "8.18.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" + integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== + ws@^7.0.0, ws@^7.4.6, ws@^7.5.5: version "7.5.9" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" @@ -15933,7 +16007,7 @@ zod@^3.22.4: resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== -zod@^3.23.8: - version "3.23.8" - resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d" - integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g== +zod@^4.0.15: + version "4.1.1" + resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.1.tgz#73451b42896deaacedfcc8297be87f66a5a2ea8f" + integrity sha512-SgMZK/h8Tigt9nnKkfJMvB/mKjiJXaX26xegP4sa+0wHIFVFWVlsQGdhklDmuargBD3Hsi3rsQRIzwJIhTPJHA== From 099eb4d608cf9a0631852f19d79faab3abe3be02 Mon Sep 17 00:00:00 2001 From: hiletmis <31757771+hiletmis@users.noreply.github.com> Date: Mon, 25 Aug 2025 13:36:51 +0300 Subject: [PATCH 2/6] Replace @api3/chains with @api3/contracts across packages --- packages/airnode-examples/src/utils.ts | 2 +- packages/airnode-node/src/evm/evm-provider.ts | 2 +- packages/airnode-protocol/hardhat.config.js | 6 +++--- packages/airnode-protocol/scripts/write-example-env-file.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/airnode-examples/src/utils.ts b/packages/airnode-examples/src/utils.ts index d73fd7ddb..46ab0360d 100644 --- a/packages/airnode-examples/src/utils.ts +++ b/packages/airnode-examples/src/utils.ts @@ -4,7 +4,7 @@ import { parse as parseEnvFile } from 'dotenv'; import prompts, { PromptObject } from 'prompts'; import isWsl from 'is-wsl'; import { AirnodeRrpV0 } from '@api3/airnode-protocol/deployments/references.json'; -import { hardhatConfig } from '@api3/chains'; +import { hardhatConfig } from '@api3/contracts'; export const supportedNetworks = ['ethereum-sepolia-testnet'] as const; diff --git a/packages/airnode-node/src/evm/evm-provider.ts b/packages/airnode-node/src/evm/evm-provider.ts index 7640d9cc2..faa5ad06b 100644 --- a/packages/airnode-node/src/evm/evm-provider.ts +++ b/packages/airnode-node/src/evm/evm-provider.ts @@ -1,5 +1,5 @@ import { ethers } from 'ethers'; -import { CHAINS } from '@api3/chains'; +import { CHAINS } from '@api3/contracts'; import { EVM_PROVIDER_TIMEOUT } from '../constants'; export function buildEVMProvider(url: string, chainId: string) { diff --git a/packages/airnode-protocol/hardhat.config.js b/packages/airnode-protocol/hardhat.config.js index ef6de413d..00495d282 100644 --- a/packages/airnode-protocol/hardhat.config.js +++ b/packages/airnode-protocol/hardhat.config.js @@ -3,11 +3,11 @@ require('@nomiclabs/hardhat-waffle'); require('solidity-coverage'); require('hardhat-deploy'); require('hardhat-gas-reporter'); -const api3Chains = require('@api3/chains'); +const api3Contracts = require('@api3/contracts'); require('dotenv').config(); -const etherscan = api3Chains.hardhatConfig.etherscan(); -const networks = api3Chains.hardhatConfig.networks(); +const etherscan = api3Contracts.hardhatConfig.etherscan(); +const networks = api3Contracts.hardhatConfig.networks(); module.exports = { etherscan, diff --git a/packages/airnode-protocol/scripts/write-example-env-file.ts b/packages/airnode-protocol/scripts/write-example-env-file.ts index f4f496cf6..a0bc4b3cd 100644 --- a/packages/airnode-protocol/scripts/write-example-env-file.ts +++ b/packages/airnode-protocol/scripts/write-example-env-file.ts @@ -1,5 +1,5 @@ import * as fs from 'fs'; -import { hardhatConfig } from '@api3/chains'; +import { hardhatConfig } from '@api3/contracts'; fs.writeFileSync( 'example.env', From c2cf96fd4b685477d42eee5db03f1a2d80652bce Mon Sep 17 00:00:00 2001 From: hiletmis <31757771+hiletmis@users.noreply.github.com> Date: Mon, 25 Aug 2025 13:40:04 +0300 Subject: [PATCH 3/6] Add changeset --- .changeset/khaki-olives-rush.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .changeset/khaki-olives-rush.md diff --git a/.changeset/khaki-olives-rush.md b/.changeset/khaki-olives-rush.md new file mode 100644 index 000000000..4cd27a3c6 --- /dev/null +++ b/.changeset/khaki-olives-rush.md @@ -0,0 +1,14 @@ +--- +"@api3/airnode-examples": patch +"@api3/airnode-protocol": patch +"@api3/airnode-node": patch +"@api3/airnode-abi": patch +"@api3/airnode-adapter": patch +"@api3/airnode-admin": patch +"@api3/airnode-deployer": patch +"@api3/airnode-operation": patch +"@api3/airnode-utilities": patch +"@api3/airnode-validator": patch +--- + +Replace @api3/chains with @api3/contracts \ No newline at end of file From 96159e429222641f11c343e1390bfa0cdefa4b44 Mon Sep 17 00:00:00 2001 From: hiletmis <31757771+hiletmis@users.noreply.github.com> Date: Mon, 25 Aug 2025 14:06:00 +0300 Subject: [PATCH 4/6] Update bootstrap script to ignore engine checks during installation --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 694f53a95..de817105a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "packages/*" ], "scripts": { - "bootstrap": "yarn install", + "bootstrap": "yarn install --ignore-engines", "build": "lerna run build --stream && ts-node scripts/make-cli-executable.ts", "build:adapter": "(cd packages/airnode-adapter && yarn run build)", "build:admin": "(cd packages/airnode-admin && yarn run build)", From 9ae4ea723ae02aaae13952aef009ec9ef649137e Mon Sep 17 00:00:00 2001 From: hiletmis <31757771+hiletmis@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:09:30 +0300 Subject: [PATCH 5/6] Remove --ignore-engines flag from bootstrap script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d7e4cbc0..c33b4dde3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "packages/*" ], "scripts": { - "bootstrap": "yarn install --ignore-engines", + "bootstrap": "yarn install", "build": "lerna run build --stream && ts-node scripts/make-cli-executable.ts", "build:adapter": "(cd packages/airnode-adapter && yarn run build)", "build:admin": "(cd packages/airnode-admin && yarn run build)", From e3be8a88d3f2e5e8c5f7278a60add92583c74879 Mon Sep 17 00:00:00 2001 From: hiletmis <31757771+hiletmis@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:13:16 +0300 Subject: [PATCH 6/6] Bump @api3/contracts --- packages/airnode-examples/package.json | 2 +- packages/airnode-node/package.json | 2 +- packages/airnode-protocol/package.json | 2 +- yarn.lock | 17 +++++++++++------ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/airnode-examples/package.json b/packages/airnode-examples/package.json index 64b88d204..3d3cd4e7d 100644 --- a/packages/airnode-examples/package.json +++ b/packages/airnode-examples/package.json @@ -39,7 +39,7 @@ "@api3/airnode-node": "^0.15.0", "@api3/airnode-protocol": "^0.15.0", "@api3/airnode-utilities": "^0.15.0", - "@api3/contracts": "^27.0.0", + "@api3/contracts": "^31.4.0", "ethers": "^5.7.2", "is-wsl": "^2.2.0" }, diff --git a/packages/airnode-node/package.json b/packages/airnode-node/package.json index 2ee04c46f..767343ddc 100644 --- a/packages/airnode-node/package.json +++ b/packages/airnode-node/package.json @@ -29,7 +29,7 @@ "@api3/airnode-protocol": "^0.15.0", "@api3/airnode-utilities": "^0.15.0", "@api3/airnode-validator": "^0.15.0", - "@api3/contracts": "^27.0.0", + "@api3/contracts": "^31.4.0", "@api3/commons": "^0.9.0", "@api3/ois": "2.3.2", "@api3/promise-utils": "^0.4.0", diff --git a/packages/airnode-protocol/package.json b/packages/airnode-protocol/package.json index 8350b56e3..233e25279 100644 --- a/packages/airnode-protocol/package.json +++ b/packages/airnode-protocol/package.json @@ -29,7 +29,7 @@ "write-example-env-file": "hardhat run scripts/write-example-env-file.ts" }, "devDependencies": { - "@api3/contracts": "^27.0.0", + "@api3/contracts": "^31.4.0", "@nomicfoundation/hardhat-verify": "^2.0.6", "@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-waffle": "^2.0.6", diff --git a/yarn.lock b/yarn.lock index 212e7bc7f..c5b6ad353 100644 --- a/yarn.lock +++ b/yarn.lock @@ -63,12 +63,12 @@ winston-console-format "^1.0.8" zod "^3.22.4" -"@api3/contracts@^27.0.0": - version "27.0.0" - resolved "https://registry.yarnpkg.com/@api3/contracts/-/contracts-27.0.0.tgz#5b5dcbb42054fbc7d2ff6d6260fdf8242c88bfc9" - integrity sha512-FPjsKqTI4o737kIdO5K5mCUw1Uij0UOLkd7fjkiD63Dhxz1p5NQQzeuigpXtnyhG7kqXtmOoBSZeOxzpK2b/lA== +"@api3/contracts@^31.4.0": + version "31.4.0" + resolved "https://registry.yarnpkg.com/@api3/contracts/-/contracts-31.4.0.tgz#3c48291c18ba863aa434ce1302777cf8914a31d5" + integrity sha512-wCjtCNHslRYpC1BaKk5NXY7vkBUAmVLHCUG2/EYaADEzroSrOqWfBWZUbIYxp0BaqU/J8p58o5/AhFgyH899qA== dependencies: - ethers "^6.13.2" + ethers "^6.15.0" viem "^2.23.2" yargs "^17.7.2" zod "^4.0.15" @@ -8219,7 +8219,7 @@ ethers@^5.7.0, ethers@^5.7.2, ethers@~5.7.0: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" -ethers@^6.13.2: +ethers@^6.15.0: version "6.15.0" resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.15.0.tgz#2980f2a3baf0509749b7e21f8692fa8a8349c0e3" integrity sha512-Kf/3ZW54L4UT0pZtsY/rf+EkBU7Qi5nnhonjUb8yTXcxH3cdcWrV2cRyk0Xk/4jK6OoHhxxZHriyhje20If2hQ== @@ -15289,6 +15289,11 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + undici-types@~6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"